Upgrade to .net 6.0

FoundatioFx · Jan 20, 2022 · 192d11b · 192d11b
1 parent 67241d6
commit 192d11b
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 55 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
     - name: Build Reason
       run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
     - name: Build Version

diff --git a/Foundatio.All.sln b/Foundatio.All.sln
@@ -85,12 +85,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Foundatio.Repositories.Test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Foundatio.Storage.SshNet.Tests", "..\Foundatio.Storage.SshNet\tests\Foundatio.Storage.SshNet.Tests\Foundatio.Storage.SshNet.Tests.csproj", "{AD5EAA6E-E914-4F6E-80F0-D09FC0D85E21}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Renci.SshNet", "..\..\Other\SSH.NET\src\Renci.SshNet\Renci.SshNet.csproj", "{7E024AD7-29CD-4E65-BD3E-F0716161D78E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Foundatio.Rebex", "..\Foundatio.Rebex\src\Foundatio.Rebex\Foundatio.Rebex.csproj", "{29968DA3-F74E-4759-A0A3-80E12698374B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Foundatio.Rebex.Tests", "..\Foundatio.Rebex\tests\Foundatio.Rebex.Tests\Foundatio.Rebex.Tests.csproj", "{F66E5836-E830-4279-9F4C-E3FEA923A992}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -509,42 +503,6 @@ Global
 		{AD5EAA6E-E914-4F6E-80F0-D09FC0D85E21}.Release|x64.Build.0 = Release|Any CPU
 		{AD5EAA6E-E914-4F6E-80F0-D09FC0D85E21}.Release|x86.ActiveCfg = Release|Any CPU
 		{AD5EAA6E-E914-4F6E-80F0-D09FC0D85E21}.Release|x86.Build.0 = Release|Any CPU
-		{7E024AD7-29CD-4E65-BD3E-F0716161D78E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E024AD7-29CD-4E65-BD3E-F0716161D78E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E024AD7-29CD-4E65-BD3E-F0716161D78E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7E024AD7-29CD-4E65-BD3E-F0716161D78E}.Debug|x64.Build.0 = Debug|Any CPU
-		{7E024AD7-29CD-4E65-BD3E-F0716161D78E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7E024AD7-29CD-4E65-BD3E-F0716161D78E}.Debug|x86.Build.0 = Debug|Any CPU
-		{7E024AD7-29CD-4E65-BD3E-F0716161D78E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E024AD7-29CD-4E65-BD3E-F0716161D78E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7E024AD7-29CD-4E65-BD3E-F0716161D78E}.Release|x64.ActiveCfg = Release|Any CPU
-		{7E024AD7-29CD-4E65-BD3E-F0716161D78E}.Release|x64.Build.0 = Release|Any CPU
-		{7E024AD7-29CD-4E65-BD3E-F0716161D78E}.Release|x86.ActiveCfg = Release|Any CPU
-		{7E024AD7-29CD-4E65-BD3E-F0716161D78E}.Release|x86.Build.0 = Release|Any CPU
-		{29968DA3-F74E-4759-A0A3-80E12698374B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29968DA3-F74E-4759-A0A3-80E12698374B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29968DA3-F74E-4759-A0A3-80E12698374B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{29968DA3-F74E-4759-A0A3-80E12698374B}.Debug|x64.Build.0 = Debug|Any CPU
-		{29968DA3-F74E-4759-A0A3-80E12698374B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{29968DA3-F74E-4759-A0A3-80E12698374B}.Debug|x86.Build.0 = Debug|Any CPU
-		{29968DA3-F74E-4759-A0A3-80E12698374B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{29968DA3-F74E-4759-A0A3-80E12698374B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{29968DA3-F74E-4759-A0A3-80E12698374B}.Release|x64.ActiveCfg = Release|Any CPU
-		{29968DA3-F74E-4759-A0A3-80E12698374B}.Release|x64.Build.0 = Release|Any CPU
-		{29968DA3-F74E-4759-A0A3-80E12698374B}.Release|x86.ActiveCfg = Release|Any CPU
-		{29968DA3-F74E-4759-A0A3-80E12698374B}.Release|x86.Build.0 = Release|Any CPU
-		{F66E5836-E830-4279-9F4C-E3FEA923A992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F66E5836-E830-4279-9F4C-E3FEA923A992}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F66E5836-E830-4279-9F4C-E3FEA923A992}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F66E5836-E830-4279-9F4C-E3FEA923A992}.Debug|x64.Build.0 = Debug|Any CPU
-		{F66E5836-E830-4279-9F4C-E3FEA923A992}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F66E5836-E830-4279-9F4C-E3FEA923A992}.Debug|x86.Build.0 = Debug|Any CPU
-		{F66E5836-E830-4279-9F4C-E3FEA923A992}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F66E5836-E830-4279-9F4C-E3FEA923A992}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F66E5836-E830-4279-9F4C-E3FEA923A992}.Release|x64.ActiveCfg = Release|Any CPU
-		{F66E5836-E830-4279-9F4C-E3FEA923A992}.Release|x64.Build.0 = Release|Any CPU
-		{F66E5836-E830-4279-9F4C-E3FEA923A992}.Release|x86.ActiveCfg = Release|Any CPU
-		{F66E5836-E830-4279-9F4C-E3FEA923A992}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -564,7 +522,6 @@ Global
 		{EAF2535F-F943-499C-9260-0ADA6F0523C2} = {70515E66-DAF8-4D18-8F8F-8A2934171AA9}
 		{488C58C3-6510-4A77-9EFC-30041E8B28A1} = {70515E66-DAF8-4D18-8F8F-8A2934171AA9}
 		{AD5EAA6E-E914-4F6E-80F0-D09FC0D85E21} = {70515E66-DAF8-4D18-8F8F-8A2934171AA9}
-		{F66E5836-E830-4279-9F4C-E3FEA923A992} = {70515E66-DAF8-4D18-8F8F-8A2934171AA9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BD75F5C6-658B-40DF-A8F6-91C3EB76DAAA}

diff --git a/build/common.props b/build/common.props
@@ -36,7 +36,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
     <PackageReference Include="AsyncFixer" Version="1.5.1" PrivateAssets="All" />
     <PackageReference Include="MinVer" Version="2.5.0" PrivateAssets="All" />
   </ItemGroup>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.100",
+    "version": "6.0.100",
     "rollForward": "latestMinor",
     "allowPrerelease": false
   }

diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="..\build\common.props" />
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <IsPackable>False</IsPackable>
   </PropertyGroup>

diff --git a/src/Foundatio.TestHarness/Foundatio.TestHarness.csproj b/src/Foundatio.TestHarness/Foundatio.TestHarness.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>

diff --git a/src/Foundatio/Foundatio.csproj b/src/Foundatio/Foundatio.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
+    <PackageReference Include="System.Text.Json" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0" />
   </ItemGroup>
 </Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -1,12 +1,12 @@
 <Project>
   <Import Project="..\build\common.props" />
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <IsPackable>False</IsPackable>
     <NoWarn>$(NoWarn);CS1591;NU1701</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
   </ItemGroup>