Skip to content

Commit afa5665

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#6423)
[main] Update dependencies from dotnet/arcade
1 parent afee469 commit afa5665

File tree

5 files changed

+60
-9
lines changed

5 files changed

+60
-9
lines changed

‎eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23058.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23062.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</Sha>
8+
<Sha>12b42d0d77948889890ef2f35af8c46438d3f2d2</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
1111
</ToolsetDependencies>

‎eng/common/generate-locproject.ps1

+43-2
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

@@ -99,8 +118,7 @@ $locJson = @{
99118
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
100119
$continue = $true
101120
foreach ($exclusion in $exclusions.Exclusions) {
102-
if ($_.FullName.Contains($exclusion))
103-
{
121+
if ($_.FullName.Contains($exclusion)) {
104122
$continue = $false
105123
}
106124
}
@@ -115,6 +133,29 @@ $locJson = @{
115133
}
116134
}
117135
)
136+
},
137+
@{
138+
LanguageSet = $LanguageSet
139+
CloneLanguageSet = "VS_macOS_CloneLanguages"
140+
LocItems = @(
141+
$macosHtmlFiles | ForEach-Object {
142+
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
143+
$continue = $true
144+
foreach ($exclusion in $exclusions.Exclusions) {
145+
if ($_.FullName.Contains($exclusion)) {
146+
$continue = $false
147+
}
148+
}
149+
$sourceFile = ($_.FullName | Resolve-Path -Relative)
150+
if ($continue) {
151+
return @{
152+
SourceFile = $sourceFile
153+
CopyOption = "LangIDOnPath"
154+
OutputPath = $outputPath
155+
}
156+
}
157+
}
158+
)
118159
}
119160
)
120161
}

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

+10
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,16 @@ jobs:
8888
- ${{ if ne(variable.group, '') }}:
8989
- group: ${{ variable.group }}
9090

91+
# handle template variable syntax
92+
# example:
93+
# - template: path/to/template.yml
94+
# parameters:
95+
# [key]: [value]
96+
- ${{ if ne(variable.template, '') }}:
97+
- template: ${{ variable.template }}
98+
${{ if ne(variable.parameters, '') }}:
99+
parameters: ${{ variable.parameters }}
100+
91101
# handle key-value variable syntax.
92102
# example:
93103
# - [key]: [value]

‎eng/common/templates/variables/pool-providers.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# First, import the template in an arcade-ified repo to pick up the variables, e.g.:
1717
#
1818
# variables:
19-
# - template: eng/common/templates/variables/pool-providers.yml
19+
# - template: /eng/common/templates/variables/pool-providers.yml
2020
#
2121
# ... then anywhere specifying the pool provider use the runtime variables,
2222
# $(DncEngInternalBuildPool) and $ (DncEngPublicBuildPool), e.g.:
@@ -45,4 +45,4 @@ variables:
4545
- name: DncEngPublicBuildPool
4646
value: NetCore-Svc-Public
4747
- name: DncEngInternalBuildPool
48-
value: NetCore1ESPool-Svc-Internal
48+
value: NetCore1ESPool-Svc-Internal

‎global.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.100-alpha.1.23055.1",
3+
"dotnet": "8.0.100-alpha.1.23061.8",
44
"runtimes": {
55
"dotnet": [
66
"3.1.7",
@@ -13,11 +13,11 @@
1313
"xcopy-msbuild": "16.10.0-preview2"
1414
},
1515
"sdk": {
16-
"version": "8.0.100-alpha.1.23055.1",
16+
"version": "8.0.100-alpha.1.23061.8",
1717
"allowPrerelease": true,
1818
"rollForward": "patch"
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23058.1"
21+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23062.3"
2222
}
2323
}

0 commit comments

Comments
 (0)