Skip to content

Commit 8f9d9f9

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/7.0] Update dependencies from dotnet/arcade (#43880)
[release/7.0] Update dependencies from dotnet/arcade - Fix trimming warning - Update justification - Suppress IL2121 - Revert "Update justification" This reverts commit c1e4066. - Revert "Fix trimming warning" This reverts commit 7bbda38. - Validate DataProtection custom algorithm has a constructor - Additional fixes - Fix NoWarn overrides - Update LinkabilityChecker.csproj - Update WasmLinkerTest.csproj
1 parent 85db441 commit 8f9d9f9

32 files changed

+267
-117
lines changed

‎Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@
119119

120120
<!-- xUnit1004 = warns about skipped tests. Make this a non-fatal build warning. -->
121121
<WarningsNotAsErrors>$(WarningsNotAsErrors);xUnit1004</WarningsNotAsErrors>
122+
123+
<!-- don't warn about unnecessary trim warning suppressions. can be removed with preview 6. -->
124+
<NoWarn>$(NoWarn);IL2121</NoWarn>
122125
</PropertyGroup>
123126

124127
<!-- Source code settings -->

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,22 @@
302302
<Uri>https://github.com/dotnet/runtime</Uri>
303303
<Sha>559d9e7ca86eac451a8c840190593fad9fd5b842</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22423.1">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22458.5">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>e2fcd61c25c61c6ad0c2a649c8f257077fb1fd88</Sha>
307+
<Sha>622c2dc5ced5df5af002a3b06a52f9584b726b28</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22423.1">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22458.5">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>e2fcd61c25c61c6ad0c2a649c8f257077fb1fd88</Sha>
312+
<Sha>622c2dc5ced5df5af002a3b06a52f9584b726b28</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22423.1">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22458.5">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>e2fcd61c25c61c6ad0c2a649c8f257077fb1fd88</Sha>
316+
<Sha>622c2dc5ced5df5af002a3b06a52f9584b726b28</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22423.1">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22458.5">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>e2fcd61c25c61c6ad0c2a649c8f257077fb1fd88</Sha>
320+
<Sha>622c2dc5ced5df5af002a3b06a52f9584b726b28</Sha>
321321
</Dependency>
322322
</ToolsetDependencies>
323323
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@
135135
<MicrosoftEntityFrameworkCoreVersion>7.0.0-rc.2.22462.15</MicrosoftEntityFrameworkCoreVersion>
136136
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.0-rc.2.22462.15</MicrosoftEntityFrameworkCoreDesignVersion>
137137
<!-- Packages from dotnet/arcade -->
138-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22423.1</MicrosoftDotNetBuildTasksInstallersVersion>
139-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22423.1</MicrosoftDotNetBuildTasksTemplatingVersion>
138+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22458.5</MicrosoftDotNetBuildTasksInstallersVersion>
139+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22458.5</MicrosoftDotNetBuildTasksTemplatingVersion>
140140
<!-- Packages from dotnet/source-build-externals -->
141141
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.22459.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
142142
<!-- Packages from dotnet/xdt -->

‎eng/common/cross/arm/sources.list.focal

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse

‎eng/common/cross/arm/sources.list.jammy

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse

‎eng/common/cross/arm64/sources.list.focal

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse

‎eng/common/cross/arm64/sources.list.jammy

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse

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

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -186,32 +186,27 @@ while :; do
186186
__UbuntuArch=i386
187187
__UbuntuRepo="http://archive.ubuntu.com/ubuntu/"
188188
;;
189-
lldb3.6)
190-
__LLDB_Package="lldb-3.6-dev"
191-
;;
192-
lldb3.8)
193-
__LLDB_Package="lldb-3.8-dev"
194-
;;
195-
lldb3.9)
196-
__LLDB_Package="liblldb-3.9-dev"
197-
;;
198-
lldb4.0)
199-
__LLDB_Package="liblldb-4.0-dev"
200-
;;
201-
lldb5.0)
202-
__LLDB_Package="liblldb-5.0-dev"
203-
;;
204-
lldb6.0)
205-
__LLDB_Package="liblldb-6.0-dev"
189+
lldb*)
190+
version="${lowerI/lldb/}"
191+
parts=(${version//./ })
192+
193+
# for versions > 6.0, lldb has dropped the minor version
194+
if [[ "${parts[0]}" -gt 6 ]]; then
195+
version="${parts[0]}"
196+
fi
197+
198+
__LLDB_Package="liblldb-${version}-dev"
206199
;;
207200
no-lldb)
208201
unset __LLDB_Package
209202
;;
210203
llvm*)
211-
version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
204+
version="${lowerI/llvm/}"
212205
parts=(${version//./ })
213206
__LLVM_MajorVersion="${parts[0]}"
214207
__LLVM_MinorVersion="${parts[1]}"
208+
209+
# for versions > 6.0, llvm has dropped the minor version
215210
if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then
216211
__LLVM_MinorVersion=0;
217212
fi
@@ -231,6 +226,16 @@ while :; do
231226
__CodeName=bionic
232227
fi
233228
;;
229+
focal) # Ubuntu 20.04
230+
if [[ "$__CodeName" != "jessie" ]]; then
231+
__CodeName=focal
232+
fi
233+
;;
234+
jammy) # Ubuntu 22.04
235+
if [[ "$__CodeName" != "jessie" ]]; then
236+
__CodeName=jammy
237+
fi
238+
;;
234239
jessie) # Debian 8
235240
__CodeName=jessie
236241
__UbuntuRepo="http://ftp.debian.org/debian/"

