Skip to content

Commit afa9b98

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210317.3 (#31124)
Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21167.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 26a88e0 commit afa9b98

File tree

6 files changed

+186
-10
lines changed

6 files changed

+186
-10
lines changed

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,17 +296,17 @@
296296
<Uri>https://github.com/dotnet/runtime</Uri>
297297
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21160.7">
299+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21167.3">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
301+
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
302302
</Dependency>
303-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21160.7">
303+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21167.3">
304304
<Uri>https://github.com/dotnet/arcade</Uri>
305-
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
305+
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
306306
</Dependency>
307-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21160.7">
307+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21167.3">
308308
<Uri>https://github.com/dotnet/arcade</Uri>
309-
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
309+
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
310310
</Dependency>
311311
</ToolsetDependencies>
312312
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<MicrosoftEntityFrameworkCoreVersion>6.0.0-preview.3.21167.2</MicrosoftEntityFrameworkCoreVersion>
139139
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-preview.3.21167.2</MicrosoftEntityFrameworkCoreDesignVersion>
140140
<!-- Packages from dotnet/arcade -->
141-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21160.7</MicrosoftDotNetBuildTasksInstallersVersion>
141+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21167.3</MicrosoftDotNetBuildTasksInstallersVersion>
142142
</PropertyGroup>
143143
<!--
144144

‎eng/common/generate-locproject.ps1‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
Param(
2+
[Parameter(Mandatory=$true)][string] $SourcesDirectory, # Directory where source files live; if using a Localize directory it should live in here
3+
[string] $LanguageSet = 'VS_Main_Languages', # Language set to be used in the LocProject.json
4+
[switch] $UseCheckedInLocProjectJson, # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one
5+
[switch] $CreateNeutralXlfs # Creates neutral xlf files. Only set to false when running locally
6+
)
7+
8+
# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here:
9+
# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task
10+
11+
Set-StrictMode -Version 2.0
12+
$ErrorActionPreference = "Stop"
13+
. $PSScriptRoot\tools.ps1
14+
15+
Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
16+
17+
$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json"
18+
$exclusions = @{ Exclusions = @() }
19+
if (Test-Path -Path $exclusionsFilePath)
20+
{
21+
$exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json
22+
}
23+
24+
Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work
25+
26+
# Template files
27+
$jsonFiles = @()
28+
$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern
29+
$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
30+
31+
$xlfFiles = @()
32+
33+
$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf"
34+
$langXlfFiles = @()
35+
if ($allXlfFiles) {
36+
$null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf'
37+
$firstLangCode = $Matches.1
38+
$langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf"
39+
}
40+
$langXlfFiles | ForEach-Object {
41+
$null = $_.Name -Match "([^.]+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf'
42+
43+
$destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
44+
$xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
45+
}
46+
47+
$locFiles = $jsonFiles + $xlfFiles
48+
49+
$locJson = @{
50+
Projects = @(
51+
@{
52+
LanguageSet = $LanguageSet
53+
LocItems = @(
54+
$locFiles | ForEach-Object {
55+
$outputPath = "Localize\$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
56+
$continue = $true
57+
foreach ($exclusion in $exclusions.Exclusions) {
58+
if ($outputPath.Contains($exclusion))
59+
{
60+
$continue = $false
61+
}
62+
}
63+
$sourceFile = ($_.FullName | Resolve-Path -Relative)
64+
if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') {
65+
Remove-Item -Path $sourceFile
66+
}
67+
if ($continue)
68+
{
69+
return @{
70+
SourceFile = $sourceFile
71+
CopyOption = "LangIDOnName"
72+
OutputPath = $outputPath
73+
}
74+
}
75+
}
76+
)
77+
}
78+
)
79+
}
80+
81+
$json = ConvertTo-Json $locJson -Depth 5
82+
Write-Host "(NETCORE_ENGINEERING_TELEMETRY=Build) LocProject.json generated:`n`n$json`n`n"
83+
Pop-Location
84+
85+
if (!$UseCheckedInLocProjectJson) {
86+
New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created
87+
Set-Content "$SourcesDirectory\Localize\LocProject.json" $json
88+
}
89+
else {
90+
New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created
91+
Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json
92+
93+
if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) {
94+
Write-PipelineTaskError -Type "warning" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
95+
96+
exit 1
97+
}
98+
else {
99+
Write-Host "Generated LocProject.json and current LocProject.json are identical."
100+
}
101+
}

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

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
parameters:
2+
# Optional: dependencies of the job
3+
dependsOn: ''
4+
5+
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
6+
pool:
7+
vmImage: vs2017-win2016
8+
9+
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
10+
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
11+
12+
SourcesDirectory: $(Build.SourcesDirectory)
13+
CreatePr: true
14+
UseCheckedInLocProjectJson: false
15+
LanguageSet: VS_Main_Languages
16+
LclSource: lclFilesInRepo
17+
LclPackageId: ''
18+
RepoType: gitHub
19+
20+
jobs:
21+
- job: OneLocBuild
22+
23+
dependsOn: ${{ parameters.dependsOn }}
24+
25+
displayName: OneLocBuild
26+
27+
pool: ${{ parameters.pool }}
28+
29+
variables:
30+
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
31+
- name: _GenerateLocProjectArguments
32+
value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
33+
-LanguageSet "${{ parameters.LanguageSet }}"
34+
-CreateNeutralXlfs
35+
- ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
36+
- name: _GenerateLocProjectArguments
37+
value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
38+
39+
40+
steps:
41+
- task: Powershell@2
42+
inputs:
43+
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
44+
arguments: $(_GenerateLocProjectArguments)
45+
displayName: Generate LocProject.json
46+
47+
- task: OneLocBuild@2
48+
displayName: OneLocBuild
49+
inputs:
50+
locProj: Localize/LocProject.json
51+
outDir: $(Build.ArtifactStagingDirectory)
52+
lclSource: ${{ parameters.LclSource }}
53+
lclPackageId: ${{ parameters.LclPackageId }}
54+
isCreatePrSelected: ${{ parameters.CreatePr }}
55+
repoType: ${{ parameters.RepoType }}
56+
gitHubPatVariable: "${{ parameters.GithubPat }}"
57+
packageSourceAuth: patAuth
58+
patVariable: ${{ parameters.CeapexPat }}
59+
condition: always()
60+
61+
- task: PublishBuildArtifacts@1
62+
displayName: Publish Localization Files
63+
inputs:
64+
PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc'
65+
PublishLocation: Container
66+
ArtifactName: Loc
67+
condition: always()
68+
69+
- task: PublishBuildArtifacts@1
70+
displayName: Publish LocProject.json
71+
inputs:
72+
PathtoPublish: '$(Build.SourcesDirectory)/Localize/'
73+
PublishLocation: Container
74+
ArtifactName: Loc
75+
condition: always()

‎eng/common/templates/steps/perf-send-to-helix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ steps:
2929
sendParams: $(Build.SourcesDirectory)/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
3030
displayName: ${{ parameters.DisplayNamePrefix }}
3131
condition: ${{ parameters.condition }}
32-
continueOnError: ${{ parameters.continueOnError }}
32+
shouldContinueOnError: ${{ parameters.continueOnError }}
3333
environment:
3434
BuildConfig: $(_BuildConfig)
3535
HelixSource: ${{ parameters.HelixSource }}

‎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.21160.7",
34-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21160.7"
33+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21167.3",
34+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21167.3"
3535
}
3636
}

0 commit comments

Comments
 (0)