diff --git a/NuGet.config b/NuGet.config index b6737b3d28d..0d112603fdb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 5ec07ea0d32..e0336b7de34 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25555.106 - 10.0.0-beta.25555.106 - 10.0.0-beta.25555.106 + 10.0.0-beta.25563.104 + 10.0.0-beta.25563.104 + 10.0.0-beta.25563.104 10.0.1 10.0.1 10.0.1 @@ -16,10 +16,10 @@ This file should be imported by eng/Versions.props 10.0.1 10.0.1 10.0.1 - 10.0.1-servicing.25555.106 + 10.0.1-servicing.25563.104 10.0.1 10.0.1 - 10.0.1-servicing.25555.106 + 10.0.1-servicing.25563.104 10.0.1 10.0.1 10.0.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb182bc5c18..e71616bb1ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + 93970af2dae989c795efb703be9a25ff95079f25 diff --git a/eng/common/cross/arm64/tizen/tizen.patch b/eng/common/cross/arm64/tizen/tizen.patch index af7c8be0590..2cebc547382 100644 --- a/eng/common/cross/arm64/tizen/tizen.patch +++ b/eng/common/cross/arm64/tizen/tizen.patch @@ -5,5 +5,5 @@ diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so Use the shared library, but some functions are only in the static library, so try that secondarily. */ OUTPUT_FORMAT(elf64-littleaarch64) --GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-aarch64.so.1 ) ) +-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-aarch64.so.1 ) ) +GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-aarch64.so.1 ) ) diff --git a/global.json b/global.json index f7de8586974..c1bbda751a6 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25555.106", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25555.106" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25563.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25563.104" } }