Skip to content

Commit 90d5b7e

Browse files
mmitchemmitche
committed
Merged PR 29652: Merge From Public
# {PR title} Summary of the changes (Less than 80 chars) ## Description {Detail} Fixes #{bug number} (in this specific format) ## Customer Impact {Justification} ## Regression? - [ ] Yes - [ ] No [If yes, specify the version the behavior has regressed from] ## Risk - [ ] High - [ ] Medium - [ ] Low [Justify the selection above] ## Verification - [ ] Manual (required) - [ ] Automated ## Packaging changes reviewed? - [ ] Yes - [ ] No - [ ] N/A ---- ## When servicing release/2.1 - [ ] Make necessary changes in eng/PatchConfig.props Update dependencies from https://github.com/dotnet/arcade build 20230214.3 (#46668) [release/7.0] Update dependencies from dotnet/arcade
2 parents 8712850 + 0e23c05 commit 90d5b7e

13 files changed

+166
-56
lines changed

‎eng/Version.Details.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,22 @@
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
303303
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23073.6">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23114.3">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
307+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23073.6">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23114.3">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
312+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23073.6">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23114.3">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
316+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23073.6">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23114.3">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
320+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
321321
</Dependency>
322322
</ToolsetDependencies>
323323
</Dependencies>

‎eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@
134134
<MicrosoftEntityFrameworkCoreVersion>7.0.4</MicrosoftEntityFrameworkCoreVersion>
135135
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.4</MicrosoftEntityFrameworkCoreDesignVersion>
136136
<!-- Packages from dotnet/arcade -->
137-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23073.6</MicrosoftDotNetBuildTasksInstallersVersion>
138-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23073.6</MicrosoftDotNetBuildTasksTemplatingVersion>
137+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksInstallersVersion>
138+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksTemplatingVersion>
139139
<!-- Packages from dotnet/source-build-externals -->
140140
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.22505.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
141141
<!-- Packages from dotnet/xdt -->

‎eng/common/generate-locproject.ps1

