From b0a1c21568b526a8afd4f3f33d57a1426ad23870 Mon Sep 17 00:00:00 2001 From: David Acker Date: Sun, 15 Jan 2023 17:20:58 -0500 Subject: [PATCH 1/4] Moved shared source test attributes to src\Shared --- ...Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj | 4 ++-- .../IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj | 4 ++-- ...soft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj | 2 +- .../Interop.FunctionalTests/Interop.FunctionalTests.csproj | 2 +- .../TransportTestHelpers/HttpSysHttp3SupportedAttribute.cs | 0 .../TransportTestHelpers/MsQuicSupportedAttribute.cs | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename src/{Servers/Kestrel/shared/test => Shared}/TransportTestHelpers/HttpSysHttp3SupportedAttribute.cs (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TransportTestHelpers/MsQuicSupportedAttribute.cs (100%) diff --git a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj index adde5fed6bbb..ef494a407f65 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj +++ b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index ba8561bb4cc2..fe4ad4ddcc9b 100644 --- a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -34,8 +34,8 @@ - - + + diff --git a/src/Servers/Kestrel/Transport.Quic/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj b/src/Servers/Kestrel/Transport.Quic/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj index 36733755bf7e..ef46a4c8aeb2 100644 --- a/src/Servers/Kestrel/Transport.Quic/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj +++ b/src/Servers/Kestrel/Transport.Quic/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj index 854e1ce3db57..c173d6d82776 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Servers/Kestrel/shared/test/TransportTestHelpers/HttpSysHttp3SupportedAttribute.cs b/src/Shared/TransportTestHelpers/HttpSysHttp3SupportedAttribute.cs similarity index 100% rename from src/Servers/Kestrel/shared/test/TransportTestHelpers/HttpSysHttp3SupportedAttribute.cs rename to src/Shared/TransportTestHelpers/HttpSysHttp3SupportedAttribute.cs diff --git a/src/Servers/Kestrel/shared/test/TransportTestHelpers/MsQuicSupportedAttribute.cs b/src/Shared/TransportTestHelpers/MsQuicSupportedAttribute.cs similarity index 100% rename from src/Servers/Kestrel/shared/test/TransportTestHelpers/MsQuicSupportedAttribute.cs rename to src/Shared/TransportTestHelpers/MsQuicSupportedAttribute.cs From 42ce10d134c5182577a6a6a8a52dcf67412ab55b Mon Sep 17 00:00:00 2001 From: David Acker Date: Wed, 18 Jan 2023 23:50:47 -0500 Subject: [PATCH 2/4] Move remaining Kestrel shared sources to src\Shared --- ...AspNetCore.Server.HttpSys.FunctionalTests.csproj | 4 ++-- ...soft.AspNetCore.Server.Kestrel.Core.Tests.csproj | 7 ++++--- ...Microsoft.AspNetCore.Server.Kestrel.Tests.csproj | 12 ++++++------ ...tCore.Server.Kestrel.Transport.Quic.Tests.csproj | 4 ++-- .../samples/HttpClientApp/HttpClientApp.csproj | 4 ++-- .../InMemory.FunctionalTests.csproj | 9 +++++---- .../Interop.FunctionalTests.csproj | 4 ++-- .../test/Sockets.BindTests/Sockets.BindTests.csproj | 4 ++-- .../Sockets.FunctionalTests.csproj | 4 ++-- .../test => Shared}/TestCertificates/.gitattributes | 0 .../TestCertificates/aspnetdevcert.pfx | Bin .../test => Shared}/TestCertificates/eku.client.ini | 0 .../test => Shared}/TestCertificates/eku.client.pfx | Bin .../TestCertificates/eku.code_signing.ini | 0 .../TestCertificates/eku.code_signing.pfx | Bin .../TestCertificates/eku.multiple_usages.ini | 0 .../TestCertificates/eku.multiple_usages.pfx | Bin .../test => Shared}/TestCertificates/eku.server.ini | 0 .../test => Shared}/TestCertificates/eku.server.pfx | Bin .../TestCertificates/https-aspnet.crt | Bin .../TestCertificates/https-aspnet.key | 0 .../TestCertificates/https-aspnet.pub | 0 .../TestCertificates/https-dsa-protected.key | 0 .../test => Shared}/TestCertificates/https-dsa.crt | Bin .../test => Shared}/TestCertificates/https-dsa.key | 0 .../test => Shared}/TestCertificates/https-dsa.pem | 0 .../TestCertificates/https-ecdsa-protected.key | 0 .../TestCertificates/https-ecdsa.crt | Bin .../TestCertificates/https-ecdsa.key | 0 .../TestCertificates/https-ecdsa.pem | 0 .../TestCertificates/https-rsa-protected.key | 0 .../test => Shared}/TestCertificates/https-rsa.crt | Bin .../test => Shared}/TestCertificates/https-rsa.key | 0 .../test => Shared}/TestCertificates/https-rsa.pem | 0 .../TestCertificates/intermediate2_ca.crt | 0 .../TestCertificates/intermediate2_ca.key | 0 .../TestCertificates/intermediate_ca.crt | 0 .../TestCertificates/intermediate_ca.key | 0 .../test => Shared}/TestCertificates/leaf.com.crt | 0 .../test => Shared}/TestCertificates/leaf.com.key | 0 .../TestCertificates/make-test-certs.sh | 0 .../TestCertificates/no_extensions.ini | 0 .../TestCertificates/no_extensions.pfx | Bin .../test => Shared}/TestCertificates/root_ca.crt | 0 .../test => Shared}/TestCertificates/root_ca.key | 0 .../test => Shared}/TestCertificates/testCert.pfx | Bin .../Kestrel/shared/test => Shared}/TestResources.cs | 0 47 files changed, 27 insertions(+), 25 deletions(-) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/.gitattributes (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/aspnetdevcert.pfx (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/eku.client.ini (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/eku.client.pfx (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/eku.code_signing.ini (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/eku.code_signing.pfx (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/eku.multiple_usages.ini (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/eku.multiple_usages.pfx (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/eku.server.ini (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/eku.server.pfx (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-aspnet.crt (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-aspnet.key (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-aspnet.pub (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-dsa-protected.key (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-dsa.crt (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-dsa.key (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-dsa.pem (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-ecdsa-protected.key (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-ecdsa.crt (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-ecdsa.key (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-ecdsa.pem (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-rsa-protected.key (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-rsa.crt (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-rsa.key (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/https-rsa.pem (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/intermediate2_ca.crt (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/intermediate2_ca.key (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/intermediate_ca.crt (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/intermediate_ca.key (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/leaf.com.crt (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/leaf.com.key (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/make-test-certs.sh (100%) mode change 100755 => 100644 rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/no_extensions.ini (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/no_extensions.pfx (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/root_ca.crt (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/root_ca.key (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestCertificates/testCert.pfx (100%) rename src/{Servers/Kestrel/shared/test => Shared}/TestResources.cs (100%) diff --git a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj index ef494a407f65..e7e3e2f81563 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj +++ b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj index ccfe2c28c585..8ab8fb711da1 100644 --- a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj +++ b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj @@ -17,10 +17,11 @@ + - - - + + + diff --git a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj index cca8788dce80..99c9f591ee43 100644 --- a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj +++ b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj @@ -6,12 +6,12 @@ - - - - - - + + + + + + diff --git a/src/Servers/Kestrel/Transport.Quic/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj b/src/Servers/Kestrel/Transport.Quic/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj index ef46a4c8aeb2..b7ba36177491 100644 --- a/src/Servers/Kestrel/Transport.Quic/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj +++ b/src/Servers/Kestrel/Transport.Quic/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj @@ -14,14 +14,14 @@ - + - + diff --git a/src/Servers/Kestrel/samples/HttpClientApp/HttpClientApp.csproj b/src/Servers/Kestrel/samples/HttpClientApp/HttpClientApp.csproj index 6a651656c7b3..49066bf15747 100644 --- a/src/Servers/Kestrel/samples/HttpClientApp/HttpClientApp.csproj +++ b/src/Servers/Kestrel/samples/HttpClientApp/HttpClientApp.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj index 16dc2c48315b..814b0bf8be5a 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj @@ -23,11 +23,12 @@ + - - - - + + + + diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj index c173d6d82776..547743f51cf5 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj @@ -20,9 +20,9 @@ - + - + diff --git a/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj b/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj index 4338b1ea87f8..5a39a90d9b4e 100644 --- a/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj +++ b/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj @@ -16,12 +16,12 @@ - + - + diff --git a/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj b/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj index b128aa8aff69..3e8bcdf17ec0 100644 --- a/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj +++ b/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj @@ -17,7 +17,7 @@ - + @@ -25,7 +25,7 @@ - + diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/.gitattributes b/src/Shared/TestCertificates/.gitattributes similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/.gitattributes rename to src/Shared/TestCertificates/.gitattributes diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/aspnetdevcert.pfx b/src/Shared/TestCertificates/aspnetdevcert.pfx similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/aspnetdevcert.pfx rename to src/Shared/TestCertificates/aspnetdevcert.pfx diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/eku.client.ini b/src/Shared/TestCertificates/eku.client.ini similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/eku.client.ini rename to src/Shared/TestCertificates/eku.client.ini diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/eku.client.pfx b/src/Shared/TestCertificates/eku.client.pfx similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/eku.client.pfx rename to src/Shared/TestCertificates/eku.client.pfx diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/eku.code_signing.ini b/src/Shared/TestCertificates/eku.code_signing.ini similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/eku.code_signing.ini rename to src/Shared/TestCertificates/eku.code_signing.ini diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/eku.code_signing.pfx b/src/Shared/TestCertificates/eku.code_signing.pfx similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/eku.code_signing.pfx rename to src/Shared/TestCertificates/eku.code_signing.pfx diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/eku.multiple_usages.ini b/src/Shared/TestCertificates/eku.multiple_usages.ini similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/eku.multiple_usages.ini rename to src/Shared/TestCertificates/eku.multiple_usages.ini diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/eku.multiple_usages.pfx b/src/Shared/TestCertificates/eku.multiple_usages.pfx similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/eku.multiple_usages.pfx rename to src/Shared/TestCertificates/eku.multiple_usages.pfx diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/eku.server.ini b/src/Shared/TestCertificates/eku.server.ini similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/eku.server.ini rename to src/Shared/TestCertificates/eku.server.ini diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/eku.server.pfx b/src/Shared/TestCertificates/eku.server.pfx similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/eku.server.pfx rename to src/Shared/TestCertificates/eku.server.pfx diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-aspnet.crt b/src/Shared/TestCertificates/https-aspnet.crt similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-aspnet.crt rename to src/Shared/TestCertificates/https-aspnet.crt diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-aspnet.key b/src/Shared/TestCertificates/https-aspnet.key similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-aspnet.key rename to src/Shared/TestCertificates/https-aspnet.key diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-aspnet.pub b/src/Shared/TestCertificates/https-aspnet.pub similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-aspnet.pub rename to src/Shared/TestCertificates/https-aspnet.pub diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-dsa-protected.key b/src/Shared/TestCertificates/https-dsa-protected.key similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-dsa-protected.key rename to src/Shared/TestCertificates/https-dsa-protected.key diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-dsa.crt b/src/Shared/TestCertificates/https-dsa.crt similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-dsa.crt rename to src/Shared/TestCertificates/https-dsa.crt diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-dsa.key b/src/Shared/TestCertificates/https-dsa.key similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-dsa.key rename to src/Shared/TestCertificates/https-dsa.key diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-dsa.pem b/src/Shared/TestCertificates/https-dsa.pem similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-dsa.pem rename to src/Shared/TestCertificates/https-dsa.pem diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-ecdsa-protected.key b/src/Shared/TestCertificates/https-ecdsa-protected.key similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-ecdsa-protected.key rename to src/Shared/TestCertificates/https-ecdsa-protected.key diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-ecdsa.crt b/src/Shared/TestCertificates/https-ecdsa.crt similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-ecdsa.crt rename to src/Shared/TestCertificates/https-ecdsa.crt diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-ecdsa.key b/src/Shared/TestCertificates/https-ecdsa.key similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-ecdsa.key rename to src/Shared/TestCertificates/https-ecdsa.key diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-ecdsa.pem b/src/Shared/TestCertificates/https-ecdsa.pem similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-ecdsa.pem rename to src/Shared/TestCertificates/https-ecdsa.pem diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-rsa-protected.key b/src/Shared/TestCertificates/https-rsa-protected.key similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-rsa-protected.key rename to src/Shared/TestCertificates/https-rsa-protected.key diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-rsa.crt b/src/Shared/TestCertificates/https-rsa.crt similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-rsa.crt rename to src/Shared/TestCertificates/https-rsa.crt diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-rsa.key b/src/Shared/TestCertificates/https-rsa.key similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-rsa.key rename to src/Shared/TestCertificates/https-rsa.key diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/https-rsa.pem b/src/Shared/TestCertificates/https-rsa.pem similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/https-rsa.pem rename to src/Shared/TestCertificates/https-rsa.pem diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/intermediate2_ca.crt b/src/Shared/TestCertificates/intermediate2_ca.crt similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/intermediate2_ca.crt rename to src/Shared/TestCertificates/intermediate2_ca.crt diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/intermediate2_ca.key b/src/Shared/TestCertificates/intermediate2_ca.key similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/intermediate2_ca.key rename to src/Shared/TestCertificates/intermediate2_ca.key diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/intermediate_ca.crt b/src/Shared/TestCertificates/intermediate_ca.crt similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/intermediate_ca.crt rename to src/Shared/TestCertificates/intermediate_ca.crt diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/intermediate_ca.key b/src/Shared/TestCertificates/intermediate_ca.key similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/intermediate_ca.key rename to src/Shared/TestCertificates/intermediate_ca.key diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/leaf.com.crt b/src/Shared/TestCertificates/leaf.com.crt similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/leaf.com.crt rename to src/Shared/TestCertificates/leaf.com.crt diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/leaf.com.key b/src/Shared/TestCertificates/leaf.com.key similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/leaf.com.key rename to src/Shared/TestCertificates/leaf.com.key diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/make-test-certs.sh b/src/Shared/TestCertificates/make-test-certs.sh old mode 100755 new mode 100644 similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/make-test-certs.sh rename to src/Shared/TestCertificates/make-test-certs.sh diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/no_extensions.ini b/src/Shared/TestCertificates/no_extensions.ini similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/no_extensions.ini rename to src/Shared/TestCertificates/no_extensions.ini diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/no_extensions.pfx b/src/Shared/TestCertificates/no_extensions.pfx similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/no_extensions.pfx rename to src/Shared/TestCertificates/no_extensions.pfx diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/root_ca.crt b/src/Shared/TestCertificates/root_ca.crt similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/root_ca.crt rename to src/Shared/TestCertificates/root_ca.crt diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/root_ca.key b/src/Shared/TestCertificates/root_ca.key similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/root_ca.key rename to src/Shared/TestCertificates/root_ca.key diff --git a/src/Servers/Kestrel/shared/test/TestCertificates/testCert.pfx b/src/Shared/TestCertificates/testCert.pfx similarity index 100% rename from src/Servers/Kestrel/shared/test/TestCertificates/testCert.pfx rename to src/Shared/TestCertificates/testCert.pfx diff --git a/src/Servers/Kestrel/shared/test/TestResources.cs b/src/Shared/TestResources.cs similarity index 100% rename from src/Servers/Kestrel/shared/test/TestResources.cs rename to src/Shared/TestResources.cs From fe22acf18c05502458b9f0aac780ffb2336472a8 Mon Sep 17 00:00:00 2001 From: David Acker Date: Thu, 19 Jan 2023 01:20:00 -0500 Subject: [PATCH 3/4] Update remaining references to shared source --- ...spNetCore.Server.Kestrel.Transport.NamedPipes.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Servers/Kestrel/Transport.NamedPipes/test/Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.Tests.csproj b/src/Servers/Kestrel/Transport.NamedPipes/test/Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.Tests.csproj index a43c3ef8bc96..768d76495f10 100644 --- a/src/Servers/Kestrel/Transport.NamedPipes/test/Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.Tests.csproj +++ b/src/Servers/Kestrel/Transport.NamedPipes/test/Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.Tests.csproj @@ -10,13 +10,13 @@ - + - + From acf4119c633c04998e1a7ff9bc3436598b2d33f1 Mon Sep 17 00:00:00 2001 From: David Acker Date: Thu, 19 Jan 2023 18:28:45 -0500 Subject: [PATCH 4/4] Add back execute permissions --- src/Shared/TestCertificates/make-test-certs.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 src/Shared/TestCertificates/make-test-certs.sh diff --git a/src/Shared/TestCertificates/make-test-certs.sh b/src/Shared/TestCertificates/make-test-certs.sh old mode 100644 new mode 100755