mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies from https://github.com/dotnet/arcade build 20211126.2 (#12732)

Browse source 
[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2021-11-26 14:15:30 +00:00 committed by GitHub
parent 6d8b7083a9
commit 33a8b886da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -172,19 +172,19 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21574.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11fb2931671a47924e29b92e5fe06043fb3c6bbb</Sha>
<Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21574.3">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21576.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11fb2931671a47924e29b92e5fe06043fb3c6bbb</Sha>
<Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21574.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21576.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11fb2931671a47924e29b92e5fe06043fb3c6bbb</Sha>
<Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-alpha.1.21521.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
View file

@ -20,7 +20,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21574.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21576.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

6
eng/common/native/init-compiler.sh
View file

@ -111,14 +111,12 @@ 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
if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then
if "$CC" -fuse-ld=lld -Wl,--version 2>/dev/null; then
LDFLAGS="-fuse-ld=lld"
fi
fi
fi
SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21574.3",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21574.3"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.2",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21576.2"
}
}