NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitb6f4807

committed

Ensure that fsharp-vsintegration-build.proj builds on a machine with only vs2015 installed.

1 parentdd14064 commitb6f4807Copy full SHA for b6f4807

File tree

10 files changed

+47

-71

lines changed

src/fsharp/FSharp.LanguageService.Compiler
- FSharp.LanguageService.Compiler.fsproj
vsintegration/src
- Salsa
  - Salsa.fsproj
- unittests
  - Unittests.fsproj
- vs/FsPkgs
  - FSharp.Editor
    - FSharp.Editor.fsproj
  - FSharp.LanguageService
    - FSharp.LanguageService.Base
      - FSharp.LanguageService.Base.csproj
    - FSharp.LanguageService.fsproj
  - FSharp.Project
    - Common.Source.CSharp/Project
      - ProjectSystem.Base.csproj
    - FS
      - ProjectSystem.fsproj
    - VB/FSharpPropPage
      - FSharp.PropertiesPages.vbproj
  - FSharp.VS.FSI
    - FSHarp.VS.FSI.fsproj

10 files changed

+47

-71

lines changed

`‎src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -472,12 +472,12 @@`
`472`	`472`	`<ReferenceInclude="System.Drawing" />`
`473`	`473`	`<ReferenceInclude="System.Windows.Forms" />`
`474`	`474`	`<ReferenceInclude="System.Runtime.Remoting" />`
`475`		`- <ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`476`		`- <ReferenceInclude="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`475`	`+ <ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`476`	`+ <ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`477`	`477`	`<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`478`		`- <ReferenceInclude="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`479`		`- <ReferenceInclude="Microsoft.Build.Utilities.v12.0" />`
`480`		`- <ReferenceInclude="Microsoft.Build.Tasks.v12.0" />`
	`478`	`+ <ReferenceInclude="Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`479`	`+ <ReferenceInclude="Microsoft.Build.Utilities.core" />`
	`480`	`+ <ReferenceInclude="Microsoft.Build.Tasks.core" />`
`481`	`481`	`<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >`
`482`	`482`	`<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>`
`483`	`483`	`<Name>FSharp.Core</Name>`

`‎vsintegration/src/Salsa/Salsa.fsproj‎`

Lines changed: 6 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">`
`4`	`4`	`<PropertyGroup>`
`5`	`5`	`<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>`
`6`		`- <vsFrameworkLatest>Microsoft.VisualStudio.Shell.12.0</vsFrameworkLatest>`
`7`	`6`	`<ProjectLanguage>FSharp</ProjectLanguage>`
`8`	`7`	`<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>`
`9`	`8`	`</PropertyGroup>`
`@@ -36,22 +35,17 @@`
`36`	`35`	`<ReferenceInclude="System.ComponentModel.Composition" />`
`37`	`36`	`<ReferenceInclude="System.Xml" />`
`38`	`37`	`<ReferenceInclude="System.Windows.Forms" />`
`39`		`- <ReferenceInclude="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`40`		`- <SpecificVersion>true</SpecificVersion>`
`41`		`- </Reference>`
`42`		`- <ReferenceInclude="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`43`		`- <SpecificVersion>true</SpecificVersion>`
`44`		`- </Reference>`
`45`		`- <ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`46`		`- <SpecificVersion>true</SpecificVersion>`
`47`		`- </Reference>`
`48`		`- <ReferenceInclude="Microsoft.Build.Utilities.v12.0" />`
	`38`	`+`
	`39`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />`
	`40`	`+ <ReferenceInclude="Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />`
	`41`	`+ <ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />`
	`42`	`+ <ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />`
	`43`	`+ <ReferenceInclude="Microsoft.Build.Utilities.core" />`
`49`	`44`	`<ReferenceInclude="EnvDTE.dll" />`
`50`	`45`	`<ReferenceInclude="EnvDTE80.dll" />`
`51`	`46`	`<ReferenceInclude="VSLangProj" />`
`52`	`47`	`<ReferenceInclude="VSLangProj80" />`
`53`	`48`	`<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />`
`54`		`- <ReferenceInclude="$(vsFrameworkLatest)" />`
`55`	`49`	`<ReferenceInclude="Microsoft.VisualStudio.Threading" />`
`56`	`50`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />`
`57`	`51`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />`

`‎vsintegration/src/unittests/Unittests.fsproj‎`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">`
`4`	`4`	`<PropertyGroup>`
`5`	`5`	`<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>`
`6`		`- <vsFrameworkLatest>Microsoft.VisualStudio.Shell.12.0</vsFrameworkLatest>`
`7`	`6`	`<ProjectLanguage>FSharp</ProjectLanguage>`
`8`	`7`	`<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>`
`9`	`8`	`</PropertyGroup>`
`@@ -81,23 +80,23 @@`
`81`	`80`	`<ReferenceInclude="System.Xaml" />`
`82`	`81`	`<ReferenceInclude="WindowsBase" />`
`83`	`82`	`<ReferenceInclude="UIAutomationTypes" />`
`84`		`- <ReferenceInclude="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
	`83`	`+ <ReferenceInclude="Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`85`	`84`	`<SpecificVersion>true</SpecificVersion>`
