diff --git a/Directory.Build.props b/Directory.Build.props index 1d999d66ee1f..835097f0ff59 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -88,10 +88,10 @@ - $(MicrosoftNETCoreAppHostwinx64PackageVersion) - $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - $(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion) - $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftAspNetCoreAppRefPackageVersion) + $(MicrosoftWindowsDesktopAppRefPackageVersion) $(MicrosoftNETCoreAppRuntimePackageVersion) $(MicrosoftNETCoreAppRuntimePackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1af605ffaea6..6e03c246dcdd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,22 +42,6 @@ https://github.com/dotnet/dotnet ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - - https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - - - https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - - - https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - - - https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - https://github.com/dotnet/dotnet ad8565092bbfdd5c8b4a94a718d10b2d394f7aee @@ -238,20 +222,11 @@ https://github.com/dotnet/dotnet ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - - https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - - - - https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - https://github.com/dotnet/dotnet ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet ad8565092bbfdd5c8b4a94a718d10b2d394f7aee @@ -267,14 +242,6 @@ https://github.com/dotnet/dotnet ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - - https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - - - https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - https://github.com/dotnet/dotnet ad8565092bbfdd5c8b4a94a718d10b2d394f7aee diff --git a/eng/Versions.props b/eng/Versions.props index 08cef11cf0cc..207394cea3ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -102,8 +102,6 @@ 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 10.0.0-preview.5.25265.101 10.0.0-preview.5.25265.101 10.0.0-preview.5.25265.101 @@ -115,9 +113,6 @@ 10.0.0-preview.5.25265.101 8.0.0-rc.1.23414.4 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 10.0.0-preview.5.25265.101 10.0.0-preview.5.25265.101 10.0.0-preview.5.25265.101 @@ -155,8 +150,7 @@ - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 10.0.0-preview.5.25265.101 diff --git a/global.json b/global.json index 2b7ac602e585..9f7058551db2 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "10.0.100-preview.3.25201.16", "runtimes": { "dotnet": [ - "$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)" + "$(MicrosoftNETCorePlatformsPackageVersion)" ], "aspnetcore": [ "$(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion)" diff --git a/src/Layout/Directory.Build.targets b/src/Layout/Directory.Build.targets index c1e2f454cbe6..e4bc36badb08 100644 --- a/src/Layout/Directory.Build.targets +++ b/src/Layout/Directory.Build.targets @@ -14,7 +14,7 @@ $(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay) -pgo - dotnet-sdk-internal$(PgoTerm)-$(Version)-$(ProductMonikerRid) + dotnet-sdk-internal$(PgoTerm)-$(FullNugetVersion)-$(ProductMonikerRid) dotnet-sdk$(PgoTerm)-$(Version)-$(ProductMonikerRid) $(ArtifactNameWithVersionSdk)$(InstallerExtension) diff --git a/src/Layout/redist/targets/Crossgen.targets b/src/Layout/redist/targets/Crossgen.targets index 3ffa1f7a5b82..3817ea7656d8 100644 --- a/src/Layout/redist/targets/Crossgen.targets +++ b/src/Layout/redist/targets/Crossgen.targets @@ -22,7 +22,7 @@ $(RedistInstallerLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion) - $(RedistInstallerLayoutPath)shared/$(SharedFrameworkName)/$(VSRedistCommonNetCoreTargetingPackx64100PackageVersion) + $(RedistInstallerLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCorePlatformsPackageVersion) - $(MicrosoftAspNetCoreAppRuntimePackageVersion) + $(MicrosoftAspNetCoreAppRefInternalPackageVersion) $(MicrosoftNETCorePlatformsPackageVersion) - $(VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion) - $(MicrosoftWindowsDesktopAppRuntimePackageVersion) + $(MicrosoftWindowsDesktopAppInternalPackageVersion) 3.0.0 x64 @@ -23,7 +22,7 @@ dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - dotnet-runtime$(InstallerStartSuffix)$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-runtime$(InstallerStartSuffix)$(PgoTerm)-$(MicrosoftNETCorePlatformsPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) @@ -40,7 +39,7 @@ dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + dotnet-runtime$(PgoTerm)-$(MicrosoftNETCorePlatformsPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid) @@ -49,9 +48,11 @@ aarch64 aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) - aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) + + aspnetcore-runtime-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) + + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension) aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension)