Skip to content

Commit 8402b21

Browse files
ViktorHoferViktorHofer
authored
Use xunit runner fork in coreclr (#77)
1 parent 0cb5378 commit 8402b21

4 files changed

Lines changed: 13 additions & 61 deletions

File tree

‎src/coreclr/dependencies.props‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<!-- Tests/infrastructure dependency versions. -->
99
<PropertyGroup>
1010
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview6.19280.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
11-
<XunitPackageVersion>2.4.1-pre.build.4059</XunitPackageVersion>
1211
<XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
1312
<MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.43</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
1413
<MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
@@ -42,49 +41,6 @@
4241
<ElementName>MicrosoftNETCoreRuntimeCoreCLRPackageVersion</ElementName>
4342
<PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId>
4443
</XmlUpdateStep>
45-
<UpdateStep Include="ILAsm">
46-
<UpdaterType>File</UpdaterType>
47-
<Path>$(MSBuildThisFileDirectory)ILAsmVersion.txt</Path>
48-
<PackageId>Microsoft.NETCore.ILAsm</PackageId>
49-
</UpdateStep>
50-
</ItemGroup>
51-
52-
<!-- Set up dependencies on packages that aren't found in a BuildInfo. -->
53-
<ItemGroup>
54-
<XUnitDependency Include="xunit"/>
55-
<XUnitDependency Include="xunit.assert"/>
56-
<XUnitDependency Include="xunit.core"/>
57-
<XUnitDependency Include="xunit.extensibility.core" />
58-
<XUnitDependency Include="xunit.runner.console"/>
59-
<XUnitDependency Include="xunit.runner.msbuild"/>
60-
<XUnitDependency Include="xunit.runner.utility"/>
61-
<StaticDependency Include="@(XUnitDependency)">
62-
<Version>$(XunitPackageVersion)</Version>
63-
</StaticDependency>
64-
65-
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance" />
66-
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.analysis" />
67-
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.analysis.cli" />
68-
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.metrics" />
69-
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.run.core" />
70-
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.runner.cli" />
71-
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.runner.Windows" />
72-
<StaticDependency Include="@(XunitPerformanceDependency)">
73-
<Version>1.0.0-alpha-build0040</Version>
74-
</StaticDependency>
75-
76-
<XUnitPerformanceApiDependency Include="xunit.performance.api" />
77-
<XUnitPerformanceApiDependency Include="xunit.performance.core" />
78-
<XUnitPerformanceApiDependency Include="xunit.performance.execution" />
79-
<XUnitPerformanceApiDependency Include="xunit.performance.metrics" />
80-
<StaticDependency Include="@(XUnitPerformanceApiDependency)">
81-
<Version>$(XunitPerformanceApiPackageVersion)</Version>
82-
</StaticDependency>
83-
84-
<DependencyBuildInfo Include="@(StaticDependency)">
85-
<PackageId>%(Identity)</PackageId>
86-
<UpdateStableVersions>true</UpdateStableVersions>
87-
</DependencyBuildInfo>
8844
</ItemGroup>
8945

9046
<!-- Override isolated build dependency versions with versions from Repo API. -->

‎src/coreclr/tests/external/external.csproj‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
<NuGetTargetMoniker>.NETCoreApp,Version=v3.0</NuGetTargetMoniker>
1717
<NuGetTargetMonikerShort>netcoreapp3.0</NuGetTargetMonikerShort>
1818
<RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
19-
<XUnitRunnerPackageId>xunit.runner.console</XUnitRunnerPackageId>
20-
<XUnitRunnerTargetFramework>netcoreapp2.0</XUnitRunnerTargetFramework>
19+
<XUnitRunnerTargetFramework>netcoreapp2.1</XUnitRunnerTargetFramework>
2120
<CLRTestKind>SharedLibrary</CLRTestKind>
2221
<IsTestProject>false</IsTestProject>
2322
<GenerateDependencyFile>false</GenerateDependencyFile>
@@ -78,23 +77,20 @@
7877
<PackageReference Include="xunit.performance.metrics" Version="$(XunitPerformanceApiPackageVersion)" />
7978
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)" />
8079
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
81-
<PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
82-
<PackageReference Include="xunit.runner.console" Version="$(XunitPackageVersion)" GeneratePathProperty="True" />
83-
<PackageReference Include="xunit.runner.utility" Version="$(XunitPackageVersion)" />
80+
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
81+
<PackageReference Include="$(MicrosoftDotNetXUnitConsoleRunnerPackage)" Version="$(MicrosoftDotNetXUnitConsoleRunnerVersion)" GeneratePathProperty="True" />
82+
<PackageReference Include="xunit.runner.utility" Version="$(XUnitVersion)" />
8483
</ItemGroup>
8584

