Skip to content

Commit 0f52aed

Browse files
nguerreranguerrera
committed
Prepare for 3.0.1xx servicing
We were bumping targeting pack, framework-dependent default runtime version, and self-contained default (latest) runtime version in unison. This only works for previews where these versions are all the same always. Now that we're servicing 3.0, we: 1. Pin targeting packs to 3.0.0 2. Fix default framework-dependent runtime version at 3.0.0 This change also: * Removes dependencies on legacy/internal netcoreapp packages. We now use Microsoft.NETCore.App.Internal version exclusively to calculate the blob storage path for core-setup. * Uses PackageDownload for all templates, including latest. PackageReference had been used for latest only because it hid another bug with the netcoreapp reference of redist.csproj that is fixed here. That reference is now a FrameworkReference as it should be. * Removes a bunch of shenanigans from GenerateBundledVersions.props that were causing issues with above. One casualty of that is that we hard code the RID lists for runtime pack, which I don't think is too bad, and actually will make it easier to merge in source build patches. * Cleans up how runtime and targeting pack versions are referenced throughout, removing incorrect assumptions about them being the same. * Incorporates a prior closed PR to use suffixed version for blob storage, even when assets coming from blob storage are stabilized. It needed changes to merge with this. Note: * A similar theoretical servicing issue exists for the versions of apphost, hostfxr, shared host, which are still assumed to be the same as the runtime version in several places. If we choose to service those independently, more work is required. * There will be a 3.0.1 ASP.NET targeting pack, and so we will have to unpin that once it is ready. This change establishes the baseline of all targeting packs being pinnned, and they can be unpinned in the (hopefully rare) cases where they need to be serviced.
1 parent 9749981 commit 0f52aed

19 files changed

+289
-254
lines changed

‎eng/Version.Details.xml

+28-26
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,47 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<!-- Winforms / WPF -->
5-
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.1-servicing-19502-09">
4+
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
5+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="3.0.0" Pinned="true">
66
<Uri>https://github.com/dotnet/core-setup</Uri>
7-
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
7+
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.0.1-servicing-19502-09">
9+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.0.1-servicing-19502-01">
1010
<Uri>https://github.com/dotnet/core-setup</Uri>
11-
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
11+
<Sha>93abb6b3a675b44ee35698d9640a42779b18e004</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.NETCore.App" Version="3.0.1-servicing-19502-09">
13+
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
14+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0" Pinned="true">
1415
<Uri>https://github.com/dotnet/core-setup</Uri>
15-
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
16+
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
1617
</Dependency>
17-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.1-servicing-19502-09">
18+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.0.1-servicing-19502-01">
1819
<Uri>https://github.com/dotnet/core-setup</Uri>
19-
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
20+
<Sha>93abb6b3a675b44ee35698d9640a42779b18e004</Sha>
2021
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.DotNetAppHost" Version="3.0.1-servicing-19502-09">
22+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.1-servicing-19502-01">
2223
<Uri>https://github.com/dotnet/core-setup</Uri>
23-
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
24+
<Sha>93abb6b3a675b44ee35698d9640a42779b18e004</Sha>
2425
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.0.1-servicing-19502-09">
26+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.0.1-servicing-19502-01">
2627
<Uri>https://github.com/dotnet/core-setup</Uri>
27-
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
28+
<Sha>93abb6b3a675b44ee35698d9640a42779b18e004</Sha>
2829
</Dependency>
29-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.1-servicing-19502-09">
30+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.0.1-servicing-19502-01">
3031
<Uri>https://github.com/dotnet/core-setup</Uri>
31-
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
32+
<Sha>93abb6b3a675b44ee35698d9640a42779b18e004</Sha>
3233
</Dependency>
33-
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-servicing-19502-09">
34+
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
35+
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
3436
<Uri>https://github.com/dotnet/core-setup</Uri>
35-
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
37+
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
3638
</Dependency>
37-
<!-- Used to pull in the feed for Microsoft.NETCore.Platforms, but not referenced directly -->
38-
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.1-servicing.19501.4" CoherentParentDependency="Microsoft.NetCore.App">
39+
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.1-servicing.19501.4" CoherentParentDependency="Microsoft.NETCore.App.Internal">
3940
<Uri>https://github.com/dotnet/corefx</Uri>
4041
<Sha>54d63c3e283e0c3937a35ab4e99f391c84ff119e</Sha>
4142
</Dependency>
42-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0">
43+
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
44+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0" Pinned="true">
4345
<Uri>https://github.com/aspnet/AspNetCore</Uri>
4446
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
4547
</Dependency>
@@ -67,24 +69,24 @@
6769
<Uri>https://github.com/dotnet/templating</Uri>
6870
<Sha>a776e417c83c52908298b3767e462feae8b18b98</Sha>
6971
</Dependency>
70-
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.101-servicing.19503.4">
72+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.101-servicing.19502.7">
7173
<Uri>https://github.com/dotnet/toolset</Uri>
72-
<Sha>d62b7c37ab654e5019131ec3c0418d0a23639a31</Sha>
74+
<Sha>78da18674ad084d58311d36b5354925a8bef62fc</Sha>
7375
</Dependency>
7476
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.101-servicing.19477.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
7577
<Uri>https://github.com/dotnet/sdk</Uri>
7678
<Sha>3819a21a612cd8bc15b6f6c4e361d18490469577</Sha>
7779
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.101-servicing.19503.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
80+
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.101-servicing.19502.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
7981
<Uri>https://github.com/dotnet/cli</Uri>
80-
<Sha>850536d605a5a84ee573760b755608ab596146de</Sha>
82+
<Sha>11f4a837a9d746af3b7d72767ab06c5a64c772f9</Sha>
8183
</Dependency>
8284
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup -->
83-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-servicing.19480.1" CoherentParentDependency="Microsoft.WindowsDesktop.App">
85+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-servicing.19480.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
8486
<Uri>https://github.com/dotnet/winforms</Uri>
8587
<Sha>af088e57775b7b9f28322511bc5be8ddb356b8a8</Sha>
8688
</Dependency>
87-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.1-servicing.19480.1" CoherentParentDependency="Microsoft.WindowsDesktop.App">
89+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.1-servicing.19480.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
8890
<Uri>https://github.com/dotnet/wpf</Uri>
8991
<Sha>d4121027999cb01b941481c774b42a2193775b93</Sha>
9092
</Dependency>

