From f88e0907ac4a0b3a8a7c923990425a04a04f27b7 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 2 Jan 2024 15:14:00 -0800 Subject: [PATCH 1/3] Search through source looking for remaining 8.0 versions Bring back the host resolver dependency --- eng/Version.Details.xml | 8 ++++++-- eng/Versions.props | 4 ++-- src/redist/targets/GenerateBundledVersions.targets | 1 - 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09ccdc1f3..a112ace8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,6 +42,10 @@ https://github.com/dotnet/runtime ab1a8224cdf115b65e0db5dc88d11f205068f444 + + https://github.com/dotnet/runtime + ab1a8224cdf115b65e0db5dc88d11f205068f444 + @@ -236,9 +240,9 @@ https://github.com/dotnet/arcade 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + ab1a8224cdf115b65e0db5dc88d11f205068f444 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b3a71de8a..ef8374a8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ 9.0.0-alpha.1.23612.13 9.0.0-alpha.1.23612.13 9.0.0-alpha.1.23612.13 - 8.0.0-rc.1.23414.4 + 9.0.0-alpha.1.23612.13 2.1.0 @@ -247,7 +247,7 @@ 2.2.0-beta.19072.10 2.0.0 17.9.0-preview-23610-02 - 8.0.0-alpha.1.22557.12 + 9.0.0-alpha.1.23612.13 9.0.0-preview.23613.1 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 7fd7b2c14..4eec546bb 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -95,7 +95,6 @@ <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NET80RuntimePackVersion>8.0.$(VersionFeature80) <_NET80TargetingPackVersion>8.0.$(VersionFeature80) <_NET80WebAssemblyPackVersion>8.0.$(VersionFeature80) From 5587c75e839da6664bc63c2d0231b7f8eb1ff98a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 8 Jan 2024 09:59:55 -0800 Subject: [PATCH 2/3] Switch from host resolver package to using the runtime package --- eng/Version.Details.xml | 4 ---- eng/Versions.props | 1 - src/SdkResolver/SdkResolver.csproj | 12 ++++++------ src/VSTemplateLocator/VSTemplateLocator.csproj | 12 ++++++------ 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a112ace8c..7bd4578d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,10 +42,6 @@ https://github.com/dotnet/runtime ab1a8224cdf115b65e0db5dc88d11f205068f444 - - https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 - diff --git a/eng/Versions.props b/eng/Versions.props index ef8374a8a..175eb68a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,6 @@ 9.0.0-alpha.1.23612.13 9.0.0-alpha.1.23612.13 9.0.0-alpha.1.23612.13 - 9.0.0-alpha.1.23612.13 2.1.0 diff --git a/src/SdkResolver/SdkResolver.csproj b/src/SdkResolver/SdkResolver.csproj index 5dc640f4e..07d248ee9 100644 --- a/src/SdkResolver/SdkResolver.csproj +++ b/src/SdkResolver/SdkResolver.csproj @@ -12,9 +12,9 @@ - - - + + + - <_SdkResolverSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> - <_SdkResolverSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> - <_SdkResolverSrc Include="$(Pkgruntime_win-arm64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-arm64\native\hostfxr.dll" Arch="arm64\" /> + <_SdkResolverSrc Include="$(PkgMicrosoft_NETCore_App_Runtime_win-x86)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> + <_SdkResolverSrc Include="$(PkgMicrosoft_NETCore_App_Runtime_win-x64)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> + <_SdkResolverSrc Include="$(PkgMicrosoft_NETCore_App_Runtime_win-arm64)\runtimes\win-arm64\native\hostfxr.dll" Arch="arm64\" /> <_SdkResolverSrc Include="$(PkgMicrosoft_DotNet_MSBuildSdkResolver)\lib\net472\**\*.dll" Arch="" /> <_SdkResolverDst Include="@(_SdkResolverSrc->'$(OutputPath)%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" /> diff --git a/src/VSTemplateLocator/VSTemplateLocator.csproj b/src/VSTemplateLocator/VSTemplateLocator.csproj index 2b71df4f6..ad300a2c2 100644 --- a/src/VSTemplateLocator/VSTemplateLocator.csproj +++ b/src/VSTemplateLocator/VSTemplateLocator.csproj @@ -12,9 +12,9 @@ - - - + + + @@ -29,9 +29,9 @@ - <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> - <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> - <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-arm64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-arm64\native\hostfxr.dll" Arch="arm64\" /> + <_VSTemplateLocatorSrc Include="$(PkgMicrosoft_NETCore_App_Runtime_win-x86)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> + <_VSTemplateLocatorSrc Include="$(PkgMicrosoft_NETCore_App_Runtime_win-x64)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> + <_VSTemplateLocatorSrc Include="$(PkgMicrosoft_NETCore_App_Runtime_win-arm64)\runtimes\win-arm64\native\hostfxr.dll" Arch="arm64\" /> <_VSTemplateLocatorSrc Include="$(Pkgmicrosoft_dotnet_templateLocator)\lib\net472\**\*.dll" Arch="" /> <_VSTemplateLocatorSrc Include="$(PkgMicrosoft_Deployment_DotNet_Releases)\lib\net452\**\*.dll" Arch="" /> <_VSTemplateLocatorDst Include="@(_VSTemplateLocatorSrc->'$(OutputPath)VSTemplateLocator\%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" /> From 6f9173cec96811f5714ab432e9819d5960b3e75d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 9 Jan 2024 09:43:41 -0800 Subject: [PATCH 3/3] Switch the property used to the primary runtime one per PR feedback --- src/SdkResolver/SdkResolver.csproj | 6 +++--- src/VSTemplateLocator/VSTemplateLocator.csproj | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SdkResolver/SdkResolver.csproj b/src/SdkResolver/SdkResolver.csproj index 07d248ee9..6b7d8821a 100644 --- a/src/SdkResolver/SdkResolver.csproj +++ b/src/SdkResolver/SdkResolver.csproj @@ -12,9 +12,9 @@ - - - + + + - - - + + +