Merge pull request #58 from IowaComputerGurus/feature/net-6

Updated to .NET 6
IowaComputerGurus · Dec 7, 2021 · bffff97 · bffff97
2 parents 328d7d7 + 6ad58f4
commit bffff97
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Ensure .NET Installed
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
 
     - name: Install GitVersion
       run: dotnet tool install --global GitVersion.Tool

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Ensure .NET Installed
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
 
     - name: Install GitVersion
       run: dotnet tool install --global GitVersion.Tool

diff --git a/icgAppIcon.png b/icgAppIcon.png
diff --git a/src/AspNetCore.Utilities.Tests/AspNetCore.Utilities.Tests.csproj b/src/AspNetCore.Utilities.Tests/AspNetCore.Utilities.Tests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>ICG.AspNetCore.Utilities.Tests</RootNamespace>
     <OutputType>Library</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

diff --git a/src/AspNetCore.Utilities/AspNetCore.Utilities.csproj b/src/AspNetCore.Utilities/AspNetCore.Utilities.csproj
@@ -1,11 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <Version>0.0.0</Version>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>ICG.AspNetCore.Utilities</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -41,9 +37,9 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>