‎eng/Versions.props

+28-20
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
1313
</PropertyGroup>
1414
<PropertyGroup>
15-
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.101-servicing.19503.4</MicrosoftDotnetToolsetInternalPackageVersion>
15+
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.101-servicing.19502.7</MicrosoftDotnetToolsetInternalPackageVersion>
1616
</PropertyGroup>
1717
<PropertyGroup>
1818
<!-- Dependency from https://github.com/dotnet/winforms -->
@@ -33,7 +33,7 @@
3333
</PropertyGroup>
3434
<PropertyGroup>
3535
<!-- Dependencies from https://github.com/dotnet/cli -->
36-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.101-servicing.19503.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
36+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.101-servicing.19502.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
3737
</PropertyGroup>
3838
<PropertyGroup>
3939
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
@@ -44,23 +44,31 @@
4444
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
4545
</PropertyGroup>
4646
<PropertyGroup>
47-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.1-servicing-19502-09</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
48-
<MicrosoftNETCoreAppPackageVersion>3.0.1-servicing-19502-09</MicrosoftNETCoreAppPackageVersion>
49-
<MicrosoftNETCoreAppInternalPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppInternalPackageVersion>
50-
<MicrosoftNETCoreDotNetAppHostPackageVersion>3.0.1-servicing-19502-09</MicrosoftNETCoreDotNetAppHostPackageVersion>
51-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.0.1-servicing-19502-09</MicrosoftNETCoreDotNetHostResolverPackageVersion>
52-
<SharedHostVersion>$(MicrosoftNETCoreDotNetHostResolverPackageVersion)</SharedHostVersion>
53-
<HostFxrVersion>$(MicrosoftNETCoreDotNetAppHostPackageVersion)</HostFxrVersion>
54-
<MicrosoftNETCoreAppRefPackageVersion>3.0.1-servicing-19502-09</MicrosoftNETCoreAppRefPackageVersion>
55-
<NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackVersion>
56-
<NetCoreAppHostPackVersion>$(MicrosoftNETCoreDotNetAppHostPackageVersion)</NetCoreAppHostPackVersion>
57-
<NETStandardLibraryRefPackageVersion>2.1.0-servicing-19502-09</NETStandardLibraryRefPackageVersion>
58-
<WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppRefPackageVersion)</WindowsDesktopTargetingPackVersion>
59-
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
60-
<AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
61-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.0.1-servicing-19502-09</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
62-
<MicrosoftWindowsDesktopAppPackageVersion>3.0.1-servicing-19502-09</MicrosoftWindowsDesktopAppPackageVersion>
63-
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
47+
<!-- Dependencies from https://github.com/dotnet/corefx -->
48+
<MicrosoftNETCorePlatformsPackageVersion>3.0.1-servicing.19501.4</MicrosoftNETCorePlatformsPackageVersion>
49+
</PropertyGroup>
50+
<PropertyGroup>
51+
<!-- Dependencies from https://github.com/dotnet/core-setup -->
52+
<MicrosoftNETCoreAppInternalPackageVersion>3.0.1-servicing-19502-01</MicrosoftNETCoreAppInternalPackageVersion>
53+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.1-servicing-19502-01</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
54+
<MicrosoftNETCoreAppHostwinx64PackageVersion>3.0.1-servicing-19502-01</MicrosoftNETCoreAppHostwinx64PackageVersion>
55+
<MicrosoftNETCoreAppRefPackageVersion>3.0.0</MicrosoftNETCoreAppRefPackageVersion>
56+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.0.1-servicing-19502-01</MicrosoftNETCoreDotNetHostResolverPackageVersion>
57+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.0.1-servicing-19502-01</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
58+
<MicrosoftWindowsDesktopAppRefPackageVersion>3.0.0</MicrosoftWindowsDesktopAppRefPackageVersion>
59+
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
60+
</PropertyGroup>
61+
<PropertyGroup>
62+
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
63+
<!-- version above and create aliases without the winx64 here for clarity elsewhere. -->
64+
<MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppHostwinx64PackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
65+
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
66+
<MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
67+
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
68+
</PropertyGroup>
69+
<PropertyGroup>
70+
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
71+
<SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>
6472
</PropertyGroup>
6573
<PropertyGroup>
6674
<!-- 3.0 Template versions -->
@@ -70,7 +78,7 @@
7078
<MicrosoftDotNetCommonItemTemplates30PackageVersion>2.0.0-preview8.19373.1</MicrosoftDotNetCommonItemTemplates30PackageVersion>
7179
<MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplates30PackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
7280
<MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19354.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>
73-
<AspNetCorePackageVersionFor30Templates>$(AspNetCoreVersion)</AspNetCorePackageVersionFor30Templates>
81+
<AspNetCorePackageVersionFor30Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor30Templates>
7482
<!-- 2.2 Template versions -->
7583
<NUnit3Templates22PackageVersion>1.6.0</NUnit3Templates22PackageVersion>
7684
<MicrosoftDotNetCommonItemTemplates22PackageVersion>1.0.2-beta4</MicrosoftDotNetCommonItemTemplates22PackageVersion>

