Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
7c149a86
R
runtime
项目概览
dotNET Platform
/
runtime
大约 1 年 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
runtime
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7c149a86
编写于
11月 16, 2019
作者:
V
Viktor Hofer
提交者:
jashook
11月 17, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use xunit runner fork in coreclr (#77)
上级
56215d97
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
61 deletion
+13
-61
src/coreclr/dependencies.props
src/coreclr/dependencies.props
+0
-44
src/coreclr/tests/external/external.csproj
src/coreclr/tests/external/external.csproj
+9
-13
src/coreclr/tests/scripts/scripts.csproj
src/coreclr/tests/scripts/scripts.csproj
+2
-2
src/coreclr/tests/src/runtest.proj
src/coreclr/tests/src/runtest.proj
+2
-2
未找到文件。
src/coreclr/dependencies.props
浏览文件 @
7c149a86
...
...
@@ -8,7 +8,6 @@
<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview6.19280.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<XunitPackageVersion>2.4.1-pre.build.4059</XunitPackageVersion>
<XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
<MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.43</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
<MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
...
...
@@ -42,49 +41,6 @@
<ElementName>MicrosoftNETCoreRuntimeCoreCLRPackageVersion</ElementName>
<PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId>
</XmlUpdateStep>
<UpdateStep Include="ILAsm">
<UpdaterType>File</UpdaterType>
<Path>$(MSBuildThisFileDirectory)ILAsmVersion.txt</Path>
<PackageId>Microsoft.NETCore.ILAsm</PackageId>
</UpdateStep>
</ItemGroup>
<!-- Set up dependencies on packages that aren't found in a BuildInfo. -->
<ItemGroup>
<XUnitDependency Include="xunit"/>
<XUnitDependency Include="xunit.assert"/>
<XUnitDependency Include="xunit.core"/>
<XUnitDependency Include="xunit.extensibility.core" />
<XUnitDependency Include="xunit.runner.console"/>
<XUnitDependency Include="xunit.runner.msbuild"/>
<XUnitDependency Include="xunit.runner.utility"/>
<StaticDependency Include="@(XUnitDependency)">
<Version>$(XunitPackageVersion)</Version>
</StaticDependency>
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance" />
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.analysis" />
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.analysis.cli" />
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.metrics" />
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.run.core" />
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.runner.cli" />
<XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.runner.Windows" />
<StaticDependency Include="@(XunitPerformanceDependency)">
<Version>1.0.0-alpha-build0040</Version>
</StaticDependency>
<XUnitPerformanceApiDependency Include="xunit.performance.api" />
<XUnitPerformanceApiDependency Include="xunit.performance.core" />
<XUnitPerformanceApiDependency Include="xunit.performance.execution" />
<XUnitPerformanceApiDependency Include="xunit.performance.metrics" />
<StaticDependency Include="@(XUnitPerformanceApiDependency)">
<Version>$(XunitPerformanceApiPackageVersion)</Version>
</StaticDependency>
<DependencyBuildInfo Include="@(StaticDependency)">
<PackageId>%(Identity)</PackageId>
<UpdateStableVersions>true</UpdateStableVersions>
</DependencyBuildInfo>
</ItemGroup>
<!-- Override isolated build dependency versions with versions from Repo API. -->
...
...
src/coreclr/tests/external/external.csproj
浏览文件 @
7c149a86
...
...
@@ -16,8 +16,7 @@
<NuGetTargetMoniker>.NETCoreApp,Version=v3.0</NuGetTargetMoniker>
<NuGetTargetMonikerShort>netcoreapp3.0</NuGetTargetMonikerShort>
<RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
<XUnitRunnerPackageId>xunit.runner.console</XUnitRunnerPackageId>
<XUnitRunnerTargetFramework>netcoreapp2.0</XUnitRunnerTargetFramework>
<XUnitRunnerTargetFramework>netcoreapp2.1</XUnitRunnerTargetFramework>
<CLRTestKind>SharedLibrary</CLRTestKind>
<IsTestProject>false</IsTestProject>
<GenerateDependencyFile>false</GenerateDependencyFile>
...
...
@@ -78,23 +77,20 @@
<PackageReference Include="xunit.performance.metrics" Version="$(XunitPerformanceApiPackageVersion)" />
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="xunit" Version="$(X
unitPackage
Version)" />
<PackageReference Include="
xunit.runner.console" Version="$(XunitPackage
Version)" GeneratePathProperty="True" />
<PackageReference Include="xunit.runner.utility" Version="$(X
unitPackage
Version)" />
<PackageReference Include="xunit" Version="$(X
Unit
Version)" />
<PackageReference Include="
$(MicrosoftDotNetXUnitConsoleRunnerPackage)" Version="$(MicrosoftDotNetXUnitConsoleRunner
Version)" GeneratePathProperty="True" />
<PackageReference Include="xunit.runner.utility" Version="$(X
Unit
Version)" />
</ItemGroup>
<Target Name="AddXunitConsoleRunner" BeforeTargets="ResolveReferences">
<Error Condition="!Exists('$(Pkg
xunit_runner_console
)\tools\$(XUnitRunnerTargetFramework)\xunit.console.dll')"
Text="Error: looks the package $(Pkg
xunit_runner_console
) not restored or missing xunit.console.dll."
<Error Condition="!Exists('$(Pkg
Microsoft_DotNet_XunitConsoleRunner
)\tools\$(XUnitRunnerTargetFramework)\xunit.console.dll')"
Text="Error: looks the package $(Pkg
Microsoft_DotNet_XunitConsoleRunner
) not restored or missing xunit.console.dll."
/>
<ItemGroup>
<ReferenceCopyLocalPaths
Include="$(Pkgxunit_runner_console)\tools\$(XUnitRunnerTargetFramework)\*.*"
Exclude="$(Pkgxunit_runner_console)\tools\$(XUnitRunnerTargetFramework)\xunit.console.dll.config"
>
<ReferenceCopyLocalPaths Include="$(PkgMicrosoft_DotNet_XunitConsoleRunner)\tools\$(XUnitRunnerTargetFramework)\*.*">
<Private>false</Private>
<NuGetPackageId>$(
XUnitRunnerPackageId
)</NuGetPackageId>
<NuGetPackageVersion>$(
XUnitPackage
Version)</NuGetPackageVersion>
<NuGetPackageId>$(
MicrosoftDotNetXUnitConsoleRunnerPackage
)</NuGetPackageId>
<NuGetPackageVersion>$(
MicrosoftDotNetXUnitConsoleRunner
Version)</NuGetPackageVersion>
</ReferenceCopyLocalPaths>
</ItemGroup>
</Target>
...
...
src/coreclr/tests/scripts/scripts.csproj
浏览文件 @
7c149a86
...
...
@@ -14,8 +14,8 @@
<PackageReference
Include=
"Microsoft.DotNet.xunit.performance"
>
<Version>
1.0.0-alpha-build0040
</Version>
</PackageReference>
<PackageReference
Include=
"
xunit.runner.console
"
>
<Version>
$(
XunitPackage
Version)
</Version>
<PackageReference
Include=
"
$(MicrosoftDotNetXUnitConsoleRunnerPackage)
"
>
<Version>
$(
MicrosoftDotNetXUnitConsoleRunner
Version)
</Version>
</PackageReference>
<PackageReference
Include=
"Microsoft.DotNet.BuildTools.TestSuite"
>
<Version>
1.0.0-prerelease-00629-04
</Version>
...
...
src/coreclr/tests/src/runtest.proj
浏览文件 @
7c149a86
...
...
@@ -108,8 +108,8 @@ $(_XunitEpilog)
</ItemGroup>
<ItemGroup>
<PackageReference
Include=
"xunit"
Version=
"$(X
unitPackage
Version)"
/>
<PackageReference
Include=
"
xunit.runner.console"
Version=
"$(XunitPackage
Version)"
/>
<PackageReference
Include=
"xunit"
Version=
"$(X
Unit
Version)"
/>
<PackageReference
Include=
"
$(MicrosoftDotNetXUnitConsoleRunnerPackage)"
Version=
"$(MicrosoftDotNetXUnitConsoleRunner
Version)"
/>
</ItemGroup>
<Import
Sdk=
"Microsoft.NET.Sdk"
Project=
"Sdk.targets"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录