Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (dotnet#97087)
Browse files Browse the repository at this point in the history 
* 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 <viktor.hofer@microsoft.com>
Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
  • Loading branch information
@dotnet-maestro @ViktorHofer
@akoeplinger @MichalStrehovsky @tmds
5 people authored and tmds committed Jan 23, 2024
1 parent 0552936 commit 821731b
Show file tree
Hide file tree
Showing 30 changed files with 157 additions and 123 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "9.0.0-prerelease.23611.1",
"version": "9.0.0-prerelease.24066.3",
"commands": [
"xharness"
]
Expand Down
92 changes: 46 additions & 46 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,82 +111,82 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.3-beta.23607.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24068.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -321,21 +321,21 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>6f9d6569684cc17015aa6fc5f9d9a5f7580ade97</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.23611.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24066.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>a855ee8bf3e90a5baef9de25ccff5be597390087</Sha>
<Sha>fa3b643cc0b028ae875546b7527927adcfcd9348</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.23611.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.24066.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>a855ee8bf3e90a5baef9de25ccff5be597390087</Sha>
<Sha>fa3b643cc0b028ae875546b7527927adcfcd9348</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.23611.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24066.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>a855ee8bf3e90a5baef9de25ccff5be597390087</Sha>
<Sha>fa3b643cc0b028ae875546b7527927adcfcd9348</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.23607.2">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24056.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
40 changes: 21 additions & 19 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,24 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-alpha.1.23551.3</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.23607.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.23607.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.23607.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>9.0.0-beta.23607.2</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.23607.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.3-beta.23607.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23607.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.23607.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.23607.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24069.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24069.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24069.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24069.2</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24069.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24069.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24069.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24069.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24069.2</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -179,9 +181,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.4.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.23611.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.23611.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.23611.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24066.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24066.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24066.3</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.24065.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<NUnitVersion>3.12.0</NUnitVersion>
<NUnitTestAdapterVersion>4.1.0</NUnitTestAdapterVersion>
Expand Down
16 changes: 8 additions & 8 deletions eng/common/cross/build-rootfs.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ usage()
echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86"
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
echo " for FreeBSD can be: freebsd12, freebsd13"
echo " for FreeBSD can be: freebsd13, freebsd14"
echo " for illumos can be: illumos"
echo " for Haiku can be: haiku."
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
Expand Down Expand Up @@ -71,9 +71,9 @@ __AlpinePackages+=" krb5-dev"
__AlpinePackages+=" openssl-dev"
__AlpinePackages+=" zlib-dev"

__FreeBSDBase="12.4-RELEASE"
__FreeBSDPkg="1.17.0"
__FreeBSDABI="12"
__FreeBSDBase="13.2-RELEASE"
__FreeBSDPkg="1.20.0"
__FreeBSDABI="13"
__FreeBSDPackages="libunwind"
__FreeBSDPackages+=" icu"
__FreeBSDPackages+=" libinotify"
Expand Down Expand Up @@ -334,14 +334,14 @@ while :; do
__AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion"
fi
;;
freebsd12)
freebsd13)
__CodeName=freebsd
__SkipUnmount=1
;;
freebsd13)
freebsd14)
__CodeName=freebsd
__FreeBSDBase="13.2-RELEASE"
__FreeBSDABI="13"
__FreeBSDBase="14.0-RELEASE"
__FreeBSDABI="14"
__SkipUnmount=1
;;
illumos)
Expand Down
11 changes: 7 additions & 4 deletions eng/testing/xunit/xunit.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Condition="'$(IncludeRemoteExecutor)' == 'true'" Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />

<!-- Excluding xunit.core/build as it enables deps file generation. -->
<PackageReference Include="xunit" Version="$(XUnitVersion)" ExcludeAssets="build" />
<PackageReference Include="xunit.analyzers" Version="$(XUnitAnalyzersVersion)" ExcludeAssets="build" />
<PackageReference Include="xunit.core" Version="$(XUnitVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true" ExcludeAssets="build" />
<PackageReference Include="xunit.analyzers" Version="$(XUnitAnalyzersVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true" />

<PackageReference Include="xunit.assert" Version="$(XUnitVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
<PackageReference Include="Microsoft.DotNet.XUnitAssert" Version="$(MicrosoftDotNetXUnitAssertVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />

<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" Condition="'$(IncludeRemoteExecutor)' == 'true'" />

<!--
Microsoft.Net.Test.Sdk has a dependency on Newtonsoft.Json v9.0.1. We upgrade the dependency version
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "9.0.100-alpha.1.23615.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23607.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23607.2",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23607.2",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24069.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24069.2",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24069.2",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.24064.3"
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,14 @@ public static int Main(string[] args)
var diagnosticSink = new ConsoleDiagnosticMessageSink();
var testsFinished = new TaskCompletionSource();
var testSink = new TestMessageSink();

#pragma warning disable CS0618 // Delegating*Sink types are marked obsolete
var summarySink = new DelegatingExecutionSummarySink(testSink,
() => false,
(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"));
var resultsXmlAssembly = new XElement("assembly");
var resultsSink = new DelegatingXmlCreationSink(summarySink, resultsXmlAssembly);
#pragma warning restore CS0618

testSink.Execution.TestSkippedEvent += args => { Console.WriteLine($"[SKIP] {args.Message.Test.DisplayName}"); };
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)}"); };
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.IO.Ports/tests/SerialPort/ReadLine.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ public void Read_LargeBuffer()
com1.Write(com1.NewLine);

string receivedLine = com2.ReadLine();
Assert.Equal(charactersToWrite, receivedLine);
Assert.Equal(charactersToWrite, receivedLine.ToCharArray());
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.IO.Ports/tests/SerialPort/ReadTo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ public void Read_LargeBuffer()
com1.Write(endString);

string received = com2.ReadTo(endString);
Assert.Equal(buffer, received);
Assert.Equal(buffer, received.ToCharArray());
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Memory/tests/Memory/CopyTo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public static void TryCopyToArraySegmentImplicit()
Memory<int> srcMemory = src;
bool success = srcMemory.TryCopyTo(segment);
Assert.True(success);
Assert.Equal<int>(src, segment);
Assert.Equal(src, segment);
}

[Fact]
Expand Down
Loading

0 comments on commit 821731b

Please sign in to comment.