Skip to content

Commit 299d1f0

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210628.3 (#34172)
[release/5.0] Update dependencies from dotnet/arcade
1 parent ecde7ae commit 299d1f0

File tree

6 files changed

+39
-20
lines changed

6 files changed

+39
-20
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -313,17 +313,17 @@
313313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
314314
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha>
315315
</Dependency>
316-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21262.2">
316+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21328.3">
317317
<Uri>https://github.com/dotnet/arcade</Uri>
318-
<Sha>dad4f3c62e24b94b1514427674af8ca899cddd5f</Sha>
318+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
319319
</Dependency>
320-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21262.2">
320+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21328.3">
321321
<Uri>https://github.com/dotnet/arcade</Uri>
322-
<Sha>dad4f3c62e24b94b1514427674af8ca899cddd5f</Sha>
322+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
323323
</Dependency>
324-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21262.2">
324+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21328.3">
325325
<Uri>https://github.com/dotnet/arcade</Uri>
326-
<Sha>dad4f3c62e24b94b1514427674af8ca899cddd5f</Sha>
326+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
327327
</Dependency>
328328
</ToolsetDependencies>
329329
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<MicrosoftEntityFrameworkCorePackageVersion>5.0.7</MicrosoftEntityFrameworkCorePackageVersion>
137137
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.7</MicrosoftEntityFrameworkCoreDesignPackageVersion>
138138
<!-- Packages from dotnet/arcade -->
139-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21262.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
139+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21328.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
140140
</PropertyGroup>
141141
<!--
142142

‎eng/common/generate-locproject.ps1

Lines changed: 7 additions & 7 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
{
@@ -38,7 +38,7 @@ if ($allXlfFiles) {
3838
$langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf"
3939
}
4040
$langXlfFiles | ForEach-Object {
41-
$null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf'
41+
$null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf
4242

4343
$destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
4444
$xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
@@ -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: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@ parameters:
1212
SourcesDirectory: $(Build.SourcesDirectory)
1313
CreatePr: true
1414
AutoCompletePr: false
15+
UseLfLineEndings: true
1516
UseCheckedInLocProjectJson: false
1617
LanguageSet: VS_Main_Languages
1718
LclSource: lclFilesInRepo
1819
LclPackageId: ''
1920
RepoType: gitHub
21+
GitHubOrg: dotnet
22+
MirrorRepo: ''
23+
MirrorBranch: main
2024
condition: ''
2125

2226
jobs:
@@ -52,18 +56,24 @@ jobs:
5256
env:
5357
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
5458
inputs:
55-
locProj: Localize/LocProject.json
59+
locProj: eng/Localize/LocProject.json
5660
outDir: $(Build.ArtifactStagingDirectory)
5761
lclSource: ${{ parameters.LclSource }}
5862
lclPackageId: ${{ parameters.LclPackageId }}
5963
isCreatePrSelected: ${{ parameters.CreatePr }}
6064
${{ if eq(parameters.CreatePr, true) }}:
6165
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
66+
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
6267
packageSourceAuth: patAuth
6368
patVariable: ${{ parameters.CeapexPat }}
6469
${{ if eq(parameters.RepoType, 'gitHub') }}:
6570
repoType: ${{ parameters.RepoType }}
6671
gitHubPatVariable: "${{ parameters.GithubPat }}"
72+
${{ if ne(parameters.MirrorRepo, '') }}:
73+
isMirrorRepoSelected: true
74+
gitHubOrganization: ${{ parameters.GitHubOrg }}
75+
mirrorRepo: ${{ parameters.MirrorRepo }}
76+
mirrorBranch: ${{ parameters.MirrorBranch }}
6777
condition: ${{ parameters.condition }}
6878

6979
- task: PublishBuildArtifacts@1
@@ -77,7 +87,7 @@ jobs:
7787
- task: PublishBuildArtifacts@1
7888
displayName: Publish LocProject.json
7989
inputs:
80-
PathtoPublish: '$(Build.SourcesDirectory)/Localize/'
90+
PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/'
8191
PublishLocation: Container
8292
ArtifactName: Loc
8393
condition: ${{ parameters.condition }}

‎eng/common/tools.ps1

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
371371
}
372372

373373
$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
374-
return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
374+
375+
$local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
376+
$local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false }
377+
if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) {
378+
$global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe"
379+
} else {
380+
$global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe"
381+
}
382+
383+
return $global:_MSBuildExe
375384
}
376385

377386
function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) {
@@ -527,7 +536,7 @@ function GetDefaultMSBuildEngine() {
527536

528537
function GetNuGetPackageCachePath() {
529538
if ($env:NUGET_PACKAGES -eq $null) {
530-
# Use local cache on CI to ensure deterministic build.
539+
# Use local cache on CI to ensure deterministic build.
531540
# Avoid using the http cache as workaround for https://github.com/NuGet/Home/issues/3116
532541
# use global cache in dev builds to avoid cost of downloading packages.
533542
# For directory normalization, see also: https://github.com/NuGet/Home/issues/7968

‎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.15.2",
33-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21262.2",
34-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21262.2"
33+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21328.3",
34+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21328.3"
3535
}
3636
}

0 commit comments

Comments
 (0)