Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
84965512
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
84965512
编写于
4月 01, 2020
作者:
J
Jonathon Marolf
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove test that aserts .NET Standard should be prefered over .NET Framework
上级
96edea5a
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
0 addition
and
81 deletion
+0
-81
src/Workspaces/MSBuildTest/NetCoreTests.cs
src/Workspaces/MSBuildTest/NetCoreTests.cs
+0
-15
src/Workspaces/MSBuildTest/Resources/NetCoreMultiTFM_ProjectReferenceWithReversedTFMs/Class1.cs
...etCoreMultiTFM_ProjectReferenceWithReversedTFMs/Class1.cs
+0
-12
src/Workspaces/MSBuildTest/Resources/NetCoreMultiTFM_ProjectReferenceWithReversedTFMs/Library.csproj
...eMultiTFM_ProjectReferenceWithReversedTFMs/Library.csproj
+0
-7
src/Workspaces/MSBuildTest/Resources/NetCoreMultiTFM_ProjectReferenceWithReversedTFMs/Program.cs
...tCoreMultiTFM_ProjectReferenceWithReversedTFMs/Program.cs
+0
-12
src/Workspaces/MSBuildTest/Resources/NetCoreMultiTFM_ProjectReferenceWithReversedTFMs/Project.csproj
...eMultiTFM_ProjectReferenceWithReversedTFMs/Project.csproj
+0
-12
src/Workspaces/MSBuildTest/TestFiles/Resources.cs
src/Workspaces/MSBuildTest/TestFiles/Resources.cs
+0
-4
src/Workspaces/MSBuildTest/WorkspaceTestBase.cs
src/Workspaces/MSBuildTest/WorkspaceTestBase.cs
+0
-19
未找到文件。
src/Workspaces/MSBuildTest/NetCoreTests.cs
浏览文件 @
84965512
...
@@ -274,21 +274,6 @@ public async Task TestOpenProject_NetCoreMultiTFM_ProjectReference()
...
@@ -274,21 +274,6 @@ public async Task TestOpenProject_NetCoreMultiTFM_ProjectReference()
await
AssertNetCoreMultiTFMProject
(
projectFilePath
);
await
AssertNetCoreMultiTFMProject
(
projectFilePath
);
}
}
[
ConditionalFact
(
typeof
(
VisualStudioMSBuildInstalled
),
typeof
(
DotNetCoreSdk
.
IsAvailable
),
AlwaysSkip
=
"https://github.com/dotnet/roslyn/issues/42772"
)]
[
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
MSBuildWorkspace
)]
[
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
NetCore
)]
public
async
Task
TestOpenProject_NetCoreMultiTFM_ProjectReferenceWithReversedTFMs
()
{
CreateFiles
(
GetNetCoreMultiTFMFiles_ProjectReferenceWithReversedTFMs
());
// Restoring for Project.csproj should also restore Library.csproj
DotNetRestore
(
@"Project\Project.csproj"
);
var
projectFilePath
=
GetSolutionFileName
(
@"Project\Project.csproj"
);
await
AssertNetCoreMultiTFMProject
(
projectFilePath
);
}
private
static
async
Task
AssertNetCoreMultiTFMProject
(
string
projectFilePath
)
private
static
async
Task
AssertNetCoreMultiTFMProject
(
string
projectFilePath
)
{
{
using
(
var
workspace
=
CreateMSBuildWorkspace
())
using
(
var
workspace
=
CreateMSBuildWorkspace
())
...
...
src/Workspaces/MSBuildTest/Resources/NetCoreMultiTFM_ProjectReferenceWithReversedTFMs/Class1.cs
已删除
100644 → 0
浏览文件 @
96edea5a
using
System
;
namespace
NetCoreApp2
{
class
Program
{
static
void
Main
(
string
[]
args
)
{
Console
.
WriteLine
(
"Hello World!"
);
}
}
}
src/Workspaces/MSBuildTest/Resources/NetCoreMultiTFM_ProjectReferenceWithReversedTFMs/Library.csproj
已删除
100644 → 0
浏览文件 @
96edea5a
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
</PropertyGroup>
</Project>
src/Workspaces/MSBuildTest/Resources/NetCoreMultiTFM_ProjectReferenceWithReversedTFMs/Program.cs
已删除
100644 → 0
浏览文件 @
96edea5a
using
System
;
namespace
NetCoreApp2
{
class
Program
{
static
void
Main
(
string
[]
args
)
{
Console
.
WriteLine
(
"Hello World!"
);
}
}
}
src/Workspaces/MSBuildTest/Resources/NetCoreMultiTFM_ProjectReferenceWithReversedTFMs/Project.csproj
已删除
100644 → 0
浏览文件 @
96edea5a
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Library\Library.csproj" />
</ItemGroup>
</Project>
src/Workspaces/MSBuildTest/TestFiles/Resources.cs
浏览文件 @
84965512
...
@@ -145,8 +145,6 @@ public static class CSharp
...
@@ -145,8 +145,6 @@ public static class CSharp
public
static
string
NetCoreMultiTFM_ProjectReference_Library
=>
GetText
(
"NetCoreMultiTFM_ProjectReference.Library.csproj"
);
public
static
string
NetCoreMultiTFM_ProjectReference_Library
=>
GetText
(
"NetCoreMultiTFM_ProjectReference.Library.csproj"
);
public
static
string
NetCoreMultiTFM_ProjectReference_Project
=>
GetText
(
"NetCoreMultiTFM_ProjectReference.Project.csproj"
);
public
static
string
NetCoreMultiTFM_ProjectReference_Project
=>
GetText
(
"NetCoreMultiTFM_ProjectReference.Project.csproj"
);
public
static
string
NetCoreMultiTFM_ProjectReferenceToFSharp_CSharpLib
=
GetText
(
"NetCoreMultiTFM_ProjectReferenceToFSharp.csharplib.csharplib.csproj"
);
public
static
string
NetCoreMultiTFM_ProjectReferenceToFSharp_CSharpLib
=
GetText
(
"NetCoreMultiTFM_ProjectReferenceToFSharp.csharplib.csharplib.csproj"
);
public
static
string
NetCoreMultiTFM_ProjectReferenceWithReversedTFMs_Library
=>
GetText
(
"NetCoreMultiTFM_ProjectReferenceWithReversedTFMs.Library.csproj"
);
public
static
string
NetCoreMultiTFM_ProjectReferenceWithReversedTFMs_Project
=>
GetText
(
"NetCoreMultiTFM_ProjectReferenceWithReversedTFMs.Project.csproj"
);
public
static
string
PortableProject
=>
GetText
(
"ProjectFiles.CSharp.PortableProject.csproj"
);
public
static
string
PortableProject
=>
GetText
(
"ProjectFiles.CSharp.PortableProject.csproj"
);
public
static
string
ProjectLoadErrorOnMissingDebugType
=>
GetText
(
"ProjectFiles.CSharp.ProjectLoadErrorOnMissingDebugType.csproj"
);
public
static
string
ProjectLoadErrorOnMissingDebugType
=>
GetText
(
"ProjectFiles.CSharp.ProjectLoadErrorOnMissingDebugType.csproj"
);
public
static
string
ProjectReference
=>
GetText
(
"ProjectFiles.CSharp.ProjectReference.csproj"
);
public
static
string
ProjectReference
=>
GetText
(
"ProjectFiles.CSharp.ProjectReference.csproj"
);
...
@@ -207,8 +205,6 @@ public static class CSharp
...
@@ -207,8 +205,6 @@ public static class CSharp
public
static
string
NetCoreMultiTFM_ProjectReference_Class1
=>
GetText
(
"NetCoreMultiTFM_ProjectReference.Class1.cs"
);
public
static
string
NetCoreMultiTFM_ProjectReference_Class1
=>
GetText
(
"NetCoreMultiTFM_ProjectReference.Class1.cs"
);
public
static
string
NetCoreMultiTFM_ProjectReference_Program
=>
GetText
(
"NetCoreMultiTFM_ProjectReference.Program.cs"
);
public
static
string
NetCoreMultiTFM_ProjectReference_Program
=>
GetText
(
"NetCoreMultiTFM_ProjectReference.Program.cs"
);
public
static
string
NetCoreMultiTFM_ProjectReferenceToFSharp_CSharpLib_Class1
=
GetText
(
"NetCoreMultiTFM_ProjectReferenceToFSharp.csharplib.Class1.cs"
);
public
static
string
NetCoreMultiTFM_ProjectReferenceToFSharp_CSharpLib_Class1
=
GetText
(
"NetCoreMultiTFM_ProjectReferenceToFSharp.csharplib.Class1.cs"
);
public
static
string
NetCoreMultiTFM_ProjectReferenceWithReversedTFMs_Class1
=>
GetText
(
"NetCoreMultiTFM_ProjectReferenceWithReversedTFMs.Class1.cs"
);
public
static
string
NetCoreMultiTFM_ProjectReferenceWithReversedTFMs_Program
=>
GetText
(
"NetCoreMultiTFM_ProjectReferenceWithReversedTFMs.Program.cs"
);
public
static
string
MainWindow
=>
GetText
(
"SourceFiles.CSharp.MainWindow.xaml.cs"
);
public
static
string
MainWindow
=>
GetText
(
"SourceFiles.CSharp.MainWindow.xaml.cs"
);
public
static
string
OtherStuff_Foo
=>
GetText
(
"SourceFiles.CSharp.OtherStuff_Foo.cs"
);
public
static
string
OtherStuff_Foo
=>
GetText
(
"SourceFiles.CSharp.OtherStuff_Foo.cs"
);
}
}
...
...
src/Workspaces/MSBuildTest/WorkspaceTestBase.cs
浏览文件 @
84965512
...
@@ -34,13 +34,6 @@ public string GetSolutionFileName(string relativeFileName)
...
@@ -34,13 +34,6 @@ public string GetSolutionFileName(string relativeFileName)
return
Path
.
Combine
(
this
.
SolutionDirectory
.
Path
,
relativeFileName
);
return
Path
.
Combine
(
this
.
SolutionDirectory
.
Path
,
relativeFileName
);
}
}
protected
void
CreateFiles
(
params
string
[]
fileNames
)
{
var
fileNamesAndContent
=
Array
.
ConvertAll
(
fileNames
,
fileName
=>
(
fileName
,
(
object
)
Resources
.
GetText
(
fileName
)));
var
fileSet
=
new
FileSet
(
fileNamesAndContent
);
CreateFiles
(
fileSet
);
}
protected
void
CreateFiles
(
IEnumerable
<(
string
filePath
,
object
fileContent
)>
fileNamesAndContent
)
protected
void
CreateFiles
(
IEnumerable
<(
string
filePath
,
object
fileContent
)>
fileNamesAndContent
)
{
{
foreach
(
var
(
filePath
,
fileContent
)
in
fileNamesAndContent
)
foreach
(
var
(
filePath
,
fileContent
)
in
fileNamesAndContent
)
...
@@ -177,18 +170,6 @@ protected static FileSet GetNetCoreMultiTFMFiles_ProjectReference()
...
@@ -177,18 +170,6 @@ protected static FileSet GetNetCoreMultiTFMFiles_ProjectReference()
(
@"Library\Class1.cs"
,
Resources
.
SourceFiles
.
CSharp
.
NetCoreMultiTFM_ProjectReference_Class1
));
(
@"Library\Class1.cs"
,
Resources
.
SourceFiles
.
CSharp
.
NetCoreMultiTFM_ProjectReference_Class1
));
}
}
protected
static
FileSet
GetNetCoreMultiTFMFiles_ProjectReferenceWithReversedTFMs
()
{
return
new
FileSet
(
(
@"NuGet.Config"
,
Resources
.
NuGet_Config
),
(
@"Directory.Build.props"
,
Resources
.
Directory_Build_props
),
(
@"Directory.Build.targets"
,
Resources
.
Directory_Build_targets
),
(
@"Project\Project.csproj"
,
Resources
.
ProjectFiles
.
CSharp
.
NetCoreMultiTFM_ProjectReferenceWithReversedTFMs_Project
),
(
@"Project\Program.cs"
,
Resources
.
SourceFiles
.
CSharp
.
NetCoreMultiTFM_ProjectReferenceWithReversedTFMs_Program
),
(
@"Library\Library.csproj"
,
Resources
.
ProjectFiles
.
CSharp
.
NetCoreMultiTFM_ProjectReferenceWithReversedTFMs_Library
),
(
@"Library\Class1.cs"
,
Resources
.
SourceFiles
.
CSharp
.
NetCoreMultiTFM_ProjectReferenceWithReversedTFMs_Class1
));
}
protected
static
FileSet
GetNetCoreMultiTFMFiles_ProjectReferenceToFSharp
()
protected
static
FileSet
GetNetCoreMultiTFMFiles_ProjectReferenceToFSharp
()
{
{
return
new
FileSet
(
return
new
FileSet
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录