8685
<Target Name="AddXunitConsoleRunner" BeforeTargets="ResolveReferences">
87-
<Error Condition="!Exists('$(Pkgxunit_runner_console)\tools\$(XUnitRunnerTargetFramework)\xunit.console.dll')"
88-
Text="Error: looks the package $(Pkgxunit_runner_console) not restored or missing xunit.console.dll."
86+
<Error Condition="!Exists('$(PkgMicrosoft_DotNet_XunitConsoleRunner)\tools\$(XUnitRunnerTargetFramework)\xunit.console.dll')"
87+
Text="Error: looks the package $(PkgMicrosoft_DotNet_XunitConsoleRunner) not restored or missing xunit.console.dll."
8988
/>
9089
<ItemGroup>
91-
<ReferenceCopyLocalPaths
92-
Include="$(Pkgxunit_runner_console)\tools\$(XUnitRunnerTargetFramework)\*.*"
93-
Exclude="$(Pkgxunit_runner_console)\tools\$(XUnitRunnerTargetFramework)\xunit.console.dll.config"
94-
>
90+
<ReferenceCopyLocalPaths Include="$(PkgMicrosoft_DotNet_XunitConsoleRunner)\tools\$(XUnitRunnerTargetFramework)\*.*">
9591
<Private>false</Private>
96-
<NuGetPackageId>$(XUnitRunnerPackageId)</NuGetPackageId>
97-
<NuGetPackageVersion>$(XUnitPackageVersion)</NuGetPackageVersion>
92+
<NuGetPackageId>$(MicrosoftDotNetXUnitConsoleRunnerPackage)</NuGetPackageId>
93+
<NuGetPackageVersion>$(MicrosoftDotNetXUnitConsoleRunnerVersion)</NuGetPackageVersion>
9894
</ReferenceCopyLocalPaths>
9995
</ItemGroup>
10096
</Target>

‎src/coreclr/tests/scripts/scripts.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<PackageReference Include="Microsoft.DotNet.xunit.performance">
1515
<Version>1.0.0-alpha-build0040</Version>
1616
</PackageReference>
17-
<PackageReference Include="xunit.runner.console">
18-
<Version>$(XunitPackageVersion)</Version>
17+
<PackageReference Include="$(MicrosoftDotNetXUnitConsoleRunnerPackage)">
18+
<Version>$(MicrosoftDotNetXUnitConsoleRunnerVersion)</Version>
1919
</PackageReference>
2020
<PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite">
2121
<Version>1.0.0-prerelease-00629-04</Version>

‎src/coreclr/tests/src/runtest.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ $(_XunitEpilog)
108108
</ItemGroup>
109109
110110
<ItemGroup>
111-
<PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
112-
<PackageReference Include="xunit.runner.console" Version="$(XunitPackageVersion)" />
111+
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
112+
<PackageReference Include="$(MicrosoftDotNetXUnitConsoleRunnerPackage)" Version="$(MicrosoftDotNetXUnitConsoleRunnerVersion)" />
113113
</ItemGroup>
114114
115115
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />

0 commit comments

Comments
 (0)