Skip to content

Commit 0c20206

Browse files
committed
Merge in 'release/6.0' changes
2 parents 7deb767 + f2b3063 commit 0c20206

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
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": "6.0.0-prerelease.23316.1",
18+
"version": "6.0.0-prerelease.23401.2",
1919
"commands": [
2020
"xharness"
2121
]

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,13 @@
214214
<Uri>https://github.com/mono/linker</Uri>
215215
<Sha>c8499798a2a09639174e2f5c694d6652794cc73d</Sha>
216216
</Dependency>
217-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.23316.1">
217+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.23401.2">
218218
<Uri>https://github.com/dotnet/xharness</Uri>
219-
<Sha>7370c34d6af084a9dce5c755b0d7d1defdc96fec</Sha>
219+
<Sha>5aa438c8aa5ca20646b5d91149fd9be8646dbe65</Sha>
220220
</Dependency>
221-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.23316.1">
221+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.23401.2">
222222
<Uri>https://github.com/dotnet/xharness</Uri>
223-
<Sha>7370c34d6af084a9dce5c755b0d7d1defdc96fec</Sha>
223+
<Sha>5aa438c8aa5ca20646b5d91149fd9be8646dbe65</Sha>
224224
</Dependency>
225225
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.23361.3">
226226
<Uri>https://github.com/dotnet/arcade</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@
143143
<!-- Testing -->
144144
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
145145
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
146-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>6.0.0-prerelease.23316.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
147-
<MicrosoftDotNetXHarnessCLIVersion>6.0.0-prerelease.23316.1</MicrosoftDotNetXHarnessCLIVersion>
146+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>6.0.0-prerelease.23401.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
147+
<MicrosoftDotNetXHarnessCLIVersion>6.0.0-prerelease.23401.2</MicrosoftDotNetXHarnessCLIVersion>
148148
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.23226.4</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
149149
<XUnitVersion>2.4.2-pre.9</XUnitVersion>
150150
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>

0 commit comments

Comments
 (0)