diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets
index 9f81239cd..e70d058c2 100644
--- a/src/redist/targets/Branding.targets
+++ b/src/redist/targets/Branding.targets
@@ -12,6 +12,9 @@
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion)</HostFxrBrandName>
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
<SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
+ <BundledTemplates30BrandName>Microsoft .NET Core 3.0 Templates</BundledTemplates30BrandName>
+ <BundledTemplates22BrandName>Microsoft .NET Core 2.2 Templates</BundledTemplates22BrandName>
+ <BundledTemplates21BrandName>Microsoft .NET Core 2.1 Templates</BundledTemplates21BrandName>
</PropertyGroup>
</Target>
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index d94092fb9..9fdb03b75 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -143,8 +143,8 @@
Outputs="@(TemplatesMsiComponent->'%(MSIInstallerFile)')">
<Exec Command="powershell -NoProfile -NoLogo $(TemplatesGenerateMsiPowershellScript) ^
- '@(TemplatesMsiComponent->'%(LayoutPath)')' ^
- '%(TemplatesMsiComponent.MSIInstallerFile)' ^
+ '%(TemplatesMsiComponent.LayoutPath)' ^
+ '@(TemplatesMsiComponent->'%(MSIInstallerFile)')' ^
'$(WixRoot)' ^
'@(TemplatesMsiComponent->'%(BrandName)')' ^
'@(TemplatesMsiComponent->'%(MsiVersion)')' ^
@@ -164,7 +164,7 @@
<TemplatesMsiComponent Include="NetCore30TemplatesMsi">
<LayoutPath>$(Templates30LayoutPath.TrimEnd('\'))</LayoutPath>
<MSIInstallerFile>$(Templates30MSIInstallerFile)</MSIInstallerFile>
- <BrandName>Microsoft .NET Core 3.0 Templates</BrandName>
+ <BrandName>$(BundledTemplates30BrandName)</BrandName>
<MsiVersion>$(BundledTemplates30MsiVersion)</MsiVersion>
<Version>$(BundledTemplates30Version)</Version>
<UpgradeCode>$(Templates30InstallerUpgradeCode)</UpgradeCode>
@@ -172,7 +172,7 @@
<TemplatesMsiComponent Include="NetCore22TemplatesMsi">
<LayoutPath>$(Templates22LayoutPath.TrimEnd('\'))</LayoutPath>
<MSIInstallerFile>$(Templates22MSIInstallerFile)</MSIInstallerFile>
- <BrandName>Microsoft .NET Core 2.2 Templates</BrandName>
+ <BrandName>$(BundledTemplates22BrandName)</BrandName>
<MsiVersion>$(BundledTemplates22MsiVersion)</MsiVersion>
<Version>$(BundledTemplates22Version)</Version>
<UpgradeCode>$(Templates22InstallerUpgradeCode)</UpgradeCode>
@@ -180,7 +180,7 @@
<TemplatesMsiComponent Include="NetCore21TemplatesMsi">
<LayoutPath>$(Templates21LayoutPath.TrimEnd('\'))</LayoutPath>
<MSIInstallerFile>$(Templates21MSIInstallerFile)</MSIInstallerFile>
- <BrandName>Microsoft .NET Core 2.1 Templates</BrandName>
+ <BrandName>$(BundledTemplates21BrandName)</BrandName>
<MsiVersion>$(BundledTemplates21MsiVersion)</MsiVersion>
<Version>$(BundledTemplates21Version)</Version>
<UpgradeCode>$(Templates21InstallerUpgradeCode)</UpgradeCode>
@@ -241,6 +241,7 @@
'$(ToolsetInstallerNuspecFile)' ^
'$(ToolsetInstallerNupkgFile)' ^
'$(Architecture)' ^
+ '$(MajorMinorVersion)' ^
'$(SdkMSICabFile)'" />
</Target>
@@ -258,7 +259,8 @@
'@(TemplatesNupkgComponent->'%(Version)')' ^
'$(TemplatesInstallerNuspecFile)' ^
'@(TemplatesNupkgComponent->'%(NupkgFile)')' ^
- '@(TemplatesNupkgComponent->'%(IDSuffix)')'" />
+ '$(Architecture)' ^
+ '@(TemplatesNupkgComponent->'%(MajorMinorVersion)')'" />
</Target>
<Target Name="SetupTemplatesNupkgs">
@@ -271,19 +273,19 @@
<MSIInstallerFile>$(Templates30MSIInstallerFile)</MSIInstallerFile>
<NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(BundledTemplates30Version).nupkg</NupkgFile>
<Version>$(BundledTemplates30Version)</Version>
- <IDSuffix>$(Architecture).$(BundledTemplates30MajorMinorVersion)</IDSuffix>
+ <MajorMinorVersion>$(BundledTemplates30MajorMinorVersion)</MajorMinorVersion>
</TemplatesNupkgComponent>
<TemplatesNupkgComponent Include="NetCore22TemplatesNupkg">
<MSIInstallerFile>$(Templates22MSIInstallerFile)</MSIInstallerFile>
<NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates22MajorMinorVersion).$(BundledTemplates22Version).nupkg</NupkgFile>
<Version>$(BundledTemplates22Version)</Version>
- <IDSuffix>$(Architecture).$(BundledTemplates22MajorMinorVersion)</IDSuffix>
+ <MajorMinorVersion>$(BundledTemplates22MajorMinorVersion)</MajorMinorVersion>
</TemplatesNupkgComponent>
<TemplatesNupkgComponent Include="NetCore21TemplatesNupkg">
<MSIInstallerFile>$(Templates21MSIInstallerFile)</MSIInstallerFile>
<NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates21MajorMinorVersion).$(BundledTemplates21Version).nupkg</NupkgFile>
<Version>$(BundledTemplates21Version)</Version>
- <IDSuffix>$(Architecture).$(BundledTemplates21MajorMinorVersion)</IDSuffix>
+ <MajorMinorVersion>$(BundledTemplates21MajorMinorVersion)</MajorMinorVersion>
</TemplatesNupkgComponent>
</ItemGroup>
</Target>
diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec
index acf7fe532..b6bcf5915 100644
--- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec
+++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
- <id>VS.Redist.Common.NetCore.Templates.$DATA$</id>
+ <id>VS.Redist.Common.NetCore.Templates.$ARCH$.$MAJOR_MINOR$</id>
<version>1.0.0</version>
- <title>VS.Redist.Common.NetCore.Templates.$DATA$</title>
+ <title>VS.Redist.Common.NetCore.Templates.$ARCH$.$MAJOR_MINOR$</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
<projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
- <description>.NET Core $DATA$ Templates Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
+ <description>.NET Core $MAJOR_MINOR$ Templates Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
<files>
diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec
index 8915aac6e..1c71d7a34 100644
--- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec
+++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
- <id>VS.Redist.Common.NetCore.Toolset.$DATA$</id>
+ <id>VS.Redist.Common.NetCore.Toolset.$ARCH$</id>
<version>1.0.0</version>
- <title>VS.Redist.Common.NetCore.Toolset.$DATA$</title>
+ <title>VS.Redist.Common.NetCore.Toolset.$ARCH$</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
<projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
- <description>.NET Core SDK Toolset ($DATA$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
+ <description>.NET Core $MAJOR_MINOR$ SDK Toolset ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
<files>
diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec
index 5b93186c9..b986d3440 100644
--- a/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec
+++ b/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
- <id>VS.Tools.Net.Core.SDK.$DATA$</id>
+ <id>VS.Tools.Net.Core.SDK.$ARCH$</id>
<version>1.0.0</version>
- <title>VS.Tools.Net.Core.SDK.$DATA$</title>
+ <title>VS.Tools.Net.Core.SDK.$ARCH$</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
<projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
- <description>.NET Core SDK ($DATA$) as a .nupkg for internal Visual Studio build consumption</description>
+ <description>.NET Core SDK ($ARCH$) as a .nupkg for internal Visual Studio build consumption</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
<files>
diff --git a/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1 b/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1
index d54154225..9fda65872 100644
--- a/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1
@@ -7,7 +7,8 @@ param(
[Parameter(Mandatory=$true)][string]$NugetVersion,
[Parameter(Mandatory=$true)][string]$NuspecFile,
[Parameter(Mandatory=$true)][string]$NupkgFile,
- [Parameter(Mandatory=$false)][string]$AdditionalData,
+ [Parameter(Mandatory=$false)][string]$Architecture,
+ [Parameter(Mandatory=$false)][string]$MmVersion,
[Parameter(Mandatory=$false)][string]$CabPath
)
@@ -33,5 +34,5 @@ if (Test-Path $NupkgFile) {
Remove-Item -Force $NupkgFile
}
-& $NuGetExe pack $NuspecFile -Version $NugetVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties PAYLOAD_FILES=$ContentPath`;DOTNET_CAB_FILE=$CabPath`;DATA=$AdditionalData
+& $NuGetExe pack $NuspecFile -Version $NugetVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties PAYLOAD_FILES=$ContentPath`;DOTNET_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR_MINOR=$MmVersion
Exit $LastExitCode