Skip to content

Commit 596970a

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20210521.3 (dotnet#32962)
[main] Update dependencies from dotnet/arcade
1 parent 44fa2ea commit 596970a

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,18 +300,18 @@
300300
<Uri>https://github.com/dotnet/runtime</Uri>
301301
<Sha>5a26d12c41b866731a195938bf3c162ba4a04ce2</Sha>
302302
</Dependency>
303-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21264.2">
303+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21271.3">
304304
<Uri>https://github.com/dotnet/arcade</Uri>
305-
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
305+
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
306306
<SourceBuild RepoName="arcade" ManagedOnly="true" />
307307
</Dependency>
308-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21264.2">
308+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21271.3">
309309
<Uri>https://github.com/dotnet/arcade</Uri>
310-
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
310+
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
311311
</Dependency>
312-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21264.2">
312+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21271.3">
313313
<Uri>https://github.com/dotnet/arcade</Uri>
314-
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
314+
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
315315
</Dependency>
316316
</ToolsetDependencies>
317317
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<MicrosoftEntityFrameworkCoreVersion>6.0.0-preview.6.21271.2</MicrosoftEntityFrameworkCoreVersion>
140140
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-preview.6.21271.2</MicrosoftEntityFrameworkCoreDesignVersion>
141141
<!-- Packages from dotnet/arcade -->
142-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21264.2</MicrosoftDotNetBuildTasksInstallersVersion>
142+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21271.3</MicrosoftDotNetBuildTasksInstallersVersion>
143143
</PropertyGroup>
144144
<!--
145145

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
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.22.10",
33-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2",
34-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2"
33+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21271.3",
34+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21271.3"
3535
}
3636
}

0 commit comments

Comments
 (0)