From c42ea803d329e4417a34c80b53fe2b3937984d26 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 20 Oct 2025 09:37:38 -0700 Subject: [PATCH 01/12] Fix CG alerts --- eng/Version.Details.props | 8 ++++---- eng/Version.Details.xml | 16 ++++++++-------- .../InProcessNewShimWebSite.csproj | 19 +++++++++++-------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f78705adbf4f..e9bf4a303dca 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -114,10 +114,10 @@ This file should be imported by eng/Versions.props 1.0.0-prerelease.25502.1 1.0.0-prerelease.25502.1 - 17.12.36 - 17.12.36 - 17.12.36 - 17.12.36 + 17.12.50 + 17.12.50 + 17.12.50 + 17.12.50 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad977c619757..c303e6c4f147 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -424,21 +424,21 @@ - + https://github.com/dotnet/msbuild - d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 + 465c45808f0e9f3c32eb145101eeeccdc29d39e6 - + https://github.com/dotnet/msbuild - d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 + 465c45808f0e9f3c32eb145101eeeccdc29d39e6 - + https://github.com/dotnet/msbuild - d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 + 465c45808f0e9f3c32eb145101eeeccdc29d39e6 - + https://github.com/dotnet/msbuild - d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 + 465c45808f0e9f3c32eb145101eeeccdc29d39e6 https://github.com/dotnet/dotnet diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index f358dd93534e..47eb6e2e5cfd 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -35,28 +35,31 @@ - + true - + true - + true - + true - + true - + true - + true - + + true + + true From d45b600030a0d15d4096a4e9a4aa358f6b7b6d27 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 20 Oct 2025 11:46:04 -0700 Subject: [PATCH 02/12] Just kestrel.core --- .../InProcessNewShimWebSite.csproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index 47eb6e2e5cfd..1e91b38c7986 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -35,31 +35,31 @@ - + true - + true - + true - + true true - + true - + true - + true - + true From f115f9d0012469f9b8f198d6e5179392760d7cdb Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 20 Oct 2025 15:21:59 -0700 Subject: [PATCH 03/12] Multitarget --- .../InProcessNewShimWebSite.csproj | 38 +------------------ 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index 1e91b38c7986..01ae054971ad 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -2,7 +2,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework);$(NetMinimum) InProcessWebSite FORWARDCOMPAT false @@ -26,42 +26,6 @@ - - - - - true - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - From 05a26be36796e25ea03492ff41cf2dffce3e4175 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 20 Oct 2025 15:31:50 -0700 Subject: [PATCH 04/12] Fixup --- .../InProcessNewShimWebSite/InProcessNewShimWebSite.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index 01ae054971ad..63967c98a434 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -26,6 +26,8 @@ + + From 26bdc2502de54d229a50715e95430d8b51e375da Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 20 Oct 2025 16:03:19 -0700 Subject: [PATCH 05/12] Refs --- .../InProcessNewShimWebSite.csproj | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index 63967c98a434..c0bbc904480d 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -26,8 +26,18 @@ - + + + + + + + + + + + From b2a2ef18c64a09761ab10e8ab7e5d30a93b40a9d Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 20 Oct 2025 16:35:31 -0700 Subject: [PATCH 06/12] FrameworkRef --- .../InProcessNewShimWebSite/InProcessNewShimWebSite.csproj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index c0bbc904480d..b0ed864eca66 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -27,7 +27,11 @@ - + + + + + From 1961b81b7f291ef95788124a7b781ff7a0466be0 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 20 Oct 2025 16:36:05 -0700 Subject: [PATCH 07/12] Xunit --- .../InProcessNewShimWebSite/InProcessNewShimWebSite.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index b0ed864eca66..0baa032bb48a 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -42,6 +42,9 @@ + + + From b4048bdcde1a3d874bc3ca31a1daae7632c72232 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 20 Oct 2025 20:13:45 -0700 Subject: [PATCH 08/12] Try this --- .../InProcessNewShimWebSite/InProcessNewShimWebSite.csproj | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index 0baa032bb48a..45195df1a1e7 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -27,9 +27,10 @@ - - - + + true + true + From 143686513747e1cc41aec282e5dd1b6712c81d35 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 20 Oct 2025 21:43:55 -0700 Subject: [PATCH 09/12] Add back fref --- .../InProcessNewShimWebSite/InProcessNewShimWebSite.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index 45195df1a1e7..842cf97a4e39 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -32,6 +32,10 @@ true + + + + From 357903aa1fe1caafd7b7202b07d4f384f64bf1a3 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 21 Oct 2025 11:40:21 -0700 Subject: [PATCH 10/12] Just newhsim --- eng/Version.Details.props | 8 ++++---- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e9bf4a303dca..f78705adbf4f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -114,10 +114,10 @@ This file should be imported by eng/Versions.props 1.0.0-prerelease.25502.1 1.0.0-prerelease.25502.1 - 17.12.50 - 17.12.50 - 17.12.50 - 17.12.50 + 17.12.36 + 17.12.36 + 17.12.36 + 17.12.36 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c303e6c4f147..ad977c619757 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -424,21 +424,21 @@ - + https://github.com/dotnet/msbuild - 465c45808f0e9f3c32eb145101eeeccdc29d39e6 + d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/msbuild - 465c45808f0e9f3c32eb145101eeeccdc29d39e6 + d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/msbuild - 465c45808f0e9f3c32eb145101eeeccdc29d39e6 + d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/msbuild - 465c45808f0e9f3c32eb145101eeeccdc29d39e6 + d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 https://github.com/dotnet/dotnet From a654b708642a787aa973c36e0e8a078b427cbee5 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 21 Oct 2025 11:43:23 -0700 Subject: [PATCH 11/12] Typo --- .../InProcessNewShimWebSite/InProcessNewShimWebSite.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index 842cf97a4e39..55e748852793 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -27,12 +27,12 @@ - + true true - + From f2b8c67ce2c75f48a13d632596035625cee6828d Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 21 Oct 2025 11:51:15 -0700 Subject: [PATCH 12/12] Fixup --- .../InProcessNewShimWebSite/InProcessNewShimWebSite.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index 55e748852793..0d70e739c0b5 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -32,10 +32,6 @@ true - - - -