`86`	`85`	`</Reference>`
`87`		`- <ReferenceInclude="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
	`86`	`+ <ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`88`	`87`	`<SpecificVersion>true</SpecificVersion>`
`89`	`88`	`</Reference>`
`90`		`- <ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
	`89`	`+ <ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`91`	`90`	`<SpecificVersion>true</SpecificVersion>`
`92`	`91`	`</Reference>`
`93`		`- <ReferenceInclude="Microsoft.Build.Utilities.v12.0" />`
	`92`	`+ <ReferenceInclude="Microsoft.Build.Utilities.core" />`
`94`	`93`	`<ReferenceInclude="Microsoft.Build.Utilities.v3.5.dll" />`
`95`	`94`	`<ReferenceInclude="EnvDTE.dll" />`
`96`	`95`	`<ReferenceInclude="EnvDTE80.dll" />`
`97`	`96`	`<ReferenceInclude="VSLangProj" />`
`98`	`97`	`<ReferenceInclude="VSLangProj80" />`
`99`	`98`	`<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />`
`100`		`- <ReferenceInclude="$(vsFrameworkLatest)" />`
	`99`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.14.0" />`
`101`	`100`	`<ReferenceInclude="Microsoft.VisualStudio.Threading" />`
`102`	`101`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />`
`103`	`102`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />`

`‎vsintegration/src/vs/FsPkgs/FSharp.Editor/FSharp.Editor.fsproj‎`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">`
`4`	`4`	`<PropertyGroup>`
`5`	`5`	`<FSharpSourcesRoot>..\..\..\..\..\src</FSharpSourcesRoot>`
`6`		`- <vsFrameworkLatest>Microsoft.VisualStudio.Shell.12.0</vsFrameworkLatest>`
`7`		`- <vsLanguageServiceLatest>Microsoft.VisualStudio.Package.LanguageService.12.0</vsLanguageServiceLatest>`
`8`	`6`	`<ProjectLanguage>FSharp</ProjectLanguage>`
`9`	`7`	`<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>`
`10`	`8`	`</PropertyGroup>`

`‎vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj‎`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">`
`4`	`4`	`<PropertyGroup>`
`5`	`5`	`<FSharpSourcesRoot>..\..\..\..\..\..\src</FSharpSourcesRoot>`
`6`		`- <vsFrameworkLatest>Microsoft.VisualStudio.Shell.12.0</vsFrameworkLatest>`
`7`		`- <vsLanguageServiceLatest>Microsoft.VisualStudio.Package.LanguageService.12.0</vsLanguageServiceLatest>`
`8`	`6`	`<ProjectLanguage>CSharp</ProjectLanguage>`
`9`	`7`	`<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>`
`10`	`8`	`</PropertyGroup>`
`@@ -40,10 +38,10 @@`
`40`	`38`	`</PropertyGroup>`
`41`	`39`	`<ImportProject="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />`
`42`	`40`	`<ItemGroup>`
`43`		`- <ReferenceInclude="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
	`41`	`+ <ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`44`	`42`	`<SpecificVersion>true</SpecificVersion>`
`45`	`43`	`</Reference>`
`46`		`- <ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
	`44`	`+ <ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`47`	`45`	`<SpecificVersion>true</SpecificVersion>`
`48`	`46`	`</Reference>`
`49`	`47`	`<ReferenceInclude="microsoft.msxml" />`
`@@ -58,7 +56,7 @@`
`58`	`56`	`<ReferenceInclude="VSLangProj" />`
`59`	`57`	`<ReferenceInclude="VSLangProj80" />`
`60`	`58`	`<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />`
`61`		`- <ReferenceInclude="$(vsFrameworkLatest)" />`
	`59`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.14.0" />`
`62`	`60`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />`
`63`	`61`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />`
`64`	`62`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />`

`‎vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.fsproj‎`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">`
`4`	`4`	`<PropertyGroup>`
`5`	`5`	`<FSharpSourcesRoot>..\..\..\..\..\src</FSharpSourcesRoot>`
`6`		`- <vsFrameworkLatest>Microsoft.VisualStudio.Shell.12.0</vsFrameworkLatest>`
`7`		`- <vsLanguageServiceLatest>Microsoft.VisualStudio.Package.LanguageService.12.0</vsLanguageServiceLatest>`
`8`	`6`	`<ProjectLanguage>FSharp</ProjectLanguage>`
`9`	`7`	`<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>`
`10`	`8`	`</PropertyGroup>`
`@@ -59,26 +57,26 @@`
`59`	`57`	`<ReferenceInclude="System.Configuration" />`
`60`	`58`	`<ReferenceInclude="System.Drawing" />`
`61`	`59`	`<ReferenceInclude="System.Windows.Forms" />`
`62`		`- <ReferenceInclude="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
	`60`	`+ <ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`63`	`61`	`<SpecificVersion>true</SpecificVersion>`
