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

Merge pull request #4549 from johnbeisner/UpdatesFor3.1.1xx

Browse source 
Setup updates for release/3.1.1xx
This commit is contained in:
John Beisner 2019-09-04 11:31:26 -07:00 • committed by GitHub
commit 235177056a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@
<PropertyGroup> <PropertyGroup>
<BuildName>cli</BuildName> <BuildName>cli</BuildName>
<SdkBrandName>Microsoft .NET Core SDK $(CliBrandingVersion)</SdkBrandName> <SdkBrandName>Microsoft .NET Core SDK $(CliBrandingVersion)</SdkBrandName>
<ToolsetBrandName>Microsoft .NET Core Toolset $(CliBrandingVersion)</ToolsetBrandName>
<MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName> <MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core Runtime $(MicrosoftNETCoreAppPackageVersion)</SharedFrameworkBrandName> <SharedFrameworkBrandName>Microsoft .NET Core Runtime $(MicrosoftNETCoreAppPackageVersion)</SharedFrameworkBrandName>
<NetCoreAppTargetingPackBrandName>Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackBrandName> <NetCoreAppTargetingPackBrandName>Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackBrandName>
@ -12,9 +13,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> <BundledTemplates30BrandName>Microsoft .NET Core 3.0 Templates $(CliBrandingVersion)</BundledTemplates30BrandName>
<BundledTemplates22BrandName>Microsoft .NET Core 2.2 Templates</BundledTemplates22BrandName> <BundledTemplates22BrandName>Microsoft .NET Core 2.2 Templates $(CliBrandingVersion)</BundledTemplates22BrandName>
<BundledTemplates21BrandName>Microsoft .NET Core 2.1 Templates</BundledTemplates21BrandName> <BundledTemplates21BrandName>Microsoft .NET Core 2.1 Templates $(CliBrandingVersion)</BundledTemplates21BrandName>
</PropertyGroup> </PropertyGroup>
</Target> </Target>

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

@ -38,7 +38,6 @@
<PropertyGroup> <PropertyGroup>
<SdkMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFile> <SdkMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFile>
<SdkMSICabFile>$(ArtifactsShippingPackagesDir)d$(Architecture)-1.cab</SdkMSICabFile>
<SdkDependencyKeyName>Dotnet_CLI</SdkDependencyKeyName> <SdkDependencyKeyName>Dotnet_CLI</SdkDependencyKeyName>
<Templates30MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-30templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates30MSIInstallerFile> <Templates30MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-30templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates30MSIInstallerFile>
<Templates22MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-22templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates22MSIInstallerFile> <Templates22MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-22templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates22MSIInstallerFile>
@ -136,7 +135,7 @@
'$(SdkInternalLayoutPath.TrimEnd('\'))' ^ '$(SdkInternalLayoutPath.TrimEnd('\'))' ^
'$(SdkMSIInstallerFile)' ^ '$(SdkMSIInstallerFile)' ^
'$(WixRoot)' ^ '$(WixRoot)' ^
'$(SdkBrandName)' ^ '$(ToolsetBrandName)' ^
'$(MsiVersion)' ^ '$(MsiVersion)' ^
'$(SDKBundleVersion)' ^ '$(SDKBundleVersion)' ^
'$(NugetVersion)' ^ '$(NugetVersion)' ^
@ -274,8 +273,7 @@
'$(ToolsetInstallerNuspecFile)' ^ '$(ToolsetInstallerNuspecFile)' ^
'$(ToolsetInstallerNupkgFile)' ^ '$(ToolsetInstallerNupkgFile)' ^
'$(Architecture)' ^ '$(Architecture)' ^
'$(MajorMinorVersion)' ^ '$(MajorMinorVersion)'" />
'$(SdkMSICabFile)'" />
</Target> </Target>
<Target Name="GenerateSdkPlaceholderNupkg" <Target Name="GenerateSdkPlaceholderNupkg"

1
src/redist/targets/Signing.targets
View file

@ -147,7 +147,6 @@
<ItemGroup> <ItemGroup>
<SdkMsiFilesToSign Include="$(SdkMSIInstallerFile)" /> <SdkMsiFilesToSign Include="$(SdkMSIInstallerFile)" />
<SdkMsiFilesToSign Include="$(ArtifactsShippingPackagesDir)*.cab" />
<SdkMsiFileSignInfo Include="@(SdkMsiFilesToSign->'%(Filename)%(Extension)')"> <SdkMsiFileSignInfo Include="@(SdkMsiFilesToSign->'%(Filename)%(Extension)')">
<CertificateName>$(InternalCertificateId)</CertificateName> <CertificateName>$(InternalCertificateId)</CertificateName>

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

@ -14,6 +14,5 @@
</metadata> </metadata>
<files> <files>
<file src="$PAYLOAD_FILES$" /> <file src="$PAYLOAD_FILES$" />
<file src="$DOTNET_CAB_FILE$" />
</files> </files>
</package> </package>

7
src/redist/targets/packaging/windows/clisdk/dotnet.wxs
View file

@ -10,12 +10,7 @@
<MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize"/> <MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize"/>
<?if $(var.Platform)=x86?> <MediaTemplate CompressionLevel="high" EmbedCab="yes" />
<MediaTemplate CabinetTemplate="dx86-{0}.cab" CompressionLevel="high" />
<?elseif $(var.Platform)=x64?>
<MediaTemplate CabinetTemplate="dx64-{0}.cab" CompressionLevel="high" />
<?endif?>
<Feature Id="MainFeature" Title="Main Feature" Level="1"> <Feature Id="MainFeature" Title="Main Feature" Level="1">
<ComponentGroupRef Id="InstallFiles" /> <ComponentGroupRef Id="InstallFiles" />
<ComponentGroupRef Id="AuthoredRegistryKeys_x86node"/> <ComponentGroupRef Id="AuthoredRegistryKeys_x86node"/>

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

@ -8,8 +8,7 @@ param(
[Parameter(Mandatory=$true)][string]$NuspecFile, [Parameter(Mandatory=$true)][string]$NuspecFile,
[Parameter(Mandatory=$true)][string]$NupkgFile, [Parameter(Mandatory=$true)][string]$NupkgFile,
[Parameter(Mandatory=$false)][string]$Architecture, [Parameter(Mandatory=$false)][string]$Architecture,
[Parameter(Mandatory=$false)][string]$MmVersion, [Parameter(Mandatory=$false)][string]$MmVersion
[Parameter(Mandatory=$false)][string]$CabPath
) )
$NuGetDir = Join-Path $BinDir "nuget" $NuGetDir = Join-Path $BinDir "nuget"
@ -34,5 +33,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`;ARCH=$Architecture`;MAJOR_MINOR=$MmVersion & $NuGetExe pack $NuspecFile -Version $NugetVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties PAYLOAD_FILES=$ContentPath`;ARCH=$Architecture`;MAJOR_MINOR=$MmVersion
Exit $LastExitCode Exit $LastExitCode