Skip to content

Merge master to dev15.8 #5046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 2 commits into from
May 31, 2018
Merged

Merge master to dev15.8 #5046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2298fdb
allow `FSharpTargetsPath` to be properly overwritten in a project file
brettfo May 17, 2018
0b940a4
Merge pull request #4934 from brettfo/compiler-redirect-redux
brettfo May 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion setup/resources/Microsoft.FSharp.NetSdk.Shim.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<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>
3 changes: 2 additions & 1 deletion setup/resources/Microsoft.FSharp.NetSdk.Shim.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<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>
3 changes: 2 additions & 1 deletion setup/resources/Microsoft.FSharp.Overrides.NetSdk.Shim.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<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>
7 changes: 4 additions & 3 deletions setup/resources/Microsoft.FSharp.Shim.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<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>
7 changes: 4 additions & 3 deletions setup/resources/Microsoft.Portable.FSharp.Shim.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<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>
9 changes: 2 additions & 7 deletions vsintegration/src/FSharp.Editor/Build/SetGlobalPropertiesForSdkProjects.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 5 additions & 3 deletions vsintegration/src/FSharp.ProjectSystem.Base/Project/Utilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down