未验证 提交 1fee2718 编写于 作者: D dotnet-maestro[bot] 提交者: GitHub

[main] Update dependencies from dotnet/arcade (#1735)

* Update dependencies from https://github.com/dotnet/arcade build 20211124.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21573.3 -> To Version 7.0.0-beta.21574.3

* Update dependencies from https://github.com/dotnet/arcade build 20211126.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21573.3 -> To Version 7.0.0-beta.21576.2

* Don't run markdown lint on eng\common files
Co-authored-by: Ndotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: NJose Perez Rodriguez <joperezr@microsoft.com>
上级 62c3d370
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21573.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
<Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21573.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21576.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
<Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21573.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21576.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
<Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
</Dependency>
</ToolsetDependencies>
<!-- ProductDependencies -->
......
......@@ -4,7 +4,7 @@
<!-- Disabling the check for End of live TFMs since we still target netcoreapp 2.1 -->
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
<MicrosoftDotNetGenAPIPackageVersion>7.0.0-beta.21573.3</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>7.0.0-beta.21576.2</MicrosoftDotNetGenAPIPackageVersion>
<!-- dotnet/corefx dependencies -->
<SystemDrawingCommonPackageVersion>5.0.3</SystemDrawingCommonPackageVersion>
<SystemIOPortsPackageVersion>5.0.1</SystemIOPortsPackageVersion>
......
......@@ -25,4 +25,4 @@
!!! Changes made in this directory are subject to being overwritten by automation !!!
The files in this directory are shared by all Arcade repos and managed by automation. If you need to make changes to these files, open an issue or submit a pull request to <https://github.com/dotnet/arcade> first.
The files in this directory are shared by all Arcade repos and managed by automation. If you need to make changes to these files, open an issue or submit a pull request to https://github.com/dotnet/arcade first.
......@@ -111,12 +111,10 @@ if [[ -z "$CC" ]]; then
exit 1
fi
if [[ "$compiler" == "clang" ]]; then
if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then
# Only lld version >= 9 can be considered stable
if [[ "$majorVersion" -ge 9 ]]; then
LDFLAGS="-fuse-ld=lld"
fi
# Only lld version >= 9 can be considered stable
if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then
if "$CC" -fuse-ld=lld -Wl,--version 2>/dev/null; then
LDFLAGS="-fuse-ld=lld"
fi
fi
......
......@@ -12,7 +12,7 @@
"version": "6.0.100"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21573.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21573.3"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.2"
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册