Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0b940a4

Browse files
authored
Merge pull request #4934 from brettfo/compiler-redirect-redux
allow `FSharpTargetsPath` to be properly overwritten in a project file
2 parents704c1e3 +2298fdb commit0b940a4

File tree

7 files changed

+21
-19
lines changed

7 files changed

+21
-19
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

3-
<ImportProject="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.NetSdk.props" />
3+
<ImportCondition="'$(FSharpCompilerPath)' != ''"Project="$(FSharpCompilerPath)\Microsoft.FSharp.NetSdk.props" />
4+
<ImportCondition="'$(FSharpCompilerPath)' == ''"Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.NetSdk.props" />
45

56
</Project>
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

3-
<ImportProject="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.NetSdk.targets" />
3+
<ImportCondition="'$(FSharpCompilerPath)' != ''"Project="$(FSharpCompilerPath)\Microsoft.FSharp.NetSdk.targets" />
4+
<ImportCondition="'$(FSharpCompilerPath)' == ''"Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.NetSdk.targets" />
45

56
</Project>
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

3-
<ImportProject="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.Overrides.NetSdk.targets" />
3+
<ImportCondition="'$(FSharpCompilerPath)' != ''"Project="$(FSharpCompilerPath)\Microsoft.FSharp.Overrides.NetSdk.targets" />
4+
<ImportCondition="'$(FSharpCompilerPath)' == ''"Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.Overrides.NetSdk.targets" />
45

56
</Project>
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
3-
<ImportProject="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.targets" />
4-
2+
3+
<ImportCondition="'$(FSharpCompilerPath)' != ''"Project="$(FSharpCompilerPath)\Microsoft.FSharp.targets" />
4+
<ImportCondition="'$(FSharpCompilerPath)' == ''"Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.targets" />
5+
56
</Project>
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
3-
<ImportProject="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.Portable.FSharp.targets" />
4-
2+
3+
<ImportCondition="'$(FSharpCompilerPath)' != ''"Project="$(FSharpCompilerPath)\Microsoft.Portable.FSharp.targets" />
4+
<ImportCondition="'$(FSharpCompilerPath)' == ''"Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.Portable.FSharp.targets" />
5+
56
</Project>

‎vsintegration/src/FSharp.Editor/Build/SetGlobalPropertiesForSdkProjects.fs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,5 @@ type internal SetGlobalPropertiesForSdkProjects
2222
inherit StaticGlobalPropertiesProviderBase(projectService.Services)
2323

2424
override__.GetGlobalPropertiesAsync(_cancellationToken:CancellationToken):Task<IImmutableDictionary<string, string>>=
25-
leteditorDirectory= Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
26-
["FSharpPropsShim","Microsoft.FSharp.NetSdk.props"
27-
"FSharpTargetsShim","Microsoft.FSharp.NetSdk.targets"
28-
"FSharpOverridesTargetsShim","Microsoft.FSharp.Overrides.NetSdk.targets"]
29-
|> List.map(fun(key,value)->(key, Path.Combine(editorDirectory, value)))
30-
|> List.fold(fun(map:ImmutableDictionary<string, string>)(key,value)-> map.Add(key, value))(Empty.PropertiesMap)
31-
|> Task.FromResult<IImmutableDictionary<string, string>>
25+
letproperties= Empty.PropertiesMap.Add("FSharpCompilerPath", Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location))
26+
Task.FromResult<IImmutableDictionary<string, string>>(properties)

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/Utilities.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -738,12 +738,14 @@ public static Microsoft.Build.Evaluation.Project InitializeMsBuildProject(Micros
738738

739739
if(buildProject==null)
740740
{
741-
buildProject=buildEngine.LoadProject(fullProjectPath);
741+
varglobalProperties=newDictionary<string,string>()
742+
{
743+
{"FSharpCompilerPath",Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)}
744+
};
745+
buildProject=buildEngine.LoadProject(fullProjectPath,globalProperties,null);
742746
buildProject.IsBuildEnabled=true;
743747
}
744748

745-
buildProject.SetProperty("FSharpTargetsPath",Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),"Microsoft.FSharp.targets"));
746-
747749
returnbuildProject;
748750
}
749751

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp