diff --git a/eng/Versions.props b/eng/Versions.props index 4599fc459..1a9b0356c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 3.0.100-preview-009707 + 3.0.100-preview-009719 @@ -17,7 +17,7 @@ - 3.0.0-preview-27113-06 + 3.0.0-preview-27114-01 $(MicrosoftNETCoreAppPackageVersion) @@ -35,9 +35,9 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) - 3.0.0-alpha-27113-1 - $(MicrosoftDesktopUIPackageVersion) - $(MicrosoftDesktopUIPackageVersion) + 3.0.0-alpha-27115-10 + $(MicrosoftWindowsDesktopPackageVersion) + $(MicrosoftWindowsDesktopPackageVersion) diff --git a/old/build/BundledRuntimes.props b/old/build/BundledRuntimes.props index 9192d752d..8c1145d1b 100644 --- a/old/build/BundledRuntimes.props +++ b/old/build/BundledRuntimes.props @@ -23,7 +23,7 @@ dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName) - dotnet-extension-$(MicrosoftDesktopUIPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-extension-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName) @@ -45,7 +45,7 @@ aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) $(PackagesDirectory)/$(AspNetCoreSharedFxArchiveFileName) - dotnet-extension-$(MicrosoftDesktopUIPackageVersion)-$(Architecture)$(ArchiveExtension) + dotnet-extension-$(MicrosoftWindowsDesktopPackageVersion)-$(Architecture)$(ArchiveExtension) $(PackagesDirectory)/$(WinFormsAndWpfSharedFxArchiveFileName) @@ -124,14 +124,14 @@ <_DownloadAndExtractItem Include="WinFormsAndWpfSharedFxArchiveFile" Condition="!Exists('$(WinFormsAndWpfSharedFxArchiveFile)')"> - $(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftDesktopUIPackageVersion)/$(WinFormsAndWpfSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam) + $(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftWindowsDesktopPackageVersion)/$(WinFormsAndWpfSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam) $(WinFormsAndWpfSharedFxArchiveFile) $(WinFormsAndWpfSharedFxPublishDirectory)/shared <_DownloadAndExtractItem Include="DownloadedWinFormsAndWpfSharedFrameworkInstallerFile" Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))"> - $(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftDesktopUIPackageVersion)/$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam) + $(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftWindowsDesktopPackageVersion)/$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(DownloadedWinFormsAndWpfSharedFrameworkInstallerFile) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 7089a0b72..735a1b519 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -158,13 +158,13 @@ Copyright (c) .NET Foundation. All rights reserved. ') -