Skip to content

Commit 821731b

Browse files
dotnet-maestro[bot]ViktorHoferakoeplingerMichalStrehovsky
authored and
tmds
committed
[main] Update dependencies from dotnet/arcade (dotnet#97087)
* Update dependencies from https://github.com/dotnet/arcade build 20240116.3 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 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24066.3 * Update Versions.props * Make xunit.props respect different versions and assert libraries * Update dependencies from https://github.com/dotnet/arcade build 20240116.3 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 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24066.3 * Avoid XUNIT_SPAN unambiguous call issues * Disable obsoletion warning for xunit Delegating*Sink * Fix nullable collection test * Fix "DynamicObject_MissingProperty" null test * Remove unnecessary Extensions references * Update dependencies from xharness 9.0.0-prerelease.24066.3 * Try to fix TryCatchFinally test for real * Fix TryCatchFinally for real real * Update dependencies from https://github.com/dotnet/arcade build 20240117.4 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 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24067.4 * Fix TryCatchFinally for real real real * Update dependencies from https://github.com/dotnet/arcade build 20240118.1 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 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24068.1 * Work around Mono issue in AppDomainTests.AssemblyLoad * Update dependencies from https://github.com/dotnet/arcade build 20240118.4 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 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24068.4 * Update dependencies from https://github.com/dotnet/arcade build 20240119.2 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 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24069.2 * Update xunit.props * Update xunit.props * Update dependencies from https://github.com/dotnet/arcade build 20240119.2 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 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24069.2 * Disable DisabledRuntimeMarshalling_Disabled_NativeAssemblyEnabled test See dotnet#97272 * Disable AmbiguousImplementationException.ilproj and Pause_ro.csproj too They also fail with dotnet#97272 * Disable Regression2_Regressions.csproj too * Revert "Disable Regression2_Regressions.csproj too" This reverts commit 4a6bdb8. * Revert "Disable AmbiguousImplementationException.ilproj and Pause_ro.csproj too" This reverts commit f5729ce. * Revert "Disable DisabledRuntimeMarshalling_Disabled_NativeAssemblyEnabled test" This reverts commit 2267a5c. * Work around IsPrimitive compilation issue --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]> Co-authored-by: Alexander Köplinger <[email protected]> Co-authored-by: Michal Strehovský <[email protected]>
1 parent 0552936 commit 821731b

File tree

30 files changed

+157
-123
lines changed

30 files changed

+157
-123
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "9.0.0-prerelease.23611.1",
18+
"version": "9.0.0-prerelease.24066.3",
1919
"commands": [
2020
"xharness"
2121
]

‎eng/Version.Details.xml‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -111,82 +111,82 @@
111111
</Dependency>
112112
</ProductDependencies>
113113
<ToolsetDependencies>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23607.2">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24069.2">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
116+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23607.2">
119+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24069.2">
120120
<Uri>https://github.com/dotnet/arcade</Uri>
121-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
121+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
122122
</Dependency>
123-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23607.2">
123+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24069.2">
124124
<Uri>https://github.com/dotnet/arcade</Uri>
125-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
125+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
126126
</Dependency>
127-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23607.2">
127+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24069.2">
128128
<Uri>https://github.com/dotnet/arcade</Uri>
129-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
129+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
130130
</Dependency>
131-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23607.2">
131+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24069.2">
132132
<Uri>https://github.com/dotnet/arcade</Uri>
133-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
133+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
134134
</Dependency>
135-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="9.0.0-beta.23607.2">
135+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24069.2">
136136
<Uri>https://github.com/dotnet/arcade</Uri>
137-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
137+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
138138
</Dependency>
139-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23607.2">
139+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24069.2">
140140
<Uri>https://github.com/dotnet/arcade</Uri>
141-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
141+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
142142
</Dependency>
143-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.3-beta.23607.2">
143+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24069.2">
144144
<Uri>https://github.com/dotnet/arcade</Uri>
145-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
145+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
146146
</Dependency>
147-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.23607.2">
147+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24069.2">
148148
<Uri>https://github.com/dotnet/arcade</Uri>
149-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
149+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
150150
</Dependency>
151-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.23607.2">
151+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24069.2">
152152
<Uri>https://github.com/dotnet/arcade</Uri>
153-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
153+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
154154
</Dependency>
155-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23607.2">
155+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24069.2">
156156
<Uri>https://github.com/dotnet/arcade</Uri>
157-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
157+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23607.2">
159+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24069.2">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
161+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.23607.2">
163+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24069.2">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
165+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23607.2">
167+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24069.2">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
169+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.23607.2">
171+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24069.2">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
173+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23607.2">
175+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24069.2">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
177+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
178178
</Dependency>
179-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.23607.2">
179+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24069.2">
180180
<Uri>https://github.com/dotnet/arcade</Uri>
181-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
181+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
182182
</Dependency>
183-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.23607.2">
183+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24069.2">
184184
<Uri>https://github.com/dotnet/arcade</Uri>
185-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
185+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
186186
</Dependency>
187-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.23607.2">
187+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24069.2">
188188
<Uri>https://github.com/dotnet/arcade</Uri>
189-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
189+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
190190
</Dependency>
191191
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24068.1">
192192
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -321,21 +321,21 @@
321321
<Uri>https://github.com/dotnet/runtime</Uri>
322322
<Sha>6f9d6569684cc17015aa6fc5f9d9a5f7580ade97</Sha>
323323
</Dependency>
324-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.23611.1">
324+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24066.3">
325325
<Uri>https://github.com/dotnet/xharness</Uri>
326-
<Sha>a855ee8bf3e90a5baef9de25ccff5be597390087</Sha>
326+
<Sha>fa3b643cc0b028ae875546b7527927adcfcd9348</Sha>
327327
</Dependency>
328-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.23611.1">
328+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.24066.3">
329329
<Uri>https://github.com/dotnet/xharness</Uri>
330-
<Sha>a855ee8bf3e90a5baef9de25ccff5be597390087</Sha>
330+
<Sha>fa3b643cc0b028ae875546b7527927adcfcd9348</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.23611.1">
332+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24066.3">
333333
<Uri>https://github.com/dotnet/xharness</Uri>
334-
<Sha>a855ee8bf3e90a5baef9de25ccff5be597390087</Sha>
334+
<Sha>fa3b643cc0b028ae875546b7527927adcfcd9348</Sha>
335335
</Dependency>
336-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.23607.2">
336+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24069.2">
337337
<Uri>https://github.com/dotnet/arcade</Uri>
338-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
338+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
339339
</Dependency>
340340
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24056.4">
341341
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,24 @@
8282
<!-- SDK dependencies -->
8383
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-alpha.1.23551.3</MicrosoftDotNetApiCompatTaskVersion>
8484
<!-- Arcade dependencies -->
85-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksFeedVersion>
86-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.23607.2</MicrosoftDotNetCodeAnalysisVersion>
87-
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.23607.2</MicrosoftDotNetGenAPIVersion>
88-
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.23607.2</MicrosoftDotNetGenFacadesVersion>
89-
<MicrosoftDotNetXUnitAssertVersion>9.0.0-beta.23607.2</MicrosoftDotNetXUnitAssertVersion>
90-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.23607.2</MicrosoftDotNetXUnitExtensionsVersion>
91-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.3-beta.23607.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
92-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksArchivesVersion>
93-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksInstallersVersion>
94-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksPackagingVersion>
95-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
96-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksTemplatingVersion>
97-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
98-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23607.2</MicrosoftDotNetRemoteExecutorVersion>
99-
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.23607.2</MicrosoftDotNetVersionToolsTasksVersion>
100-
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.23607.2</MicrosoftDotNetPackageTestingVersion>
85+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksFeedVersion>
86+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24069.2</MicrosoftDotNetCodeAnalysisVersion>
87+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24069.2</MicrosoftDotNetGenAPIVersion>
88+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24069.2</MicrosoftDotNetGenFacadesVersion>
89+
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24069.2</MicrosoftDotNetXUnitAssertVersion>
90+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24069.2</MicrosoftDotNetXUnitExtensionsVersion>
91+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24069.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
92+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksArchivesVersion>
93+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksInstallersVersion>
94+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksPackagingVersion>
95+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
96+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksTemplatingVersion>
97+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
98+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24069.2</MicrosoftDotNetRemoteExecutorVersion>
99+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24069.2</MicrosoftDotNetVersionToolsTasksVersion>
100+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24069.2</MicrosoftDotNetPackageTestingVersion>
101+
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
102+
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
101103
<!-- NuGet dependencies -->
102104
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
103105
<!-- Installer dependencies -->
@@ -179,9 +181,9 @@
179181
<!-- Testing -->
180182
<MicrosoftNETCoreCoreDisToolsVersion>1.4.0</MicrosoftNETCoreCoreDisToolsVersion>
181183
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
182-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.23611.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
183-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.23611.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
184-
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.23611.1</MicrosoftDotNetXHarnessCLIVersion>
184+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24066.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
185+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24066.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
186+
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24066.3</MicrosoftDotNetXHarnessCLIVersion>
185187
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.24065.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
186188
<NUnitVersion>3.12.0</NUnitVersion>
187189
<NUnitTestAdapterVersion>4.1.0</NUnitTestAdapterVersion>

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ usage()
88
echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86"
99
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
1010
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
11-
echo " for FreeBSD can be: freebsd12, freebsd13"
11+
echo " for FreeBSD can be: freebsd13, freebsd14"
1212
echo " for illumos can be: illumos"
1313
echo " for Haiku can be: haiku."
1414
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
@@ -71,9 +71,9 @@ __AlpinePackages+=" krb5-dev"
7171
__AlpinePackages+=" openssl-dev"
7272
__AlpinePackages+=" zlib-dev"
7373

74-
__FreeBSDBase="12.4-RELEASE"
75-
__FreeBSDPkg="1.17.0"
76-
__FreeBSDABI="12"
74+
__FreeBSDBase="13.2-RELEASE"
75+
__FreeBSDPkg="1.20.0"
76+
__FreeBSDABI="13"
7777
__FreeBSDPackages="libunwind"
7878
__FreeBSDPackages+=" icu"
7979
__FreeBSDPackages+=" libinotify"
@@ -334,14 +334,14 @@ while :; do
334334
__AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion"
335335
fi
336336
;;
337-
freebsd12)
337+
freebsd13)
338338
__CodeName=freebsd
339339
__SkipUnmount=1
340340
;;
341-
freebsd13)
341+
freebsd14)
342342
__CodeName=freebsd
343-
__FreeBSDBase="13.2-RELEASE"
344-
__FreeBSDABI="13"
343+
__FreeBSDBase="14.0-RELEASE"
344+
__FreeBSDABI="14"
345345
__SkipUnmount=1
346346
;;
347347
illumos)

