Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26381.103">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26359.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e2c1e00b3d0f96afb892fb261d5921565b400246</Sha>
<Sha>ba53d0ed335bed4ab7bfd01988c8e3953ee5ffbe</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
7 changes: 3 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,10 @@
</PropertyGroup>
<PropertyGroup>
<!--
Arcade 11 replaced the WixToolsetPath parameter on CreateVisualStudioWorkloadSet with
WixExe/HeatExe/WixExtensions, so opt out of the legacy WiX 3 toolset. WixPackageVersion
is only used by the WiX 3 path and can be removed once every branch has opted out.
Force the legacy WiX 3 path while testing the pre-migration Arcade SDK.
WixPackageVersion is only used by the WiX 3 path.
-->
<UseWixToolset3>false</UseWixToolset3>
<UseWixToolset3>true</UseWixToolset3>
<WixPackageVersion>3.14.0-8606.20240208.1</WixPackageVersion>
<SwixPackageVersion>1.1.392</SwixPackageVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26381.103",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26359.118",
"Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174"
}
}