Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
2298fdba
F
fsharp
项目概览
dotNET Platform
/
fsharp
12 个月 前同步成功
通知
0
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
fsharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2298fdba
编写于
5月 17, 2018
作者:
B
Brett V. Forsgren
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
allow `FSharpTargetsPath` to be properly overwritten in a project file
上级
704c1e30
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
21 addition
and
19 deletion
+21
-19
setup/resources/Microsoft.FSharp.NetSdk.Shim.props
setup/resources/Microsoft.FSharp.NetSdk.Shim.props
+2
-1
setup/resources/Microsoft.FSharp.NetSdk.Shim.targets
setup/resources/Microsoft.FSharp.NetSdk.Shim.targets
+2
-1
setup/resources/Microsoft.FSharp.Overrides.NetSdk.Shim.targets
.../resources/Microsoft.FSharp.Overrides.NetSdk.Shim.targets
+2
-1
setup/resources/Microsoft.FSharp.Shim.targets
setup/resources/Microsoft.FSharp.Shim.targets
+4
-3
setup/resources/Microsoft.Portable.FSharp.Shim.targets
setup/resources/Microsoft.Portable.FSharp.Shim.targets
+4
-3
vsintegration/src/FSharp.Editor/Build/SetGlobalPropertiesForSdkProjects.fs
.../FSharp.Editor/Build/SetGlobalPropertiesForSdkProjects.fs
+2
-7
vsintegration/src/FSharp.ProjectSystem.Base/Project/Utilities.cs
...ration/src/FSharp.ProjectSystem.Base/Project/Utilities.cs
+5
-3
未找到文件。
setup/resources/Microsoft.FSharp.NetSdk.Shim.props
浏览文件 @
2298fdba
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.NetSdk.props" />
<Import Condition="'$(FSharpCompilerPath)' != ''" Project="$(FSharpCompilerPath)\Microsoft.FSharp.NetSdk.props" />
<Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.NetSdk.props" />
</Project>
setup/resources/Microsoft.FSharp.NetSdk.Shim.targets
浏览文件 @
2298fdba
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.NetSdk.targets" />
<Import Condition="'$(FSharpCompilerPath)' != ''" Project="$(FSharpCompilerPath)\Microsoft.FSharp.NetSdk.targets" />
<Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.NetSdk.targets" />
</Project>
setup/resources/Microsoft.FSharp.Overrides.NetSdk.Shim.targets
浏览文件 @
2298fdba
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.Overrides.NetSdk.targets" />
<Import Condition="'$(FSharpCompilerPath)' != ''" Project="$(FSharpCompilerPath)\Microsoft.FSharp.Overrides.NetSdk.targets" />
<Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.Overrides.NetSdk.targets" />
</Project>
setup/resources/Microsoft.FSharp.Shim.targets
浏览文件 @
2298fdba
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.targets" />
<Import Condition="'$(FSharpCompilerPath)' != ''" Project="$(FSharpCompilerPath)\Microsoft.FSharp.targets" />
<Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.targets" />
</Project>
setup/resources/Microsoft.Portable.FSharp.Shim.targets
浏览文件 @
2298fdba
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.Portable.FSharp.targets" />
<Import Condition="'$(FSharpCompilerPath)' != ''" Project="$(FSharpCompilerPath)\Microsoft.Portable.FSharp.targets" />
<Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.Portable.FSharp.targets" />
</Project>
vsintegration/src/FSharp.Editor/Build/SetGlobalPropertiesForSdkProjects.fs
浏览文件 @
2298fdba
...
...
@@ -22,10 +22,5 @@ type internal SetGlobalPropertiesForSdkProjects
inherit
StaticGlobalPropertiesProviderBase
(
projectService
.
Services
)
override
__.
GetGlobalPropertiesAsync
(_
cancellationToken
:
CancellationToken
):
Task
<
IImmutableDictionary
<
string
,
string
>>
=
let
editorDirectory
=
Path
.
GetDirectoryName
(
Assembly
.
GetExecutingAssembly
()
.
Location
)
[
"FSharpPropsShim"
,
"Microsoft.FSharp.NetSdk.props"
"FSharpTargetsShim"
,
"Microsoft.FSharp.NetSdk.targets"
"FSharpOverridesTargetsShim"
,
"Microsoft.FSharp.Overrides.NetSdk.targets"
]
|>
List
.
map
(
fun
(
key
,
value
)
->
(
key
,
Path
.
Combine
(
editorDirectory
,
value
)))
|>
List
.
fold
(
fun
(
map
:
ImmutableDictionary
<
string
,
string
>)
(
key
,
value
)
->
map
.
Add
(
key
,
value
))
(
Empty
.
PropertiesMap
)
|>
Task
.
FromResult
<
IImmutableDictionary
<
string
,
string
>>
let
properties
=
Empty
.
PropertiesMap
.
Add
(
"FSharpCompilerPath"
,
Path
.
GetDirectoryName
(
Assembly
.
GetExecutingAssembly
()
.
Location
))
Task
.
FromResult
<
IImmutableDictionary
<
string
,
string
>>(
properties
)
vsintegration/src/FSharp.ProjectSystem.Base/Project/Utilities.cs
浏览文件 @
2298fdba
...
...
@@ -738,12 +738,14 @@ public static Microsoft.Build.Evaluation.Project InitializeMsBuildProject(Micros
if
(
buildProject
==
null
)
{
buildProject
=
buildEngine
.
LoadProject
(
fullProjectPath
);
var
globalProperties
=
new
Dictionary
<
string
,
string
>()
{
{
"FSharpCompilerPath"
,
Path
.
GetDirectoryName
(
Assembly
.
GetExecutingAssembly
().
Location
)
}
};
buildProject
=
buildEngine
.
LoadProject
(
fullProjectPath
,
globalProperties
,
null
);
buildProject
.
IsBuildEnabled
=
true
;
}
buildProject
.
SetProperty
(
"FSharpTargetsPath"
,
Path
.
Combine
(
Path
.
GetDirectoryName
(
Assembly
.
GetExecutingAssembly
().
Location
),
"Microsoft.FSharp.targets"
));
return
buildProject
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录