From 2fddbebffab69846758a72ce4507b35aec6c7ac5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 23 Feb 2025 13:40:02 +0000 Subject: [PATCH 01/10] Update .NET SDK Update .NET SDK to version 10.0.100-preview.3.25122.1. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: github-actions[bot] --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index b2756281e727..7c015821aa5c 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "10.0.100-preview.2.25109.3" + "version": "10.0.100-preview.3.25122.1" }, "tools": { - "dotnet": "10.0.100-preview.2.25109.3", + "dotnet": "10.0.100-preview.3.25122.1", "runtimes": { "dotnet/x86": [ "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" From 126904a385860abb590dbf12c743399a3bbaa69f Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 18 Feb 2025 10:00:40 +0100 Subject: [PATCH 02/10] Remove unnecessary package references (cherry picked from commit ab38a2990fc712288783c1778485cd68a1fcdc11) --- eng/tools/RepoTasks/RepoTasks.csproj | 5 ++--- .../BlazorUnitedApp.Client/BlazorUnitedApp.Client.csproj | 1 - .../Client/HostedBlazorWebassemblyApp.Client.csproj | 1 - ...etCore.Components.WebAssembly.Authentication.Tests.csproj | 1 - .../Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj | 1 - .../testassets/CustomBasePathApp/CustomBasePathApp.csproj | 1 - .../HostedInAspNet.Server/HostedInAspNet.Server.csproj | 2 -- .../testassets/StandaloneApp/StandaloneApp.csproj | 1 - .../WebAssembly/testassets/ThreadingApp/ThreadingApp.csproj | 1 - .../Wasm.Prerendered.Server/Wasm.Prerendered.Server.csproj | 2 -- .../test/testassets/BasicTestApp/BasicTestApp.csproj | 2 -- .../Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj | 1 - .../Microsoft.AspNetCore.Identity.FunctionalTests.csproj | 1 - .../Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj | 1 - .../Microsoft.AspNetCore.SpaServices.Extensions.Tests.csproj | 1 - .../Microsoft.AspNetCore.Mvc.FunctionalTests.csproj | 1 - .../Templates.Blazor.Tests/Templates.Blazor.Tests.csproj | 1 - .../Templates.Blazor.WebAssembly.Auth.Tests.csproj | 1 - .../Templates.Blazor.WebAssembly.Tests.csproj | 1 - .../test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj | 1 - .../test/Templates.Tests/Templates.Tests.csproj | 1 - .../AuthSamples.FunctionalTests.csproj | 1 - .../InProcessNewShimWebSite/InProcessNewShimWebSite.csproj | 3 --- .../InMemory.FunctionalTests/InMemory.FunctionalTests.csproj | 1 - .../Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj | 2 -- .../Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj | 2 -- .../test/Microsoft.AspNetCore.InternalTesting.Tests.csproj | 2 +- src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj | 1 - src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj | 1 - 29 files changed, 3 insertions(+), 38 deletions(-) diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj index aa59934196bc..229b2a338ebb 100644 --- a/eng/tools/RepoTasks/RepoTasks.csproj +++ b/eng/tools/RepoTasks/RepoTasks.csproj @@ -1,4 +1,5 @@ + $(DefaultNetCoreTargetFramework) $(TargetFrameworks);net472 @@ -35,15 +36,13 @@ - - - + diff --git a/src/Components/Samples/BlazorUnitedApp.Client/BlazorUnitedApp.Client.csproj b/src/Components/Samples/BlazorUnitedApp.Client/BlazorUnitedApp.Client.csproj index a9a7bc04f7ad..3de34000e0fc 100644 --- a/src/Components/Samples/BlazorUnitedApp.Client/BlazorUnitedApp.Client.csproj +++ b/src/Components/Samples/BlazorUnitedApp.Client/BlazorUnitedApp.Client.csproj @@ -9,7 +9,6 @@ - diff --git a/src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/Client/HostedBlazorWebassemblyApp.Client.csproj b/src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/Client/HostedBlazorWebassemblyApp.Client.csproj index 03bdbe317a10..e855db9a45be 100644 --- a/src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/Client/HostedBlazorWebassemblyApp.Client.csproj +++ b/src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/Client/HostedBlazorWebassemblyApp.Client.csproj @@ -8,7 +8,6 @@ - diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj b/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj index 3fe158db76c6..01092f99d71d 100644 --- a/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj +++ b/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj @@ -9,7 +9,6 @@ - diff --git a/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj b/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj index e5a906e46f4e..2f9ac20c7c09 100644 --- a/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj +++ b/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj @@ -7,7 +7,6 @@ - diff --git a/src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj b/src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj index 5ac505c35e96..64512155abe0 100644 --- a/src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj +++ b/src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj @@ -7,7 +7,6 @@ - diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/src/Components/WebAssembly/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj index eba5ab363e14..3b727d71c2b8 100644 --- a/src/Components/WebAssembly/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj +++ b/src/Components/WebAssembly/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj @@ -14,8 +14,6 @@ - - diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/StandaloneApp.csproj b/src/Components/WebAssembly/testassets/StandaloneApp/StandaloneApp.csproj index 93e3e9453bce..c43a347a6150 100644 --- a/src/Components/WebAssembly/testassets/StandaloneApp/StandaloneApp.csproj +++ b/src/Components/WebAssembly/testassets/StandaloneApp/StandaloneApp.csproj @@ -6,7 +6,6 @@ - diff --git a/src/Components/WebAssembly/testassets/ThreadingApp/ThreadingApp.csproj b/src/Components/WebAssembly/testassets/ThreadingApp/ThreadingApp.csproj index 7dce100846f6..e9e9491848e3 100644 --- a/src/Components/WebAssembly/testassets/ThreadingApp/ThreadingApp.csproj +++ b/src/Components/WebAssembly/testassets/ThreadingApp/ThreadingApp.csproj @@ -7,7 +7,6 @@ - diff --git a/src/Components/WebAssembly/testassets/Wasm.Prerendered.Server/Wasm.Prerendered.Server.csproj b/src/Components/WebAssembly/testassets/Wasm.Prerendered.Server/Wasm.Prerendered.Server.csproj index f1be7bc53587..793e251088b9 100644 --- a/src/Components/WebAssembly/testassets/Wasm.Prerendered.Server/Wasm.Prerendered.Server.csproj +++ b/src/Components/WebAssembly/testassets/Wasm.Prerendered.Server/Wasm.Prerendered.Server.csproj @@ -21,8 +21,6 @@ - - diff --git a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj index 754f18ae9f5c..6d1f87776686 100644 --- a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj +++ b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj @@ -19,8 +19,6 @@ - - diff --git a/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj b/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj index d1175fe212a4..866a08e32b43 100644 --- a/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj +++ b/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj @@ -26,7 +26,6 @@ - diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj index 3a29cbd5fd55..88bbd988b1f3 100644 --- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -24,7 +24,6 @@ - diff --git a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj index 7d5bf22a80d1..798e4dc3db40 100644 --- a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj +++ b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj @@ -10,7 +10,6 @@ - diff --git a/src/Middleware/Spa/SpaServices.Extensions/test/Microsoft.AspNetCore.SpaServices.Extensions.Tests.csproj b/src/Middleware/Spa/SpaServices.Extensions/test/Microsoft.AspNetCore.SpaServices.Extensions.Tests.csproj index 17e20fdc10cc..56847fc93bde 100644 --- a/src/Middleware/Spa/SpaServices.Extensions/test/Microsoft.AspNetCore.SpaServices.Extensions.Tests.csproj +++ b/src/Middleware/Spa/SpaServices.Extensions/test/Microsoft.AspNetCore.SpaServices.Extensions.Tests.csproj @@ -13,7 +13,6 @@ - diff --git a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj index 436507d6a9d5..c33d71b8927c 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj +++ b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj @@ -24,7 +24,6 @@ ..\WebSites\RazorPagesClassLibrary\RazorPagesClassLibrary.csproj" /> - diff --git a/src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj b/src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj index cfd8616293b2..d4d021fd72f6 100644 --- a/src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj +++ b/src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj @@ -50,7 +50,6 @@ - diff --git a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj index 74bfd58798ba..3e35764237f4 100644 --- a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj +++ b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj @@ -43,7 +43,6 @@ - - - - - diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index 13ae36e09fa5..f358dd93534e 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -59,9 +59,6 @@ true - - true - diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj index 3fd95d1cc652..eedce343bc81 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj @@ -34,7 +34,6 @@ - diff --git a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj index f72f75419dd0..72496024ef3b 100644 --- a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj +++ b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj @@ -46,8 +46,6 @@ - - diff --git a/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj b/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj index ff022626496b..3061127181c5 100644 --- a/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj +++ b/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj @@ -33,8 +33,6 @@ - - diff --git a/src/Testing/test/Microsoft.AspNetCore.InternalTesting.Tests.csproj b/src/Testing/test/Microsoft.AspNetCore.InternalTesting.Tests.csproj index 9e7bd0e702ba..2ec19113d106 100644 --- a/src/Testing/test/Microsoft.AspNetCore.InternalTesting.Tests.csproj +++ b/src/Testing/test/Microsoft.AspNetCore.InternalTesting.Tests.csproj @@ -14,10 +14,10 @@ - + diff --git a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj index 3a9a992b5ac9..2947cd817fd1 100644 --- a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj +++ b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj @@ -28,7 +28,6 @@ - diff --git a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj index b9b1b99952f2..249504b09fdc 100644 --- a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj +++ b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj @@ -29,7 +29,6 @@ - From bf4eb9f473a3ead4a583d2038a1f045732e4d521 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 24 Feb 2025 13:13:30 +0100 Subject: [PATCH 03/10] Restore the host for the given platform in vcxprojs --- eng/tools/GenerateFiles/Directory.Build.props.in | 3 +-- eng/tools/GenerateFiles/GenerateFiles.csproj | 1 - src/Servers/IIS/Directory.Build.props | 11 +++++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/eng/tools/GenerateFiles/Directory.Build.props.in b/eng/tools/GenerateFiles/Directory.Build.props.in index 619ec1ded3d9..596fb8cf2d07 100644 --- a/eng/tools/GenerateFiles/Directory.Build.props.in +++ b/eng/tools/GenerateFiles/Directory.Build.props.in @@ -3,8 +3,7 @@ ${DefaultNetCoreTargetFramework} ${ArtifactsShippingPackagesDir} true - ${LibNetHostAppPackVersion} - + true diff --git a/eng/tools/GenerateFiles/GenerateFiles.csproj b/eng/tools/GenerateFiles/GenerateFiles.csproj index 8a1be59353fe..53ee549992cd 100644 --- a/eng/tools/GenerateFiles/GenerateFiles.csproj +++ b/eng/tools/GenerateFiles/GenerateFiles.csproj @@ -25,7 +25,6 @@ MicrosoftNETCoreAppRefVersion=$(MicrosoftNETCoreAppRefVersion); MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion); MicrosoftPlaywrightCLIVersion=$(MicrosoftPlaywrightCLIVersion); - LibNetHostAppPackVersion=$(BundledNETCoreAppPackageVersion); SupportedRuntimeIdentifiers=$([MSBuild]::Escape($(SupportedRuntimeIdentifiers))); ArtifactsShippingPackagesDir=$(ArtifactsShippingPackagesDir) diff --git a/src/Servers/IIS/Directory.Build.props b/src/Servers/IIS/Directory.Build.props index 624773c5b877..d6a92d1336b3 100644 --- a/src/Servers/IIS/Directory.Build.props +++ b/src/Servers/IIS/Directory.Build.props @@ -1,13 +1,20 @@ - + $(MSBuildThisFileDirectory)..\Kestrel\shared\ + + true $(Platform) x86 x64 - $(NetCoreTargetingPackRoot)Microsoft.NETCore.App.Host.win-$(HostArch)\$(LibNetHostAppPackVersion)\runtimes\win-$(HostArch)\native + $(NuGetPackageRoot)microsoft.netcore.app.host.win-$(HostArch)\$(MicrosoftNETCoreAppRefVersion)\runtimes\win-$(HostArch)\native 143 + + + + + From f0f290d7c07f1b114cba59851394be7db0a6aace Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 24 Feb 2025 13:22:09 +0100 Subject: [PATCH 04/10] Cleanup --- Directory.Build.props | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 0c211aa964fe..4da5c8684e93 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -195,18 +195,13 @@ limitations in the way the .NET SDK finds shared frameworks and targeting packs. It allows tests to use the shared frameworks and targeting packs that were just built. - However, source-build needs this to not happen while building projects that rely on the - AppHost framework pack. Source-build installs an SDK in a custom location outside this + However, the VMR needs this to not happen while building projects that rely on the + AppHost framework pack. The VMR installs an SDK in a custom location outside this repository, and setting NetCoreTargetingPackRoot to a different location causes source-build to restore the AppHost pack as a prebuilt rather than using the one that's present in the SDK. - Source-build doesn't run tests, so the property is simply conditioned out. + The dotnet product build doesn't run tests, so the property is simply conditioned out. --> $(LocalDotNetRoot)packs\ - - $(DotNetRoot)packs\ - From 5acb6d95ba26e046da73ea0cf12b247b4be36686 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 24 Feb 2025 13:30:05 +0100 Subject: [PATCH 05/10] fix --- src/Servers/IIS/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Servers/IIS/Directory.Build.props b/src/Servers/IIS/Directory.Build.props index d6a92d1336b3..b4675c91f346 100644 --- a/src/Servers/IIS/Directory.Build.props +++ b/src/Servers/IIS/Directory.Build.props @@ -13,7 +13,7 @@ 143 - + From be0818c059ea94f6b172a7b8cf96ba20ec4b2870 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 11 Mar 2025 14:05:03 +0100 Subject: [PATCH 06/10] Try PackageReference instead of PackageDownload --- src/Servers/IIS/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Servers/IIS/Directory.Build.props b/src/Servers/IIS/Directory.Build.props index b4675c91f346..5420b505c8d3 100644 --- a/src/Servers/IIS/Directory.Build.props +++ b/src/Servers/IIS/Directory.Build.props @@ -14,7 +14,7 @@ - + From e31f0ba65baf82f1f4b72414c4dcfe40993756aa Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 11 Mar 2025 14:23:19 +0100 Subject: [PATCH 07/10] Fix ProjectReference to PackageReference in props file --- src/Servers/IIS/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Servers/IIS/Directory.Build.props b/src/Servers/IIS/Directory.Build.props index 5420b505c8d3..ed67044a4a6e 100644 --- a/src/Servers/IIS/Directory.Build.props +++ b/src/Servers/IIS/Directory.Build.props @@ -14,7 +14,7 @@ - + From 96f5319b71cd1776f7ce18af924aa5d3a0daf188 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 11 Mar 2025 15:15:24 +0100 Subject: [PATCH 08/10] Use correct architecture for host --- src/Servers/IIS/Directory.Build.props | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Servers/IIS/Directory.Build.props b/src/Servers/IIS/Directory.Build.props index ed67044a4a6e..827c4dab7efb 100644 --- a/src/Servers/IIS/Directory.Build.props +++ b/src/Servers/IIS/Directory.Build.props @@ -5,16 +5,13 @@ $(MSBuildThisFileDirectory)..\Kestrel\shared\ true - $(Platform) - x86 - x64 - $(NuGetPackageRoot)microsoft.netcore.app.host.win-$(HostArch)\$(MicrosoftNETCoreAppRefVersion)\runtimes\win-$(HostArch)\native + $(NuGetPackageRoot)microsoft.netcore.app.host.win-$(TargetArchitecture)\$(MicrosoftNETCoreAppRefVersion)\runtimes\win-$(TargetArchitecture)\native 143 - + From 53f75d1124271e61ef29f3668f09894189541ecc Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 11 Mar 2025 15:25:33 +0100 Subject: [PATCH 09/10] Fix hopefully --- src/Servers/IIS/Directory.Build.props | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/Servers/IIS/Directory.Build.props b/src/Servers/IIS/Directory.Build.props index 827c4dab7efb..e6b97935c591 100644 --- a/src/Servers/IIS/Directory.Build.props +++ b/src/Servers/IIS/Directory.Build.props @@ -5,13 +5,24 @@ $(MSBuildThisFileDirectory)..\Kestrel\shared\ true - $(NuGetPackageRoot)microsoft.netcore.app.host.win-$(TargetArchitecture)\$(MicrosoftNETCoreAppRefVersion)\runtimes\win-$(TargetArchitecture)\native + $(Platform) + x86 + x64 + $(TargetArchitecture) + $(NuGetPackageRoot)microsoft.netcore.app.host.win-$(HostArch)\$(MicrosoftNETCoreAppRefVersion)\runtimes\win-$(HostArch)\native 143 - - + + + + + + + + + From 419929c277e7432812d3a38e2cb7d0c4ae519972 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 11 Mar 2025 17:16:55 +0100 Subject: [PATCH 10/10] More fixes? --- src/Servers/IIS/Directory.Build.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Servers/IIS/Directory.Build.props b/src/Servers/IIS/Directory.Build.props index e6b97935c591..3820ff2921a7 100644 --- a/src/Servers/IIS/Directory.Build.props +++ b/src/Servers/IIS/Directory.Build.props @@ -16,13 +16,13 @@ - - - + + + - +