‎eng/configure-toolset.ps1

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# SdkTests do not currently work with globally installed CLI as they use dotnet-install.ps1 to install more runtimes
2+
3+
$script:useInstalledDotNetCli = $false
4+

‎eng/configure-toolset.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SdkTests do not currently work with globally installed CLI as they use dotnet-install.ps1 to install more runtimes
2+
3+
useInstalledDotNetCli="false"

‎src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.IO;
4+
using System.Linq;
5+
using System.Text;
6+
using Microsoft.Build.Framework;
7+
using Microsoft.Build.Utilities;
8+
using Newtonsoft.Json.Linq;
9+
10+
namespace Microsoft.DotNet.Cli.Build
11+
{
12+
public class GetLinuxNativeInstallerDependencyVersions : Task
13+
{
14+
[Required]
15+
public string PackageVersion { get; set; }
16+
17+
[Output]
18+
public string MajorMinorVersion { get; private set; }
19+
20+
[Output]
21+
public string MajorMinorPatchVersion { get; private set; }
22+
23+
[Output]
24+
public string VersionWithTilde { get; private set; }
25+
26+
public override bool Execute()
27+
{
28+
string[] dotSplit = PackageVersion.Split('.');
29+
MajorMinorVersion = dotSplit[0] + "." + dotSplit[1];
30+
31+
string[] prereleaseSplit = PackageVersion.Split(new[] { '-' }, count: 2);
32+
MajorMinorPatchVersion = prereleaseSplit[0];
33+
VersionWithTilde = MajorMinorPatchVersion;
34+
35+
if (prereleaseSplit.Length > 1)
36+
{
37+
VersionWithTilde += "~" + prereleaseSplit[1];
38+
}
39+
40+
return true;
41+
}
42+
}
43+
}

‎src/redist/redist.csproj

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
44
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
55
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
6-
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
76
</PropertyGroup>
87

98
<ItemGroup>
10-
<!-- Explicitlty reference Microsoft.NETCore.App package here, using the version from Version.props, instead
11-
of the version from the stage 0 SDK. -->
12-
<PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)"
13-
PrivateAssets="All" Publish="true"/>
9+
<FrameworkReference Update="Microsoft.NETCore.App"
10+
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
11+
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
12+
/>
1413

1514
<ProjectReference Include="..\SdkResolver\SdkResolver.csproj" ReferenceOutputAssembly="false" />
1615
</ItemGroup>

