Skip to content

Commit 2bd23e1

Browse files
[main] Update dependencies from dotnet/arcade (#3177)
[main] Update dependencies from dotnet/arcade - Analyzer fix - Update to net8 - Update import order - Add net8 handling - Analyzer fixes - Merge branch 'main' into darc-main-328ee272-9fb8-4717-bae0-5575b14d7744 - More analyzer fixes - Port fix from runtime - Update failing test - verbose test - Fix formatting - Fix the task to look for net8.0 location. Revert test changes. - Workaround a possible issue in the new SDK
1 parent 6381e0b commit 2bd23e1

File tree

53 files changed

+165
-119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+165
-119
lines changed

Directory.Build.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<Project>
2+
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
3+
<Import Project="eng/Analyzers.props" />
4+
25
<PropertyGroup>
36
<!-- Don't produce ref assemblies by default. -->
47
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
58
<IsReferenceAssembly Condition="'$(IsReferenceAssembly)' == '' and '$([System.IO.Path]::GetFileName($(MSBuildProjectDirectory)))' == 'ref'">true</IsReferenceAssembly>
69
<DisableImplicitNamespaceImports_DotNet>true</DisableImplicitNamespaceImports_DotNet>
710
<!-- The TFM for the product (linker, task,.. not analyzer, which is netstandard) -->
8-
<NetCoreAppToolCurrent>net7.0</NetCoreAppToolCurrent>
11+
<NetCoreAppToolCurrent>$(NetCurrent)</NetCoreAppToolCurrent>
912
<!-- The TFM for all the tests - intentionally different since tests may depend on new framework APIs in order to validate
1013
linker interaction with them, linker itself doesn't need the new framework typically. -->
11-
<NetCoreAppTestsCurrent>net7.0</NetCoreAppTestsCurrent>
14+
<NetCoreAppTestsCurrent>$(NetCurrent)</NetCoreAppTestsCurrent>
1215
</PropertyGroup>
1316
<PropertyGroup Condition=" '$(IsReferenceAssembly)' == 'true' ">
1417
<ProduceOnlyReferenceAssembly>true</ProduceOnlyReferenceAssembly>
@@ -18,9 +21,6 @@
1821
<PublishWindowsPdb>false</PublishWindowsPdb>
1922
<RunApiCompat>false</RunApiCompat>
2023
</PropertyGroup>
21-
22-
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
23-
<Import Project="eng/Analyzers.props" />
2424
<PropertyGroup>
2525
<IsPackable>false</IsPackable>
2626
<PackageLicenseExpression>MIT</PackageLicenseExpression>

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
77
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
88
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
9+
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
910
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
1011
</packageSources>
1112
<disabledPackageSources />

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22630.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23067.5">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>e82404fca08383513e0b0b3c5308d4a9b18b7c7a</Sha>
8+
<Sha>3600aa80a01e90f38a7b86b9d7c1264e091aa5a8</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22630.1">
11+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.23067.5">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>e82404fca08383513e0b0b3c5308d4a9b18b7c7a</Sha>
13+
<Sha>3600aa80a01e90f38a7b86b9d7c1264e091aa5a8</Sha>
1414
</Dependency>
1515
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-rtm.22507.1">
1616
<Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
1919
<MicrosoftBuildFrameworkVersion>17.0.0-preview-21267-01</MicrosoftBuildFrameworkVersion>
2020
<MicrosoftBuildUtilitiesCoreVersion>17.0.0-preview-21267-01</MicrosoftBuildUtilitiesCoreVersion>
21-
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.22630.1</MicrosoftDotNetApiCompatVersion>
21+
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.23067.5</MicrosoftDotNetApiCompatVersion>
2222
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21271.1</MicrosoftDotNetCodeAnalysisVersion>
2323
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
2424
<MicrosoftCodeAnalysisVersion>4.5.0-1.22517.9</MicrosoftCodeAnalysisVersion>
2525
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftNetCompilersToolsetVersion>
2626
<MicrosoftCodeAnalysisCSharpAnalyzerTestingXunitVersion>1.0.1-beta1.*</MicrosoftCodeAnalysisCSharpAnalyzerTestingXunitVersion>
2727
<MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
28-
<MicrosoftILVerificationVersion>7.0.0-preview.7.22375.6</MicrosoftILVerificationVersion>
28+
<MicrosoftILVerificationVersion>8.0.0-alpha.1.23067.11</MicrosoftILVerificationVersion>
2929
<!-- This controls the version of the cecil package, or the version of cecil in the project graph
3030
when we build the cecil submodule. The reference assembly package will depend on this version of cecil.
3131
Keep this in sync with ProjectInfo.cs in the submodule. -->

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)