Skip to content

Commit 946c391

Browse files
thaystgthaystg
committed
Merge remote-tracking branch 'origin/main' into thays_hot_reload_debug
* 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) ...
2 parents 45aa206 + 41e6601 commit 946c391

File tree

169 files changed

+2437
-1649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+2437
-1649
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": "1.0.0-prerelease.21328.4",
18+
"version": "1.0.0-prerelease.21330.2",
1919
"commands": [
2020
"xharness"
2121
]

‎docs/workflow/trimming/feature-switches.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ configurations but their defaults might vary as any SDK can set the defaults dif
1313
| EnableUnsafeBinaryFormatterSerialization | System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization | BinaryFormatter serialization support is trimmed when set to false |
1414
| EventSourceSupport | System.Diagnostics.Tracing.EventSource.IsSupported | Any EventSource related code or logic is trimmed when set to false |
1515
| InvariantGlobalization | System.Globalization.Invariant | All globalization specific code and data is trimmed when set to true |
16+
| PredefinedCulturesOnly | System.Globalization.PredefinedCulturesOnly | Don't allow creating a culture for which the platform does not have data |
1617
| UseSystemResourceKeys | System.Resources.UseSystemResourceKeys | Any localizable resources for system assemblies is trimmed when set to true |
1718
| HttpActivityPropagationSupport | System.Net.Http.EnableActivityPropagation | Any dependency related to diagnostics support for System.Net.Http is trimmed when set to false |
1819
| UseNativeHttpHandler | System.Net.Http.UseNativeHttpHandler | HttpClient uses by default platform native implementation of HttpMessageHandler if set to true. |

‎eng/Version.Details.xml‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -8,67 +8,71 @@
88
<Uri>https://github.com/dotnet/msquic</Uri>
99
<Sha>d7db669b70f4dd67ec001c192f9809c218cab88b</Sha>
1010
</Dependency>
11+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.23.Node.win-x64" Version="6.0.0-preview.7.21330.1">
12+
<Uri>https://github.com/dotnet/emsdk</Uri>
13+
<Sha>f5349765b7af1970c5b25cce4ed278544907cbe0</Sha>
14+
</Dependency>
1115
</ProductDependencies>
1216
<ToolsetDependencies>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21329.8">
17+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21330.2">
1418
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
19+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
1620
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21329.8">
21+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21330.2">
1822
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
23+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
2024
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21329.8">
25+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21330.2">
2226
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
27+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
2428
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21329.8">
29+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21330.2">
2630
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
31+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
2832
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21329.8">
33+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21330.2">
3034
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
35+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
3236
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21329.8">
37+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21330.2">
3438
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
39+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
3640
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21329.8">
41+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21330.2">
3842
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
43+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
4044
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21329.8">
45+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21330.2">
4246
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
47+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
4448
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21329.8">
49+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21330.2">
4650
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
51+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
4852
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21329.8">
53+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21330.2">
5054
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
55+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
5256
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21329.8">
57+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21330.2">
5458
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
59+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
5660
</Dependency>
5761
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21330.3">
5862
<Uri>https://github.com/dotnet/arcade</Uri>
5963
<Sha>ff3e7d23139c30feefe36d3d4e8d41a06160f254</Sha>
6064
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21329.8">
65+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21330.2">
6266
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
67+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
6468
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21329.8">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21330.2">
6670
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
71+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
6872
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21329.8">
73+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21330.2">
7074
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
75+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
7276
</Dependency>
7377
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21330.3">
7478
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -182,41 +186,37 @@
182186
<Uri>https://github.com/mono/linker</Uri>
183187
<Sha>f574448d16af45f7ac2c4b89d71dea73dec86726</Sha>
184188
</Dependency>
185-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21328.4">
189+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21330.2">
186190
<Uri>https://github.com/dotnet/xharness</Uri>
187-
<Sha>2890d740e1dd9fc41a634777c4af59a3986b1f7b</Sha>
191+
<Sha>6d17e5ba4709de02f2e5c62a308f8518253cb002</Sha>
188192
</Dependency>
189-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21328.4">
193+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21330.2">
190194
<Uri>https://github.com/dotnet/xharness</Uri>
191-
<Sha>2890d740e1dd9fc41a634777c4af59a3986b1f7b</Sha>
195+
<Sha>6d17e5ba4709de02f2e5c62a308f8518253cb002</Sha>
192196
</Dependency>
193-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21329.8">
197+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21330.2">
194198
<Uri>https://github.com/dotnet/arcade</Uri>
195-
<Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha>
199+
<Sha>26345756f99087811b1fe4d02ff213eb172ec506</Sha>
196200
</Dependency>
197-
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21329.4">
201+
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21330.5">
198202
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
199-
<Sha>b89374348ff2344a625677584be9dfc9bea2b971</Sha>
203+
<Sha>366fc54b3a9b6226dbbbf3672fae78ba82e82b6f</Sha>
200204
</Dependency>
201-
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21329.4">
205+
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21330.5">
202206
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
203-
<Sha>b89374348ff2344a625677584be9dfc9bea2b971</Sha>
207+
<Sha>366fc54b3a9b6226dbbbf3672fae78ba82e82b6f</Sha>
204208
</Dependency>
205-
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21329.4">
209+
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21330.5">
206210
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
207-
<Sha>b89374348ff2344a625677584be9dfc9bea2b971</Sha>
211+
<Sha>366fc54b3a9b6226dbbbf3672fae78ba82e82b6f</Sha>
208212
</Dependency>
209-
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21329.4">
213+
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21330.5">
210214
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
211-
<Sha>b89374348ff2344a625677584be9dfc9bea2b971</Sha>
212-
</Dependency>
213-
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.23.Node.win-x64" Version="6.0.0-preview.7.21330.1">
214-
<Uri>https://github.com/dotnet/emsdk</Uri>
215-
<Sha>f5349765b7af1970c5b25cce4ed278544907cbe0</Sha>
215+
<Sha>366fc54b3a9b6226dbbbf3672fae78ba82e82b6f</Sha>
216216
</Dependency>
217-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21328.1">
217+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21330.1">
218218
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
219-
<Sha>2b1536142083d6270dc40c5cba74fbb0a612beab</Sha>
219+
<Sha>a8e0dc88077495e43d7820f631815fa95ce92f8a</Sha>
220220
</Dependency>
221221
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.21314.1">
222222
<Uri>https://github.com/dotnet/runtime-assets</Uri>

