diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e7fd6c9a1..eceea1def 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 7e4335781b94e4f2de94df15c444f0679fa65701 + b81b63e6ecfe50fbd87507a5ef8f24501bb2cf9c - + https://github.com/dotnet/windowsdesktop - 7e4335781b94e4f2de94df15c444f0679fa65701 + b81b63e6ecfe50fbd87507a5ef8f24501bb2cf9c - + https://github.com/dotnet/windowsdesktop - 7e4335781b94e4f2de94df15c444f0679fa65701 + b81b63e6ecfe50fbd87507a5ef8f24501bb2cf9c - + https://github.com/dotnet/windowsdesktop - 7e4335781b94e4f2de94df15c444f0679fa65701 + b81b63e6ecfe50fbd87507a5ef8f24501bb2cf9c - + https://github.com/dotnet/runtime - 2330b4bef645bf8bcd3011f35968e55192c697f5 + ce813882f4061459dc62b63acb75add040f1f603 - + https://github.com/dotnet/runtime - 2330b4bef645bf8bcd3011f35968e55192c697f5 + ce813882f4061459dc62b63acb75add040f1f603 - + https://github.com/dotnet/runtime - 2330b4bef645bf8bcd3011f35968e55192c697f5 + ce813882f4061459dc62b63acb75add040f1f603 - + https://github.com/dotnet/runtime - 2330b4bef645bf8bcd3011f35968e55192c697f5 + ce813882f4061459dc62b63acb75add040f1f603 - + https://github.com/dotnet/runtime - 2330b4bef645bf8bcd3011f35968e55192c697f5 + ce813882f4061459dc62b63acb75add040f1f603 - + https://github.com/dotnet/runtime - 2330b4bef645bf8bcd3011f35968e55192c697f5 + ce813882f4061459dc62b63acb75add040f1f603 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 2330b4bef645bf8bcd3011f35968e55192c697f5 + ce813882f4061459dc62b63acb75add040f1f603 - + https://github.com/dotnet/aspnetcore - 3bc56046a2b8076f2e771cb99c35daabf5147d7b + 429c578753386ec0b762632d27de5f6ed68a5365 - + https://github.com/dotnet/aspnetcore - 3bc56046a2b8076f2e771cb99c35daabf5147d7b + 429c578753386ec0b762632d27de5f6ed68a5365 - + https://github.com/dotnet/aspnetcore - 3bc56046a2b8076f2e771cb99c35daabf5147d7b + 429c578753386ec0b762632d27de5f6ed68a5365 - + https://github.com/dotnet/aspnetcore - 3bc56046a2b8076f2e771cb99c35daabf5147d7b + 429c578753386ec0b762632d27de5f6ed68a5365 - + https://github.com/dotnet/aspnetcore - 3bc56046a2b8076f2e771cb99c35daabf5147d7b + 429c578753386ec0b762632d27de5f6ed68a5365 - + https://github.com/dotnet/aspnetcore - 3bc56046a2b8076f2e771cb99c35daabf5147d7b + 429c578753386ec0b762632d27de5f6ed68a5365 https://github.com/dotnet/test-templates @@ -94,40 +94,40 @@ 9c17a4a6ee6327c95faa6ce5dba391e0dd91cacd - + https://github.com/dotnet/templating - c30b2dca81bec3f510cc2fd7c77d9c5384bb2204 + 16ccdb61e2cb1e941162c2b1040ea58e5cb23e84 - + https://github.com/dotnet/templating - c30b2dca81bec3f510cc2fd7c77d9c5384bb2204 + 16ccdb61e2cb1e941162c2b1040ea58e5cb23e84 - + https://github.com/dotnet/sdk - 9f6035515210e71275f80affca3faeb9eb305a02 + 7ebf3587bee9882049faf9303ac99e1b208743fb - + https://github.com/dotnet/sdk - 9f6035515210e71275f80affca3faeb9eb305a02 + 7ebf3587bee9882049faf9303ac99e1b208743fb - + https://github.com/dotnet/winforms - aa27d81b0b54824a5c0d1de5a28f0724a366008d + f2eb3f7f3cb5b024a560a0f8b51ed0f36d274d2d - + https://github.com/dotnet/wpf - 1a194e4008cc9c14ed194d4ccbaf2fc878528a29 + ffa55d974b55f40b580d98ddf4ac93b72fb8bee4 - + https://github.com/dotnet/fsharp - 695d8c1e326fd7cfb7fa4c5c8d9c5559a7ef8a63 + 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/dotnet/fsharp - 695d8c1e326fd7cfb7fa4c5c8d9c5559a7ef8a63 + 6d626ff0752a77d339f609b4d361787dc9ca93a5 @@ -135,25 +135,25 @@ 4c2d848ef50380313b3e60488f6f3a6bf422a2a4 - + https://github.com/dotnet/linker - e003f2c4e13a1d89279afa4d655c6a15feac18b5 + 5d8277a86cb5dd9027ea5b31207e843d31fc3f9d linker - + https://github.com/dotnet/roslyn - be223bbc06bdad4ee7e615ad32f18c40a10dea81 + f81a859bb414665faafaf9f48b15d76c30df06a0 - + https://github.com/dotnet/msbuild - 9c173296404f9c365cc524569766f16d7cfcf308 + a32366d8051ae27a3690476bb0f2b70adbe7470f - + https://github.com/nuget/nuget.client - db1acf828845c4f6177d3acae0abab1ac6b9a1c5 + 919c7e10ebdcc43235c36cf0b72c389d741835a8 @@ -166,13 +166,13 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 50d92d57d5a760017cd7fbd9b97cdac86b68c233 + d2be7d0bf644d9608bf8180d706483238d85f13a - + https://github.com/dotnet/source-build - 10d0f7e94aa45889155c312f51cfc01bf326b853 + 90bdf447e1b97605f109b34243ab8c9f215308e9 diff --git a/eng/Versions.props b/eng/Versions.props index a6de3088c..4b122e43d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 7.0.0-preview.3.22158.8 + 7.0.0-preview.3.22166.2 - 7.0.0-preview.3.22159.1 + 7.0.0-preview.3.22169.1 - 7.0.100-preview.3.22159.1 + 7.0.100-preview.4.22173.1 @@ -52,44 +52,44 @@ - 7.0.0-preview.3.22158.12 - 7.0.0-preview.3.22158.12 - 7.0.0-preview.3.22158.12 - 7.0.0-preview.3.22158.12 - 7.0.0-preview.3.22158.12 - 7.0.0-preview.3.22158.12 + 7.0.0-preview.4.22172.10 + 7.0.0-preview.4.22172.10 + 7.0.0-preview.4.22172.10 + 7.0.0-preview.4.22172.10 + 7.0.0-preview.4.22172.10 + 7.0.0-preview.4.22172.10 0.2.0 - 7.0.100-preview.3.22159.14 - 7.0.100-preview.3.22159.14 + 7.0.100-preview.3.22173.6 + 7.0.100-preview.3.22173.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-preview.3.22151.6 + 7.0.0-preview.3.22171.6 - 7.0.0-preview.3.22151.6 - 7.0.0-preview.3.22151.6 - 7.0.0-preview.3.22151.6 - 7.0.0-preview.3.22151.6 - 7.0.0-preview.3.22151.6 - 7.0.0-preview.3.22151.6 + 7.0.0-preview.3.22171.6 + 7.0.0-preview.3.22171.6 + 7.0.0-preview.3.22171.6 + 7.0.0-preview.3.22171.6 + 7.0.0-preview.3.22171.6 + 7.0.0-preview.3.22171.6 2.1.0 - 7.0.0-preview.3.22159.1 - 7.0.0-preview.3.22159.1 - 7.0.0-preview.3.22159.1 - 7.0.0-preview.3.22159.1 + 7.0.0-preview.3.22169.2 + 7.0.0-preview.3.22169.2 + 7.0.0-preview.3.22169.2 + 7.0.0-preview.3.22169.2 @@ -200,7 +200,7 @@ 12.1.301-preview.13.2 15.2.301-preview.13.2 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-preview.3.22122.1 + 7.0.0-preview.3.22167.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index ad2d80666..4391c495a 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -82,20 +82,21 @@ dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - $(SharedFrameworkRid) - linux-x64 - $(AspNetCoreSharedFxInstallerRid) - x64 + $(SharedFrameworkRid) + linux-x64 + $(AspNetCoreInstallerRid) + x64 + aarch64 - aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) - aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid).wixlib + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension) - aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension) + aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension) aspnetcore_base_runtime.version