Remove net3.0 support (#1860)

* Remove net3.0 support * Fix test failure * Update version.props * Update dependencies.props * update dep * update test result * update test * update ci * Fix error
Azure · Nov 30, 2023 · 4e76ffd · 4e76ffd
1 parent 58581d9
commit 4e76ffd
Show file tree

Hide file tree

Showing 51 changed files with 46 additions and 26,457 deletions.
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -12,7 +12,7 @@ jobs:
   build_osx:
     runs-on: macOS-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: dorny/paths-filter@v2.2.0
       id: filter
       with:
@@ -39,8 +39,6 @@ jobs:
         dotnet-version: |
           7.0.x
           6.0.x
-          5.0.x
-        include-prerelease: true
     - name: Build with dotnet
       run:  "dotnet build AzureSignalR.sln /p:DisableNet461Tests=true"
       if: steps.filter.outputs.src == 'true'

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -12,7 +12,7 @@ jobs:
   build_ubuntu:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: dorny/paths-filter@v2.2.0
       id: filter
       with:
@@ -32,17 +32,25 @@ jobs:
     - name: Update SubModules
       run: git submodule update --init --recursive
       if: steps.filter.outputs.src == 'true'
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
           7.0.x
           6.0.x
-          5.0.x
-        include-prerelease: true
+
+    - name: Set Dotnet Version
+      run: echo "DOTNET_VERSION=${{ steps.dotnet-setup.outputs.dotnet-version }}" >> $GITHUB_ENV
+
     - name: Build with dotnet
       run:  "dotnet build AzureSignalR.sln /p:DisableNet461Tests=true"
       if: steps.filter.outputs.src == 'true'
     - name: Test
-      run:  "dotnet test --no-build"
-      if: steps.filter.outputs.src == 'true'
+      run: dotnet test --no-build --logger trx --results-directory "TestResults-ubuntu-$DOTNET_VERSION"
+    - name: Upload dotnet test results
+      uses: actions/upload-artifact@v3
+      with:
+        name: dotnet-results-$DOTNET_VERSION
+        path: TestResults-ubuntu-$DOTNET_VERSION
+      # Use always() to always run this step to publish test results when there are test failures
+      if: ${{ always() }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -12,7 +12,7 @@ jobs:
   build_windows:
     runs-on: [windows-latest]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: dorny/paths-filter@v2.2.0
       id: filter
       with:

diff --git a/AzureSignalR.sln b/AzureSignalR.sln
@@ -70,8 +70,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "emulator", "emulator", "{AD
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.SignalR.Emulator", "src\Microsoft.Azure.SignalR.Emulator\Microsoft.Azure.SignalR.Emulator.csproj", "{ABAAAEA8-40B3-4178-A7FD-09779A5DC757}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChatSample.Net50", "samples\ChatSample\ChatSample.Net50\ChatSample.Net50.csproj", "{29EF376E-DF94-419F-9DF2-50756B60DF38}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.SignalR.Emulator.Tests", "test\Microsoft.Azure.SignalR.Emulator.Tests\Microsoft.Azure.SignalR.Emulator.Tests.csproj", "{870A10E3-D17A-4239-9715-5610FFE1FC76}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.SignalR.Serverless.Protocols", "src\Microsoft.Azure.SignalR.Serverless.Protocols\Microsoft.Azure.SignalR.Serverless.Protocols.csproj", "{52944A80-44A9-48D4-919D-11AAAD55193E}"
@@ -82,7 +80,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChatSample.Net60", "samples
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChatSample.Net70", "samples\ChatSample\ChatSample.Net70\ChatSample.Net70.csproj", "{49634EE4-A0F4-4672-A8B3-B994CF81C9AB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagementPublisher", "samples\ChatSample\ChatSample.ManagementPublisher\ManagementPublisher.csproj", "{0F32E624-7AC8-4CA7-8ED9-E1A877442020}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagementPublisher", "samples\ChatSample\ChatSample.ManagementPublisher\ManagementPublisher.csproj", "{0F32E624-7AC8-4CA7-8ED9-E1A877442020}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -174,10 +172,6 @@ Global
 		{ABAAAEA8-40B3-4178-A7FD-09779A5DC757}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ABAAAEA8-40B3-4178-A7FD-09779A5DC757}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ABAAAEA8-40B3-4178-A7FD-09779A5DC757}.Release|Any CPU.Build.0 = Release|Any CPU
-		{29EF376E-DF94-419F-9DF2-50756B60DF38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29EF376E-DF94-419F-9DF2-50756B60DF38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29EF376E-DF94-419F-9DF2-50756B60DF38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{29EF376E-DF94-419F-9DF2-50756B60DF38}.Release|Any CPU.Build.0 = Release|Any CPU
 		{870A10E3-D17A-4239-9715-5610FFE1FC76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{870A10E3-D17A-4239-9715-5610FFE1FC76}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{870A10E3-D17A-4239-9715-5610FFE1FC76}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -230,7 +224,6 @@ Global
 		{63BB9836-126B-4E65-92B9-019438185E41} = {C965ED06-6A17-4329-B3C6-811830F4F4ED}
 		{3E11208B-B038-4840-8180-69DC6B5EAD22} = {2429FBD8-1FCE-4C42-AA28-DF32F7249E77}
 		{ABAAAEA8-40B3-4178-A7FD-09779A5DC757} = {ADD61A03-340D-426C-BA51-DBBC096434ED}
-		{29EF376E-DF94-419F-9DF2-50756B60DF38} = {C965ED06-6A17-4329-B3C6-811830F4F4ED}
 		{870A10E3-D17A-4239-9715-5610FFE1FC76} = {2429FBD8-1FCE-4C42-AA28-DF32F7249E77}
 		{52944A80-44A9-48D4-919D-11AAAD55193E} = {DA69F624-5398-4884-87E4-B816698CDE65}
 		{82C1FF3D-EC6C-4B21-B6A4-E69E8D75D0D0} = {2429FBD8-1FCE-4C42-AA28-DF32F7249E77}

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,8 +1,5 @@
 <Project>
   <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
     <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">$(MicrosoftNETCoreApp31PackageVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 </Project>
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -5,32 +5,28 @@
   <PropertyGroup Label="Package Versions">
     <!-- Azure ASP.NET Core SignalR -->
     <MicrosoftAspNetCoreHttpConnectionsCommonPackageVersion>1.0.4</MicrosoftAspNetCoreHttpConnectionsCommonPackageVersion>
-    <MicrosoftAspNetCoreHttpConnectionsCommonPackage3_0Version>3.0.0</MicrosoftAspNetCoreHttpConnectionsCommonPackage3_0Version>
     <MicrosoftAspNetCoreHttpConnectionsCommonPackage3_1Version>3.1.9</MicrosoftAspNetCoreHttpConnectionsCommonPackage3_1Version>
     <MicrosoftAspNetCoreHttpConnectionsCommonPackage5_0Version>5.0.1</MicrosoftAspNetCoreHttpConnectionsCommonPackage5_0Version>
     <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
-    <MicrosoftExtensionsLoggingAbstractionsPackage3_0Version>3.0.0</MicrosoftExtensionsLoggingAbstractionsPackage3_0Version>
     <MicrosoftExtensionsLoggingAbstractionsPackage3_1Version>3.1.9</MicrosoftExtensionsLoggingAbstractionsPackage3_1Version>
     <MicrosoftExtensionsDependencyInjectionPackageVersion>2.1.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackage3_0Version>3.0.0</MicrosoftExtensionsDependencyInjectionPackage3_0Version>
     <MicrosoftExtensionsDependencyInjectionPackage3_1Version>3.1.9</MicrosoftExtensionsDependencyInjectionPackage3_1Version>
     <MicrosoftExtensionHttpVersion>2.1.0</MicrosoftExtensionHttpVersion>
     <MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>2.1.2</MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>
-    <MicrosoftAspNetCoreConnectionsAbstractionsPackage3_0Version>3.0.0</MicrosoftAspNetCoreConnectionsAbstractionsPackage3_0Version>
     <MicrosoftAspNetCoreConnectionsAbstractionsPackage3_1Version>3.1.9</MicrosoftAspNetCoreConnectionsAbstractionsPackage3_1Version>
     <MicrosoftAspNetCoreSignalRPackageVersion>1.0.0</MicrosoftAspNetCoreSignalRPackageVersion>
     <MicrosoftAspNetCoreLocalizationPackageVersion>2.1.0</MicrosoftAspNetCoreLocalizationPackageVersion>
     <MicrosoftIdentitiyModelClientsActiveDirectoryPackageVersion>3.19.1</MicrosoftIdentitiyModelClientsActiveDirectoryPackageVersion>
     <MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion>
     <SystemBuffersPackageVersion>4.5.1</SystemBuffersPackageVersion>
     <SystemMemoryPackageVersion>4.5.4</SystemMemoryPackageVersion>
-    <SystemRuntimeCompilerServicesUnsafePackageVersion>4.6.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
+    <SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
     <SystemIdentityModelTokensJwtPackageVersion>5.5.0</SystemIdentityModelTokensJwtPackageVersion>
-    <AzureIdentityPackageVersion>1.4.0</AzureIdentityPackageVersion>
+    <AzureIdentityPackageVersion>1.10.4</AzureIdentityPackageVersion>
     <MicrosoftExtensionsLoggingPackageVersion>2.1.0</MicrosoftExtensionsLoggingPackageVersion>
     <MicrosoftExtensionsPrimitivesPackageVersion>2.1.1</MicrosoftExtensionsPrimitivesPackageVersion>
     <MicrosoftAspNetCoreSignalRClient>1.1.0</MicrosoftAspNetCoreSignalRClient>
-    <MicrosoftRestClientRuntimePackageVersion>2.3.21</MicrosoftRestClientRuntimePackageVersion>
+    <MicrosoftRestClientRuntimePackageVersion>2.3.24</MicrosoftRestClientRuntimePackageVersion>
 
     <!--Security Patch-->
     <!-- Fix risks from Microsoft.AspNetCore.SignalR 1.0.0-->
@@ -49,7 +45,7 @@
     <SystemIOPipelinesPackage3_1Version>4.7.3</SystemIOPipelinesPackage3_1Version>
 
     <!-- SignalR Management -->
-    <AzureCorePackageVersion>1.21.0</AzureCorePackageVersion>
+    <AzureCorePackageVersion>1.36.0</AzureCorePackageVersion>
     <MicrosoftAzureCoreNewtonsoftJsonPackageVersion>1.0.0</MicrosoftAzureCoreNewtonsoftJsonPackageVersion>
     <MicrosoftConfigurationFileExtensionVersion>2.2.0</MicrosoftConfigurationFileExtensionVersion>
     <MicrosoftConfigurationUserSecretVersion>2.2.0</MicrosoftConfigurationUserSecretVersion>
@@ -67,7 +63,7 @@
     <!-- Samples -->
     <MicrosoftAspNetCorePackageVersion>2.1.0</MicrosoftAspNetCorePackageVersion>
     <MicrosoftAspNetCoreSignalRClientPackageVersion>3.1.24</MicrosoftAspNetCoreSignalRClientPackageVersion>
-    <MicrosoftOwinPackageVersion>2.1.0</MicrosoftOwinPackageVersion>
+    <MicrosoftOwinPackageVersion>4.2.2</MicrosoftOwinPackageVersion>
     <OwinPackageVersion>1.0.0</OwinPackageVersion>
 
     <!--Emulator -->
@@ -79,14 +75,14 @@
     <MicrosoftAspNetCoreHttpConnectionsClientPackageVersion>1.0.0</MicrosoftAspNetCoreHttpConnectionsClientPackageVersion>
     <MessagePackPackage3_1Version>1.9.11</MessagePackPackage3_1Version>
     <MicrosoftAspNetCoreSignalRProtocolsMessagePackPackageVersion>3.1.24</MicrosoftAspNetCoreSignalRProtocolsMessagePackPackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
+    <MicrosoftNETTestSdkPackageVersion>17.7.2</MicrosoftNETTestSdkPackageVersion>
     <MoqPackageVersion>4.14.5</MoqPackageVersion>
-    <XunitPackageVersion>2.4.0</XunitPackageVersion>
-    <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
+    <XunitPackageVersion>2.4.2</XunitPackageVersion>
+    <XunitRunnerVisualStudioPackageVersion>2.4.2</XunitRunnerVisualStudioPackageVersion>
     <MicrosoftOwinTestingPackageVersion>4.0.0</MicrosoftOwinTestingPackageVersion>
     <MicrosoftAspNetCoreTestingVersion>2.1.0</MicrosoftAspNetCoreTestingVersion>
-    <SystemThreadingTasksExtensionsVersion>4.5.3</SystemThreadingTasksExtensionsVersion>
-    <MicrosoftAspNetCoreTestHostPackageVersion>3.0.3</MicrosoftAspNetCoreTestHostPackageVersion>
+    <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
+    <MicrosoftAspNetCoreTestHostPackageVersion>6.0.24</MicrosoftAspNetCoreTestHostPackageVersion>
     <E2eTestUserSecretId>E2eTestUserSecret</E2eTestUserSecretId>
     <MicrosoftAspNetCoreSignalRProtocolsJsonPackageVersion>5.0.0</MicrosoftAspNetCoreSignalRProtocolsJsonPackageVersion>
   </PropertyGroup>

diff --git a/build/package-test.3.proj b/build/package-test.3.proj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <PackageVersion Condition=" '$(PackageVersion)' == '' ">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
   </PropertyGroup>
 

diff --git a/build/package-test.proj b/build/package-test.proj
diff --git a/samples/BlazorAppSample/BlazorAppSample.csproj b/samples/BlazorAppSample/BlazorAppSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/ChatSample/ChatSample.Net50/ChatSample.Net50.csproj b/samples/ChatSample/ChatSample.Net50/ChatSample.Net50.csproj
diff --git a/samples/ChatSample/ChatSample.Net50/Hub/BenchHub.cs b/samples/ChatSample/ChatSample.Net50/Hub/BenchHub.cs
diff --git a/samples/ChatSample/ChatSample.Net50/Hub/Chat.cs b/samples/ChatSample/ChatSample.Net50/Hub/Chat.cs