Skip to content

Commit f0df3de

Browse files
oleksandr-didykoleksandr-didyk
committed
adapt to new Arcade version
1 parent a6e02d1 commit f0df3de

File tree

12 files changed

+97
-33
lines changed

12 files changed

+97
-33
lines changed

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
<!-- Additional documentation on pre-built detection can be found at https://aka.ms/source-build/pre-built -->
1+
<!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->
22
<UsageData>
33
<IgnorePatterns>
44
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*" />
55
</IgnorePatterns>
6+
<!-- To be removed by https://github.com/dotnet/sourcelink/issues/938 -->
7+
<Usages>
8+
<Usage Id="Microsoft.AspNetCore.App.Ref" Version="7.0.0" />
9+
<Usage Id="Microsoft.NETCore.App.Ref" Version="7.0.0" />
10+
</Usages>
611
</UsageData>

‎eng/Version.Details.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="System.Text.Json" Version="8.0.0-alpha.1.22631.1">
4+
<Dependency Name="System.Text.Json" Version="8.0.0-alpha.1.23080.3">
55
<Uri>https://github.com/dotnet/runtime</Uri>
6-
<Sha>a6f84d42529494b3539684ed993fa554281215b7</Sha>
6+
<Sha>c174c2280bc42b09652813423e0edf65cc2a2aae</Sha>
77
<SourceBuild RepoName="runtime" ManagedOnly="false" />
88
</Dependency>
99
<!-- MSBuild versions starting from 16.10.0 do not target NET Core -->
@@ -17,24 +17,24 @@
1717
</Dependency>
1818
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23076.1">
1919
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
20-
<Sha>a7d9aec195d309a8d25022553a43561441a599a8</Sha>
20+
<Sha>d114eecff6c3149a55cb643fba6c4e7580b9f0b7</Sha>
2121
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
2222
</Dependency>
2323
</ProductDependencies>
2424
<ToolsetDependencies>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22630.1">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23080.3">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>e82404fca08383513e0b0b3c5308d4a9b18b7c7a</Sha>
27+
<Sha>608f3c7aed68dec1314d75601c6f143747e78cc6</Sha>
2828
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2929
</Dependency>
30-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22518-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
30+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23079-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
3131
<Uri>https://github.com/dotnet/sourcelink</Uri>
32-
<Sha>d047202874ad79d72c75b6354c0f8a9a12d1b054</Sha>
32+
<Sha>adfb4309de0588668e8ebc29acbbf4495be3d306</Sha>
3333
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
3434
</Dependency>
35-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22627.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
35+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23077.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
3636
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
37-
<Sha>c9b8a539c59158e189e4a6b9ebcf29b748dcb843</Sha>
37+
<Sha>2df8bb0b0f279dd7158956be8c33e77b6bb9ec98</Sha>
3838
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
3939
</Dependency>
4040
</ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@
1010
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
1111
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
1212
<!-- latest versions auto-updated by Maestro/Darc tooling -->
13-
<MicrosoftSourceLinkGitHubVersion>1.2.0-beta-22518-02</MicrosoftSourceLinkGitHubVersion>
14-
<MicrosoftDotNetXliffTasksVersion>1.0.0-beta.22627.1</MicrosoftDotNetXliffTasksVersion>
15-
<SystemTextJsonVersion>8.0.0-alpha.1.22631.1</SystemTextJsonVersion>
13+
<MicrosoftSourceLinkGitHubVersion>1.2.0-beta-23079-01</MicrosoftSourceLinkGitHubVersion>
14+
<MicrosoftDotNetXliffTasksVersion>1.0.0-beta.23077.1</MicrosoftDotNetXliffTasksVersion>
15+
<SystemTextJsonVersion>8.0.0-alpha.1.23080.3</SystemTextJsonVersion>
1616
<!-- Pinned versions -->
1717
<MicrosoftBuildVersion>16.8.0</MicrosoftBuildVersion>
1818
<MicrosoftBuildTasksCoreVersion>16.8.0</MicrosoftBuildTasksCoreVersion>
1919
<MicrosoftTeamFoundationServerExtendedClientVersion>19.210.0-preview</MicrosoftTeamFoundationServerExtendedClientVersion>
2020
<NuGetVersioningVersion>5.7.0</NuGetVersioningVersion>
2121
<SystemCommandLineVersion>2.0.0-beta4.22272.1</SystemCommandLineVersion>
22+
<SystemCommandLineNamingConventionBinderVersion>2.0.0-beta4.22272.1</SystemCommandLineNamingConventionBinderVersion>
2223
<SystemCommandLineRenderingVersion>0.4.0-alpha.22272.1</SystemCommandLineRenderingVersion>
2324
<SystemReflectionMetadataVersion>1.8.1</SystemReflectionMetadataVersion>
2425
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>

