Skip to content

Commit 3986fcf

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#6566)
* Update dependencies from https://github.com/dotnet/arcade build 20230208.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23073.6 -> To Version 7.0.0-beta.23108.1 * Update dependencies from https://github.com/dotnet/arcade build 20230214.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23073.6 -> To Version 7.0.0-beta.23114.3 * Update dependencies from https://github.com/dotnet/arcade build 20230222.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23073.6 -> To Version 7.0.0-beta.23122.4 * Update dependencies from https://github.com/dotnet/arcade build 20230314.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23073.6 -> To Version 7.0.0-beta.23164.3 * Update dependencies from https://github.com/dotnet/arcade build 20230411.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23073.6 -> To Version 7.0.0-beta.23211.2 * Update dependencies from https://github.com/dotnet/arcade build 20230421.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23073.6 -> To Version 7.0.0-beta.23221.2 * Update dependencies from https://github.com/dotnet/arcade build 20230428.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23073.6 -> To Version 7.0.0-beta.23228.7 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 896d69a commit 3986fcf

16 files changed

+189
-65
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23073.6">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23228.7">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
12+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23073.6">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23228.7">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
16+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23073.6">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23228.7">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
20+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23073.6">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23228.7">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
24+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23073.6">
26+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23228.7">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
28+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
2929
</Dependency>
3030
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
3131
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -39,9 +39,9 @@
3939
<Uri>https://github.com/dotnet/xharness</Uri>
4040
<Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23073.6">
42+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23228.7">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
44+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
4545
</Dependency>
4646
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
4747
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<DotNetRuntime80Version>8.0.0-preview.3.23174.8</DotNetRuntime80Version>
8080
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
8181
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
82-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
82+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23228.7</MicrosoftDotNetXUnitExtensionsVersion>
8383
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
8484
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
8585
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>

‎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/native/init-compiler.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
7171
# Set default versions
7272
if [[ -z "$majorVersion" ]]; then
7373
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
74-
if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
74+
if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
7575
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
7676

7777
for version in "${versions[@]}"; do

‎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/job.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ parameters:
2424
enablePublishBuildAssets: false
2525
enablePublishTestResults: false
2626
enablePublishUsingPipelines: false
27-
disableComponentGovernance: false
27+
disableComponentGovernance: ''
2828
mergeTestResults: false
2929
testRunTitle: ''
3030
testResultsFormat: ''
@@ -142,9 +142,13 @@ jobs:
142142
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
143143
continueOnError: true
144144

145-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
146-
- task: ComponentGovernanceComponentDetection@0
147-
continueOnError: true
145+
- template: /eng/common/templates/steps/component-governance.yml
146+
parameters:
147+
${{ if eq(parameters.disableComponentGovernance, '') }}:
148+
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
149+
disableComponentGovernance: false
150+
${{ else }}:
151+
disableComponentGovernance: true
148152

149153
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
150154
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

‎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

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

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

0 commit comments

Comments
 (0)