Skip to content

Commit e1ce4c3

Browse files
authored
Test WiX 3 with pre-migration Arcade (#887)
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7e395b65-e592-4d78-aa38-58dc5cedae7c
1 parent 1fc3eb5 commit e1ce4c3

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
</Dependency>
3737
</ProductDependencies>
3838
<ToolsetDependencies>
39-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26381.103">
39+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26359.118">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>e2c1e00b3d0f96afb892fb261d5921565b400246</Sha>
41+
<Sha>ba53d0ed335bed4ab7bfd01988c8e3953ee5ffbe</Sha>
4242
<SourceBuild RepoName="arcade" ManagedOnly="true" />
4343
</Dependency>
4444
</ToolsetDependencies>

eng/Versions.props

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@
3535
</PropertyGroup>
3636
<PropertyGroup>
3737
<!--
38-
Arcade 11 replaced the WixToolsetPath parameter on CreateVisualStudioWorkloadSet with
39-
WixExe/HeatExe/WixExtensions, so opt out of the legacy WiX 3 toolset. WixPackageVersion
40-
is only used by the WiX 3 path and can be removed once every branch has opted out.
38+
Force the legacy WiX 3 path while testing the pre-migration Arcade SDK.
39+
WixPackageVersion is only used by the WiX 3 path.
4140
-->
42-
<UseWixToolset3>false</UseWixToolset3>
41+
<UseWixToolset3>true</UseWixToolset3>
4342
<WixPackageVersion>3.14.0-8606.20240208.1</WixPackageVersion>
4443
<SwixPackageVersion>1.1.392</SwixPackageVersion>
4544
</PropertyGroup>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"msbuild-sdks": {
1111
"Microsoft.Build.NoTargets": "3.7.0",
12-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26381.103",
12+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26359.118",
1313
"Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174"
1414
}
1515
}

0 commit comments

Comments
 (0)