‎eng/cibuild.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@ while [[ -h $source ]]; do
1313
done
1414
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1515

16-
# SourceBuildIntermediateNupkgRid indicates to source-build that portable intermediates should be restored (required for runtime dependency)
17-
. "$scriptroot/common/build.sh" --restore --build --test --pack --integrationTest --publish --ci /p:SourceBuildIntermediateNupkgRid="linux-x64" "$@"
16+
. "$scriptroot/common/build.sh" --restore --build --test --pack --integrationTest --publish --ci "$@"

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,14 @@ __UbuntuPackages+=" symlinks"
4848
__UbuntuPackages+=" libicu-dev"
4949
__UbuntuPackages+=" liblttng-ust-dev"
5050
__UbuntuPackages+=" libunwind8-dev"
51+
__UbuntuPackages+=" libnuma-dev"
5152

5253
__AlpinePackages+=" gettext-dev"
5354
__AlpinePackages+=" icu-dev"
5455
__AlpinePackages+=" libunwind-dev"
5556
__AlpinePackages+=" lttng-ust-dev"
5657
__AlpinePackages+=" compiler-rt-static"
58+
__AlpinePackages+=" numactl-dev"
5759

5860
# runtime libraries' dependencies
5961
__UbuntuPackages+=" libcurl4-openssl-dev"
@@ -147,17 +149,17 @@ while :; do
147149
__BuildArch=ppc64le
148150
__UbuntuArch=ppc64el
149151
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
150-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
151-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
152-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
152+
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
153+
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
154+
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
153155
unset __LLDB_Package
154156
;;
155157
riscv64)
156158
__BuildArch=riscv64
157159
__UbuntuArch=riscv64
158160
__UbuntuRepo="http://deb.debian.org/debian-ports"
159161
__CodeName=sid
160-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
162+
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
161163
unset __LLDB_Package
162164

163165
if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
@@ -168,9 +170,9 @@ while :; do
168170
__BuildArch=s390x
169171
__UbuntuArch=s390x
170172
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
171-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
172-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
173-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
173+
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
174+
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
175+
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
174176
unset __LLDB_Package
175177
;;
176178
x64)
@@ -310,6 +312,8 @@ done
310312

311313
if [[ "$__BuildArch" == "armel" ]]; then
312314
__LLDB_Package="lldb-3.5-dev"
315+
elif [[ "$__BuildArch" == "arm" && "$__AlpineVersion" == "3.13" ]]; then
316+
__AlpinePackages="${__AlpinePackages//numactl-dev/}"
313317
fi
314318

315319
__UbuntuPackages+=" ${__LLDB_Package:-}"

‎eng/common/generate-locproject.ps1‎

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

@@ -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‎

Lines changed: 10 additions & 0 deletions
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/job/source-index-stage1.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20220804.1
3+
sourceIndexPackageVersion: 1.0.1-20221220.2
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
66
preSteps: []
@@ -40,10 +40,10 @@ jobs:
4040
- ${{ preStep }}
4141

4242
- task: UseDotNet@2
43-
displayName: Use .NET Core sdk 3.1
43+
displayName: Use .NET Core SDK 6
4444
inputs:
4545
packageType: sdk
46-
version: 3.1.x
46+
version: 6.0.x
4747
installationPath: $(Agent.TempDirectory)/dotnet
4848
workingDirectory: $(Agent.TempDirectory)
4949

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

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

‎eng/common/tools.ps1‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ function InitializeBuildTool() {
581581
ExitWithExitCode 1
582582
}
583583
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
584-
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' }
584+
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' }
585585
} elseif ($msbuildEngine -eq "vs") {
586586
try {
587587
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -743,6 +743,8 @@ function MSBuild() {
743743
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
744744
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
745745
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
746+
(Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')),
747+
(Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
746748
)
747749
$selectedPath = $null
748750
foreach ($path in $possiblePaths) {

0 commit comments

Comments
 (0)