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

Revert "Merge remote-tracking branch 'origin/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx"

Browse source 
This reverts commit 40be59f753, reversing
changes made to 734a41730a.
This commit is contained in:
jbeisner 2018-06-20 22:11:00 +00:00
parent 40be59f753
commit 4402dfb684
3 changed files with 1 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,8 +21,6 @@
<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>
<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>
<SdkMSBuildExtensionsNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg</SdkMSBuildExtensionsNupkgFile>
@ -166,21 +164,14 @@
Condition=" '$(OS)' == 'Windows_NT'"
Inputs="$(CombinedFrameworkSdkHostInstallerFile);
$(SdkInstallerNuspecFile);
$(SdkInstallerNuspecFile2xx);
$(SdkGenerateNupkgPowershellScript)"
Outputs="$(SdkInstallerNupkgFile);$(SdkInstallerNupkgFile2xx)">
Outputs="$(SdkInstallerNupkgFile)">
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
'$(CombinedFrameworkSdkHostInstallerFile)'
'$(FullNugetVersion)'
'$(SdkInstallerNuspecFile)'
'$(SdkInstallerNupkgFile)'" />
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
'$(CombinedFrameworkSdkHostInstallerFile)'
'$(FullNugetVersion)'
'$(SdkInstallerNuspecFile2xx)'
'$(SdkInstallerNupkgFile2xx)'" />
</Target>
<Target Name="GenerateSdkMSBuildExtensionsNupkg"

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

@ -1,18 +0,0 @@
<?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
View file

@ -1,18 +0,0 @@
<?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>