‎eng/testing/xunit/xunit.props‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Condition="'$(IncludeRemoteExecutor)' == 'true'" Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
10-
119
<!-- Excluding xunit.core/build as it enables deps file generation. -->
12-
<PackageReference Include="xunit" Version="$(XUnitVersion)" ExcludeAssets="build" />
13-
<PackageReference Include="xunit.analyzers" Version="$(XUnitAnalyzersVersion)" ExcludeAssets="build" />
10+
<PackageReference Include="xunit.core" Version="$(XUnitVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true" ExcludeAssets="build" />
11+
<PackageReference Include="xunit.analyzers" Version="$(XUnitAnalyzersVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true" />
12+
13+
<PackageReference Include="xunit.assert" Version="$(XUnitVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
14+
<PackageReference Include="Microsoft.DotNet.XUnitAssert" Version="$(MicrosoftDotNetXUnitAssertVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
15+
1416
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
17+
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" Condition="'$(IncludeRemoteExecutor)' == 'true'" />
1518

1619
<!--
1720
Microsoft.Net.Test.Sdk has a dependency on Newtonsoft.Json v9.0.1. We upgrade the dependency version

‎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-alpha.1.23615.4"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23607.2",
12-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23607.2",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23607.2",
11+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24069.2",
12+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24069.2",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24069.2",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.24064.3"

