Merge pull request #58 from CycloneDX/dotnet6

Author: coderpatros

.github/workflows/dotnetcore.yml

@@ -15,6 +15,9 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/[email protected]
+      - uses: actions/[email protected]
+        with:
+          dotnet-version: '6.0'
 
       - name: Build
         run: dotnet build /WarnAsError

.github/workflows/release.yml

@@ -29,17 +29,20 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/[email protected]
+      - uses: actions/[email protected]
+        with:
+          dotnet-version: '6.0'
 
       # Build and package everything
       - name: Package release
         id: package_release
         run: |
           VERSION=`cat semver.txt`
           echo "##[set-output name=version;]$VERSION"
-          dotnet publish --configuration Release /p:Version=$VERSION --output ./gh-pages CycloneDX.WebTool/CycloneDX.WebTool.csproj
+          dotnet publish --configuration Release /p:Version=$VERSION --output ./gh-pages src/CycloneDX.WebTool/CycloneDX.WebTool.csproj
           cd gh-pages/wwwroot
-          zip -r ../../CycloneDX.WebTools.zip ./
-          tar -zcvf ../../CycloneDX.WebTools.tar.gz ./
+          zip -r ../../CycloneDX.WebTool.zip ./
+          tar -zcvf ../../CycloneDX.WebTool.tar.gz ./
           cd ../..
 
       - name: Create github release and git tag for release
@@ -59,8 +62,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: CycloneDX.WebTools.zip
-          asset_name: CycloneDX.WebTools.${{ steps.package_release.outputs.version }}.zip
+          asset_path: CycloneDX.WebTool.zip
+          asset_name: CycloneDX.WebTool.${{ steps.package_release.outputs.version }}.zip
           asset_content_type: application/zip
 
       - name: Upload tar.gz package to github release
@@ -69,8 +72,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: CycloneDX.WebTools.tar.gz
-          asset_name: CycloneDX.WebTools.${{ steps.package_release.outputs.version }}.tar.gz
+          asset_path: CycloneDX.WebTool.tar.gz
+          asset_name: CycloneDX.WebTool.${{ steps.package_release.outputs.version }}.tar.gz
           asset_content_type: application/gzip
 
       - name: Update GitHub pages

README.md

@@ -45,5 +45,5 @@ Permission to modify and redistribute is granted under the terms of the Apache 2
 Pull requests are welcome. But please read the
 [CycloneDX contributing guidelines](https://github.com/CycloneDX/.github/blob/master/CONTRIBUTING.md) first.
 
-To build and test the solution locally you should have .NET 5
+To build and test the solution locally you should have .NET 6
 installed. Standard commands like `dotnet build` and `dotnet test` work.

cyclonedx-web-tool.sln

@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30308.16
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CycloneDX.WebTool", "CycloneDX.WebTool\CycloneDX.WebTool.csproj", "{1C027F59-3888-4CFF-B0AF-88D15BE55971}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{23C80BB2-A808-4547-A9DA-2D695D372FBB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CycloneDX.WebTool", "src\CycloneDX.WebTool\CycloneDX.WebTool.csproj", "{19DB1620-6888-4FA7-86CC-B6B1302A8CD4}"
 EndProject
 Global
 	GlobalSection(SolutionProperties) = preSolution
@@ -21,17 +23,20 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1C027F59-3888-4CFF-B0AF-88D15BE55971}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C027F59-3888-4CFF-B0AF-88D15BE55971}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C027F59-3888-4CFF-B0AF-88D15BE55971}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1C027F59-3888-4CFF-B0AF-88D15BE55971}.Debug|x64.Build.0 = Debug|Any CPU
-		{1C027F59-3888-4CFF-B0AF-88D15BE55971}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1C027F59-3888-4CFF-B0AF-88D15BE55971}.Debug|x86.Build.0 = Debug|Any CPU
-		{1C027F59-3888-4CFF-B0AF-88D15BE55971}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C027F59-3888-4CFF-B0AF-88D15BE55971}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C027F59-3888-4CFF-B0AF-88D15BE55971}.Release|x64.ActiveCfg = Release|Any CPU
-		{1C027F59-3888-4CFF-B0AF-88D15BE55971}.Release|x64.Build.0 = Release|Any CPU
-		{1C027F59-3888-4CFF-B0AF-88D15BE55971}.Release|x86.ActiveCfg = Release|Any CPU
-		{1C027F59-3888-4CFF-B0AF-88D15BE55971}.Release|x86.Build.0 = Release|Any CPU
+		{19DB1620-6888-4FA7-86CC-B6B1302A8CD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19DB1620-6888-4FA7-86CC-B6B1302A8CD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19DB1620-6888-4FA7-86CC-B6B1302A8CD4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19DB1620-6888-4FA7-86CC-B6B1302A8CD4}.Debug|x64.Build.0 = Debug|Any CPU
+		{19DB1620-6888-4FA7-86CC-B6B1302A8CD4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19DB1620-6888-4FA7-86CC-B6B1302A8CD4}.Debug|x86.Build.0 = Debug|Any CPU
+		{19DB1620-6888-4FA7-86CC-B6B1302A8CD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19DB1620-6888-4FA7-86CC-B6B1302A8CD4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19DB1620-6888-4FA7-86CC-B6B1302A8CD4}.Release|x64.ActiveCfg = Release|Any CPU
+		{19DB1620-6888-4FA7-86CC-B6B1302A8CD4}.Release|x64.Build.0 = Release|Any CPU
+		{19DB1620-6888-4FA7-86CC-B6B1302A8CD4}.Release|x86.ActiveCfg = Release|Any CPU
+		{19DB1620-6888-4FA7-86CC-B6B1302A8CD4}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{19DB1620-6888-4FA7-86CC-B6B1302A8CD4} = {23C80BB2-A808-4547-A9DA-2D695D372FBB}
 	EndGlobalSection
 EndGlobal

local-build.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-dotnet publish --configuration Release --output ./gh-pages CycloneDX.WebTool
+dotnet publish --configuration Release --output ./gh-pages src/CycloneDX.WebTool

CycloneDX.WebTool/App.razor renamed to src/CycloneDX.WebTool/App.razor

@@ -1,17 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
     <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CycloneDX.Core" Version="3.0.3" />
-    <PackageReference Include="CycloneDX.Utils" Version="3.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.11" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
+    <PackageReference Include="CycloneDX.Utils" Version="4.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.1" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>