diff --git a/NuGet.config b/NuGet.config index 4b6a2da9147bbc..3795f6e59e8c2b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a54f27bb2af56..1dcc321065a7f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,9 +111,9 @@ - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc @@ -121,69 +121,69 @@ 73f0850939d96131c28cf6ea6ee5aacb4da0083a - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc https://github.com/dotnet/runtime-assets @@ -334,9 +334,9 @@ https://github.com/dotnet/xharness d33548342ade8e537d891c8f0f593aa206418625 - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 09b899fa13341f..65ebc153d93e10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,21 +87,21 @@ 8.0.100 - 8.0.0-beta.25114.5 - 8.0.0-beta.25114.5 - 8.0.0-beta.25114.5 - 8.0.0-beta.25114.5 - 8.0.0-beta.25114.5 - 2.5.1-beta.25114.5 - 8.0.0-beta.25114.5 - 8.0.0-beta.25114.5 - 8.0.0-beta.25114.5 - 8.0.0-beta.25114.5 - 8.0.0-beta.25114.5 - 8.0.0-beta.25114.5 - 8.0.0-beta.25114.5 - 8.0.0-beta.25114.5 - 8.0.0-beta.25114.5 + 8.0.0-beta.25120.1 + 8.0.0-beta.25120.1 + 8.0.0-beta.25120.1 + 8.0.0-beta.25120.1 + 8.0.0-beta.25120.1 + 2.5.1-beta.25120.1 + 8.0.0-beta.25120.1 + 8.0.0-beta.25120.1 + 8.0.0-beta.25120.1 + 8.0.0-beta.25120.1 + 8.0.0-beta.25120.1 + 8.0.0-beta.25120.1 + 8.0.0-beta.25120.1 + 8.0.0-beta.25120.1 + 8.0.0-beta.25120.1 6.0.0-preview.1.102 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index dafabdcaef00d4..f93dc440df0e9c 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -280,6 +280,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64") add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}") endif() +elseif(TARGET_ARCH_NAME STREQUAL "s390x") + add_toolchain_linker_flag("--target=${TOOLCHAIN}") elseif(TARGET_ARCH_NAME STREQUAL "x86") if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) add_toolchain_linker_flag("--target=${TOOLCHAIN}") @@ -327,6 +329,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TARGET_ARCH_NAME STREQUAL "armel") add_compile_options(-mfloat-abi=softfp) endif() +elseif(TARGET_ARCH_NAME STREQUAL "s390x") + add_compile_options("--target=${TOOLCHAIN}") elseif(TARGET_ARCH_NAME STREQUAL "x86") if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) add_compile_options(--target=${TOOLCHAIN}) diff --git a/global.json b/global.json index 50ee710d83fdc4..c63eebc644eae3 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.113" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25114.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25114.5", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25114.5", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25120.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6" diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs index 0c23059c17ae88..ecfe219e072843 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs @@ -145,6 +145,7 @@ public async Task TestBasicReceiveAndResponseEvents() } } + [ActiveIssue("https://github.com/dotnet/runtime/issues/112792")] [OuterLoop] [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))] public void TestW3CHeaders() @@ -194,6 +195,7 @@ public void TestW3CHeadersTraceStateAndCorrelationContext() { using (var eventRecords = new EventObserverAndRecorder()) { + Activity.DefaultIdFormat = ActivityIdFormat.W3C; var parent = new Activity("w3c activity"); parent.SetParentId(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom()); parent.TraceStateString = "some=state";