Skip to content

Commit 9a5c34f

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210210.10 (#30148)
[release/3.1] Update dependencies from dotnet/arcade
1 parent 0b833ae commit 9a5c34f

File tree

7 files changed

+24
-29
lines changed

7 files changed

+24
-29
lines changed

‎NuGet.config

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
7-
<add key="darc-int-dotnet-aspnetcore-tooling-7f783df" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-7f783df7/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
98
<!-- Begin: Package sources from dotnet-corefx -->
10-
<add key="darc-int-dotnet-corefx-50a99d5" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-50a99d5d/nuget/v3/index.json" />
119
<!-- End: Package sources from dotnet-corefx -->
1210
<!-- Begin: Package sources from dotnet-core-setup -->
13-
<add key="darc-int-dotnet-core-setup-0267ad0" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0267ad09/nuget/v3/index.json" />
1411
<!-- End: Package sources from dotnet-core-setup -->
1512
<!-- Begin: Package sources from dotnet-efcore -->
16-
<add key="darc-int-dotnet-efcore-d078590" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-d078590d/nuget/v3/index.json" />
1713
<!-- End: Package sources from dotnet-efcore -->
1814
<!-- Begin: Package sources from dotnet-extensions -->
19-
<add key="darc-int-dotnet-extensions-4210e7d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-4210e7d1/nuget/v3/index.json" />
2015
<!-- End: Package sources from dotnet-extensions -->
2116
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2217
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -418,17 +418,17 @@
418418
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
419419
<Sha>4210e7d19b3e18ecadbd1c4c8589e39eea035d5f</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21072.7">
421+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21110.10">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
423+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21072.7">
425+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21110.10">
426426
<Uri>https://github.com/dotnet/arcade</Uri>
427-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
427+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
428428
</Dependency>
429-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21072.7">
429+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21110.10">
430430
<Uri>https://github.com/dotnet/arcade</Uri>
431-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
431+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
432432
</Dependency>
433433
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.12-servicing.21069.9" CoherentParentDependency="Microsoft.EntityFrameworkCore">
434434
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
-->
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/arcade -->
65-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21072.7</MicrosoftDotNetGenAPIPackageVersion>
65+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21110.10</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/core-setup -->

‎eng/common/internal-feed-operations.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ function SetupCredProvider {
6464
}
6565

6666
if (($endpoints | Measure-Object).Count -gt 0) {
67-
# Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}'
6867
$endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress
6968

7069
# Create the environment variables the AzDo way

‎eng/common/internal-feed-operations.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ function SetupCredProvider {
6262
endpoints+=']'
6363

6464
if [ ${#endpoints} -gt 2 ]; then
65-
# Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}'
6665
local endpointCredentials="{\"endpointCredentials\": "$endpoints"}"
6766

6867
echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials"

‎eng/common/sdl/init-sdl.ps1

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ $ErrorActionPreference = "Stop"
1111
Set-StrictMode -Version 2.0
1212
$LASTEXITCODE = 0
1313

14+
# `tools.ps1` checks $ci to perform some actions. Since the SDL
15+
# scripts don't necessarily execute in the same agent that run the
16+
# build.ps1/sh script this variable isn't automatically set.
17+
$ci = $true
18+
. $PSScriptRoot\..\tools.ps1
19+
1420
# Don't display the console progress UI - it's a huge perf hit
1521
$ProgressPreference = 'SilentlyContinue'
1622

@@ -21,19 +27,9 @@ $uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cf
2127
$zipFile = "$WorkingDirectory/gdn.zip"
2228

2329
Add-Type -AssemblyName System.IO.Compression.FileSystem
24-
$gdnFolder = (Join-Path $WorkingDirectory ".gdn")
25-
Try
26-
{
27-
# We try to download the zip; if the request fails (e.g. the file doesn't exist), we catch it and init guardian instead
28-
Write-Host "Downloading gdn folder from internal config repostiory..."
29-
Invoke-WebRequest -Headers @{ "Accept"="application/zip"; "Authorization"="Basic $encodedPat" } -Uri $uri -OutFile $zipFile
30-
if (Test-Path $gdnFolder) {
31-
# Remove the gdn folder if it exists (it shouldn't unless there's too much caching; this is just in case)
32-
Remove-Item -Force -Recurse $gdnFolder
33-
}
34-
[System.IO.Compression.ZipFile]::ExtractToDirectory($zipFile, $WorkingDirectory)
35-
Write-Host $gdnFolder
36-
} Catch [System.Net.WebException] {
30+
$gdnFolder = (Join-Path $WorkingDirectory '.gdn')
31+
32+
try {
3733
# if the folder does not exist, we'll do a guardian init and push it to the remote repository
3834
Write-Host "Initializing Guardian..."
3935
Write-Host "$GuardianCliLocation init --working-directory $WorkingDirectory --logger-level $GuardianLoggerLevel"
@@ -48,4 +44,10 @@ Try
4844
Write-Error "Guardian baseline failed with exit code $LASTEXITCODE."
4945
}
5046
& $(Join-Path $PSScriptRoot "push-gdn.ps1") -Repository $Repository -BranchName $BranchName -GdnFolder $gdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason "Initialize gdn folder"
47+
ExitWithExitCode 0
48+
}
49+
catch {
50+
Write-Host $_.ScriptStackTrace
51+
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
52+
ExitWithExitCode 1
5153
}

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.15.2",
28-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21072.7",
29-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21072.7"
28+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21110.10",
29+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21110.10"
3030
}
3131
}

0 commit comments

Comments
 (0)