From 930cc6477100ee4b1cdcd745e8a4805c0a89ca2a Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Fri, 8 Sep 2023 15:59:09 -0400 Subject: [PATCH 1/2] [release/7.0-staging] [maccatalyst] Make sure MacProxy is included in System.Net.Http Backport of https://github.com/dotnet/runtime/pull/91473 to release/7.0 --- src/libraries/System.Net.Http/src/System.Net.Http.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj index 0f1758689cd87b..b9cf8177f48f59 100644 --- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj +++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj @@ -313,7 +313,7 @@ - + Date: Mon, 11 Sep 2023 11:31:22 -0400 Subject: [PATCH 2/2] Additional conditions --- src/libraries/System.Net.Http/src/System.Net.Http.csproj | 4 ++-- .../System.Net.Security/src/System.Net.Security.csproj | 2 +- ...System.Security.Cryptography.X509Certificates.Tests.csproj | 2 +- .../src/System.Security.Cryptography.csproj | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj index b9cf8177f48f59..240b32a64b7196 100644 --- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj +++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj @@ -309,7 +309,7 @@ - + @@ -413,7 +413,7 @@ - + diff --git a/src/libraries/System.Net.Security/src/System.Net.Security.csproj b/src/libraries/System.Net.Security/src/System.Net.Security.csproj index e030690763e7cf..2862c028b4249c 100644 --- a/src/libraries/System.Net.Security/src/System.Net.Security.csproj +++ b/src/libraries/System.Net.Security/src/System.Net.Security.csproj @@ -12,7 +12,7 @@ SR.SystemNetSecurity_PlatformNotSupported $(DefineConstants);TARGET_WINDOWS true - true + true true $(DefineConstants);SYSNETSECURITY_NO_OPENSSL ReferenceAssemblyExclusions.txt diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj index 84f30311a63b8e..7735200b767220 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj @@ -11,7 +11,7 @@ $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) $(DefineConstants);Unix - true + true true diff --git a/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj b/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj index fefe1086c00aab..4f25d9df941e8d 100644 --- a/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj +++ b/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj @@ -13,7 +13,7 @@ $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) SR.SystemSecurityCryptography_PlatformNotSupported true - true + true true true true