Skip to content

Commit b68fd88

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20230214.3 (#82171)
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23060.4 -> To Version 7.0.0-beta.23114.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 527278b commit b68fd88

13 files changed

+213
-103
lines changed

‎eng/Version.Details.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -58,77 +58,77 @@
5858
</Dependency>
5959
</ProductDependencies>
6060
<ToolsetDependencies>
61-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23060.4">
61+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23114.3">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
63+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23060.4">
65+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23114.3">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
67+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23060.4">
69+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23114.3">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
71+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23060.4">
73+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23114.3">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
75+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23060.4">
77+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23114.3">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
79+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23060.4">
81+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23114.3">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
83+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23060.4">
85+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23114.3">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
87+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23060.4">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23114.3">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
91+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23060.4">
93+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23114.3">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
95+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23060.4">
97+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23114.3">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
99+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23060.4">
101+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23114.3">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
103+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23060.4">
105+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23114.3">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
107+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23060.4">
109+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23114.3">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
111+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23060.4">
113+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23114.3">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
115+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23060.4">
117+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23114.3">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
119+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23060.4">
121+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23114.3">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
123+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23060.4">
125+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23114.3">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
127+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23060.4">
129+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23114.3">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
131+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
132132
</Dependency>
133133
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22553.1">
134134
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -258,9 +258,9 @@
258258
<Uri>https://github.com/dotnet/xharness</Uri>
259259
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
260260
</Dependency>
261-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23060.4">
261+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23114.3">
262262
<Uri>https://github.com/dotnet/arcade</Uri>
263-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
263+
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
264264
</Dependency>
265265
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
266266
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,22 @@
5353
<!-- SDK dependencies -->
5454
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
5555
<!-- Arcade dependencies -->
56-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23060.4</MicrosoftDotNetApiCompatVersion>
57-
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23060.4</MicrosoftDotNetBuildTasksFeedVersion>
58-
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23060.4</MicrosoftDotNetCodeAnalysisVersion>
59-
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23060.4</MicrosoftDotNetGenAPIVersion>
60-
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23060.4</MicrosoftDotNetGenFacadesVersion>
61-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23060.4</MicrosoftDotNetXUnitExtensionsVersion>
62-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23060.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
63-
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23060.4</MicrosoftDotNetBuildTasksArchivesVersion>
64-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23060.4</MicrosoftDotNetBuildTasksInstallersVersion>
65-
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23060.4</MicrosoftDotNetBuildTasksPackagingVersion>
66-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23060.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
67-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23060.4</MicrosoftDotNetBuildTasksTemplatingVersion>
68-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23060.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69-
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23060.4</MicrosoftDotNetRemoteExecutorVersion>
70-
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23060.4</MicrosoftDotNetVersionToolsTasksVersion>
71-
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23060.4</MicrosoftDotNetPackageTestingVersion>
56+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23114.3</MicrosoftDotNetApiCompatVersion>
57+
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksFeedVersion>
58+
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23114.3</MicrosoftDotNetCodeAnalysisVersion>
59+
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23114.3</MicrosoftDotNetGenAPIVersion>
60+
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23114.3</MicrosoftDotNetGenFacadesVersion>
61+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23114.3</MicrosoftDotNetXUnitExtensionsVersion>
62+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23114.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
63+
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksArchivesVersion>
64+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksInstallersVersion>
65+
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksPackagingVersion>
66+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
67+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksTemplatingVersion>
68+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69+
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23114.3</MicrosoftDotNetRemoteExecutorVersion>
70+
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23114.3</MicrosoftDotNetVersionToolsTasksVersion>
71+
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23114.3</MicrosoftDotNetPackageTestingVersion>
7272
<!-- NuGet dependencies -->
7373
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7474
<!-- Installer dependencies -->

‎eng/common/generate-locproject.ps1

Lines changed: 45 additions & 3 deletions
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 23 additions & 20 deletions
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

Lines changed: 12 additions & 2 deletions
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

0 commit comments

Comments
 (0)