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

Enabling publishing the nupkgs produced by the CLI to blob storage and hooking up DropSuffix to the VS targeted nupkg of the CLI.

Browse source
This commit is contained in:
Livar Cunha 2017-02-09 15:33:00 -08:00
parent a88df7953c
commit 81a94c0902
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/Microsoft.DotNet.Cli.Prepare.targets
View file

@ -78,6 +78,9 @@
<NugetVersion Condition=" '$(DropSuffix)' == '' ">$(FullNugetVersion)</NugetVersion>
<NugetVersion Condition=" '$(NugetVersion)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch)</NugetVersion>
<NugetVersionToUseWithVS Condition=" '$(DropSuffix)' == '' ">$(NugetVersion)</NugetVersionToUseWithVS>
<NugetVersionToUseWithVS Condition=" '$(NugetVersionToUseWithVS)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)-final-$(CommitCount)</NugetVersionToUseWithVS>
<SdkVersion>$(NugetVersion)</SdkVersion>
<SdkNugetVersion>$(NugetVersion)</SdkNugetVersion>

1
build/Microsoft.DotNet.Cli.Publish.targets
View file

@ -43,6 +43,7 @@
<ItemGroup>
<ForPublishing Include="@(GeneratedInstallers)" />
<ForPublishing Include="%(GenerateArchivesInputsOutputs.Outputs)" />
<ForPublishing Include="$(PackagesDirectory)/Microsoft*.nupkg" Condition=" 'PUBLISH_NUPKG_TO_AZURE_BLOB' != '' " />
</ItemGroup>
<ItemGroup>

4
build/package/Microsoft.DotNet.Cli.Installer.MSI.targets
View file

@ -23,7 +23,7 @@
<SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
<CombinedFrameworkSdkHostInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostInstallerFile>
<SdkInstallerNuspecFile>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec</SdkInstallerNuspecFile>
<SdkInstallerNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(NugetVersion).nupkg</SdkInstallerNupkgFile>
<SdkInstallerNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(NugetVersionToUseWithVS).nupkg</SdkInstallerNupkgFile>
</PropertyGroup>
<!-- Generate SDK MSI Inputs -->
@ -134,7 +134,7 @@
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
'$(CombinedFrameworkSdkHostInstallerFile)'
'$(NugetVersion)'
'$(NugetVersionToUseWithVS)'
'$(SdkInstallerNuspecFile)'
'$(SdkInstallerNupkgFile)'" />
</Target>