‎src/redist/targets/Branding.targets

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<BuildName>cli</BuildName>
55
<SdkBrandName>Microsoft .NET Core SDK $(CliBrandingVersion)</SdkBrandName>
66
<MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
7-
<SharedFrameworkBrandName>Microsoft .NET Core Runtime $(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</SharedFrameworkBrandName>
7+
<SharedFrameworkBrandName>Microsoft .NET Core Runtime $(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkBrandName>
88
<NetCoreAppTargetingPackBrandName>Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackBrandName>
99
<NetStandardTargetingPackBrandName>Microsoft .NET Standard 2.1 Targeting Pack $(NETStandardLibraryRefPackageVersion)</NetStandardTargetingPackBrandName>
10-
<NetCoreAppHostPackBrandName>Microsoft .NET AppHost Pack $(MicrosoftNETCoreDotNetAppHostPackageVersion)</NetCoreAppHostPackBrandName>
11-
<SharedHostBrandName>Microsoft .NET Core Host $(MicrosoftNETCoreDotNetAppHostPackageVersion)</SharedHostBrandName>
12-
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreDotNetAppHostPackageVersion)</HostFxrBrandName>
10+
<NetCoreAppHostPackBrandName>Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppHostHostPackageVersion)</NetCoreAppHostPackBrandName>
11+
<SharedHostBrandName>Microsoft .NET Core Host $(SharedHostVersion)</SharedHostBrandName>
12+
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(HostFxrVersion)</HostFxrBrandName>
1313
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
1414
<SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
1515
<BundledTemplates30BrandName>Microsoft .NET Core 3.0 Templates</BundledTemplates30BrandName>

‎src/redist/targets/BuildCoreSdkTasks.targets

+1
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@
3838
<UsingTask TaskName="GenerateChecksums" AssemblyFile="$(CoreSdkTaskDll)"/>
3939
<UsingTask TaskName="GetRuntimePackRids" AssemblyFile="$(CoreSdkTaskDll)"/>
4040
<UsingTask TaskName="GenerateMSBuildExtensionsSWR" AssemblyFile="$(CoreSdkTaskDll)"/>
41+
<UsingTask TaskName="GetLinuxNativeInstallerDependencyVersions" AssemblyFile="$(CoreSdkTaskDll)"/>
4142

4243
</Project>

‎src/redist/targets/BundledTemplates.targets

+10-6
Original file line numberDiff line numberDiff line change
@@ -91,28 +91,32 @@
9191

9292
<PackageDownload Include="@(Bundled21Templates)" Exclude="@(PackageDownload)" />
9393
<PackageDownload Include="@(Bundled22Templates)" Exclude="@(PackageDownload)" />
94+
<PackageDownload Include="@(Bundled30Templates)" Exclude="@(PackageDownload)" />
9495

9596
<PackageDownload Update="Microsoft.DotNet.Common.ItemTemplates"
9697
Version="[$(MicrosoftDotNetCommonItemTemplates21PackageVersion)];
9798
[$(MicrosoftDotNetCommonItemTemplates22PackageVersion)];
99+
[$(MicrosoftDotNetCommonItemTemplates30PackageVersion)];
98100
" />
99101

100-
<PackageDownload Update="Microsoft.DotNet.Web.ItemTemplates;Microsoft.DotNet.Web.Spa.ProjectTemplates"
102+
<PackageDownload Update="Microsoft.DotNet.Web.ItemTemplates"
103+
Version="[$(AspNetCorePackageVersionFor21Templates)];
104+
[$(AspNetCorePackageVersionFor22Templates)];
105+
[$(AspNetCorePackageVersionFor30Templates)];
106+
" />
107+
108+
<PackageDownload Update="Microsoft.DotNet.Web.Spa.ProjectTemplates"
101109
Version="[$(AspNetCorePackageVersionFor21Templates)];
102110
[$(AspNetCorePackageVersionFor22Templates)];
103111
" />
104112

105113
<PackageDownload Update="NUnit3.DotNetNew.Template"
106114
Version="[$(NUnit3Templates21PackageVersion)];
107115
[$(NUnit3Templates22PackageVersion)];
116+
[$(NUnit3Templates30PackageVersion)];
108117
" />
109118
</ItemGroup>
110119

111-
<!-- Restore bundled templates via PackageReference -->
112-
<ItemGroup>
113-
<PackageReference Include="@(Bundled30Templates)" />
114-
</ItemGroup>
115-
116120
<Target Name="LayoutTemplates"
117121
DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor30MSI;LayoutTemplatesFor22MSI;LayoutTemplatesFor21MSI" />
118122

0 commit comments

Comments
 (0)