From 6db2bc24eb615b91cd2a247ff7d5013b0d2f4373 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 21 Sep 2023 07:35:58 -0700 Subject: [PATCH] Update dependencies and ensure coherency --- eng/Version.Details.xml | 98 +++++++++++------------ eng/Versions.props | 34 ++++---- global.json | 2 +- src/redist/targets/Crossgen.targets | 2 +- src/redist/targets/GenerateLayout.targets | 8 +- 5 files changed, 70 insertions(+), 74 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54ef99861..ad6a92378 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,26 @@ https://github.com/dotnet/windowsdesktop 52e969f93c15d4eaa2f709ebbfe168fb1bb09fa2 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 - + + https://github.com/dotnet/runtime + 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 + + https://github.com/dotnet/runtime f8c110b8003d68cc635add4ca791d6cf2e645561 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 - - - https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 - - - https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 @@ -52,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 - + https://github.com/dotnet/aspnetcore - 5a5ee72cf4d2dac73d9ca4d9aa333a4362313dab + fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/aspnetcore - 5a5ee72cf4d2dac73d9ca4d9aa333a4362313dab + fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/aspnetcore - 5a5ee72cf4d2dac73d9ca4d9aa333a4362313dab + fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/aspnetcore - 5a5ee72cf4d2dac73d9ca4d9aa333a4362313dab + fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/aspnetcore - 5a5ee72cf4d2dac73d9ca4d9aa333a4362313dab + fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/aspnetcore - 5a5ee72cf4d2dac73d9ca4d9aa333a4362313dab + fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/aspnetcore - 5a5ee72cf4d2dac73d9ca4d9aa333a4362313dab + fa54329186df2e11b40bdfec4ae08f16fdbe9d99 https://github.com/dotnet/sdk @@ -132,57 +128,57 @@ https://github.com/dotnet/wpf 3a8376ca92de4c85dd92b05fba8a1c0a49b14cb9 - + https://github.com/dotnet/fsharp - 95b9d4c9eccc2607d4cb507f41f3d585fa5d9e38 + 767ffa73e8147418ecf54df376e6685b03efd6e4 - + https://github.com/dotnet/fsharp - 95b9d4c9eccc2607d4cb507f41f3d585fa5d9e38 + 767ffa73e8147418ecf54df376e6685b03efd6e4 - + https://github.com/microsoft/vstest - bb99e3ea07aaecd62d5c59568524133317d081b4 + cf7d549fc0197abaabec19d61d2c20d7a7b089f8 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 - + https://github.com/dotnet/roslyn - 0562ad2ea04873383eb39176bde43256f4d14953 + 79963f8a40c6429cd25667c4c62e717b4ca72098 - + https://github.com/dotnet/msbuild - caf06d19326f9e7dcc06d4d4f4b04f1c6ddae5f0 + 60ae06f6d20616f524a751373aea071df8c2ae48 - + https://github.com/nuget/nuget.client - 11a62174beb847bc2a59ffbb08b70eaa84781d25 + f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - abfa03c97f4175d4d209435cd0e71f558e36c3fd + bebe955e9f7d392fbca594b1c76c54ba2e27027e - + https://github.com/dotnet/deployment-tools - 783889e0db1be82a43a84e67c4c26b0225eb3cbb + 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/deployment-tools - 783889e0db1be82a43a84e67c4c26b0225eb3cbb + 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 diff --git a/eng/Versions.props b/eng/Versions.props index dc48013ed..e3a160913 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,13 +71,13 @@ - 9.0.0-alpha.1.23462.17 - 9.0.0-alpha.1.23462.17 - 9.0.0-alpha.1.23462.17 - 9.0.0-alpha.1.23462.17 - 9.0.0-alpha.1.23462.17 - 9.0.0-alpha.1.23462.17 - 9.0.0-alpha.1.23462.17 + 9.0.0-alpha.1.23470.9 + 9.0.0-alpha.1.23470.9 + 9.0.0-alpha.1.23470.9 + 9.0.0-alpha.1.23470.9 + 9.0.0-alpha.1.23470.9 + 9.0.0-alpha.1.23470.9 + 9.0.0-alpha.1.23470.9 0.2.0 @@ -93,19 +93,19 @@ - 4.8.0-3.23462.3 + 4.8.0-3.23470.12 - 8.0.0-rc.2.23457.7 + 9.0.0-alpha.1.23470.17 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 + 9.0.0-alpha.1.23470.17 + 9.0.0-alpha.1.23470.1 + 9.0.0-alpha.1.23470.17 + 9.0.0-alpha.1.23470.17 + 9.0.0-alpha.1.23470.17 8.0.0-rc.2.23457.7 2.1.0 @@ -126,11 +126,11 @@ - 6.8.0-rc.110 + 6.8.0-rc.112 - 1.0.0-preview.6.23430.3 + 2.0.0-preview.1.23463.1 @@ -241,7 +241,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-preview-23456-01 + 17.8.0-release-23468-02 8.0.0-alpha.1.22557.12 8.0.0-preview.23424.2 diff --git a/global.json b/global.json index 789235dfe..3c9b4459d 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "8.0.100-preview.7.23376.3", "runtimes": { "dotnet": [ - "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" + "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" ] } }, diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index d9f961933..b29552579 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -11,7 +11,7 @@ $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion) - $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(VSRedistCommonNetCoreTargetingPackx6480PackageVersion) + $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(VSRedistCommonNetCoreTargetingPackx6490PackageVersion) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 0c9a73ef3..52746f790 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -11,7 +11,7 @@ $(VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion) $(MicrosoftAspNetCoreAppRuntimePackageVersion) - $(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion) + $(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion) $(MicrosoftNETCoreAppRuntimePackageVersion) $(VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion) @@ -20,7 +20,7 @@ - $(VSRedistCommonNetCoreTargetingPackx6480PackageVersion) + $(VSRedistCommonNetCoreTargetingPackx6490PackageVersion) $(MicrosoftAspNetCoreAppRefInternalPackageVersion) $(VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion) @@ -60,7 +60,7 @@ dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - dotnet-runtime$(InstallerStartSuffix)$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-runtime$(InstallerStartSuffix)$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime-deps-$(SharedHostVersion)-$(RuntimeDepsInstallerFileRid)$(InstallerExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) @@ -81,7 +81,7 @@ $(ProductMonikerRid) linux-$(Architecture) dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(HostOSName)-$(BuildArchitecture)