Skip to content

Commit

Permalink
Update to arcade with WiX fix (225808)
Browse files Browse the repository at this point in the history
  • Loading branch information
mmitche committed May 17, 2024
1 parent deb4323 commit 136f129
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24209.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24266.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
<Sha>4c7a2a3a3a23698ba4ce15cf9a98560c654483b6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24209.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24266.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
<Sha>4c7a2a3a3a23698ba4ce15cf9a98560c654483b6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24209.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24266.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
<Sha>4c7a2a3a3a23698ba4ce15cf9a98560c654483b6</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<MicrosoftExtensionsLoggingVersion>7.0.0</MicrosoftExtensionsLoggingVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24266.2</MicrosoftDotNetBuildTasksTemplatingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<!-- NB: Roslyn version affects the minimum required Visual Studio version -->
Expand Down
Binary file modified eng/common/loc/P22DotNetHtmlLocalization.lss
Binary file not shown.
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"rollForward": "latestMajor"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24209.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24209.2"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24266.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24266.2"
}
}

0 comments on commit 136f129

Please sign in to comment.