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 20211020.1 (#12476)

Browse source 
[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2021-10-21 13:00:44 +00:00 committed by GitHub
parent c2f87182f4
commit 63f0ff75fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 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> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21519.8"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21520.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cb683d57fb7f7dffbe70d51ce430b3910320460d</Sha> <Sha>76b53a100dd070e5a20377db79ba5faddd50627e</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21519.8"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21520.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cb683d57fb7f7dffbe70d51ce430b3910320460d</Sha> <Sha>76b53a100dd070e5a20377db79ba5faddd50627e</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21519.8"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21520.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cb683d57fb7f7dffbe70d51ce430b3910320460d</Sha> <Sha>76b53a100dd070e5a20377db79ba5faddd50627e</Sha>
</Dependency> </Dependency>
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1"> <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
View file

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

6
eng/common/sdl/configure-sdl-tool.ps1
View file

@ -69,13 +69,13 @@ try {
# For some tools, add default and automatic args. # For some tools, add default and automatic args.
if ($tool.Name -eq 'credscan') { if ($tool.Name -eq 'credscan') {
if ($targetDirectory) { if ($targetDirectory) {
$tool.Args += "TargetDirectory < $TargetDirectory" $tool.Args += "`"TargetDirectory < $TargetDirectory`""
} }
$tool.Args += "OutputType < pre" $tool.Args += "`"OutputType < pre`""
$tool.Args += $CrScanAdditionalRunConfigParams $tool.Args += $CrScanAdditionalRunConfigParams
} elseif ($tool.Name -eq 'policheck') { } elseif ($tool.Name -eq 'policheck') {
if ($targetDirectory) { if ($targetDirectory) {
$tool.Args += "Target < $TargetDirectory" $tool.Args += "`"Target < $TargetDirectory`""
} }
$tool.Args += $PoliCheckAdditionalRunConfigParams $tool.Args += $PoliCheckAdditionalRunConfigParams
} }

4
global.json
View file

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