Skip to content

Commit 2e344a5

Browse files
am11am11
authored
Merge branch 'main' into feature/fcalls-cleanups
2 parents f340359 + 517b835 commit 2e344a5

File tree

4 files changed

+79
-78
lines changed

4 files changed

+79
-78
lines changed

‎eng/Version.Details.xml

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -88,87 +88,87 @@
8888
</Dependency>
8989
</ProductDependencies>
9090
<ToolsetDependencies>
91-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24515.3">
91+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24522.1">
9292
<Uri>https://github.com/dotnet/arcade</Uri>
93-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
93+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
9494
</Dependency>
9595
<!-- Intermediate is necessary for source build. -->
96-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24515.3">
96+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24522.1">
9797
<Uri>https://github.com/dotnet/arcade</Uri>
98-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
98+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
9999
<SourceBuild RepoName="arcade" ManagedOnly="true" />
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24515.3">
101+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24522.1">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
103+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24515.3">
105+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24522.1">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
107+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24515.3">
109+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24522.1">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
111+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24515.3">
113+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24522.1">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
115+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.24515.3">
117+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.24522.1">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
119+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24515.3">
121+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24522.1">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
123+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.24515.3">
125+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.24522.1">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
127+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24515.3">
129+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24522.1">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
131+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24515.3">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24522.1">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
135+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24515.3">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24522.1">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
139+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24515.3">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24522.1">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
143+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24515.3">
145+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24522.1">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
147+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24515.3">
149+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24522.1">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
151+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24515.3">
153+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24522.1">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
155+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24515.3">
157+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24522.1">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
159+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24515.3">
161+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24522.1">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
163+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24515.3">
165+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24522.1">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
167+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
168168
</Dependency>
169-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24515.3">
169+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24522.1">
170170
<Uri>https://github.com/dotnet/arcade</Uri>
171-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
171+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
172172
</Dependency>
173173
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.24521.1">
174174
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -324,9 +324,9 @@
324324
<Uri>https://github.com/dotnet/xharness</Uri>
325325
<Sha>8c6d5afd99c713777165f4378462085a5679c223</Sha>
326326
</Dependency>
327-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24515.3">
327+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24522.1">
328328
<Uri>https://github.com/dotnet/arcade</Uri>
329-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
329+
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
330330
</Dependency>
331331
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
332332
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -414,37 +414,37 @@
414414
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
415415
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
416416
</Dependency>
417-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.24175.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
417+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.24514.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
418418
<Uri>https://github.com/dotnet/node</Uri>
419-
<Sha>308c7d0f1fa19bd1e7b768ad13646f5206133cdb</Sha>
419+
<Sha>e252d360329507e992681e0ad6c87dd71196ed7f</Sha>
420420
</Dependency>
421-
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.24175.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
421+
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.24514.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
422422
<Uri>https://github.com/dotnet/node</Uri>
423-
<Sha>308c7d0f1fa19bd1e7b768ad13646f5206133cdb</Sha>
423+
<Sha>e252d360329507e992681e0ad6c87dd71196ed7f</Sha>
424424
</Dependency>
425-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.24175.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
425+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.24514.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
426426
<Uri>https://github.com/dotnet/node</Uri>
427-
<Sha>308c7d0f1fa19bd1e7b768ad13646f5206133cdb</Sha>
427+
<Sha>e252d360329507e992681e0ad6c87dd71196ed7f</Sha>
428428
</Dependency>
429-
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.24175.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
429+
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.24514.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
430430
<Uri>https://github.com/dotnet/node</Uri>
431-
<Sha>308c7d0f1fa19bd1e7b768ad13646f5206133cdb</Sha>
431+
<Sha>e252d360329507e992681e0ad6c87dd71196ed7f</Sha>
432432
</Dependency>
433-
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.24175.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
433+
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.24514.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
434434
<Uri>https://github.com/dotnet/node</Uri>
435-
<Sha>308c7d0f1fa19bd1e7b768ad13646f5206133cdb</Sha>
435+
<Sha>e252d360329507e992681e0ad6c87dd71196ed7f</Sha>
436436
</Dependency>
437-
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.24175.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
437+
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.24514.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
438438
<Uri>https://github.com/dotnet/node</Uri>
439-
<Sha>308c7d0f1fa19bd1e7b768ad13646f5206133cdb</Sha>
439+
<Sha>e252d360329507e992681e0ad6c87dd71196ed7f</Sha>
440440
</Dependency>
441-
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.24175.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
441+
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.24514.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
442442
<Uri>https://github.com/dotnet/node</Uri>
443-
<Sha>308c7d0f1fa19bd1e7b768ad13646f5206133cdb</Sha>
443+
<Sha>e252d360329507e992681e0ad6c87dd71196ed7f</Sha>
444444
</Dependency>
445-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="9.0.0-alpha.1.24175.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
445+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.24514.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport">
446446
<Uri>https://github.com/dotnet/node</Uri>
447-
<Sha>308c7d0f1fa19bd1e7b768ad13646f5206133cdb</Sha>
447+
<Sha>e252d360329507e992681e0ad6c87dd71196ed7f</Sha>
448448
</Dependency>
449449
</ToolsetDependencies>
450450
</Dependencies>