+45-3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object {
3434
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
3535

3636
$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
37+
if (-not $wxlFiles) {
38+
$wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
39+
if ($wxlEnFiles) {
40+
$wxlFiles = @()
41+
$wxlEnFiles | ForEach-Object {
42+
$destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
43+
$wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
44+
}
45+
}
46+
}
47+
48+
$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
49+
$macosHtmlFiles = @()
50+
if ($macosHtmlEnFiles) {
51+
$macosHtmlEnFiles | ForEach-Object {
52+
$destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
53+
$macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
54+
}
55+
}
3756

3857
$xlfFiles = @()
3958

@@ -91,15 +110,15 @@ $locJson = @{
91110
)
92111
},
93112
@{
113+
LanguageSet = $LanguageSet
94114
CloneLanguageSet = "WiX_CloneLanguages"
95115
LssFiles = @( "wxl_loc.lss" )
96116
LocItems = @(
97117
$wxlFiles | ForEach-Object {
98118
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
99119
$continue = $true
100120
foreach ($exclusion in $exclusions.Exclusions) {
101-
if ($_.FullName.Contains($exclusion))
102-
{
121+
if ($_.FullName.Contains($exclusion)) {
103122
$continue = $false
104123
}
105124
}
@@ -110,7 +129,30 @@ $locJson = @{
110129
SourceFile = $sourceFile
111130
CopyOption = "LangIDOnPath"
112131
OutputPath = $outputPath
113-
Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
132+
}
133+
}
134+
}
135+
)
136+
},
137+
@{
138+
LanguageSet = $LanguageSet
139+
CloneLanguageSet = "VS_macOS_CloneLanguages"
140+
LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" )
141+
LocItems = @(
142+
$macosHtmlFiles | ForEach-Object {
143+
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
144+
$continue = $true
145+
foreach ($exclusion in $exclusions.Exclusions) {
146+
if ($_.FullName.Contains($exclusion)) {
147+
$continue = $false
148+
}
149+
}
150+
$sourceFile = ($_.FullName | Resolve-Path -Relative)
151+
if ($continue) {
152+
return @{
153+
SourceFile = $sourceFile
154+
CopyOption = "LangIDOnPath"
155+
OutputPath = $outputPath
114156
}
115157
}
116158
}

‎eng/common/loc/P22DotNetHtmlLocalization.lss

3.72 KB
Binary file not shown.

‎eng/common/templates/job/execute-sdl.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,15 @@ jobs:
4646
- template: /eng/common/templates/variables/sdl-variables.yml
4747
- name: GuardianVersion
4848
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
49+
- template: /eng/common/templates/variables/pool-providers.yml
4950
pool:
5051
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
5152
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
5253
name: VSEngSS-MicroBuild2022-1ES
5354
demands: Cmd
5455
# If it's not devdiv, it's dnceng
5556
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
56-
name: NetCore1ESPool-Svc-Internal
57+
name: $(DncEngInternalBuildPool)
5758
demands: ImageOverride -equals windows.vs2019.amd64
5859
steps:
5960
- checkout: self

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

+23-20
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ parameters:
1414
ReusePr: true
1515
UseLfLineEndings: true
1616
UseCheckedInLocProjectJson: false
17+
SkipLocProjectJsonGeneration: false
1718
LanguageSet: VS_Main_Languages
1819
LclSource: lclFilesInRepo
1920
LclPackageId: ''
@@ -22,13 +23,25 @@ parameters:
2223
MirrorRepo: ''
2324
MirrorBranch: main
2425
condition: ''
26+
JobNameSuffix: ''
2527

2628
jobs:
27-
- job: OneLocBuild
29+
- job: OneLocBuild${{ parameters.JobNameSuffix }}
2830

2931
dependsOn: ${{ parameters.dependsOn }}
3032

31-
displayName: OneLocBuild
33+
displayName: OneLocBuild${{ parameters.JobNameSuffix }}
34+
35+
variables:
36+
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
37+
- name: _GenerateLocProjectArguments
38+
value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
39+
-LanguageSet "${{ parameters.LanguageSet }}"
40+
-CreateNeutralXlfs
41+
- ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
42+
- name: _GenerateLocProjectArguments
43+
value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
44+
- template: /eng/common/templates/variables/pool-providers.yml
3245

3346
${{ if ne(parameters.pool, '') }}:
3447
pool: ${{ parameters.pool }}
@@ -40,27 +53,17 @@ jobs:
4053
demands: Cmd
4154
# If it's not devdiv, it's dnceng
4255
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
43-
name: NetCore1ESPool-Svc-Internal
56+
name: $(DncEngInternalBuildPool)
4457
demands: ImageOverride -equals windows.vs2019.amd64
4558

46-
variables:
47-
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
48-
- name: _GenerateLocProjectArguments
49-
value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
50-
-LanguageSet "${{ parameters.LanguageSet }}"
51-
-CreateNeutralXlfs
52-
- ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
53-
- name: _GenerateLocProjectArguments
54-
value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
55-
56-
5759
steps:
58-
- task: Powershell@2
59-
inputs:
60-
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
61-
arguments: $(_GenerateLocProjectArguments)
62-
displayName: Generate LocProject.json
63-
condition: ${{ parameters.condition }}
60+
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
61+
- task: Powershell@2
62+
inputs:
63+
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
64+
arguments: $(_GenerateLocProjectArguments)
65+
displayName: Generate LocProject.json
66+
condition: ${{ parameters.condition }}
6467

6568
- task: OneLocBuild@2
6669
displayName: OneLocBuild

‎eng/common/templates/job/publish-build-assets.yml

+12-2
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ jobs:
3434
- job: Asset_Registry_Publish
3535

3636
dependsOn: ${{ parameters.dependsOn }}
37+
timeoutInMinutes: 150
3738

3839
${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
3940
displayName: Publish Assets
4041
${{ else }}:
4142
displayName: Publish to Build Asset Registry
4243

43-
pool: ${{ parameters.pool }}
44-
4544
variables:
45+
- template: /eng/common/templates/variables/pool-providers.yml
4646
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
4747
- group: Publish-Build-Assets
4848
- group: AzureDevOps-Artifact-Feeds-Pats
@@ -51,6 +51,16 @@ jobs:
5151
- ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
5252
- template: /eng/common/templates/post-build/common-variables.yml
5353

54+
pool:
55+
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
56+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
57+
name: VSEngSS-MicroBuild2022-1ES
58+
demands: Cmd
59+
# If it's not devdiv, it's dnceng
60+
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
61+
name: $(DncEngInternalBuildPool)
62+
demands: ImageOverride -equals windows.vs2019.amd64
63+
5464
steps:
5565
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
5666
- task: DownloadBuildArtifacts@0

‎eng/common/templates/job/source-build.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,16 @@ jobs:
4444
${{ if eq(parameters.platform.pool, '') }}:
4545
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
4646
# source-build builds run in Docker, including the default managed platform.
47+
# /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
4748
pool:
4849
${{ if eq(variables['System.TeamProject'], 'public') }}:
49-
name: NetCore-Svc-Public
50+
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
5051
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
52+
5153
${{ if eq(variables['System.TeamProject'], 'internal') }}:
52-
name: NetCore1ESPool-Svc-Internal
54+
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
5355
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
56+
5457
${{ if ne(parameters.platform.pool, '') }}:
5558
pool: ${{ parameters.platform.pool }}
5659

‎eng/common/templates/job/source-index-stage1.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,17 @@ jobs:
2222
value: ${{ parameters.binlogPath }}
2323
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
2424
- group: source-dot-net stage1 variables
25+
- template: /eng/common/templates/variables/pool-providers.yml
2526

2627
${{ if ne(parameters.pool, '') }}:
2728
pool: ${{ parameters.pool }}
2829
${{ if eq(parameters.pool, '') }}:
2930
pool:
3031
${{ if eq(variables['System.TeamProject'], 'public') }}:
31-
name: NetCore-Svc-Public
32+
name: $(DncEngPublicBuildPool)
3233
demands: ImageOverride -equals windows.vs2019.amd64.open
3334
${{ if eq(variables['System.TeamProject'], 'internal') }}:
34-
name: NetCore1ESPool-Svc-Internal
35+
name: $(DncEngInternalBuildPool)
3536
demands: ImageOverride -equals windows.vs2019.amd64
3637

3738
steps:

‎eng/common/templates/jobs/jobs.yml

-9
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,6 @@ jobs:
8888
- ${{ job.job }}
8989
- ${{ if eq(parameters.enableSourceBuild, true) }}:
9090
- Source_Build_Complete
91-
pool:
92-
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
93-
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
94-
name: VSEngSS-MicroBuild2022-1ES
95-
demands: Cmd
96-
# If it's not devdiv, it's dnceng
97-
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
98-
name: NetCore1ESPool-Svc-Internal
99-
demands: ImageOverride -equals windows.vs2019.amd64
10091

10192
runAsPublic: ${{ parameters.runAsPublic }}
10293
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}

‎eng/common/templates/post-build/post-build.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ stages:
9595
displayName: Validate Build Assets
9696
variables:
9797
- template: common-variables.yml
98+
- template: /eng/common/templates/variables/pool-providers.yml
9899
jobs:
99100
- job:
100101
displayName: NuGet Validation
@@ -106,7 +107,7 @@ stages:
106107
demands: Cmd
107108
# If it's not devdiv, it's dnceng
108109
${{ else }}:
109-
name: NetCore1ESPool-Svc-Internal
110+
name: $(DncEngInternalBuildPool)
110111
demands: ImageOverride -equals windows.vs2019.amd64
111112

112113
steps:
@@ -143,7 +144,7 @@ stages:
143144
demands: Cmd
144145
# If it's not devdiv, it's dnceng
145146
${{ else }}:
146-
name: NetCore1ESPool-Svc-Internal
147+
name: $(DncEngInternalBuildPool)
147148
demands: ImageOverride -equals windows.vs2019.amd64
148149
steps:
149150
- template: setup-maestro-vars.yml
@@ -203,7 +204,7 @@ stages:
203204
demands: Cmd
204205
# If it's not devdiv, it's dnceng
205206
${{ else }}:
206-
name: NetCore1ESPool-Svc-Internal
207+
name: $(DncEngInternalBuildPool)
207208
demands: ImageOverride -equals windows.vs2019.amd64
208209
steps:
209210
- template: setup-maestro-vars.yml
@@ -251,6 +252,7 @@ stages:
251252
displayName: Publish using Darc
252253
variables:
253254
- template: common-variables.yml
255+
- template: /eng/common/templates/variables/pool-providers.yml
254256
jobs:
255257
- job:
256258
displayName: Publish Using Darc
@@ -262,7 +264,7 @@ stages:
262264
demands: Cmd
263265
# If it's not devdiv, it's dnceng
264266
${{ else }}:
265-
name: NetCore1ESPool-Svc-Internal
267+
name: $(DncEngInternalBuildPool)
266268
demands: ImageOverride -equals windows.vs2019.amd64
267269
steps:
268270
- template: setup-maestro-vars.yml
@@ -282,4 +284,4 @@ stages:
282284
-MaestroToken '$(MaestroApiAccessToken)'
283285
-WaitPublishingFinish true
284286
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
285-
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
287+
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

0 commit comments

Comments
 (0)