From 7682390fe891496635481bee524b2a6980c469d9 Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 15:51:21 -0800 Subject: [PATCH 01/17] Add net8.0 to TargetFrameworks of Configuration.csproj --- .../Microsoft.ServiceFabric.AspNetCore.Configuration.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.csproj b/src/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.csproj index 71ccc65..b9fd0dc 100644 --- a/src/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.csproj +++ b/src/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.csproj @@ -6,7 +6,7 @@ Microsoft.ServiceFabric.AspNetCore.Configuration Microsoft.ServiceFabric.AspNetCore.Configuration $(OutputPath)\$(AssemblyName).xml - net461;netcoreapp3.1;net5.0;net6.0;net7.0 + net461;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 From 33579463eeeba7199bcf4c3383a66c3a8e6bcf77 Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 15:52:29 -0800 Subject: [PATCH 02/17] Add net8.0 to TargetFrameworks of Kestrel.csproj --- .../Microsoft.ServiceFabric.AspNetCore.Kestrel.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.csproj b/src/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.csproj index 37cf76a..e755eca 100644 --- a/src/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.csproj +++ b/src/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.csproj @@ -6,7 +6,7 @@ Microsoft.ServiceFabric.AspNetCore.Kestrel Microsoft.ServiceFabric.Services.Communication.AspNetCore $(OutputPath)\$(AssemblyName).xml - net461;netcoreapp3.1;net5.0;net6.0;net7.0 + net461;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 From 1adde4f740c89a41462bc8a48af897ee23e82148 Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 15:52:53 -0800 Subject: [PATCH 03/17] Add net8.0 to TargetFrameworks of AspNetCore.csproj --- .../Microsoft.ServiceFabric.AspNetCore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.ServiceFabric.AspNetCore/Microsoft.ServiceFabric.AspNetCore.csproj b/src/Microsoft.ServiceFabric.AspNetCore/Microsoft.ServiceFabric.AspNetCore.csproj index 5f607e2..be8253f 100644 --- a/src/Microsoft.ServiceFabric.AspNetCore/Microsoft.ServiceFabric.AspNetCore.csproj +++ b/src/Microsoft.ServiceFabric.AspNetCore/Microsoft.ServiceFabric.AspNetCore.csproj @@ -6,7 +6,7 @@ Microsoft.ServiceFabric.AspNetCore Microsoft.ServiceFabric.Services.Communication.AspNetCore $(OutputPath)\$(AssemblyName).xml - net461;netcoreapp3.1;net5.0;net6.0;net7.0 + net461;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 From 9723fc83ba4cbf7deef5c348fc79557f58638ca5 Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 15:53:58 -0800 Subject: [PATCH 04/17] Add net8.0 to TargetFrameworks of HttpSys.csproj --- .../Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj b/src/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj index c2150e6..fb0559d 100644 --- a/src/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj +++ b/src/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj @@ -6,7 +6,7 @@ Microsoft.ServiceFabric.Services.Communication.AspNetCore Microsoft.ServiceFabric.AspNetCore.HttpSys $(OutputPath)\$(AssemblyName).xml - net461;netcoreapp3.1;net5.0;net6.0;net7.0 + net461;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 From e5d98e05439b8e4aa00e0b6dd7193f944eb1a2eb Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 15:54:52 -0800 Subject: [PATCH 05/17] Increase HttpSys reference to 2.1.12 in HttpSys.csproj to fix security error --- .../Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj b/src/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj index fb0559d..68fa21c 100644 --- a/src/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj +++ b/src/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj @@ -15,7 +15,7 @@ - + From d4ef8c3513afbdf169eb68febab28745a1d52496 Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 15:59:21 -0800 Subject: [PATCH 06/17] Change TargetFramework of Tests.csproj to net8.0 --- .../Microsoft.ServiceFabric.AspNetCore.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/Microsoft.ServiceFabric.AspNetCore.Tests.csproj b/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/Microsoft.ServiceFabric.AspNetCore.Tests.csproj index f47094e..b27a971 100644 --- a/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/Microsoft.ServiceFabric.AspNetCore.Tests.csproj +++ b/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/Microsoft.ServiceFabric.AspNetCore.Tests.csproj @@ -5,7 +5,7 @@ Microsoft.ServiceFabric.AspNetCore.Tests Microsoft.ServiceFabric.AspNetCore.Tests - netcoreapp3.1 + net8.0 $(OutputPath)\$(AssemblyName).xml From b18935d3ed49dffb328068db474119667b982297 Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 16:00:34 -0800 Subject: [PATCH 07/17] Suppress FormatterServices obsolete warning in TestHelper.cs --- .../Mocks/TestHelper.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/Mocks/TestHelper.cs b/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/Mocks/TestHelper.cs index 2f7b172..94281d5 100644 --- a/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/Mocks/TestHelper.cs +++ b/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/Mocks/TestHelper.cs @@ -21,7 +21,9 @@ internal static class TestHelper public static T CreateInstanced() where T : class { +#pragma warning disable SYSLIB0050 // FormatterServices is obsolete return FormatterServices.GetSafeUninitializedObject(typeof(T)) as T; +#pragma warning restore SYSLIB0050 } public static T Set(this T instance, string property, object value) From a73134c957369d04e4699e108636ef461da6b03e Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 16:01:58 -0800 Subject: [PATCH 08/17] Make ServiceFabricMiddlewareTests.cs define RequestDelegate lambdas with correct return type --- .../ServiceFabricMiddlewareTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/ServiceFabricMiddlewareTests.cs b/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/ServiceFabricMiddlewareTests.cs index 2523c45..0f4528a 100644 --- a/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/ServiceFabricMiddlewareTests.cs +++ b/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/ServiceFabricMiddlewareTests.cs @@ -81,7 +81,7 @@ public void VerifyReturnCode410(string hostType) (httpContext) => { nextCalled = true; - return Task.FromResult(true); + return Task.CompletedTask; }, this.listener.UrlSuffix); // send a request in which Path is different than urlSuffix @@ -165,7 +165,7 @@ private void VerifyNextInvocation() nextCalled = true; Console.WriteLine("In Next Request Delegate: HttpRequest.Path: " + httpContext.Request.Path); Console.WriteLine("In Next Request Delegate: HttpRequest.PathBase: " + httpContext.Request.PathBase); - return Task.FromResult(true); + return Task.CompletedTask; }, this.listener.UrlSuffix); // send a request in which Path is same as urlSuffix @@ -198,7 +198,7 @@ private void VerifyPathsInNextInvocation() Console.WriteLine("In Next Request Delegate: HttpRequest.PathBase: " + httpContext.Request.PathBase); nextCalled = true; - return Task.FromResult(true); + return Task.CompletedTask; }, this.listener.UrlSuffix); // send a request in which Path is different than urlSuffix, but has extra segment after it. From f1fea3c2de4a29554f6ea46c77ff370556adcd3f Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 16:09:21 -0800 Subject: [PATCH 09/17] Add DropFolderNet8 to service_fabric_common.props --- properties/service_fabric_common.props | 1 + 1 file changed, 1 insertion(+) diff --git a/properties/service_fabric_common.props b/properties/service_fabric_common.props index b9c21ec..988e26f 100644 --- a/properties/service_fabric_common.props +++ b/properties/service_fabric_common.props @@ -17,6 +17,7 @@ $(RepoRoot)drop\$(Configuration)\net5.0\ $(RepoRoot)drop\$(Configuration)\net6.0\ $(RepoRoot)drop\$(Configuration)\net7.0\ + $(RepoRoot)drop\$(Configuration)\net8.0\ $(DropFolder)\packages From e3588739aed4b9e1f13e9dfffd5cd0195dca1ab9 Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 16:12:56 -0800 Subject: [PATCH 10/17] Add BinariesNet8 to service_fabric_managed.targets --- properties/service_fabric_managed.targets | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/properties/service_fabric_managed.targets b/properties/service_fabric_managed.targets index 30bdaf2..f114d9d 100644 --- a/properties/service_fabric_managed.targets +++ b/properties/service_fabric_managed.targets @@ -87,6 +87,14 @@ + + + + + + + + \ No newline at end of file From 4179c6319e26a7a8442108ba66676308e1c231d1 Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 16:16:41 -0800 Subject: [PATCH 11/17] Add DropFolderNet8 to Internal.nuproj --- nuprojs/SF.AspNetCore.Internal/SF.AspNetCore.Internal.nuproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nuprojs/SF.AspNetCore.Internal/SF.AspNetCore.Internal.nuproj b/nuprojs/SF.AspNetCore.Internal/SF.AspNetCore.Internal.nuproj index bd2e3b4..b7de119 100644 --- a/nuprojs/SF.AspNetCore.Internal/SF.AspNetCore.Internal.nuproj +++ b/nuprojs/SF.AspNetCore.Internal/SF.AspNetCore.Internal.nuproj @@ -30,5 +30,8 @@ lib\net7.0 + + lib\net8.0 + From e17f70c73bc91fa86d39332065286805ae58b210 Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 16:23:18 -0800 Subject: [PATCH 12/17] Add net8.0 to Kesrtel.nuproj --- ...crosoft.ServiceFabric.AspNetCore.Kestrel.nuproj | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nuprojs/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.nuproj b/nuprojs/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.nuproj index a05c205..7d7b8bd 100644 --- a/nuprojs/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.nuproj +++ b/nuprojs/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.nuproj @@ -69,6 +69,12 @@ lib\net7.0 + + lib\net8.0 + + + lib\net8.0 + runtimes\win\lib\net461 @@ -119,6 +125,14 @@ net7.0 + + [$(NuGetPackageVersion)] + net8.0 + + + net8.0 + + [$(NuGetPackageVersion)] net461 From ac64c6fd06d0cb69a2fed6a31e770c66f0a1a9ed Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 16:26:48 -0800 Subject: [PATCH 13/17] Add net8.0 to HttpSys.nuproj --- ...crosoft.ServiceFabric.AspNetCore.HttpSys.nuproj | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nuprojs/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj b/nuprojs/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj index ce97d89..8209acc 100644 --- a/nuprojs/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj +++ b/nuprojs/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj @@ -69,6 +69,12 @@ lib\net7.0 + + lib\net8.0 + + + lib\net8.0 + runtimes\win\lib\net461 @@ -119,6 +125,14 @@ net7.0 + + [$(NuGetPackageVersion)] + net8.0 + + + net8.0 + + [$(NuGetPackageVersion)] net461 From 5d27400f80dc138b859f79487390e9b843dc7d60 Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 16:28:03 -0800 Subject: [PATCH 14/17] Increase HttpSys reference to 2.1.12 in HttpSys.nuproj to match .csproj --- .../Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuprojs/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj b/nuprojs/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj index 8209acc..ab431b9 100644 --- a/nuprojs/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj +++ b/nuprojs/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj @@ -138,7 +138,7 @@ net461 - 2.1.0 + 2.1.12 net461 From 6b474e5dcaf74762ef801c167f2fb2a322d6a4dd Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 16:40:43 -0800 Subject: [PATCH 15/17] Add net8.0 to Configuration.nuproj --- ...t.ServiceFabric.AspNetCore.Configuration.nuproj | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nuprojs/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.nuproj b/nuprojs/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.nuproj index 2efff77..1a81aab 100644 --- a/nuprojs/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.nuproj +++ b/nuprojs/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.nuproj @@ -69,6 +69,12 @@ lib\net7.0 + + lib\net8.0 + + + lib\net8.0 + runtimes\win\lib\net461 @@ -119,6 +125,14 @@ net7.0 + + [$(NugetPkg_Version_Microsoft_ServiceFabric_Services)] + net8.0 + + + net8.0 + + [$(NugetPkg_Version_Microsoft_ServiceFabric_Services)] net461 From 8e2badc0ae4f8e347e57285cb952c8665b5b66b7 Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Thu, 7 Mar 2024 16:44:26 -0800 Subject: [PATCH 16/17] Add net8.0 to Abstractions.nuproj --- ...ft.ServiceFabric.AspNetCore.Abstractions.nuproj | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nuprojs/Microsoft.ServiceFabric.AspNetCore.Abstractions/Microsoft.ServiceFabric.AspNetCore.Abstractions.nuproj b/nuprojs/Microsoft.ServiceFabric.AspNetCore.Abstractions/Microsoft.ServiceFabric.AspNetCore.Abstractions.nuproj index 4edbd31..41ed49c 100644 --- a/nuprojs/Microsoft.ServiceFabric.AspNetCore.Abstractions/Microsoft.ServiceFabric.AspNetCore.Abstractions.nuproj +++ b/nuprojs/Microsoft.ServiceFabric.AspNetCore.Abstractions/Microsoft.ServiceFabric.AspNetCore.Abstractions.nuproj @@ -69,6 +69,12 @@ lib\net7.0 + + lib\net8.0 + + + lib\net8.0 + runtimes\win\lib\net461 @@ -119,6 +125,14 @@ net7.0 + + [$(NugetPkg_Version_Microsoft_ServiceFabric_Services)] + net8.0 + + + net8.0 + + [$(NugetPkg_Version_Microsoft_ServiceFabric_Services)] net461 From 6cba8fa0746ddf554400ebbdecedeae6410aee4c Mon Sep 17 00:00:00 2001 From: Oleg Sych Date: Fri, 22 Mar 2024 16:25:06 -0700 Subject: [PATCH 17/17] Increment the internal package version in service_fabric_common.props to 7.0.3 --- properties/service_fabric_common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/properties/service_fabric_common.props b/properties/service_fabric_common.props index 988e26f..9e03dfe 100644 --- a/properties/service_fabric_common.props +++ b/properties/service_fabric_common.props @@ -31,7 +31,7 @@ 7 0 - 2 + 3 0