Skip to content

Commit d6445d0

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210521.3 (#4554)
[main] Update dependencies from dotnet/arcade
1 parent 0d27280 commit d6445d0

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,25 +95,25 @@
9595
</Dependency>
9696
</ProductDependencies>
9797
<ToolsetDependencies>
98-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21264.2">
98+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21271.3">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
100+
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21264.2">
102+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21271.3">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
104+
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21264.2">
106+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21271.3">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
108+
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21264.2">
110+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21271.3">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
112+
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21264.2">
114+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21271.3">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
116+
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
117117
</Dependency>
118118
</ToolsetDependencies>
119119
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
</PropertyGroup>
4343
<!-- Packages that come from https://github.com/dotnet/arcade -->
4444
<PropertyGroup>
45-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21264.2</MicrosoftDotNetApiCompatVersion>
46-
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21264.2</MicrosoftDotNetCodeAnalysisPackageVersion>
47-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21264.2</MicrosoftDotNetGenAPIVersion>
45+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21271.3</MicrosoftDotNetApiCompatVersion>
46+
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21271.3</MicrosoftDotNetCodeAnalysisPackageVersion>
47+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21271.3</MicrosoftDotNetGenAPIVersion>
4848
</PropertyGroup>
4949
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
5050
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

‎eng/common/generate-locproject.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $ErrorActionPreference = "Stop"
1414

1515
Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
1616

17-
$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json"
17+
$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json"
1818
$exclusions = @{ Exclusions = @() }
1919
if (Test-Path -Path $exclusionsFilePath)
2020
{
@@ -92,14 +92,14 @@ Write-Host "LocProject.json generated:`n`n$json`n`n"
9292
Pop-Location
9393

9494
if (!$UseCheckedInLocProjectJson) {
95-
New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created
96-
Set-Content "$SourcesDirectory\Localize\LocProject.json" $json
95+
New-Item "$SourcesDirectory\eng\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created
96+
Set-Content "$SourcesDirectory\eng\Localize\LocProject.json" $json
9797
}
9898
else {
99-
New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created
100-
Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json
99+
New-Item "$SourcesDirectory\eng\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created
100+
Set-Content "$SourcesDirectory\eng\Localize\LocProject-generated.json" $json
101101

102-
if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) {
102+
if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) {
103103
Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
104104

105105
exit 1

‎eng/common/templates/job/onelocbuild.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
env:
5454
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
5555
inputs:
56-
locProj: Localize/LocProject.json
56+
locProj: eng/Localize/LocProject.json
5757
outDir: $(Build.ArtifactStagingDirectory)
5858
lclSource: ${{ parameters.LclSource }}
5959
lclPackageId: ${{ parameters.LclPackageId }}
@@ -79,7 +79,7 @@ jobs:
7979
- task: PublishBuildArtifacts@1
8080
displayName: Publish LocProject.json
8181
inputs:
82-
PathtoPublish: '$(Build.SourcesDirectory)/Localize/'
82+
PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/'
8383
PublishLocation: Container
8484
ArtifactName: Loc
8585
condition: ${{ parameters.condition }}

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2",
16-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21271.3",
16+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21271.3"
1717
},
1818
"sdk": {
1919
"version": "6.0.100-preview.3.21202.5"

0 commit comments

Comments
 (0)