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

0 commit comments

Comments
 (0)