[workloads] Opt into using package groups (#92168)
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Mon, 18 Sep 2023 17:13:31 +0000 (10:13 -0700)
committerGitHub <noreply@github.com>
Mon, 18 Sep 2023 17:13:31 +0000 (10:13 -0700)
This is to make sure the MSI's we generate for VS are recognized as the same. Enabling sxs workloads by itself caused the package id's that wrap the manifest MSI's to be different. This prevents that from happening.

Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
src/workloads/workloads.csproj

index ae0a4f6af7f246d963745ce12dedd4d8f96d22b7..82c5c31badd71b724c24305301859e4a3c3790a7 100644 (file)
       <SwixWorkloadPackProjects Include="@(SwixProjects)" Condition="'%(PackageType)' == 'msi-pack'"
                                 ManifestOutputPath="$(VStemp)\p\%(SwixProjects.SdkFeatureBand)"
                                 ZipFile="Workload.VSDrop.mono.net.$(MajorVersion).$(MinorVersion)-%(SwixProjects.SdkFeatureBand).packs.zip"/>
-      <SwixComponentsAndManifests Include="@(SwixProjects)" Condition="('%(PackageType)' == 'msi-manifest') Or ('%(PackageType)' == 'component' And '%(IsPreview)' == 'false')"
+      <SwixComponentsAndManifests Include="@(SwixProjects)" Condition="('%(PackageType)' == 'msi-manifest') Or ('%(PackageType)' == 'manifest-package-group') Or ('%(PackageType)' == 'component' And '%(IsPreview)' == 'false')"
                                   ManifestOutputPath="$(VStemp)\c\%(SwixProjects.SdkFeatureBand)"
                                   ZipFile="Workload.VSDrop.mono.net.$(MajorVersion).$(MinorVersion)-%(SwixProjects.SdkFeatureBand).components.zip"/>
       <SwixPreviewComponentsAndManifests Include="@(SwixProjects)" Condition="('%(PackageType)' == 'msi-manifest') Or ('%(PackageType)' == 'component' And '%(IsPreview)' == 'true')"