‎eng/common/cross/x86/sources.list.focal

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe
2+
deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe
3+
4+
deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe
5+
deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe
6+
7+
deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted
8+
deb-src http://archive.ubuntu.com/ubuntu/ focal-backports main restricted
9+
10+
deb http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
11+
deb-src http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse

‎eng/common/cross/x86/sources.list.jammy

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe
2+
deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe
3+
4+
deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe
5+
deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe
6+
7+
deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted
8+
deb-src http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted
9+
10+
deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse
11+
deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse

‎eng/common/templates/job/execute-sdl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
demands: Cmd
5454
# If it's not devdiv, it's dnceng
5555
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
56-
name: NetCore1ESPool-Internal
56+
name: NetCore1ESPool-Svc-Internal
5757
demands: ImageOverride -equals windows.vs2019.amd64
5858
steps:
5959
- checkout: self

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
demands: Cmd
4141
# If it's not devdiv, it's dnceng
4242
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
43-
name: NetCore1ESPool-Internal
43+
name: NetCore1ESPool-Svc-Internal
4444
demands: ImageOverride -equals windows.vs2019.amd64
4545

4646
variables:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ jobs:
4646
# source-build builds run in Docker, including the default managed platform.
4747
pool:
4848
${{ if eq(variables['System.TeamProject'], 'public') }}:
49-
name: NetCore-Public
49+
name: NetCore-Svc-Public
5050
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
5151
${{ if eq(variables['System.TeamProject'], 'internal') }}:
52-
name: NetCore1ESPool-Internal
52+
name: NetCore1ESPool-Svc-Internal
5353
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
5454
${{ if ne(parameters.platform.pool, '') }}:
5555
pool: ${{ parameters.platform.pool }}

‎eng/common/templates/job/source-index-stage1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
${{ if eq(parameters.pool, '') }}:
2929
pool:
3030
${{ if eq(variables['System.TeamProject'], 'public') }}:
31-
name: NetCore-Public
31+
name: NetCore-Svc-Public
3232
demands: ImageOverride -equals windows.vs2019.amd64.open
3333
${{ if eq(variables['System.TeamProject'], 'internal') }}:
34-
name: NetCore1ESPool-Internal
34+
name: NetCore1ESPool-Svc-Internal
3535
demands: ImageOverride -equals windows.vs2019.amd64
3636

3737
steps:

‎eng/common/templates/jobs/jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
demands: Cmd
9696
# If it's not devdiv, it's dnceng
9797
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
98-
name: NetCore1ESPool-Internal
98+
name: NetCore1ESPool-Svc-Internal
9999
demands: ImageOverride -equals windows.vs2019.amd64
100100

