Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
beac2076
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,发现更多精彩内容 >>
提交
beac2076
编写于
11月 01, 2018
作者:
T
Tomas Matousek
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge fixups
上级
acdcc026
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
3 addition
and
9 deletion
+3
-9
Roslyn.sln
Roslyn.sln
+0
-6
build/Targets/Settings.props
build/Targets/Settings.props
+1
-1
src/Setup/Installer/Installer.Package.csproj
src/Setup/Installer/Installer.Package.csproj
+1
-1
src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs
src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs
+1
-1
未找到文件。
Roslyn.sln
浏览文件 @
beac2076
...
...
@@ -1058,12 +1058,10 @@ Global
{4A9B5423-11BF-4E1D-B231-C9A2FDD78EC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A9B5423-11BF-4E1D-B231-C9A2FDD78EC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A9B5423-11BF-4E1D-B231-C9A2FDD78EC4}.Release|Any CPU.Build.0 = Release|Any CPU
<<<<<<< HEAD
{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Release|Any CPU.Build.0 = Release|Any CPU
=======
{23405307-7EFF-4774-8B11-8F5885439761}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{23405307-7EFF-4774-8B11-8F5885439761}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23405307-7EFF-4774-8B11-8F5885439761}.Release|Any CPU.ActiveCfg = Release|Any CPU
...
...
@@ -1072,7 +1070,6 @@ Global
{6362616E-6A47-48F0-9EE0-27800B306ACB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6362616E-6A47-48F0-9EE0-27800B306ACB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6362616E-6A47-48F0-9EE0-27800B306ACB}.Release|Any CPU.Build.0 = Release|Any CPU
>>>>>>> upstream/dev16.0.x
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
...
...
@@ -1259,13 +1256,10 @@ Global
{B9843F65-262E-4F40-A0BC-2CBEF7563A44} = {C52D8057-43AF-40E6-A01B-6CDBB7301985}
{03607817-6800-40B6-BEAA-D6F437CD62B7} = {BE25E872-1667-4649-9D19-96B83E75A44E}
{4A9B5423-11BF-4E1D-B231-C9A2FDD78EC4} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
<<<<<<< HEAD
{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5} = {BE25E872-1667-4649-9D19-96B83E75A44E}
=======
{23405307-7EFF-4774-8B11-8F5885439761} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5}
{AFA5F921-0650-45E8-B293-51A0BB89DEA0} = {8DBA5174-B0AA-4561-82B1-A46607697753}
{6362616E-6A47-48F0-9EE0-27800B306ACB} = {AFA5F921-0650-45E8-B293-51A0BB89DEA0}
>>>>>>> upstream/dev16.0.x
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {604E6B91-7BC0-4126-AE07-D4D2FEFC3D29}
...
...
build/Targets/Settings.props
浏览文件 @
beac2076
...
...
@@ -28,7 +28,7 @@
<DisableImplicitNuGetFallbackFolder>
true
</DisableImplicitNuGetFallbackFolder>
<ToolsetPackagesDir>
$(RepoRoot)build\ToolsetPackages\
</ToolsetPackagesDir>
<RoslynPortableTargetFrameworks>
net4
6
;netcoreapp2.1
</RoslynPortableTargetFrameworks>
<RoslynPortableTargetFrameworks>
net4
72
;netcoreapp2.1
</RoslynPortableTargetFrameworks>
<RoslynPortableRuntimeIdentifiers>
win;win-x64;linux-x64;osx-x64
</RoslynPortableRuntimeIdentifiers>
<RoslynDesktopRuntimeIdentifier>
win
</RoslynDesktopRuntimeIdentifier>
<RoslynDesktopRuntimeIdentifierX86>
win-x86
</RoslynDesktopRuntimeIdentifierX86>
...
...
src/Setup/Installer/Installer.Package.csproj
浏览文件 @
beac2076
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net4
6
</TargetFramework>
<TargetFramework>net4
72
</TargetFramework>
<RoslynProjectType>Custom</RoslynProjectType>
</PropertyGroup>
...
...
src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs
浏览文件 @
beac2076
...
...
@@ -52,7 +52,7 @@ internal static AnalyzerAssemblyLoader CreateAnalyzerAssemblyLoader()
return
new
DesktopAnalyzerAssemblyLoader
();
#elif NETCOREAPP2_1
return
new
CoreClrAnalyzerAssemblyLoader
();
#elif NETSTANDARD
1_3
#elif NETSTANDARD
2_0
return
new
ThrowingAnalyzerAssemblyLoader
();
#else
#error Unsupported configuration
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录