`64`	`62`	`</Reference>`
`65`		`- <ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
	`63`	`+ <ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`66`	`64`	`<SpecificVersion>true</SpecificVersion>`
`67`	`65`	`</Reference>`
`68`	`66`	`<ReferenceInclude="EnvDTE.dll" />`
`69`	`67`	`<ReferenceInclude="EnvDTE80.dll" />`
`70`	`68`	`<ReferenceInclude="VSLangProj" />`
`71`	`69`	`<ReferenceInclude="VSLangProj80" />`
`72`	`70`	`<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />`
`73`		`- <ReferenceInclude="$(vsFrameworkLatest)" />`
	`71`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.14.0" />`
`74`	`72`	`<ReferenceInclude="Microsoft.VisualStudio.Threading" />`
`75`	`73`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />`
`76`	`74`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />`
`77`	`75`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />`
`78`	`76`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />`
`79`	`77`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.dll" />`
`80`	`78`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Design" />`
`81`		`- <ReferenceInclude="$(vsLanguageServiceLatest)" />`
	`79`	`+ <ReferenceInclude="Microsoft.VisualStudio.Package.LanguageService.14.0" />`
`82`	`80`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.11.0" />`
`83`	`81`	`<ReferenceInclude="Microsoft.VisualStudio.ProjectAggregator" />`
`84`	`82`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.dll" />`

`‎vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/ProjectSystem.Base.csproj‎`

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">`
`4`	`4`	`<PropertyGroup>`
`5`	`5`	`<FSharpSourcesRoot>..\..\..\..\..\..\..\src</FSharpSourcesRoot>`
`6`		`- <vsFrameworkLatest>Microsoft.VisualStudio.Shell.12.0</vsFrameworkLatest>`
`7`		`- <vsLanguageServiceLatest>Microsoft.VisualStudio.Package.LanguageService.12.0</vsLanguageServiceLatest>`
`8`	`6`	`<ProjectLanguage>CSharp</ProjectLanguage>`
`9`	`7`	`<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>`
`10`	`8`	`<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>`
`@@ -39,17 +37,17 @@`
`39`	`37`	`<DelaySign>true</DelaySign>`
`40`	`38`	`</PropertyGroup>`
`41`	`39`	`<ItemGroup>`
`42`		`- <ReferenceInclude="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
	`40`	`+ <ReferenceInclude="Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`43`	`41`	`<SpecificVersion>true</SpecificVersion>`
`44`	`42`	`</Reference>`
`45`		`- <ReferenceInclude="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
	`43`	`+ <ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`46`	`44`	`<SpecificVersion>true</SpecificVersion>`
`47`	`45`	`</Reference>`
`48`		`- <ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
	`46`	`+ <ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`49`	`47`	`<SpecificVersion>true</SpecificVersion>`
`50`	`48`	`</Reference>`
`51`		`- <ReferenceInclude="Microsoft.Build.Utilities.v12.0" />`
`52`		`- <ReferenceInclude="Microsoft.Build.Conversion.v12.0" />`
	`49`	`+ <ReferenceInclude="Microsoft.Build.Utilities.core" />`
	`50`	`+ <ReferenceInclude="Microsoft.Build.Conversion.core" />`
`53`	`51`	`<ReferenceInclude="System" />`
`54`	`52`	`<ReferenceInclude="System.Core" />`
`55`	`53`	`<ReferenceInclude="System.Xml" />`
`@@ -68,7 +66,7 @@`
`68`	`66`	`<ReferenceInclude="VSLangProj80" />`
`69`	`67`	`<ReferenceInclude="microsoft.visualstudio.vcprojectengine" />`
`70`	`68`	`<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />`
`71`		`- <ReferenceInclude="$(vsFrameworkLatest)" />`
	`69`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.14.0" />`
