-
Notifications
You must be signed in to change notification settings - Fork 5k
Add workloads subset for blazor installers #55087
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
2572412
Adding workloads subset
bekir-ozturk 216480b
Don't build workloads by default
bekir-ozturk be5d603
Build blazor workload as part of CI
bekir-ozturk b6928b4
Change target folder
bekir-ozturk 2faafc6
Fix build platform
bekir-ozturk 3d5789f
Update downloading artifacts
bekir-ozturk 518fdb8
Update download artifacts task
bekir-ozturk b659afd
Temporarily skip prior steps
bekir-ozturk 0469b19
Fix download paths
bekir-ozturk 10bae3e
Fix download pattern
bekir-ozturk b5564de
Fix package paths
bekir-ozturk aaf347b
Update component versions
bekir-ozturk 6fcca4a
Update temporary artifact build id
bekir-ozturk 61e50cc
Upload msis and remove wixpdbs
bekir-ozturk 85a8fe5
Remove unused arg
bekir-ozturk 9537833
Revert "Temporarily skip prior steps"
bekir-ozturk 302d028
Update task dependencies
bekir-ozturk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| parameters: | ||
| archType: '' | ||
| buildConfig: '' | ||
| container: '' | ||
| dependOnEvaluatePaths: false | ||
| dependsOn: [] | ||
| isOfficialBuild: false | ||
| osGroup: '' | ||
| osSubgroup: '' | ||
| platform: '' | ||
| pool: '' | ||
| runtimeVariant: '' | ||
| stagedBuild: false | ||
| testGroup: '' | ||
| timeoutInMinutes: '' | ||
| variables: {} | ||
|
|
||
| jobs: | ||
| - template: xplat-pipeline-job.yml | ||
| parameters: | ||
| archType: ${{ parameters.archType }} | ||
| buildConfig: ${{ parameters.buildConfig }} | ||
| container: ${{ parameters.container }} | ||
| condition: ${{ parameters.isOfficialBuild }} | ||
| helixType: 'build/product/' | ||
| osGroup: ${{ parameters.osGroup }} | ||
| osSubgroup: ${{ parameters.osSubgroup }} | ||
| pool: ${{ parameters.pool }} | ||
| runtimeVariant: ${{ parameters.runtimeVariant }} | ||
| stagedBuild: ${{ parameters.stagedBuild }} | ||
| timeoutInMinutes: ${{ parameters.timeoutInMinutes }} | ||
| dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} | ||
|
|
||
| dependsOn: ${{ parameters.dependsOn }} | ||
|
|
||
| name: workloadsbuild | ||
| displayName: Build Workloads | ||
|
|
||
| variables: | ||
| - name: officialBuildIdArg | ||
| value: '' | ||
| - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: | ||
| - name: officialBuildIdArg | ||
| value: '/p:OfficialBuildId=$(Build.BuildNumber)' | ||
| - name: SignType | ||
| value: $[ coalesce(variables.OfficialSignType, 'real') ] | ||
| - ${{ parameters.variables }} | ||
|
|
||
| steps: | ||
| - task: DownloadPipelineArtifact@2 | ||
| inputs: | ||
| artifact: 'IntermediateArtifacts' | ||
| path: $(workloadPackagesPath) | ||
| patterns: 'IntermediateArtifacts/*/Shipping/*.nupkg' | ||
|
|
||
| - task: CopyFiles@2 | ||
| displayName: Flatten packages | ||
| inputs: | ||
| sourceFolder: $(workloadPackagesPath) | ||
| contents: '*/Shipping/*.nupkg' | ||
| cleanTargetFolder: false | ||
| targetFolder: $(workloadPackagesPath) | ||
| flattenFolders: true | ||
|
|
||
| - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subset mono.workloads -arch $(archType) -c $(buildConfig) $(officialBuildIdArg) -ci | ||
| displayName: Build workload artifacts | ||
|
|
||
| # Upload packages wrapping msis | ||
| - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml | ||
| parameters: | ||
| name: workloads | ||
|
|
||
| # Delete wixpdb files before they are uploaded to artifacts | ||
| - task: DeleteFiles@1 | ||
| displayName: Delete wixpdb's | ||
| inputs: | ||
| SourceFolder: $(workloadArtifactsPath) | ||
| Contents: '*.wixpdb' | ||
|
|
||
| # Upload artifacts to be used for generating VS components | ||
| - task: PublishPipelineArtifact@1 | ||
| displayName: Publish workload artifacts | ||
| inputs: | ||
| targetPath: $(workloadArtifactsPath) | ||
| artifactName: 'Workloads' | ||
| continueOnError: true | ||
| condition: always() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <packageSources> | ||
| <add key="local-packages" value="resources" /> | ||
| </packageSources> | ||
| <disabledPackageSources /> | ||
| </configuration> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="VSSetup.targets" /> | ||
|
|
||
| <PropertyGroup> | ||
| <DebugSymbols>false</DebugSymbols> | ||
| <IsShippingAssembly>false</IsShippingAssembly> | ||
| <PublishWindowsPdb>false</PublishWindowsPdb> | ||
| <TargetType>build-manifest</TargetType> | ||
| <FinalizeManifest>true</FinalizeManifest> | ||
| <FinalizeSkipLayout>false</FinalizeSkipLayout> | ||
| <ProductName>DotNetOptionalWorkloads</ProductName> | ||
| <ProductFamily>vs</ProductFamily> | ||
| <ProductFamilyVersion Condition="$(ProductFamilyVersion) == ''">42.42.42</ProductFamilyVersion> | ||
| <ComputeRelativeUrls>true</ComputeRelativeUrls> | ||
| <OutputPath>$(ManifestOutputPath)</OutputPath> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <MergeManifest Include="$(ManifestOutputPath)\*.json"> | ||
| <RelativeUrl>/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\CHS\*.json"> | ||
| <RelativeUrl>/CHS/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\CHT\*.json"> | ||
| <RelativeUrl>/CHT/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\CSY\*.json"> | ||
| <RelativeUrl>/CSY/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\DEU\*.json"> | ||
| <RelativeUrl>/DEU/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\ENU\*.json"> | ||
| <RelativeUrl>/ENU/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\ESN\*.json"> | ||
| <RelativeUrl>/ESN/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\FRA\*.json"> | ||
| <RelativeUrl>/FRA/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\ITA\*.json"> | ||
| <RelativeUrl>/ITA/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\JPN\*.json"> | ||
| <RelativeUrl>/JPN/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\KOR\*.json"> | ||
| <RelativeUrl>/KOR/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\PLK\*.json"> | ||
| <RelativeUrl>/PLK/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\PTB\*.json"> | ||
| <RelativeUrl>/PTB/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\RUS\*.json"> | ||
| <RelativeUrl>/RUS/</RelativeUrl> | ||
| </MergeManifest> | ||
| <MergeManifest Include="$(ManifestOutputPath)\TRK\*.json"> | ||
| <RelativeUrl>/TRK/</RelativeUrl> | ||
| </MergeManifest> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="$(SwixBuildTargets)"/> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <VSSetupProps>1</VSSetupProps> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <VSDropServiceUri>https://vsdrop.corp.microsoft.com/file/v1/</VSDropServiceUri> | ||
| <DropServiceUri>https://devdiv.artifacts.visualstudio.com/</DropServiceUri> | ||
| <DropExe>$(MSBuildThisDirectory)Tools\Drop.App\lib\net45\Drop.exe</DropExe> | ||
| <!-- Default drop expiration date is 10 years from now --> | ||
| <DropExpiration Condition="'$(DropExpiration)' == ''">10</DropExpiration> | ||
| <DropExpirationDate>$([System.DateTime]::Now.AddYears($(DropExpiration)).ToString("M/d/yyyy h:m:s tt"))</DropExpirationDate> | ||
| <!-- Timeout in minutes --> | ||
| <DropTimeout>10</DropTimeout> | ||
| <!-- Can be set to 'info', 'warn', 'error', 'verbose' --> | ||
| <DropTraceLevel>verbose</DropTraceLevel> | ||
|
|
||
| <!-- Commandline parameters for drop.exe --> | ||
| <DropParamService>-s "$(DropServiceUri)"</DropParamService> | ||
| <DropParamTimeout>--timeout "$(DropTimeout)"</DropParamTimeout> | ||
| <DropParamTraceLevel>--tracelevel "$(DropTraceLevel)"</DropParamTraceLevel> | ||
| <DropParamExpirationDate>-x "$(DropExpirationDate)"</DropParamExpirationDate> | ||
| <!-- Use AAD for authentication --> | ||
| <DropParamAuth>-a</DropParamAuth> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <ManifestTeamProject Condition="'$(ManifestTeamProject)' == ''">dotnet</ManifestTeamProject> | ||
| <ManifestRepositoryName Condition="'$(ManifestRepositoryName)' == ''">installer</ManifestRepositoryName> | ||
| <ManifestBuildBranch Condition="'$(ManifestBuildBranch)' == ''">local_build</ManifestBuildBranch> | ||
| <ManifestBuildNumber Condition="'$(ManifestBuildNumber)' == ''">$([System.DateTime]::Now.ToString("yyMMdd")).1</ManifestBuildNumber> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <ManifestPublishUrl>https://vsdrop.corp.microsoft.com/file/v1/Products/$(ManifestTeamProject)/$(ManifestRepositoryName)/$(ManifestBuildBranch)/$(ManifestBuildNumber);</ManifestPublishUrl> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <ManifestIntermediateOutputPath>$(OutputPath)\obj\$(MSBuildProject)</ManifestIntermediateOutputPath> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="VSSetup.props" Condition="'$(VSSetupProps)' != '1'"/> | ||
|
|
||
| <Target Name="PublishToVSDrop" DependsOnTargets="GetDropCmdLine"> | ||
| <Exec Command="$(DropUpgradeCmd)" /> | ||
| <Exec Command="$(DropCreateCmd)" /> | ||
| <Exec Command="$(DropPublishCmd)" /> | ||
| <Exec Command="$(DropFinalizeCmd)" /> | ||
| <Exec Command="$(DropUpdateCmd)" /> | ||
|
|
||
| <ItemGroup> | ||
| <DropManifests Include="$(VSDropSource)\*.vsman" /> | ||
| </ItemGroup> | ||
|
|
||
| <WriteLinesToFile File="$(VSDropTxt)" Overwrite="true" Lines="@(DropManifests->'$(ManifestPublishUrl)%(Filename)%(Extension)')" /> | ||
| </Target> | ||
|
|
||
| <Target Name="GetDropCmdLine"> | ||
| <!-- Properties that will depend on each build configuration. We can only build the commandlines onces these are defined --> | ||
| <Error Text="VSDropSource property undefined" Condition="'$(VSDropSource)' == ''" /> | ||
|
|
||
| <PropertyGroup> | ||
| <DropName>Products/$(ManifestTeamProject)/$(ManifestRepositoryName)/$(ManifestBuildBranch)/$(ManifestBuildNumber)</DropName> | ||
|
|
||
| <DropParamName>-n "$(DropName)"</DropParamName> | ||
| <DropParamSource>-d "$(VSDropSource)"</DropParamSource> | ||
|
|
||
| <DropUpgradeCmd>$(DropExe) Upgrade $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel)</DropUpgradeCmd> | ||
| <DropCreateCmd>$(DropExe) Create $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamExpirationDate) $(DropParamName)</DropCreateCmd> | ||
| <DropPublishCmd>$(DropExe) Publish $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamName) $(DropParamSource)</DropPublishCmd> | ||
| <DropFinalizeCmd>$(DropExe) Finalize $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamName)</DropFinalizeCmd> | ||
| <DropUpdateCmd>$(DropExe) Update $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamName) --neverExpire</DropUpdateCmd> | ||
| </PropertyGroup> | ||
| </Target> | ||
|
|
||
| <Target Name="VSSetupDiagnostic" DependsOnTargets="GetDropCmdLine"> | ||
| <ItemGroup> | ||
| <VSSetupProperties Include="Drop cmd: $(DropUpgradeCmd)" /> | ||
| <VSSetupProperties Include="Drop cmd: $(DropCreateCmd)" /> | ||
| <VSSetupProperties Include="Drop cmd: $(DropPublishCmd)" /> | ||
| <VSSetupProperties Include="Drop cmd: $(DropFinalizeCmd)" /> | ||
| <VSSetupProperties Include="Drop cmd: $(DropUpdateCmd)" /> | ||
| <VSSetupProperties Include="DropName: $(DropName)" /> | ||
| </ItemGroup> | ||
|
|
||
| <Message Text="%(VSSetupProperties.Identity)" /> | ||
| </Target> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Building | ||
| The workloads project can only be built using .NET Framework msbuild. To build locally, run ```build -project src\workloads\workloads.csproj -msbuildEngine vs``` | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| !*.nupkg |
Binary file added
BIN
+31.5 MB
src/workloads/resources/MicroBuild.Plugins.SwixBuild.Dotnet.1.1.87-gba258badda.nupkg
Binary file not shown.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you copy this from my dotnet/installer PR? That was true before we rebuilt SWIX to support dotnet build and not depend on msbuild.
We should remove this readme