diff --git a/eng/Versions.props b/eng/Versions.props index 5a4ff5a4e..2bb47beed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,10 +15,6 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - - - 5.0.100-preview.1.20109.3 - 5.0.0-preview.2.20155.1 @@ -48,17 +44,15 @@ 5.0.0-preview.2.20155.1 5.0.0-preview.2.20155.1 - - - 5.0.100-preview.2.20152.2 - 0.2.0 - + 5.0.100-preview.2.20152.2 + 5.0.100-preview.2.20152.2 $(MicrosoftNETSdkPackageVersion) + $(MicrosoftNETSdkPackageVersion) diff --git a/global.json b/global.json index 4069e5446..5f5b881a3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "5.0.100-preview.1.20119.7", + "dotnet": "5.0.100-preview.1.20154.9", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppRuntimePackageVersion)" diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 2a5ad2591..8fd02ff20 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -17,20 +17,20 @@ <_NETCoreApp30RuntimePackVersion>3.0.1 <_NETCoreApp30TargetingPackVersion>3.0.0 - <_NETCoreApp31RuntimePackVersion>3.1.0 + <_NETCoreApp31RuntimePackVersion>3.1.2 <_NETCoreApp31TargetingPackVersion>3.1.0 <_WindowsDesktop30RuntimePackVersion>3.0.1 <_WindowsDesktop30TargetingPackVersion>3.0.0 - <_WindowsDesktop31RuntimePackVersion>3.1.0 + <_WindowsDesktop31RuntimePackVersion>3.1.2 <_WindowsDesktop31TargetingPackVersion>3.1.0 <_AspNet30RuntimePackVersion>3.0.1 <_AspNet30TargetingPackVersion>3.0.1 - <_AspNet31RuntimePackVersion>3.1.0 - <_AspNet31TargetingPackVersion>3.1.0 + <_AspNet31RuntimePackVersion>3.1.2 + <_AspNet31TargetingPackVersion>3.1.2 <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index d0db8d20c..da0f2ad65 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -2,6 +2,7 @@ $(BaseOutputPath)$(Configuration)\dotnet\ $(BaseOutputPath)$(Configuration)\dotnet-internal\ + $(BaseOutputPath)$(Configuration)\templates-5.0\ $(BaseOutputPath)$(Configuration)\templates-3.1\ $(BaseOutputPath)$(Configuration)\templates-3.0\ $(BaseOutputPath)$(Configuration)\templates-2.1\ @@ -30,7 +31,7 @@ https://dotnetcli.blob.core.windows.net/dotnet/ https://dotnetcli.blob.core.windows.net/dotnet/ - https://dotnetfeed.blob.core.windows.net/dotnet-toolset/ + https://dotnetfeed.blob.core.windows.net/dotnet-core/ $(HostRid) $(HostMonikerRid) @@ -227,7 +228,7 @@ - $(DotnetToolsetBlobRootUrl)Toolset/$(MicrosoftDotnetToolsetInternalPackageVersion) + $(DotnetToolsetBlobRootUrl)Sdk/$(MicrosoftDotnetToolsetInternalPackageVersion) dotnet-toolset-internal-$(MicrosoftDotnetToolsetInternalPackageVersion).zip sdk/$(Version) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 41a28054d..6182492a8 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -39,6 +39,7 @@ $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension) Dotnet_CLI + $(ArtifactsShippingPackagesDir)dotnet-50templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-31templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-30templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-21templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) @@ -82,7 +83,7 @@ DependsOnTargets="GenerateLayout;SetupWixProperties"> - + + + + + @@ -215,6 +221,14 @@ + + $(Templates50LayoutPath.TrimEnd('\')) + $(Templates50MSIInstallerFile) + $(BundledTemplates50BrandName) + $(BundledTemplates50MsiVersion) + $(Templates50InstallerUpgradeCode) + NetCore_Templates_5.0 + $(Templates31LayoutPath.TrimEnd('\')) $(Templates31MSIInstallerFile) @@ -267,7 +281,7 @@ '$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^ - '$(Templates31MSIInstallerFile)' ^ + '$(Templates50MSIInstallerFile)' ^ '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^ '$(WixRoot)' ^ '$(SdkBrandName)' ^ @@ -344,6 +358,11 @@ + + $(Templates50MSIInstallerFile) + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates50MajorMinorVersion).$(FullNugetVersion).nupkg + $(BundledTemplates50MajorMinorVersion) + $(Templates31MSIInstallerFile) $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates31MajorMinorVersion).$(FullNugetVersion).nupkg diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets index 0d5eb9596..cdb3e471f 100644 --- a/src/redist/targets/Signing.targets +++ b/src/redist/targets/Signing.targets @@ -175,10 +175,11 @@ DependsOnTargets="SetSignProps"> + - + $(InternalCertificateId)