Upgrade 30 to 31 LTS

Azure · Sep 6, 2022 · f28ff14 · f28ff14
1 parent e1d3c6c
commit f28ff14
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 14 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -31,14 +31,6 @@
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' AND '$(OutputType)' != 'Exe'">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackage3_0Version)" />
-    <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="$(MicrosoftAspNetCoreConnectionsAbstractionsPackage3_0Version)" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="$(MicrosoftAspNetCoreHttpConnectionsCommonPackage3_0Version)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackage3_0Version)" />
-    <PackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' AND '$(OutputType)' != 'Exe'">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackage3_1Version)" />
     <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="$(MicrosoftAspNetCoreConnectionsAbstractionsPackage3_1Version)" />

diff --git a/src/Microsoft.Azure.SignalR.Common/Microsoft.Azure.SignalR.Common.csproj b/src/Microsoft.Azure.SignalR.Common/Microsoft.Azure.SignalR.Common.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

diff --git a/src/Microsoft.Azure.SignalR.Management/Microsoft.Azure.SignalR.Management.csproj b/src/Microsoft.Azure.SignalR.Management/Microsoft.Azure.SignalR.Management.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Microsoft.Azure.SignalR/Microsoft.Azure.SignalR.csproj b/src/Microsoft.Azure.SignalR/Microsoft.Azure.SignalR.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -35,9 +35,9 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="$(MicrosoftAspNetCoreHttpConnectionsClientPackage5_0Version)" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0'">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="$(MicrosoftAspNetCoreHttpConnectionsClientPackage3_0Version)" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="$(MicrosoftAspNetCoreHttpConnectionsClientPackage3_1Version)" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="$(MicrosoftAspNetCoreHttpConnectionsClientPackageVersion)" />

diff --git a/test/Microsoft.Azure.SignalR.AspNet.Tests/RunAzureSignalRTests.cs b/test/Microsoft.Azure.SignalR.AspNet.Tests/RunAzureSignalRTests.cs
@@ -568,6 +568,7 @@ public async Task TestNegotiateRedirectUrlWithClientEndpoint(string path, string
         }
 
         [Fact]
+        [Obsolete]
         public void TestRunAzureSignalRWithOptions()
         {
             using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug))
@@ -582,6 +583,7 @@ public void TestRunAzureSignalRWithOptions()
                     var options = hubConfig.Resolver.Resolve<IOptions<ServiceOptions>>();
                     Assert.Equal(ConnectionString, options.Value.ConnectionString);
                     Assert.Equal(-1, options.Value.ConnectionCount);
+                    Assert.Equal(-1, options.Value.InitialHubServerConnectionCount);
                 }
             }
         }

diff --git a/test/Microsoft.Azure.SignalR.Tests/AzureSignalRMarkerServiceFact.cs b/test/Microsoft.Azure.SignalR.Tests/AzureSignalRMarkerServiceFact.cs
@@ -20,6 +20,7 @@ public class AzureSignalRMarkerServiceFact
         private const string DefaultValue = "Endpoint=https://abc;AccessKey=abc123;";
 
         [Fact]
+        [Obsolete]
         public void UseAzureSignalRWithAddAzureSignalR()
         {
             var services = new ServiceCollection();

diff --git a/version.props b/version.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.18.3</VersionPrefix>
+    <VersionPrefix>1.19.0</VersionPrefix>
     <VersionSuffix>preview1</VersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>