From 0c9fc16749139c02554552bf50439102115dc744 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang <16830051+mdh1418@users.noreply.github.com> Date: Wed, 23 Oct 2024 09:47:07 -0400 Subject: [PATCH 1/2] [ActivityInfo] Avoid writing extra byte by updating length (#109132) --- .../src/System/Diagnostics/Tracing/ActivityTracker.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/ActivityTracker.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/ActivityTracker.cs index 8700c8bd52c53b..c1a7b7ee40c85e 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/ActivityTracker.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/ActivityTracker.cs @@ -464,6 +464,7 @@ private static unsafe int AddIdToGuid(Guid* outPtr, int whereToAddId, uint id, b { // Indicate this is a 1 byte multicode with 4 high order bits in the lower nibble. *ptr = (byte)(((uint)NumberListCodes.MultiByte1 << 4) + (id >> 8)); + len--; // The id's 4 high order bits were written into the multicode byte, so update the length. id &= 0xFF; // Now we only want the low order bits. } ptr++; From 517b8355efb4524158001a320a177c2c1bd0b568 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:29:00 +0200 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20241022.1 (#109144) Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24515.3 -> To Version 10.0.0-beta.24522.1 Dependency coherency updates runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport,runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport,runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport,runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport,runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport,runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport From Version 9.0.0-alpha.1.24175.1 -> To Version 10.0.0-alpha.1.24514.4 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 116 ++++++++++++++++++++-------------------- eng/Versions.props | 34 ++++++------ global.json | 6 +-- 3 files changed, 78 insertions(+), 78 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0cfcbb083d6826..022e3ebbd2c631 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -88,87 +88,87 @@ - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 https://github.com/dotnet/runtime-assets @@ -324,9 +324,9 @@ https://github.com/dotnet/xharness 8c6d5afd99c713777165f4378462085a5679c223 - + https://github.com/dotnet/arcade - 31624193093a13f765ab5382509e693911264509 + 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -414,37 +414,37 @@ https://github.com/NuGet/NuGet.Client 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 - + https://github.com/dotnet/node - 308c7d0f1fa19bd1e7b768ad13646f5206133cdb + e252d360329507e992681e0ad6c87dd71196ed7f - + https://github.com/dotnet/node - 308c7d0f1fa19bd1e7b768ad13646f5206133cdb + e252d360329507e992681e0ad6c87dd71196ed7f - + https://github.com/dotnet/node - 308c7d0f1fa19bd1e7b768ad13646f5206133cdb + e252d360329507e992681e0ad6c87dd71196ed7f - + https://github.com/dotnet/node - 308c7d0f1fa19bd1e7b768ad13646f5206133cdb + e252d360329507e992681e0ad6c87dd71196ed7f - + https://github.com/dotnet/node - 308c7d0f1fa19bd1e7b768ad13646f5206133cdb + e252d360329507e992681e0ad6c87dd71196ed7f - + https://github.com/dotnet/node - 308c7d0f1fa19bd1e7b768ad13646f5206133cdb + e252d360329507e992681e0ad6c87dd71196ed7f - + https://github.com/dotnet/node - 308c7d0f1fa19bd1e7b768ad13646f5206133cdb + e252d360329507e992681e0ad6c87dd71196ed7f - + https://github.com/dotnet/node - 308c7d0f1fa19bd1e7b768ad13646f5206133cdb + e252d360329507e992681e0ad6c87dd71196ed7f diff --git a/eng/Versions.props b/eng/Versions.props index 88fb58155e1588..960cb70cccaaea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,22 +84,22 @@ 10.0.100-alpha.1.24480.5 - 10.0.0-beta.24515.3 - 10.0.0-beta.24515.3 - 10.0.0-beta.24515.3 - 10.0.0-beta.24515.3 - 2.9.2-beta.24515.3 - 10.0.0-beta.24515.3 - 2.9.2-beta.24515.3 - 10.0.0-beta.24515.3 - 10.0.0-beta.24515.3 - 10.0.0-beta.24515.3 - 10.0.0-beta.24515.3 - 10.0.0-beta.24515.3 - 10.0.0-beta.24515.3 - 10.0.0-beta.24515.3 - 10.0.0-beta.24515.3 - 10.0.0-beta.24515.3 + 10.0.0-beta.24522.1 + 10.0.0-beta.24522.1 + 10.0.0-beta.24522.1 + 10.0.0-beta.24522.1 + 2.9.2-beta.24522.1 + 10.0.0-beta.24522.1 + 2.9.2-beta.24522.1 + 10.0.0-beta.24522.1 + 10.0.0-beta.24522.1 + 10.0.0-beta.24522.1 + 10.0.0-beta.24522.1 + 10.0.0-beta.24522.1 + 10.0.0-beta.24522.1 + 10.0.0-beta.24522.1 + 10.0.0-beta.24522.1 + 10.0.0-beta.24522.1 1.4.0 @@ -258,7 +258,7 @@ 1.0.406601 $(MicrosoftDotNetApiCompatTaskVersion) - 9.0.0-alpha.1.24175.1 + 10.0.0-alpha.1.24514.4 $(MicrosoftNETRuntimeEmscriptenVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) diff --git a/global.json b/global.json index b8d0c159d58ac6..b47bffc6490f90 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-rc.2.24474.11" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24515.3", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24515.3", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24515.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24522.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24522.1", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24522.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.24522.5"