[Pkg-cli-apps-commits] [fsharp] 05/60: Minor tidy-up (changeset 1292191)

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to branch master
in repository fsharp.

commit 26d1a7d6899f947bad0630687c0fbe50ddd28835
Author: latkin <latkin at microsoft.com>
Date:   Sun Jul 6 08:00:41 2014 -0700

    Minor tidy-up (changeset 1292191)
---
 vsintegration/src/fsharp.common.props                          |  2 +-
 vsintegration/src/vs/FsPkgs/FSharp.Editor/FSharp.Editor.fsproj | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/vsintegration/src/fsharp.common.props b/vsintegration/src/fsharp.common.props
index a5f5303..67c5d42 100644
--- a/vsintegration/src/fsharp.common.props
+++ b/vsintegration/src/fsharp.common.props
@@ -7,7 +7,7 @@
   </PropertyGroup>  
 
   <!-- Use standard VS for Open Build. -->
-  <Import Project="..\..\..\fsharp.common.props" Condition="Exists('..\..\..\fsharp.common.props')" />
+  <Import Project="..\..\..\fsharp.common.props" Condition="Exists('..\..\..\fsharp.common.props') AND $(_NTROOT) != ''" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="'$(DevDivBuild)' == '' and Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 
   <PropertyGroup Condition="'$(DevDivBuild)' == ''">
diff --git a/vsintegration/src/vs/FsPkgs/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/vs/FsPkgs/FSharp.Editor/FSharp.Editor.fsproj
index 3e971a7..470cb5d 100644
--- a/vsintegration/src/vs/FsPkgs/FSharp.Editor/FSharp.Editor.fsproj
+++ b/vsintegration/src/vs/FsPkgs/FSharp.Editor/FSharp.Editor.fsproj
@@ -31,16 +31,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
-      <Name>FSharp.Compiler.Service</Name>
-      <Project>{a437a6ec-5323-47c2-8f86-e2cac54ff152}</Project>
-      <Private>True</Private>
-    </ProjectReference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.fsproj">
-      <Name>FSharp.Compiler.Service</Name>
-      <Project>{a437a6ec-5323-47c2-8f86-e2cac54ff152}</Project>
-      <Private>True</Private>
-    </ProjectReference>
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
       <Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
       <Name>FSharp.Core</Name>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git