Skip to content

Commit

Permalink
Merge pull request #785 from dotnet/merges/main-to-dev17.0
Browse files Browse the repository at this point in the history
Merge main to dev17.0
  • Loading branch information
JoeRobich authored Jun 22, 2021
2 parents 2a50647 + 521b7cd commit 097cf21
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21209.17">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21212.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>28d9452d7e2ae4e98a1df735b90b03d3cac1f4e7</Sha>
<Sha>db49d790a4bfa977a9ed7436bf2aa242cefae45e</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/tizen-fetch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ fetch_tizen_pkgs()
Inform "Initialize arm base"
fetch_tizen_pkgs_init standard base
Inform "fetch common packages"
fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel
fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
Inform "fetch coreclr packages"
fetch_tizen_pkgs aarch64 lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
Inform "fetch corefx packages"
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"xcopy-msbuild": "16.8.0-preview2.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21209.17"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21212.6"
}
}

0 comments on commit 097cf21

Please sign in to comment.