Skip to content

Commit d114eec

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#502)
[main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.2.0-beta-23053-01 to 1.2.0-beta-23073-01 (parent: Microsoft.DotNet.Arcade.Sdk) - Update TFM to net8.0 to eliminate prebuilts - Accept Microsoft.NETFramework.ReferenceAssemblies/1.0.3 as a known prebuilt
1 parent 44c3e16 commit d114eec

14 files changed

+95
-27
lines changed

‎Directory.Build.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@
22

33
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
44

5+
<PropertyGroup>
6+
<NetCurrent>net8.0</NetCurrent>
7+
</PropertyGroup>
8+
59
</Project>

‎eng/NoOp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- This project is a workaround utilized by the DependencyPackageProjects infrastructure -->
44

55
<PropertyGroup>
6-
<TargetFramework>net7.0</TargetFramework>
6+
<TargetFramework>$(NetCurrent)</TargetFramework>
77
</PropertyGroup>
88

99
<Target Name="Build" />

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
<UsagePattern IdentityGlob="runtime.linux-x64.Microsoft.NETCore.ILAsm/*" />
55
<UsagePattern IdentityGlob="runtime.linux-x64.Microsoft.NETCore.ILDAsm/*" />
66

7+
<!-- TODO: A decision was made to not add this targeting pack because it will no longer be needed
8+
once full framework TFMs have been filtered out with https://github.com/dotnet/source-build/issues/3014.
9+
In the meantime we are accepting this as a known prebuilt. -->
10+
<UsagePattern IdentityGlob="Microsoft.NETFramework.ReferenceAssemblies/1.0.3" />
11+
712
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
813

914
</IgnorePatterns>

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
<Sha>4ed7440e89d5fe7d4375102a441c713fadd5357c</Sha>
1414
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
1515
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23054.2">
16+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23075.2">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>eae015fb1c92ceef69126164b3969447d0355c08</Sha>
18+
<Sha>74a74c44f54249ac59d045b49f9f8da922e0b8d8</Sha>
1919
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23054.2">
21+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23075.2">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>eae015fb1c92ceef69126164b3969447d0355c08</Sha>
23+
<Sha>74a74c44f54249ac59d045b49f9f8da922e0b8d8</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23053-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
25+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23073-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
2626
<Uri>https://github.com/dotnet/sourcelink</Uri>
27-
<Sha>8a6cbd4c912ffb7d342b670850f499e0792e5a50</Sha>
27+
<Sha>de25d2565e5b89ff1d7eee1bce066005b272e365</Sha>
2828
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
2929
</Dependency>
3030
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.4.20202.18">

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PropertyGroup>
1212
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILAsmVersion>
1313
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILDAsmVersion>
14-
<MicrosoftDotNetGenAPIPackageVersion>8.0.0-beta.23054.2</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetGenAPIPackageVersion>8.0.0-beta.23075.2</MicrosoftDotNetGenAPIPackageVersion>
1515
<MicrosoftDotNetGenAPITaskPackageVersion>8.0.100-alpha.1.22573.3</MicrosoftDotNetGenAPITaskPackageVersion>
1616
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.20113.5</MicrosoftDotNetBuildTasksPackagingPackageVersion>
1717
</PropertyGroup>

‎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) {

‎eng/common/tools.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ function InitializeBuildTool {
312312
# return values
313313
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
314314
_InitializeBuildToolCommand="msbuild"
315-
_InitializeBuildToolFramework="net7.0"
315+
_InitializeBuildToolFramework="net8.0"
316316
}
317317

318318
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
@@ -428,6 +428,8 @@ function MSBuild {
428428
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
429429
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
430430
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
431+
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" )
432+
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" )
431433
for path in "${possiblePaths[@]}"; do
432434
if [[ -f $path ]]; then
433435
selectedPath=$path

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"tools": {
3-
"dotnet": "7.0.100"
3+
"dotnet": "8.0.100-alpha.1.23061.8"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23054.2"
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23075.2"
77
}
88
}

‎src/textOnlyPackageGenerator/PackageGenerator.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33

44
<PropertyGroup>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>$(NetCurrent)</TargetFramework>
66
<TargetPackagesPath>$(ArtifactsDir)textOnlyPackages/</TargetPackagesPath>
77
<CsProjTemplatePath>./textOnlyPackage.csproj.template</CsProjTemplatePath>
88
</PropertyGroup>

0 commit comments

Comments
 (0)