Skip to content

Commit

Permalink
Port workload changes from 6.0 (#10420)
Browse files Browse the repository at this point in the history
* Refactoring workload build tasks (#8645)

* Refactoring workload build tasks

* Fix source build and some random cleanup

* Updating tests, code cleanup

* Minor fixes, unit test conversion

* Mark tests as Windows only, fix missing content for Helix

* Hide WiX and test packages from Solution Explorer

* Fix duplicate publish items

* Fix link target for helix

* Fix link metadata for WiX

* Pass ICE suppressions to Light, more cleanup

* Fix file extraction for packs, add unit test for template pack MSI

* Pass ICE suppressions to Light (#9061)

* Create workload pack group installers (#9514)

* Remove duplicate PackageReference

* Create MSIs for workoad pack groups

* Build NuGet wrapper packages for workload pack group MSIs

* Generate WorkloadPackGroups.json in manifest MSIs

* Add swix authoring for workload pack groups

* De-duplicate workload pack group creation

* Put braces around ProductCode and UpgradeCode registry values

* Write registry keys for pack groups

* Fix swix dependencies for pack groups

* Use correct GUID format when setting candle variables

* Add test for creating pack group dependency in SWR file

* Support building with missing workload packs (#9628)

* Support building with missing workload packs

* Include extracted manifest files in manifest MSI payload nupkg

* Fix versioning errors in workloads (#10363)

* Fix versioning errors in workloads

* Disable TRX tests while reporting to AZDO is broken (#10358) (#10380)

Co-authored-by: Matt Galbraith <MattGal@users.noreply.github.com>

* clean up, api changes

Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
Co-authored-by: Matt Galbraith <MattGal@users.noreply.github.com>
  • Loading branch information
3 people authored Aug 15, 2022
1 parent 49b4958 commit bb38157
Show file tree
Hide file tree
Showing 84 changed files with 4,463 additions and 3,513 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsVersion)" />
<PackageReference Include="Microsoft.SymbolUploader" Version="$(MicrosoftSymbolUploaderVersion)" />

<!-- Override the vulnerable version brought in by Microsoft.DotNet.Maestro.Client -->
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;$(TargetFrameworkForNETSDK)</TargetFrameworks>
Expand All @@ -14,16 +14,30 @@
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
<PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
<PackageReference Include="Microsoft.NET.Sdk.WorkloadManifestReader" Version="$(MicrosoftNetSdkWorkloadManifestReaderVersion)" />
<PackageReference Include="NuGet.Packaging" Version="$(NuGetVersion)" />
<PackageReference Include="NuGet.Packaging" Version="$(NuGetVersion)" />
<PackageReference Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" GeneratePathProperty="true"/>
<PackageReference Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.200" Version="6.0.3" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.iOS.Templates" Version="15.2.302-preview.14.122" GeneratePathProperty="true" />
</ItemGroup>

<ItemGroup>
<Content Include="testassets\**\*" CopyToOutputDirectory="PreserveNewest" />
<Content Include="testassets\**\*" CopyToOutputDirectory="PreserveNewest" />
<Content Include="$(PkgMicrosoft_Signed_Wix)\tools\**\*" Link="testassets\wix\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" Visible="false"/>
<Content Include="$(PkgMicrosoft_NET_Workload_Mono_ToolChain_Manifest-6_0_200)\*.nupkg" Link="testassets\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" Visible="false"/>
<Content Include="$(PkgMicrosoft_iOS_Templates)\*.nupkg" Link="testassets\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" Visible="false"/>
</ItemGroup>

<ItemGroup>
<None Remove="testassets\emsdkWorkloadManifest.json" />
<None Remove="testassets\emsdkWorkloadManifest2.json" />
<None Remove="testassets\mauiWorkloadManifest.json" />
</ItemGroup>

<ItemGroup>
<Reference Include="$(WixInstallPath)\Microsoft.Deployment.Resources.dll" />
<Reference Include="$(WixInstallPath)\Microsoft.Deployment.Compression.dll" />
<Reference Include="$(WixInstallPath)\Microsoft.Deployment.Compression.Cab.dll" />
<Reference Include="$(WixInstallPath)\Microsoft.Deployment.WindowsInstaller.dll" />
<Reference Include="$(WixInstallPath)\Microsoft.Deployment.WindowsInstaller.Package.dll" />
</ItemGroup>
</Project>
Loading

0 comments on commit bb38157

Please sign in to comment.