Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
aa51be5b
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,发现更多精彩内容 >>
提交
aa51be5b
编写于
6月 13, 2017
作者:
J
Jared Parsons
提交者:
GitHub
6月 13, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #20188 from jaredpar/fix-settings
Move language settings after SDK import
上级
d3ebcc3e
c144ec6d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
42 addition
and
45 deletion
+42
-45
build/Targets/Imports.targets
build/Targets/Imports.targets
+4
-0
build/Targets/Settings.props
build/Targets/Settings.props
+38
-45
未找到文件。
build/Targets/Imports.targets
浏览文件 @
aa51be5b
...
...
@@ -200,6 +200,10 @@
</When>
</Choose>
<ItemGroup
Condition=
"'$(ProjectLanguage)' == 'CSharp' AND '$(TargetNetFX20)' == 'true'"
>
<_ExplicitReference
Include=
"$(FrameworkPathOverride)\mscorlib.dll"
/>
</ItemGroup>
<ItemDefinitionGroup
Condition=
"'$(_CopyReferences)' == 'false'"
>
<Reference>
<Private>
False
</Private>
...
...
build/Targets/Settings.props
浏览文件 @
aa51be5b
...
...
@@ -69,7 +69,6 @@
{RawFileName};
</AssemblySearchPaths>
<NoWarn>
$(NoWarn);1701
</NoWarn>
<RoslynNetSdkRootPath>
$(MSBuildSDKsPath)\Microsoft.NET.Sdk\Sdk\
</RoslynNetSdkRootPath>
<RestoreProjectStyle>
PackageReference
</RestoreProjectStyle>
</PropertyGroup>
...
...
@@ -77,7 +76,7 @@
<!-- Windows specific settings -->
<PropertyGroup
Condition=
"'$(OS)' == 'Windows_NT'"
>
<BaseNuGetRuntimeIdentifier>
win7
</BaseNuGetRuntimeIdentifier>
<
DebugType>
pdbonly
</
DebugType>
<
RoslynDebugType>
full
</Roslyn
DebugType>
<UseSharedCompilation>
true
</UseSharedCompilation>
<!-- Presently our code can build on machines with Dev14 or Dev15 but only successfully deploy
...
...
@@ -93,7 +92,7 @@
<!-- Unix specific settings -->
<PropertyGroup
Condition=
"'$(OS)' != 'Windows_NT'"
>
<
DebugType>
portable
</
DebugType>
<
RoslynDebugType>
portable
</Roslyn
DebugType>
</PropertyGroup>
<!--
...
...
@@ -121,7 +120,39 @@
<VisualBasicCoreTargetsPath>
$(BootstrapBuildPath)\Microsoft.VisualBasic.Core.targets
</VisualBasicCoreTargetsPath>
</PropertyGroup>
<!-- Language specifc settings -->
<!-- During bootstrap builds it's important to load our bootstrap tasks before doing any
other imports (which could load a same named DLL) -->
<UsingTask
TaskName=
"Microsoft.CodeAnalysis.BuildTasks.Csc"
AssemblyFile=
"$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll"
Condition=
"'$(BootstrapBuildPath)' != ''"
/>
<UsingTask
TaskName=
"Microsoft.CodeAnalysis.BuildTasks.Vbc"
AssemblyFile=
"$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll"
Condition=
"'$(BootstrapBuildPath)' != ''"
/>
<UsingTask
TaskName=
"Microsoft.CodeAnalysis.BuildTasks.ValidateBootstrap"
AssemblyFile=
"$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll"
Condition=
"'$(BootstrapBuildPath)' != ''"
/>
<!-- This file is imported by all projects at the beginning of the project files -->
<Import
Project=
"$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition=
"Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props') AND '$(RoslynSdkProject)' != 'true'"
/>
<Import
Project=
"$(RoslynNetSdkRootPath)Sdk.props"
Condition=
"'$(RoslynSdkProject)' == 'true'"
/>
<Import
Project=
"$(RoslynDiagnosticsPropsFilePath)"
Condition=
"'$(UseRoslynAnalyzers)' == 'true' AND Exists('$(RoslynDiagnosticsPropsFilePath)')"
/>
<ImportGroup
Label=
"WindowsImports"
Condition=
"'$(OS)' == 'Windows_NT'"
>
<Import
Project=
"$(NuGetPackageRoot)\Microsoft.VSSDK.BuildTools\$(VisualStudioBuildToolsVersion)\build\Microsoft.VsSDK.BuildTools.props"
/>
</ImportGroup>
<Import
Project=
"$(ToolsetCompilerPropsFilePath)"
Condition=
"Exists('$(ToolsetCompilerPropsFilePath)') AND '$(BootstrapBuildPath)' == ''"
/>
<!--
Language specifc settings
These deliberately come after importing the core targets. That way we can assure these are
the final settings, and not over written by core targets. Certain versions of the SDK for
example do exactly that.
-->
<Choose>
<!-- VB specific settings -->
<When
Condition=
"'$(MSBuildProjectExtension)' == '.vbproj' OR '$(Language)' == 'VB' OR '$(ProjectLanguage)' == 'VB'"
>
...
...
@@ -175,7 +206,7 @@
and hence suppress this warning until we get closer to release and a more
thorough documentation story
-->
<NoWarn>
$(NoWarn);1591
</NoWarn>
<NoWarn>
$(NoWarn);1591
;1701
</NoWarn>
<CheckForOverflowUnderflow>
false
</CheckForOverflowUnderflow>
<MSBuildTargetsLanguageName>
CSharp
</MSBuildTargetsLanguageName>
</PropertyGroup>
...
...
@@ -205,45 +236,7 @@
</When>
</Choose>
<ItemGroup
Condition=
"'$(ProjectLanguage)' == 'CSharp' AND '$(TargetNetFX20)' == 'true'"
>
<_ExplicitReference
Include=
"$(FrameworkPathOverride)\mscorlib.dll"
/>
</ItemGroup>
<!-- During bootstrap builds it's important to load our bootstrap tasks before doing any
other imports (which could load a same named DLL) -->
<UsingTask
TaskName=
"Microsoft.CodeAnalysis.BuildTasks.Csc"
AssemblyFile=
"$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll"
Condition=
"'$(BootstrapBuildPath)' != ''"
/>
<UsingTask
TaskName=
"Microsoft.CodeAnalysis.BuildTasks.Vbc"
AssemblyFile=
"$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll"
Condition=
"'$(BootstrapBuildPath)' != ''"
/>
<UsingTask
TaskName=
"Microsoft.CodeAnalysis.BuildTasks.ValidateBootstrap"
AssemblyFile=
"$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll"
Condition=
"'$(BootstrapBuildPath)' != ''"
/>
<!-- This file is imported by all projects at the beginning of the project files -->
<Import
Project=
"$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition=
"Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props') AND '$(RoslynSdkProject)' != 'true'"
/>
<Import
Project=
"$(RoslynNetSdkRootPath)Sdk.props"
Condition=
"'$(RoslynSdkProject)' == 'true'"
/>
<Import
Project=
"$(RoslynDiagnosticsPropsFilePath)"
Condition=
"'$(UseRoslynAnalyzers)' == 'true' AND Exists('$(RoslynDiagnosticsPropsFilePath)')"
/>
<ImportGroup
Label=
"WindowsImports"
Condition=
"'$(OS)' == 'Windows_NT'"
>
<Import
Project=
"$(NuGetPackageRoot)\Microsoft.VSSDK.BuildTools\$(VisualStudioBuildToolsVersion)\build\Microsoft.VsSDK.BuildTools.props"
/>
</ImportGroup>
<Import
Project=
"$(ToolsetCompilerPropsFilePath)"
Condition=
"Exists('$(ToolsetCompilerPropsFilePath)') AND '$(BootstrapBuildPath)' == ''"
/>
<!-- The Sdk props will set the rootnamespace to the assembly name when the property
is empty. Need to override this after -->
<PropertyGroup
Condition=
"'$(RoslynSdkProject)' == 'true'"
>
<DebugType>
full
</DebugType>
<RootNamespace
Condition=
"'$(MSBuildTargetsLanguageName)' == 'VisualBasic'"
></RootNamespace>
<DefineConstants
Condition=
"'$(InitialDefineConstants)' != ''"
>
$(InitialDefineConstants)
</DefineConstants>
<!-- The NoWarn property is still being unconditionally set. https://github.com/dotnet/sdk/issues/752 -->
<OptionStrict>
On
</OptionStrict>
<NoWarn>
$(NoWarn);1591
</NoWarn>
<PropertyGroup>
<DebugType>
$(RoslynDebugType)
</DebugType>
</PropertyGroup>
</Project>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录