Skip to content

Commit 9fe9492

Browse files
carlossanlopcarlossanlop
authored
Merge pull request #113446 from dotnet/darc-release/8.0-staging-9737b4a5-08f0-42d6-9378-a9d63438cd61
[release/8.0] Update dependencies from dotnet/arcade
2 parents 72d496b + f4764bf commit 9fe9492

File tree

6 files changed

+60
-55
lines changed

6 files changed

+60
-55
lines changed

‎NuGet.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12-
<add key="darc-pub-dotnet-emsdk-ec84e77" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775/nuget/v3/index.json" />
1312
<add key="darc-pub-dotnet-emsdk-6afd7b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6afd7b9f/nuget/v3/index.json" />
1413
<!-- End: Package sources from dotnet-emsdk -->
1514
<!-- Begin: Package sources from dotnet-sdk -->

‎eng/Version.Details.xml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -111,79 +111,79 @@
111111
</Dependency>
112112
</ProductDependencies>
113113
<ToolsetDependencies>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25114.5">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25120.1">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
116+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119119
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
120120
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
121121
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
122122
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
123123
</Dependency>
124-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25114.5">
124+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25120.1">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
126+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25114.5">
128+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25120.1">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
130+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25114.5">
132+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25120.1">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
134+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25114.5">
136+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25120.1">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
138+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25114.5">
140+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25120.1">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
142+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25114.5">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25120.1">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
146+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25114.5">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25120.1">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
150+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25114.5">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25120.1">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
154+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
155155
</Dependency>
156-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25114.5">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25120.1">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
158+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25114.5">
160+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25120.1">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
162+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25114.5">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25120.1">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
166+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25114.5">
168+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25120.1">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
170+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25114.5">
172+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25120.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
174+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25114.5">
176+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25120.1">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
178+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25114.5">
180+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25120.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
182+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25114.5">
184+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25120.1">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
186+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
187187
</Dependency>
188188
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25113.1">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -334,9 +334,9 @@
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335335
<Sha>d33548342ade8e537d891c8f0f593aa206418625</Sha>
336336
</Dependency>
337-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25114.5">
337+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25120.1">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
339-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
339+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
340340
</Dependency>
341341
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23566.3">
342342
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,21 @@
8787
<!-- SDK dependencies -->
8888
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
8989
<!-- Arcade dependencies -->
90-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25114.5</MicrosoftDotNetBuildTasksFeedVersion>
91-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25114.5</MicrosoftDotNetCodeAnalysisVersion>
92-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25114.5</MicrosoftDotNetGenAPIVersion>
93-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25114.5</MicrosoftDotNetGenFacadesVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25114.5</MicrosoftDotNetXUnitExtensionsVersion>
95-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25114.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
96-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25114.5</MicrosoftDotNetBuildTasksArchivesVersion>
97-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25114.5</MicrosoftDotNetBuildTasksInstallersVersion>
98-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25114.5</MicrosoftDotNetBuildTasksPackagingVersion>
99-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25114.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25114.5</MicrosoftDotNetBuildTasksTemplatingVersion>
101-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25114.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25114.5</MicrosoftDotNetRemoteExecutorVersion>
103-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25114.5</MicrosoftDotNetVersionToolsTasksVersion>
104-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25114.5</MicrosoftDotNetPackageTestingVersion>
90+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksFeedVersion>
91+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25120.1</MicrosoftDotNetCodeAnalysisVersion>
92+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25120.1</MicrosoftDotNetGenAPIVersion>
93+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25120.1</MicrosoftDotNetGenFacadesVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25120.1</MicrosoftDotNetXUnitExtensionsVersion>
95+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25120.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
96+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksArchivesVersion>
97+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksInstallersVersion>
98+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksPackagingVersion>
99+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksTemplatingVersion>
101+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25120.1</MicrosoftDotNetRemoteExecutorVersion>
103+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25120.1</MicrosoftDotNetVersionToolsTasksVersion>
104+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25120.1</MicrosoftDotNetPackageTestingVersion>
105105
<!-- NuGet dependencies -->
106106
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
107107
<!-- Installer dependencies -->

‎eng/common/cross/toolchain.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
280280
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
281281
add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
282282
endif()
283+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
284+
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
283285
elseif(TARGET_ARCH_NAME STREQUAL "x86")
284286
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
285287
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -327,6 +329,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
327329
if(TARGET_ARCH_NAME STREQUAL "armel")
328330
add_compile_options(-mfloat-abi=softfp)
329331
endif()
332+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
333+
add_compile_options("--target=${TOOLCHAIN}")
330334
elseif(TARGET_ARCH_NAME STREQUAL "x86")
331335
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
332336
add_compile_options(--target=${TOOLCHAIN})

‎global.json

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

‎src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ public async Task TestBasicReceiveAndResponseEvents()
145145
}
146146
}
147147

148+
[ActiveIssue("https://github.com/dotnet/runtime/issues/112792")]
148149
[OuterLoop]
149150
[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
150151
public void TestW3CHeaders()
@@ -194,6 +195,7 @@ public void TestW3CHeadersTraceStateAndCorrelationContext()
194195
{
195196
using (var eventRecords = new EventObserverAndRecorder())
196197
{
198+
Activity.DefaultIdFormat = ActivityIdFormat.W3C;
197199
var parent = new Activity("w3c activity");
198200
parent.SetParentId(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom());
199201
parent.TraceStateString = "some=state";

0 commit comments

Comments
 (0)