101101
runAsPublic: ${{ parameters.runAsPublic }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
1515
defaultManagedPlatform:
1616
name: 'Managed'
17-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab'
1818

1919
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
2020
# object in this array is sent to the job template as 'platform'. If no platforms are specified,

‎eng/common/templates/post-build/post-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ stages:
106106
demands: Cmd
107107
# If it's not devdiv, it's dnceng
108108
${{ else }}:
109-
name: NetCore1ESPool-Internal
109+
name: NetCore1ESPool-Svc-Internal
110110
demands: ImageOverride -equals windows.vs2019.amd64
111111

112112
steps:
@@ -143,7 +143,7 @@ stages:
143143
demands: Cmd
144144
# If it's not devdiv, it's dnceng
145145
${{ else }}:
146-
name: NetCore1ESPool-Internal
146+
name: NetCore1ESPool-Svc-Internal
147147
demands: ImageOverride -equals windows.vs2019.amd64
148148
steps:
149149
- template: setup-maestro-vars.yml
@@ -203,7 +203,7 @@ stages:
203203
demands: Cmd
204204
# If it's not devdiv, it's dnceng
205205
${{ else }}:
206-
name: NetCore1ESPool-Internal
206+
name: NetCore1ESPool-Svc-Internal
207207
demands: ImageOverride -equals windows.vs2019.amd64
208208
steps:
209209
- template: setup-maestro-vars.yml
@@ -262,7 +262,7 @@ stages:
262262
demands: Cmd
263263
# If it's not devdiv, it's dnceng
264264
${{ else }}:
265-
name: NetCore1ESPool-Internal
265+
name: NetCore1ESPool-Svc-Internal
266266
demands: ImageOverride -equals windows.vs2019.amd64
267267
steps:
268268
- template: setup-maestro-vars.yml

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "7.0.100-rc.1.22375.2"
3+
"version": "7.0.100-rc.1.22425.9"
44
},
55
"tools": {
6-
"dotnet": "7.0.100-rc.1.22375.2",
6+
"dotnet": "7.0.100-rc.1.22425.9",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22423.1",
31-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22423.1"
30+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22458.5",
31+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22458.5"
3232
}
3333
}

‎src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Wasm.Authentication.Server.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55

66
<!-- IdentityServer packages are not strong named. -->
7-
<NoWarn>CS8002</NoWarn>
7+
<NoWarn>$(NoWarn);CS8002</NoWarn>
88
<!-- This project references the shared framework transitively. Prevent restore errors by setting this flag. -->
99
<GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
1010
<IdentityDefaultUIFramework>Bootstrap5</IdentityDefaultUIFramework>

‎src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
OutputDirectory="$(LibrariesTrimmedArtifactsPath)"
5353
ReferenceAssemblyPaths="@(RuntimePackAsset);@(ReferencePath->WithMetadataValue('ExternallyResolved', 'true'))"
5454
ExtraArgs="$(ILLinkArgs)"
55+
NoWarn="$(NoWarn)"
5556
TrimMode="link"
5657
ToolExe="$(_DotNetHostFileName)"
5758
ToolPath="$(_DotNetHostDirectory)" />

‎src/DataProtection/DataProtection/src/AuthenticatedEncryption/AuthenticatedEncryptorFactory.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ private static string GetBCryptAlgorithmNameFromValidationAlgorithm(ValidationAl
163163
}
164164
}
165165

166+
[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
166167
private static Type GetManagedTypeFromEncryptionAlgorithm(EncryptionAlgorithm algorithm)
167168
{
168169
switch (algorithm)
@@ -180,6 +181,7 @@ private static Type GetManagedTypeFromEncryptionAlgorithm(EncryptionAlgorithm al
180181
}
181182
}
182183

184+
[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
183185
private static Type GetManagedTypeFromValidationAlgorithm(ValidationAlgorithm algorithm)
184186
{
185187
switch (algorithm)

0 commit comments

Comments
 (0)