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

Merge branch 'release/2.1.2xx' into release/2.1.2xx-MSRC

Browse source 
* release/2.1.2xx:
  Update Installer build to create both old and new package identities
  Bring back old package IDs
  Update VS Insertion NuGet package IDs in Installer.MSI.targets
  Update VS insertion package name for x86 package
  Update VS insertion package name for x64 package
This commit is contained in:
Peter Huene 2018-06-25 22:42:03 -07:00
commit ce512c767f
No known key found for this signature in database
GPG key ID: E1D265D820213D6A
3 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
build/package/Installer.MSI.targets
View file

@ -21,6 +21,8 @@
<SdkInstallerNuspecFile>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec</SdkInstallerNuspecFile> <SdkInstallerNuspecFile>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec</SdkInstallerNuspecFile>
<SdkInstallerNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</SdkInstallerNupkgFile> <SdkInstallerNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</SdkInstallerNupkgFile>
<SdkInstallerNuspecFile2xx>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.nuspec</SdkInstallerNuspecFile2xx>
<SdkInstallerNupkgFile2xx>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.$(FullNugetVersion).nupkg</SdkInstallerNupkgFile2xx>
<SdkMSBuildExtensionsNuspecFile>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec</SdkMSBuildExtensionsNuspecFile> <SdkMSBuildExtensionsNuspecFile>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec</SdkMSBuildExtensionsNuspecFile>
<SdkMSBuildExtensionsNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg</SdkMSBuildExtensionsNupkgFile> <SdkMSBuildExtensionsNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg</SdkMSBuildExtensionsNupkgFile>
@ -162,14 +164,21 @@
Condition=" '$(OS)' == 'Windows_NT'" Condition=" '$(OS)' == 'Windows_NT'"
Inputs="$(CombinedFrameworkSdkHostInstallerFile); Inputs="$(CombinedFrameworkSdkHostInstallerFile);
$(SdkInstallerNuspecFile); $(SdkInstallerNuspecFile);
$(SdkInstallerNuspecFile2xx);
$(SdkGenerateNupkgPowershellScript)" $(SdkGenerateNupkgPowershellScript)"
Outputs="$(SdkInstallerNupkgFile)"> Outputs="$(SdkInstallerNupkgFile);$(SdkInstallerNupkgFile2xx)">
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript) <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
'$(CombinedFrameworkSdkHostInstallerFile)' '$(CombinedFrameworkSdkHostInstallerFile)'
'$(FullNugetVersion)' '$(FullNugetVersion)'
'$(SdkInstallerNuspecFile)' '$(SdkInstallerNuspecFile)'
'$(SdkInstallerNupkgFile)'" /> '$(SdkInstallerNupkgFile)'" />
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
'$(CombinedFrameworkSdkHostInstallerFile)'
'$(FullNugetVersion)'
'$(SdkInstallerNuspecFile2xx)'
'$(SdkInstallerNupkgFile2xx)'" />
</Target> </Target>
<Target Name="GenerateSdkMSBuildExtensionsNupkg" <Target Name="GenerateSdkMSBuildExtensionsNupkg"

18
packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx.nuspec Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx</id>
<version>1.0.0</version>
<title>VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
<projectUrl>https://github.com/dotnet/cli</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>Windows Installers (x64) for .Net Core SDK 2.1.2xx</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
<files>
<file src="[DOTNET_BUNDLE]" />
</files>
</package>

18
packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx</id>
<version>1.0.0</version>
<title>VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
<projectUrl>https://github.com/dotnet/cli</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>Windows Installer (x86) for .Net Core SDK 2.1.2xx</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
<files>
<file src="[DOTNET_BUNDLE]" />
</files>
</package>