`72`	`70`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />`
`73`	`71`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />`
`74`	`72`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />`

`‎vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj‎`

Lines changed: 8 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">`
`4`	`4`	`<PropertyGroup>`
`5`	`5`	`<FSharpSourcesRoot>..\..\..\..\..\..\src</FSharpSourcesRoot>`
`6`		`- <vsFrameworkLatest>Microsoft.VisualStudio.Shell.12.0</vsFrameworkLatest>`
`7`		`- <vsLanguageServiceLatest>Microsoft.VisualStudio.Package.LanguageService.12.0</vsLanguageServiceLatest>`
`8`	`6`	`<ProjectLanguage>FSharp</ProjectLanguage>`
`9`	`7`	`<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>`
`10`	`8`	`<VsSdkTargetsDir>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK</VsSdkTargetsDir>`
`@@ -55,7 +53,6 @@`
`55`	`53`	`<ReferenceInclude="VSLangProj" />`
`56`	`54`	`<ReferenceInclude="VSLangProj80" />`
`57`	`55`	`<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />`
`58`		`- <ReferenceInclude="$(vsFrameworkLatest)" />`
`59`	`56`	`<ReferenceInclude="Microsoft.VisualStudio.Threading" />`
`60`	`57`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />`
`61`	`58`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />`
`@@ -70,16 +67,14 @@`
`70`	`67`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />`
`71`	`68`	`<ReferenceInclude="Microsoft.VisualStudio.Designer.Interfaces" />`
`72`	`69`	`<ReferenceInclude="Microsoft.VisualStudio.VSHelp.dll" />`
`73`		`- <ReferenceInclude="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`74`		`- <SpecificVersion>true</SpecificVersion>`
`75`		`- </Reference>`
`76`		`- <ReferenceInclude="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`77`		`- <SpecificVersion>true</SpecificVersion>`
`78`		`- </Reference>`
`79`		`- <ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">`
`80`		`- <SpecificVersion>true</SpecificVersion>`
`81`		`- </Reference>`
`82`		`- <ReferenceInclude="Microsoft.Build.Utilities.v12.0" />`
	`70`	`+ <ReferenceInclude="Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />`
	`71`	`+ <ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />`
	`72`	`+ <ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />`
	`73`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />`
	`74`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.UI.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />`
	`75`	`+ <ReferenceInclude="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />`
	`76`	`+ <ReferenceInclude="Microsoft.Build.Utilities.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />`
	`77`	`+`
`83`	`78`	`<ReferenceInclude="System" />`
`84`	`79`	`<ReferenceInclude="System.Core" />`
`85`	`80`	`<ReferenceInclude="System.Design" />`
`@@ -93,7 +88,6 @@`
`93`	`88`	`<ReferenceInclude="System.Xaml" />`
`94`	`89`	`<ReferenceInclude="System.Xml" />`
`95`	`90`	`<ReferenceInclude="System.Xml.Linq" />`
`96`		`- <ReferenceInclude="Microsoft.VisualStudio.Shell.UI.Internal, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />`
`97`	`91`	`<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.LanguageService.Compiler\FSharp.LanguageService.Compiler.fsproj">`
`98`	`92`	`<Project>{a437a6ec-5323-47c2-8f86-e2cac54ff152}</Project>`
`99`	`93`	`<Name>FSharp.LanguageService.Compiler</Name>`

`‎vsintegration/src/vs/FsPkgs/FSharp.Project/VB/FSharpPropPage/FSharp.PropertiesPages.vbproj‎`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">`
`4`	`4`	`<PropertyGroup>`
`5`	`5`	`<FSharpSourcesRoot>..\..\..\..\..\..\..\src</FSharpSourcesRoot>`
`6`		`- <vsFrameworkLatest>Microsoft.VisualStudio.Shell.12.0</vsFrameworkLatest>`
`7`		`- <vsLanguageServiceLatest>Microsoft.VisualStudio.Package.LanguageService.12.0</vsLanguageServiceLatest>`
`8`	`6`	`<ProjectLanguage>VisualBasic</ProjectLanguage>`
`9`	`7`	`<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>`
`10`	`8`	`</PropertyGroup>`
`@@ -61,7 +59,7 @@`
`61`	`59`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />`
`62`	`60`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />`
`63`	`61`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />`
`64`		`- <ReferenceInclude="$(vsFrameworkLatest)" />`
	`62`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.14.0" />`
`65`	`63`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.dll" />`
`66`	`64`	`<ReferenceInclude="Microsoft.VisualStudio.VSHelp.dll" />`
`67`	`65`	`<ReferenceInclude="Microsoft.VisualStudio.WCFReference.Interop.dll" />`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb6f4807

File tree

10 files changed

10 files changed

`‎src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj‎`

`‎vsintegration/src/Salsa/Salsa.fsproj‎`

`‎vsintegration/src/unittests/Unittests.fsproj‎`

`‎vsintegration/src/vs/FsPkgs/FSharp.Editor/FSharp.Editor.fsproj‎`

`‎vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj‎`

`‎vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.fsproj‎`

`‎vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/ProjectSystem.Base.csproj‎`

`‎vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj‎`

`‎vsintegration/src/vs/FsPkgs/FSharp.Project/VB/FSharpPropPage/FSharp.PropertiesPages.vbproj‎`

0 commit comments