Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into thays_hot_reload_debug
Browse files Browse the repository at this point in the history 
* origin/main: (27 commits)
  [mono][llvm] Only emit 'LLVM failed' messages on verbosity > 0. (dotnet#55060)
  Http2Stream throws a wrapped Http2ConnectionException on GO_AWAY (dotnet#54625)
  [main] Update dependencies from dnceng/internal/dotnet-optimization dotnet/arcade dotnet/xharness dotnet/hotreload-utils (dotnet#55007)
  disable a failing test. (dotnet#55063)
  [mono][wasm] Disable some tests which crash on AOT. (dotnet#55054)
  Fix fix_allocation_context for regions (dotnet#54931)
  Delete stale references to System.IO.FileSystem.Primitives (dotnet#55041)
  Add binplaced analyzers to ASP.NET transport package (dotnet#55042)
  [mono] Enable many HardwareIntrinsic tests on wasm
  Delete `compQuirkForPPP`. (dotnet#55050)
  [Mono] Condition Workload AOT import to be osx only (dotnet#55040)
  package native quic library (dotnet#54992)
  Make GlobalizationMode code consistent (dotnet#55039)
  Expand PerfMap format to support metadata for symbol indexation (dotnet#53792)
  [debugger]Componentize debugger (dotnet#54887)
  [Mono] Include loaded interpreter methods as EventPipe session rundown method events. (dotnet#54953)
  Delete stale ActiveIssue from HttpHeadersTest (dotnet#55027)
  Poison address-exposed user variables in debug (dotnet#54685)
  Recategorize emsdk dependency (dotnet#55028)
  Remove the the wasm AOT specific test project exclusions (dotnet#54988)
  ...
  • Loading branch information
@thaystg
thaystg committed Jul 2, 2021
2 parents 45aa206 + 41e6601 commit 946c391
Show file tree
Hide file tree
Showing 169 changed files with 2,437 additions and 1,649 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": "1.0.0-prerelease.21328.4",
"version": "1.0.0-prerelease.21330.2",
"commands": [
"xharness"
]
Expand Down
1 change: 1 addition & 0 deletions docs/workflow/trimming/feature-switches.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ configurations but their defaults might vary as any SDK can set the defaults dif
| EnableUnsafeBinaryFormatterSerialization | System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization | BinaryFormatter serialization support is trimmed when set to false |
| EventSourceSupport | System.Diagnostics.Tracing.EventSource.IsSupported | Any EventSource related code or logic is trimmed when set to false |
| InvariantGlobalization | System.Globalization.Invariant | All globalization specific code and data is trimmed when set to true |
| PredefinedCulturesOnly | System.Globalization.PredefinedCulturesOnly | Don't allow creating a culture for which the platform does not have data |
| UseSystemResourceKeys | System.Resources.UseSystemResourceKeys | Any localizable resources for system assemblies is trimmed when set to true |
| HttpActivityPropagationSupport | System.Net.Http.EnableActivityPropagation | Any dependency related to diagnostics support for System.Net.Http is trimmed when set to false |
| UseNativeHttpHandler | System.Net.Http.UseNativeHttpHandler | HttpClient uses by default platform native implementation of HttpMessageHandler if set to true. |
Expand Down
96 changes: 48 additions & 48 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,67 +8,71 @@
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>d7db669b70f4dd67ec001c192f9809c218cab88b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.23.Node.win-x64" Version="6.0.0-preview.7.21330.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>f5349765b7af1970c5b25cce4ed278544907cbe0</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21329.8">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21330.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ff3e7d23139c30feefe36d3d4e8d41a06160f254</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21330.3">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand Down Expand Up @@ -182,41 +186,37 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>f574448d16af45f7ac2c4b89d71dea73dec86726</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21328.4">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21330.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2890d740e1dd9fc41a634777c4af59a3986b1f7b</Sha>
<Sha>6d17e5ba4709de02f2e5c62a308f8518253cb002</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21328.4">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21330.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2890d740e1dd9fc41a634777c4af59a3986b1f7b</Sha>
<Sha>6d17e5ba4709de02f2e5c62a308f8518253cb002</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21329.8">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21330.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21329.4">
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21330.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>b89374348ff2344a625677584be9dfc9bea2b971</Sha>
<Sha>366fc54b3a9b6226dbbbf3672fae78ba82e82b6f</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21329.4">
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21330.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>b89374348ff2344a625677584be9dfc9bea2b971</Sha>
<Sha>366fc54b3a9b6226dbbbf3672fae78ba82e82b6f</Sha>
</Dependency>
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21329.4">
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21330.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>b89374348ff2344a625677584be9dfc9bea2b971</Sha>
<Sha>366fc54b3a9b6226dbbbf3672fae78ba82e82b6f</Sha>
</Dependency>
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21329.4">
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21330.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>b89374348ff2344a625677584be9dfc9bea2b971</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.23.Node.win-x64" Version="6.0.0-preview.7.21330.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>f5349765b7af1970c5b25cce4ed278544907cbe0</Sha>
<Sha>366fc54b3a9b6226dbbbf3672fae78ba82e82b6f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21328.1">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21330.1">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>2b1536142083d6270dc40c5cba74fbb0a612beab</Sha>
<Sha>a8e0dc88077495e43d7820f631815fa95ce92f8a</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.21314.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down
40 changes: 20 additions & 20 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@
<MicrosoftCodeAnalysisCSharpVersion>3.10.0</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21324.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21329.8</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21329.8</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21329.8</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21329.8</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21329.8</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21329.8</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21329.8</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21329.8</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21329.8</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21329.8</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21329.8</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21329.8</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21329.8</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21330.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21330.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21330.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21330.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21330.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21330.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21330.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21330.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21330.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21330.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21330.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21330.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21330.2</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -122,10 +122,10 @@
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21314.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21314.1</SystemWindowsExtensionsTestDataVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21329.4</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21329.4</optimizationwindows_ntx86MIBCRuntimeVersion>
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21329.4</optimizationlinuxx64MIBCRuntimeVersion>
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.21329.4</optimizationPGOCoreCLRVersion>
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21330.5</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21330.5</optimizationwindows_ntx86MIBCRuntimeVersion>
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21330.5</optimizationlinuxx64MIBCRuntimeVersion>
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.21330.5</optimizationPGOCoreCLRVersion>
<!-- Not auto-updated. -->
<MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion>
<SystemCommandLineVersion>2.0.0-beta1.20253.1</SystemCommandLineVersion>
Expand All @@ -149,9 +149,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21328.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21328.4</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21328.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21330.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21330.2</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21330.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
Expand Down
5 changes: 5 additions & 0 deletions eng/testing/ILLink.Descriptor.xunit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,10 @@
<namespace fullname="Xunit" />
<namespace fullname="Xunit.Sdk" />
</assembly>
<assembly fullname="xunit.assert">
<type fullname="Xunit.Sdk.AssertEqualityComparer`1">
<method signature="System.Boolean CompareTypedSets(System.Collections.IEnumerable,System.Collections.IEnumerable)" />
</type>
</assembly>
<assembly fullname="xunit.runner.utility.netcoreapp10" />
</linker>
4 changes: 2 additions & 2 deletions global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21330.3",
"Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21329.8",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21329.8",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21330.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21330.2",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21330.3",
"Microsoft.Build.NoTargets": "3.0.4",
"Microsoft.Build.Traversal": "3.0.23",
Expand Down
Loading

0 comments on commit 946c391

Please sign in to comment.