<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>89806f0b9e93ad2bbe32c654412835c0801a2032</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21370.12">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>89806f0b9e93ad2bbe32c654412835c0801a2032</Sha>
+ <Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21370.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21370.12</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21370.12</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21370.12</MicrosoftDotNetBuildTasksPackagingVersion>
- <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21370.12</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+ <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21370.12</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21370.12</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21370.12</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksInstallersTaskAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\$(MicrosoftDotNetBuildTasksInstallersTaskTargetFramework)\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
</PropertyGroup>
+ <UsingTask AssemblyFile="$(PkgMicrosoft_DotNet_Build_Tasks_Workloads)\tools\net472\Microsoft.DotNet.Build.Tasks.Workloads.dll" TaskName="GenerateManifestMsi" />
<UsingTask AssemblyFile="$(PkgMicrosoft_DotNet_Build_Tasks_Workloads)\tools\net472\Microsoft.DotNet.Build.Tasks.Workloads.dll" TaskName="GenerateVisualStudioWorkload" />
-
+ <UsingTask TaskName="GenerateMsiVersion" AssemblyFile="$(MicrosoftDotNetBuildTasksInstallersTaskAssembly)" />
<UsingTask TaskName="CreateLightCommandPackageDrop" AssemblyFile="$(MicrosoftDotNetBuildTasksInstallersTaskAssembly)" />
<PropertyGroup>
<ManifestPackages Include="$(PackageSource)Microsoft.NET.Workload.Mono.ToolChain.Manifest-*.nupkg" />
</ItemGroup>
+ <GenerateMsiVersion
+ Major="$([System.Version]::Parse('$(SDKBundleVersion)').Major)"
+ Minor="$([System.Version]::Parse('$(SDKBundleVersion)').Minor)"
+ Patch="$([System.Version]::Parse('$(SDKBundleVersion)').Build)"
+ BuildNumber="$([System.Version]::Parse('$(SDKBundleVersion)').Revision)" >
+ <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
+ </GenerateMsiVersion>
+
+ <GenerateManifestMsi
+ IntermediateBaseOutputPath="$(IntermediateOutputPath)"
+ OutputPath="$(OutputPath)"
+ MsiVersion="$(MsiVersion)"
+ WixToolsetPath="$(WixToolsetPath)"
+ WorkloadManifestPackage="%(ManifestPackages.Identity)" >
+ <Output TaskParameter="Msis" ItemName="ManifestMsis" />
+ </GenerateManifestMsi>
+
<GenerateVisualStudioWorkload IntermediateBaseOutputPath="$(WorkloadIntermediateOutputPath)"
WixToolsetPath="$(WixToolsetPath)"
GenerateMsis="true"
</GenerateVisualStudioWorkload>
<!-- Build all the SWIX projects. This requires full framework MSBuild-->
+ <MSBuild Projects="%(ManifestMsis.SwixProject)" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VersionedVisualStudioSetupInsertionPath)" />
<MSBuild Projects="@(SwixProjects)" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VersionedVisualStudioSetupInsertionPath)" />
<!-- 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=%(ManifestMsis.WixObj);_Msi=%(ManifestMsis.Identity)" Targets="CreateWixPack" />
<MSBuild Projects="$(MSBuildProjectFile)" Properties="_WixObjDir=%(Msis.WixObj);_Msi=%(Msis.Identity)" Targets="CreateWixPack" />
<!-- Build the Visual Studio manifest project. -->
<!-- Build all the MSI payload packages for NuGet. -->
<ItemGroup>
+ <MsiPackageProjects Include="%(ManifestMsis.PackageProject)" />
<MsiPackageProjects Include="%(Msis.PackageProject)" />
</ItemGroup>