Skip to content

Commit 002a05a

Browse files
[release/7.6.x] Source code updates from dotnet/dotnet (#7461)
1 parent 9c21372 commit 002a05a

4 files changed

Lines changed: 17 additions & 8 deletions

File tree

eng/Version.Details.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ This file should be imported by eng/Versions.props
1010
<!-- dotnet-corefx dependencies -->
1111
<SystemComponentModelCompositionPackageVersion>4.5.0</SystemComponentModelCompositionPackageVersion>
1212
<!-- dotnet-dotnet dependencies -->
13-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26279.106</MicrosoftDotNetArcadeSdkPackageVersion>
14-
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.26279.106</MicrosoftDotNetXliffTasksPackageVersion>
13+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26315.104</MicrosoftDotNetArcadeSdkPackageVersion>
14+
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.26315.104</MicrosoftDotNetXliffTasksPackageVersion>
1515
<!-- dotnet-msbuild dependencies -->
1616
<MicrosoftBuildPackageVersion>17.3.1</MicrosoftBuildPackageVersion>
1717
<!-- dotnet-runtime dependencies -->

eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="nuget-client" Sha="ad54eeefef23a050a8395a8d2ad99a2d4e0190f5" BarId="316379" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="nuget-client" Sha="5ef850130ff4fc29043271f51ca415a885b39d41" BarId="318769" />
44
<!--
55
Currently this file is required to publish builds to .NET build asset registry.
66
See https://github.com/dotnet/arcade/issues/2396 for details.
@@ -56,13 +56,13 @@
5656
</Dependency>
5757
</ProductDependencies>
5858
<ToolsetDependencies>
59-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26279.106">
59+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26315.104">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>ad54eeefef23a050a8395a8d2ad99a2d4e0190f5</Sha>
61+
<Sha>5ef850130ff4fc29043271f51ca415a885b39d41</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.26279.106">
63+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.26315.104">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>ad54eeefef23a050a8395a8d2ad99a2d4e0190f5</Sha>
65+
<Sha>5ef850130ff4fc29043271f51ca415a885b39d41</Sha>
6666
</Dependency>
6767
</ToolsetDependencies>
6868
</Dependencies>
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 ) )

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"pinned": true
55
},
66
"msbuild-sdks": {
7-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26279.106",
7+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26315.104",
88
"Microsoft.Build.NoTargets": "3.7.0"
99
}
1010
}

0 commit comments

Comments
 (0)