‎src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,14 @@ public static int Main(string[] args)
4444
var diagnosticSink = new ConsoleDiagnosticMessageSink();
4545
var testsFinished = new TaskCompletionSource();
4646
var testSink = new TestMessageSink();
47+
48+
#pragma warning disable CS0618 // Delegating*Sink types are marked obsolete
4749
var summarySink = new DelegatingExecutionSummarySink(testSink,
4850
() => false,
4951
(completed, summary) => Console.WriteLine($"Tests run: {summary.Total}, Errors: {summary.Errors}, Failures: {summary.Failed}, Skipped: {summary.Skipped}. Time: {TimeSpan.FromSeconds((double)summary.Time).TotalSeconds}s"));
5052
var resultsXmlAssembly = new XElement("assembly");
5153
var resultsSink = new DelegatingXmlCreationSink(summarySink, resultsXmlAssembly);
54+
#pragma warning restore CS0618
5255

5356
testSink.Execution.TestSkippedEvent += args => { Console.WriteLine($"[SKIP] {args.Message.Test.DisplayName}"); };
5457
testSink.Execution.TestFailedEvent += args => { Console.WriteLine($"[FAIL] {args.Message.Test.DisplayName}{Environment.NewLine}{Xunit.ExceptionUtility.CombineMessages(args.Message)}{Environment.NewLine}{Xunit.ExceptionUtility.CombineStackTraces(args.Message)}"); };

‎src/libraries/System.IO.Ports/tests/SerialPort/ReadLine.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ public void Read_LargeBuffer()
493493
com1.Write(com1.NewLine);
494494

495495
string receivedLine = com2.ReadLine();
496-
Assert.Equal(charactersToWrite, receivedLine);
496+
Assert.Equal(charactersToWrite, receivedLine.ToCharArray());
497497
}
498498
}
499499

‎src/libraries/System.IO.Ports/tests/SerialPort/ReadTo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ public void Read_LargeBuffer()
517517
com1.Write(endString);
518518

519519
string received = com2.ReadTo(endString);
520-
Assert.Equal(buffer, received);
520+
Assert.Equal(buffer, received.ToCharArray());
521521
}
522522
}
523523

‎src/libraries/System.Memory/tests/Memory/CopyTo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static void TryCopyToArraySegmentImplicit()
4141
Memory<int> srcMemory = src;
4242
bool success = srcMemory.TryCopyTo(segment);
4343
Assert.True(success);
44-
Assert.Equal<int>(src, segment);
44+
Assert.Equal(src, segment);
4545
}
4646

4747
[Fact]

0 commit comments

Comments
 (0)