‎eng/Versions.props‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@
5050
<MicrosoftCodeAnalysisCSharpVersion>3.10.0</MicrosoftCodeAnalysisCSharpVersion>
5151
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21324.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
5252
<!-- Arcade dependencies -->
53-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21329.8</MicrosoftDotNetApiCompatVersion>
54-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21329.8</MicrosoftDotNetBuildTasksFeedVersion>
55-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21329.8</MicrosoftDotNetCodeAnalysisVersion>
56-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21329.8</MicrosoftDotNetGenAPIVersion>
57-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21329.8</MicrosoftDotNetGenFacadesVersion>
58-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21329.8</MicrosoftDotNetXUnitExtensionsVersion>
59-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21329.8</MicrosoftDotNetXUnitConsoleRunnerVersion>
60-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21329.8</MicrosoftDotNetBuildTasksArchivesVersion>
61-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21329.8</MicrosoftDotNetBuildTasksPackagingVersion>
62-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21329.8</MicrosoftDotNetBuildTasksInstallersVersion>
63-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21329.8</MicrosoftDotNetRemoteExecutorVersion>
64-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21329.8</MicrosoftDotNetVersionToolsTasksVersion>
65-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21329.8</MicrosoftDotNetPackageTestingVersion>
53+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21330.2</MicrosoftDotNetApiCompatVersion>
54+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21330.2</MicrosoftDotNetBuildTasksFeedVersion>
55+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21330.2</MicrosoftDotNetCodeAnalysisVersion>
56+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21330.2</MicrosoftDotNetGenAPIVersion>
57+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21330.2</MicrosoftDotNetGenFacadesVersion>
58+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21330.2</MicrosoftDotNetXUnitExtensionsVersion>
59+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21330.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
60+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21330.2</MicrosoftDotNetBuildTasksArchivesVersion>
61+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21330.2</MicrosoftDotNetBuildTasksPackagingVersion>
62+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21330.2</MicrosoftDotNetBuildTasksInstallersVersion>
63+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21330.2</MicrosoftDotNetRemoteExecutorVersion>
64+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21330.2</MicrosoftDotNetVersionToolsTasksVersion>
65+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21330.2</MicrosoftDotNetPackageTestingVersion>
6666
<!-- NuGet dependencies -->
6767
<NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion>
6868
<!-- Installer dependencies -->
@@ -122,10 +122,10 @@
122122
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21314.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
123123
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21314.1</SystemWindowsExtensionsTestDataVersion>
124124
<!-- dotnet-optimization dependencies -->
125-
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21329.4</optimizationwindows_ntx64MIBCRuntimeVersion>
126-
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21329.4</optimizationwindows_ntx86MIBCRuntimeVersion>
127-
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21329.4</optimizationlinuxx64MIBCRuntimeVersion>
128-
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.21329.4</optimizationPGOCoreCLRVersion>
125+
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21330.5</optimizationwindows_ntx64MIBCRuntimeVersion>
126+
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21330.5</optimizationwindows_ntx86MIBCRuntimeVersion>
127+
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21330.5</optimizationlinuxx64MIBCRuntimeVersion>
128+
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.21330.5</optimizationPGOCoreCLRVersion>
129129
<!-- Not auto-updated. -->
130130
<MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion>
131131
<SystemCommandLineVersion>2.0.0-beta1.20253.1</SystemCommandLineVersion>
@@ -149,9 +149,9 @@
149149
<!-- Testing -->
150150
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
151151
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
152-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21328.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
153-
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21328.4</MicrosoftDotNetXHarnessCLIVersion>
154-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21328.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
152+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21330.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
153+
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21330.2</MicrosoftDotNetXHarnessCLIVersion>
154+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21330.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
155155
<XUnitVersion>2.4.1</XUnitVersion>
156156
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
157157
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>

‎eng/testing/ILLink.Descriptor.xunit.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,10 @@
1515
<namespace fullname="Xunit" />
1616
<namespace fullname="Xunit.Sdk" />
1717
</assembly>
18+
<assembly fullname="xunit.assert">
19+
<type fullname="Xunit.Sdk.AssertEqualityComparer`1">
20+
<method signature="System.Boolean CompareTypedSets(System.Collections.IEnumerable,System.Collections.IEnumerable)" />
21+
</type>
22+
</assembly>
1823
<assembly fullname="xunit.runner.utility.netcoreapp10" />
1924
</linker>

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"msbuild-sdks": {
1515
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21330.3",
1616
"Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7",
17-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21329.8",
18-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21329.8",
17+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21330.2",
18+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21330.2",
1919
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21330.3",
2020
"Microsoft.Build.NoTargets": "3.0.4",
2121
"Microsoft.Build.Traversal": "3.0.23",

0 commit comments

Comments
 (0)