Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Commit 055deb1

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/3.1' changes
2 parents 1515c29 + 6682475 commit 055deb1

6 files changed

+57
-57
lines changed

‎eng/Version.Details.xml

+28-28
Original file line numberDiff line numberDiff line change
@@ -34,65 +34,65 @@
3434
<Uri>https://github.com/dotnet/corefx</Uri>
3535
<Sha>976b84b4d969ce5d87bc437d811ec8864b47947a</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21072.7">
37+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21110.10">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
39+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
4040
</Dependency>
4141
<Dependency Name="NETStandard.Library" Version="2.1.0">
4242
<Uri>https://github.com/dotnet/standard</Uri>
4343
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21072.7">
45+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21110.10">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
47+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.21072.7">
49+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.21110.10">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
51+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21072.7">
53+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21110.10">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
55+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.21072.7">
57+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.21110.10">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
59+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.21072.7">
61+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.21110.10">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
63+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21072.7">
65+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21110.10">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
67+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.21072.7">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.21110.10">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
71+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.21072.7">
73+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.21110.10">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
75+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.21072.7">
77+
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.21110.10">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
79+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.21072.7">
81+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.21110.10">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
83+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.21072.7">
85+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.21110.10">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
87+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.21072.7">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.21110.10">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
91+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.21072.7">
93+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.21110.10">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
95+
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
9696
</Dependency>
9797
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="3.0.0-release-20190930.1">
9898
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

+10-10
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@
3434
</PropertyGroup>
3535
<PropertyGroup>
3636
<!-- Arcade dependencies -->
37-
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.21072.7</MicrosoftDotNetApiCompatPackageVersion>
38-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.21072.7</MicrosoftDotNetCodeAnalysisPackageVersion>
39-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21072.7</MicrosoftDotNetGenAPIPackageVersion>
40-
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.21072.7</MicrosoftDotNetGenFacadesPackageVersion>
41-
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.21072.7</MicrosoftDotNetXUnitExtensionsPackageVersion>
42-
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.21072.7</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
43-
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.21072.7</MicrosoftDotNetBuildTasksPackagingPackageVersion>
44-
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.21072.7</MicrosoftDotNetRemoteExecutorPackageVersion>
45-
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.21072.7</MicrosoftDotNetBuildTasksFeedVersion>
46-
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.21072.7</MicrosoftDotNetVersionToolsTasksPackageVersion>
37+
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.21110.10</MicrosoftDotNetApiCompatPackageVersion>
38+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.21110.10</MicrosoftDotNetCodeAnalysisPackageVersion>
39+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21110.10</MicrosoftDotNetGenAPIPackageVersion>
40+
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.21110.10</MicrosoftDotNetGenFacadesPackageVersion>
41+
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.21110.10</MicrosoftDotNetXUnitExtensionsPackageVersion>
42+
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.21110.10</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
43+
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.21110.10</MicrosoftDotNetBuildTasksPackagingPackageVersion>
44+
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.21110.10</MicrosoftDotNetRemoteExecutorPackageVersion>
45+
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.21110.10</MicrosoftDotNetBuildTasksFeedVersion>
46+
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.21110.10</MicrosoftDotNetVersionToolsTasksPackageVersion>
4747
<!-- sourcelink -->
4848
<MicrosoftSourceLinkVSTSVersion>1.0.0-beta2-19519-01</MicrosoftSourceLinkVSTSVersion>
4949
<!-- roslyn -->

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

-1
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

-1
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

+15-13
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

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
"dotnet": "3.1.100"
88
},
99
"msbuild-sdks": {
10-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21072.7",
11-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21072.7",
12-
"Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.21072.7",
13-
"Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.21072.7",
10+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21110.10",
11+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21110.10",
12+
"Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.21110.10",
13+
"Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.21110.10",
1414
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
1515
"Microsoft.NET.Sdk.IL": "3.1.13-servicing.21111.2"
1616
}

0 commit comments

Comments
 (0)