mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updates per code review

Browse source
This commit is contained in:
jbeisner 2019-07-24 16:08:11 +00:00
parent 249af0f120
commit 67c7c446f9
6 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/redist/targets/Branding.targets
View file

@ -12,6 +12,9 @@
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion)</HostFxrBrandName> <HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion)</HostFxrBrandName>
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName> <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
<SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName> <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> </PropertyGroup>
</Target> </Target>

20
src/redist/targets/GenerateMSIs.targets
View file

@ -143,8 +143,8 @@
Outputs="@(TemplatesMsiComponent->'%(MSIInstallerFile)')"> Outputs="@(TemplatesMsiComponent->'%(MSIInstallerFile)')">
<Exec Command="powershell -NoProfile -NoLogo $(TemplatesGenerateMsiPowershellScript) ^ <Exec Command="powershell -NoProfile -NoLogo $(TemplatesGenerateMsiPowershellScript) ^
'@(TemplatesMsiComponent->'%(LayoutPath)')' ^ '%(TemplatesMsiComponent.LayoutPath)' ^
'%(TemplatesMsiComponent.MSIInstallerFile)' ^ '@(TemplatesMsiComponent->'%(MSIInstallerFile)')' ^
'$(WixRoot)' ^ '$(WixRoot)' ^
'@(TemplatesMsiComponent->'%(BrandName)')' ^ '@(TemplatesMsiComponent->'%(BrandName)')' ^
'@(TemplatesMsiComponent->'%(MsiVersion)')' ^ '@(TemplatesMsiComponent->'%(MsiVersion)')' ^
@ -164,7 +164,7 @@
<TemplatesMsiComponent Include="NetCore30TemplatesMsi"> <TemplatesMsiComponent Include="NetCore30TemplatesMsi">
<LayoutPath>$(Templates30LayoutPath.TrimEnd('\'))</LayoutPath> <LayoutPath>$(Templates30LayoutPath.TrimEnd('\'))</LayoutPath>
<MSIInstallerFile>$(Templates30MSIInstallerFile)</MSIInstallerFile> <MSIInstallerFile>$(Templates30MSIInstallerFile)</MSIInstallerFile>
<BrandName>Microsoft .NET Core 3.0 Templates</BrandName> <BrandName>$(BundledTemplates30BrandName)</BrandName>
<MsiVersion>$(BundledTemplates30MsiVersion)</MsiVersion> <MsiVersion>$(BundledTemplates30MsiVersion)</MsiVersion>
<Version>$(BundledTemplates30Version)</Version> <Version>$(BundledTemplates30Version)</Version>
<UpgradeCode>$(Templates30InstallerUpgradeCode)</UpgradeCode> <UpgradeCode>$(Templates30InstallerUpgradeCode)</UpgradeCode>
@ -172,7 +172,7 @@
<TemplatesMsiComponent Include="NetCore22TemplatesMsi"> <TemplatesMsiComponent Include="NetCore22TemplatesMsi">
<LayoutPath>$(Templates22LayoutPath.TrimEnd('\'))</LayoutPath> <LayoutPath>$(Templates22LayoutPath.TrimEnd('\'))</LayoutPath>
<MSIInstallerFile>$(Templates22MSIInstallerFile)</MSIInstallerFile> <MSIInstallerFile>$(Templates22MSIInstallerFile)</MSIInstallerFile>
<BrandName>Microsoft .NET Core 2.2 Templates</BrandName> <BrandName>$(BundledTemplates22BrandName)</BrandName>
<MsiVersion>$(BundledTemplates22MsiVersion)</MsiVersion> <MsiVersion>$(BundledTemplates22MsiVersion)</MsiVersion>
<Version>$(BundledTemplates22Version)</Version> <Version>$(BundledTemplates22Version)</Version>
<UpgradeCode>$(Templates22InstallerUpgradeCode)</UpgradeCode> <UpgradeCode>$(Templates22InstallerUpgradeCode)</UpgradeCode>
@ -180,7 +180,7 @@
<TemplatesMsiComponent Include="NetCore21TemplatesMsi"> <TemplatesMsiComponent Include="NetCore21TemplatesMsi">
<LayoutPath>$(Templates21LayoutPath.TrimEnd('\'))</LayoutPath> <LayoutPath>$(Templates21LayoutPath.TrimEnd('\'))</LayoutPath>
<MSIInstallerFile>$(Templates21MSIInstallerFile)</MSIInstallerFile> <MSIInstallerFile>$(Templates21MSIInstallerFile)</MSIInstallerFile>
<BrandName>Microsoft .NET Core 2.1 Templates</BrandName> <BrandName>$(BundledTemplates21BrandName)</BrandName>
<MsiVersion>$(BundledTemplates21MsiVersion)</MsiVersion> <MsiVersion>$(BundledTemplates21MsiVersion)</MsiVersion>
<Version>$(BundledTemplates21Version)</Version> <Version>$(BundledTemplates21Version)</Version>
<UpgradeCode>$(Templates21InstallerUpgradeCode)</UpgradeCode> <UpgradeCode>$(Templates21InstallerUpgradeCode)</UpgradeCode>
@ -241,6 +241,7 @@
'$(ToolsetInstallerNuspecFile)' ^ '$(ToolsetInstallerNuspecFile)' ^
'$(ToolsetInstallerNupkgFile)' ^ '$(ToolsetInstallerNupkgFile)' ^
'$(Architecture)' ^ '$(Architecture)' ^
'$(MajorMinorVersion)' ^
'$(SdkMSICabFile)'" /> '$(SdkMSICabFile)'" />
</Target> </Target>
@ -258,7 +259,8 @@
'@(TemplatesNupkgComponent->'%(Version)')' ^ '@(TemplatesNupkgComponent->'%(Version)')' ^
'$(TemplatesInstallerNuspecFile)' ^ '$(TemplatesInstallerNuspecFile)' ^
'@(TemplatesNupkgComponent->'%(NupkgFile)')' ^ '@(TemplatesNupkgComponent->'%(NupkgFile)')' ^
'@(TemplatesNupkgComponent->'%(IDSuffix)')'" /> '$(Architecture)' ^
'@(TemplatesNupkgComponent->'%(MajorMinorVersion)')'" />
</Target> </Target>
<Target Name="SetupTemplatesNupkgs"> <Target Name="SetupTemplatesNupkgs">
@ -271,19 +273,19 @@
<MSIInstallerFile>$(Templates30MSIInstallerFile)</MSIInstallerFile> <MSIInstallerFile>$(Templates30MSIInstallerFile)</MSIInstallerFile>
<NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(BundledTemplates30Version).nupkg</NupkgFile> <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(BundledTemplates30Version).nupkg</NupkgFile>
<Version>$(BundledTemplates30Version)</Version> <Version>$(BundledTemplates30Version)</Version>
<IDSuffix>$(Architecture).$(BundledTemplates30MajorMinorVersion)</IDSuffix> <MajorMinorVersion>$(BundledTemplates30MajorMinorVersion)</MajorMinorVersion>
</TemplatesNupkgComponent> </TemplatesNupkgComponent>
<TemplatesNupkgComponent Include="NetCore22TemplatesNupkg"> <TemplatesNupkgComponent Include="NetCore22TemplatesNupkg">
<MSIInstallerFile>$(Templates22MSIInstallerFile)</MSIInstallerFile> <MSIInstallerFile>$(Templates22MSIInstallerFile)</MSIInstallerFile>
<NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates22MajorMinorVersion).$(BundledTemplates22Version).nupkg</NupkgFile> <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates22MajorMinorVersion).$(BundledTemplates22Version).nupkg</NupkgFile>
<Version>$(BundledTemplates22Version)</Version> <Version>$(BundledTemplates22Version)</Version>
<IDSuffix>$(Architecture).$(BundledTemplates22MajorMinorVersion)</IDSuffix> <MajorMinorVersion>$(BundledTemplates22MajorMinorVersion)</MajorMinorVersion>
</TemplatesNupkgComponent> </TemplatesNupkgComponent>
<TemplatesNupkgComponent Include="NetCore21TemplatesNupkg"> <TemplatesNupkgComponent Include="NetCore21TemplatesNupkg">
<MSIInstallerFile>$(Templates21MSIInstallerFile)</MSIInstallerFile> <MSIInstallerFile>$(Templates21MSIInstallerFile)</MSIInstallerFile>
<NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates21MajorMinorVersion).$(BundledTemplates21Version).nupkg</NupkgFile> <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates21MajorMinorVersion).$(BundledTemplates21Version).nupkg</NupkgFile>
<Version>$(BundledTemplates21Version)</Version> <Version>$(BundledTemplates21Version)</Version>
<IDSuffix>$(Architecture).$(BundledTemplates21MajorMinorVersion)</IDSuffix> <MajorMinorVersion>$(BundledTemplates21MajorMinorVersion)</MajorMinorVersion>
</TemplatesNupkgComponent> </TemplatesNupkgComponent>
</ItemGroup> </ItemGroup>
</Target> </Target>

6
src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>VS.Redist.Common.NetCore.Templates.$DATA$</id> <id>VS.Redist.Common.NetCore.Templates.$ARCH$.$MAJOR_MINOR$</id>
<version>1.0.0</version> <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> <authors>Microsoft</authors>
<owners>Microsoft</owners> <owners>Microsoft</owners>
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl> <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
<projectUrl>https://github.com/dotnet/core-sdk</projectUrl> <projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance> <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> <copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata> </metadata>
<files> <files>

6
src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>VS.Redist.Common.NetCore.Toolset.$DATA$</id> <id>VS.Redist.Common.NetCore.Toolset.$ARCH$</id>
<version>1.0.0</version> <version>1.0.0</version>
<title>VS.Redist.Common.NetCore.Toolset.$DATA$</title> <title>VS.Redist.Common.NetCore.Toolset.$ARCH$</title>
<authors>Microsoft</authors> <authors>Microsoft</authors>
<owners>Microsoft</owners> <owners>Microsoft</owners>
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl> <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
<projectUrl>https://github.com/dotnet/core-sdk</projectUrl> <projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance> <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> <copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata> </metadata>
<files> <files>

6
src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>VS.Tools.Net.Core.SDK.$DATA$</id> <id>VS.Tools.Net.Core.SDK.$ARCH$</id>
<version>1.0.0</version> <version>1.0.0</version>
<title>VS.Tools.Net.Core.SDK.$DATA$</title> <title>VS.Tools.Net.Core.SDK.$ARCH$</title>
<authors>Microsoft</authors> <authors>Microsoft</authors>
<owners>Microsoft</owners> <owners>Microsoft</owners>
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl> <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
<projectUrl>https://github.com/dotnet/core-sdk</projectUrl> <projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance> <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> <copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata> </metadata>
<files> <files>

5
src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1
View file

@ -7,7 +7,8 @@ param(
[Parameter(Mandatory=$true)][string]$NugetVersion, [Parameter(Mandatory=$true)][string]$NugetVersion,
[Parameter(Mandatory=$true)][string]$NuspecFile, [Parameter(Mandatory=$true)][string]$NuspecFile,
[Parameter(Mandatory=$true)][string]$NupkgFile, [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 [Parameter(Mandatory=$false)][string]$CabPath
) )
@ -33,5 +34,5 @@ if (Test-Path $NupkgFile) {
Remove-Item -Force $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 Exit $LastExitCode