Skip to content

Commit 15aafa5

Browse files
DonnaChen888DonnaChen888
authored
Merge branch 'release/8.0.4xx' into merge/release/8.0.3xx-to-release/8.0.4xx
2 parents 5730774 + f012aff commit 15aafa5

9 files changed

Lines changed: 72 additions & 10 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,18 @@
214214
</Dependency>
215215
</ProductDependencies>
216216
<ToolsetDependencies>
217-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25555.2">
217+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25562.3">
218218
<Uri>https://github.com/dotnet/arcade</Uri>
219-
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
219+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
220220
<SourceBuild RepoName="arcade" ManagedOnly="true" />
221221
</Dependency>
222-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25555.2">
222+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25562.3">
223223
<Uri>https://github.com/dotnet/arcade</Uri>
224-
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
224+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
225225
</Dependency>
226-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25555.2">
226+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25562.3">
227227
<Uri>https://github.com/dotnet/arcade</Uri>
228-
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
228+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
229229
</Dependency>
230230
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24306.1">
231231
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependency from https://github.com/dotnet/arcade -->
42-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25555.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
42+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25562.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4343
</PropertyGroup>
4444
<PropertyGroup>
4545
<!-- Dependency from https://github.com/dotnet/arcade-services -->

‎eng/common/cross/x64/sources.list.bionic‎

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/ bionic main restricted universe
2+
deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted universe
3+
4+
deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe
5+
deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe
6+
7+
deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
8+
deb-src http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
9+
10+
deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
11+
deb-src http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse

‎eng/common/cross/x64/sources.list.xenial‎

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/ xenial main restricted universe
2+
deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted universe
3+
4+
deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe
5+
deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe
6+
7+
deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted
8+
deb-src http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted
9+
10+
deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse
11+
deb-src http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse

‎eng/common/cross/x64/tizen/tizen.patch‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff -u -r a/usr/lib64/libc.so b/usr/lib64/libc.so
2+
--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900
3+
+++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900
4+
@@ -2,4 +2,4 @@
5+
Use the shared library, but some functions are only in
6+
the static library, so try that secondarily. */
7+
OUTPUT_FORMAT(elf64-x86-64)
8+
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-x86-64.so.2 ) )

‎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/cross/x86/tizen/tizen.patch‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
2+
--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900
3+
+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900
4+
@@ -2,4 +2,4 @@
5+
Use the shared library, but some functions are only in
6+
the static library, so try that secondarily. */
7+
OUTPUT_FORMAT(elf32-i386)
8+
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.2 ) )

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.121",
3+
"dotnet": "8.0.122",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -11,7 +11,7 @@
1111
"cmake": "3.21.0"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25555.2",
15-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25555.2"
14+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25562.3",
15+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25562.3"
1616
}
1717
}

0 commit comments

Comments
 (0)