‎eng/Versions.props

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,22 @@
8484
<!-- SDK dependencies (also used in wasm build tests -->
8585
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24480.5</MicrosoftDotNetApiCompatTaskVersion>
8686
<!-- Arcade dependencies -->
87-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24515.3</MicrosoftDotNetBuildTasksFeedVersion>
88-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24515.3</MicrosoftDotNetCodeAnalysisVersion>
89-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24515.3</MicrosoftDotNetGenAPIVersion>
90-
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24515.3</MicrosoftDotNetGenFacadesVersion>
91-
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.24515.3</MicrosoftDotNetXUnitAssertVersion>
92-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24515.3</MicrosoftDotNetXUnitExtensionsVersion>
93-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.24515.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
94-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24515.3</MicrosoftDotNetBuildTasksArchivesVersion>
95-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24515.3</MicrosoftDotNetBuildTasksInstallersVersion>
96-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24515.3</MicrosoftDotNetBuildTasksPackagingVersion>
97-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24515.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
98-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24515.3</MicrosoftDotNetBuildTasksTemplatingVersion>
99-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24515.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
100-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24515.3</MicrosoftDotNetRemoteExecutorVersion>
101-
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24515.3</MicrosoftDotNetVersionToolsTasksVersion>
102-
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24515.3</MicrosoftDotNetPackageTestingVersion>
87+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24522.1</MicrosoftDotNetBuildTasksFeedVersion>
88+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24522.1</MicrosoftDotNetCodeAnalysisVersion>
89+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24522.1</MicrosoftDotNetGenAPIVersion>
90+
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24522.1</MicrosoftDotNetGenFacadesVersion>
91+
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.24522.1</MicrosoftDotNetXUnitAssertVersion>
92+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24522.1</MicrosoftDotNetXUnitExtensionsVersion>
93+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.24522.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
94+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24522.1</MicrosoftDotNetBuildTasksArchivesVersion>
95+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24522.1</MicrosoftDotNetBuildTasksInstallersVersion>
96+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24522.1</MicrosoftDotNetBuildTasksPackagingVersion>
97+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24522.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
98+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24522.1</MicrosoftDotNetBuildTasksTemplatingVersion>
99+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24522.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
100+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24522.1</MicrosoftDotNetRemoteExecutorVersion>
101+
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24522.1</MicrosoftDotNetVersionToolsTasksVersion>
102+
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24522.1</MicrosoftDotNetPackageTestingVersion>
103103
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
104104
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
105105
<!-- NuGet dependencies -->
@@ -258,7 +258,7 @@
258258
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
259259
<!-- sdk version, for testing workloads -->
260260
<SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>
261-
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>9.0.0-alpha.1.24175.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
261+
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.24514.4</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
262262
<EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
263263
<NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>
264264
<!-- The package path for python in src/mono/mono.proj needs to be updated if this changes-->

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "9.0.100-rc.2.24474.11"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24515.3",
12-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24515.3",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24515.3",
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24522.1",
12+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24522.1",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24522.1",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.24522.5"

‎src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/ActivityTracker.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@ private static unsafe int AddIdToGuid(Guid* outPtr, int whereToAddId, uint id, b
464464
{
465465
// Indicate this is a 1 byte multicode with 4 high order bits in the lower nibble.
466466
*ptr = (byte)(((uint)NumberListCodes.MultiByte1 << 4) + (id >> 8));
467+
len--; // The id's 4 high order bits were written into the multicode byte, so update the length.
467468
id &= 0xFF; // Now we only want the low order bits.
468469
}
469470
ptr++;

0 commit comments

Comments
 (0)