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

Merge pull request #10755 from joeloff/PublishCI

Browse source 
Publish additional assets
This commit is contained in:
Lukas Lansky 2021-05-25 08:19:30 +02:00 • committed by GitHub
commit e4bd1e035e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.vsts-ci.yml
View file

@ -103,7 +103,7 @@ stages:
_DOTNET_CLI_UI_LANGUAGE: ''
# This is a very specific build process and MUST be built using .NET Framework MSBuild
# because of build task dependencies for Visual Studio.
_AdditionalBuildParameters: '-project src\workloads\workloads.csproj -msbuildEngine vs'
_AdditionalBuildParameters: '-project src\workloads\workloads.csproj -msbuildEngine vs /p:OptionalWorkloads=true'
# Never run tests for workloads
_TestArg: ''

9
eng/Publishing.props
View file

@ -75,13 +75,17 @@
<SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.svg" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
<!-- Only publish this file from windows x64 so that we don't end up with duplicates -->
<SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)productVersion.txt"
Condition=" '$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" />
Condition=" '$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true' and '$(OptionalWorkloads)' != 'true'" />
<SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt"
Condition=" '$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" />
Condition=" '$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true' and '$(OptionalWorkloads)' != 'true'" />
<SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)productCommit-*.txt" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
<SdkNonShippingAssetsToPublish Include="$(ArtifactsNonShippingPackagesDir)*.nupkg" />
<SdkNonShippingAssetsToPublish Include="$(ArtifactsNonShippingPackagesDir)*.swr" />
<SdkNonShippingAssetsToPublish Include="$(ArtifactsNonShippingPackagesDir)*.msi" />
<!-- Include MSIs and .vsman files for Visual Studio -->
<SdkNonShippingAssetsToPublish Include="$(VisualStudioSetupInsertionPath)*.msi;
$(VisualStudioSetupInsertionPath)*.vsman"
Condition="'$(OS)' == 'Windows_NT' and '$(OptionalWorkloads)' == 'true'"/>
<SdkNonShippingAssetsToPublish Condition="'$(PublishBinariesAndBadge)' != 'false'" Include="$(ArtifactsNonShippingPackagesDir)*.tar.gz" />
<SdkNonShippingAssetsToPublish Condition="'$(PublishBinariesAndBadge)' != 'false'" Include="$(ArtifactsNonShippingPackagesDir)*.zip" />
<SdkNonShippingAssetsToPublish Include="$(ArtifactsNonShippingPackagesDir)*.pkg" />
@ -125,6 +129,7 @@
<ItemsToSignPostBuildWithPaths Include="$(ArtifactsShippingPackagesDir)*.msi" />
<ItemsToSignPostBuildWithPaths Include="$(ArtifactsShippingPackagesDir)*.nupkg" />
<ItemsToSignPostBuildWithPaths Include="$(ArtifactsNonShippingPackagesDir)*.msi" />
<ItemsToSignPostBuildWithPaths Include="$(VisualStudioSetupInsertionPath)*.msi" />
<ItemsToSignPostBuildWithPaths Include="$(ArtifactsNonShippingPackagesDir)*.zip" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
<ItemsToSignPostBuildWithPaths Include="$(ArtifactsNonShippingPackagesDir)*.nupkg" />
<ItemsToSignPostBuild Remove="@(ItemsToSignPostBuild)" />

10
src/workloads/workloads.csproj
View file

@ -22,8 +22,6 @@
<WorkloadIntermediateOutputPath>$(ArtifactsObjDir)workloads\</WorkloadIntermediateOutputPath>
<WorkloadOutputPath>$(ArtifactsBinDir)workloads\</WorkloadOutputPath>
<VisualStudioManifestOutputPath>$(ArtifactsDir)VSSetup\$(Configuration)\Insertion\</VisualStudioManifestOutputPath>
<PackageSource>$(WorkloadIntermediateOutputPath)packages\</PackageSource>
<!-- Project generated from the workload manfiests to download all the workload pack packages -->
@ -110,7 +108,7 @@
</GenerateVisualStudioWorkload>
<!-- Build all the SWIX projects. This requires full framework MSBuild-->
<MSBuild Projects="@(SwixProjects)" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VisualStudioManifestOutputPath)" />
<MSBuild Projects="@(SwixProjects)" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VisualStudioSetupInsertionPath)" />
<!-- Gather .wixobj files for post-build signing. We'll have to batch since we generated multiple MSIs in the previous step. -->
<MSBuild Projects="$(MSBuildProjectFile)" Properties="_WixObjDir=%(Msis.WixObj);_Msi=%(Msis.Identity)" Targets="CreateWixPack" />
@ -120,7 +118,7 @@
<VisualStudioManifestProjects Include="OptionalWorkloads.vsmanproj" />
</ItemGroup>
<MSBuild Projects="@(VisualStudioManifestProjects)" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VisualStudioManifestOutputPath);OutputPath=$(VisualStudioManifestOutputPath)" />
<MSBuild Projects="@(VisualStudioManifestProjects)" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VisualStudioSetupInsertionPath);OutputPath=$(VisualStudioSetupInsertionPath)" />
<!-- Build all the MSI payload packages for NuGet. -->
<ItemGroup>
@ -154,7 +152,7 @@
<SwixProjects Include="$(WorkloadIntermediateOutputPath)**\*.swixproj" />
</ItemGroup>
<MSBuild Projects="@(SwixProjects)" BuildInParallel="true" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VisualStudioManifestOutputPath)" />
<MSBuild Projects="@(SwixProjects)" BuildInParallel="true" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VisualStudioSetupInsertionPath)" />
</Target>
<Target Name="BuildVisualStudioManifest">
@ -162,7 +160,7 @@
<VisualStudioManifestProjects Include="Microsoft.NET.vsmanproj" />
</ItemGroup>
<MSBuild Projects="@(VisualStudioManifestProjects)" BuildInParallel="true" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VisualStudioManifestOutputPath);OutputPath=$(VisualStudioManifestOutputPath)" />
<MSBuild Projects="@(VisualStudioManifestProjects)" BuildInParallel="true" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VisualStudioSetupInsertionPath);OutputPath=$(VisualStudioSetupInsertionPath)" />
</Target>
<Target Name="GenerateVersions">