Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request emscripten-core#140 from dotnet/darc-main-edd1ce00…
Browse files Browse the repository at this point in the history
…-d7da-47ac-bbc2-badee5bda104

[main] Update dependencies from dotnet/arcade
  • Loading branch information
lewing authored May 9, 2022
2 parents aeb9a35 + 2909059 commit b2795f8
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22225.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22255.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5145e86df0c491e082b589aa31d69eea300adc02</Sha>
<Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22225.6">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22255.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5145e86df0c491e082b589aa31d69eea300adc02</Sha>
<Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22225.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22255.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5145e86df0c491e082b589aa31d69eea300adc02</Sha>
<Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22225.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22255.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5145e86df0c491e082b589aa31d69eea300adc02</Sha>
<Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22225.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22255.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5145e86df0c491e082b589aa31d69eea300adc02</Sha>
<Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<EmscriptenVersion>3.1.7</EmscriptenVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22225.6</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21420.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22225.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22225.6</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dotnet": "7.0.100-preview.2.22153.17"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22225.6",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22225.6"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22255.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22255.2"
}
}

0 comments on commit b2795f8

Please sign in to comment.