Pateldisolution/visualfsharpPublic

forked fromdotnet/fsharp

NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitf6d830b

latkin

authored and

VFSharpTeam

committed

Use correct, consistent versions of VS binaries

1 parent827044c commitf6d830bCopy full SHA for f6d830b

File tree

7 files changed

+35

-38

lines changed

vsintegration/src
- Salsa
  - Salsa.fsproj
- unittests
  - Unittests.fsproj
- vs/FsPkgs
  - FSharp.LanguageService
    - FSharp.LanguageService.Base
      - FSharp.LanguageService.Base.csproj
    - FSharp.LanguageService.fsproj
  - FSharp.Project
    - Common.Source.CSharp/Project
      - ProjectSystem.Base.csproj
    - FS
      - ProjectSystem.fsproj
  - FSharp.VS.FSI
    - FSHarp.VS.FSI.fsproj

7 files changed

+35

-38

lines changed

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

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,21 +46,20 @@`
`46`	`46`	`<ReferenceInclude="VSLangProj" />`
`47`	`47`	`<ReferenceInclude="VSLangProj80" />`
`48`	`48`	`<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />`
`49`		`- <ReferenceInclude="Microsoft.VisualStudio.Threading" />`
	`49`	`+ <ReferenceInclude="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`50`	`50`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />`
`51`	`51`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />`
`52`	`52`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />`
`53`		`- <ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />`
`54`	`53`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.dll" />`
`55`		`- <ReferenceInclude="Microsoft.VisualStudio.Shell.Design" />`
	`54`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`56`	`55`	`<ReferenceInclude="Microsoft.VisualStudio.ProjectAggregator" />`
`57`	`56`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.dll" />`
`58`	`57`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />`
`59`	`58`	`<ReferenceInclude="Microsoft.VisualStudio.Designer.Interfaces" />`
`60`		`- <ReferenceInclude="Microsoft.VisualStudio.CommonIDE" />`
	`59`	`+ <ReferenceInclude="Microsoft.VisualStudio.CommonIDE, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`61`	`60`	`<ReferenceInclude="Microsoft.VisualStudio.VSHelp.dll" />`
`62`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.Data" />`
`63`		`- <ReferenceInclude="Microsoft.VisualStudio.CoreUtility" />`
	`61`	`+ <ReferenceInclude="Microsoft.VisualStudio.Text.Data, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`62`	`+ <ReferenceInclude="Microsoft.VisualStudio.CoreUtility, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`64`	`63`	`<ReferenceInclude="nunit.framework">`
`65`	`64`	`<Private>True</Private>`
`66`	`65`	`<HintPath>$(NUnitLibDir)\nunit.framework.dll</HintPath>`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@`
`99`	`99`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Design" />`
`100`	`100`	`<ReferenceInclude="Microsoft.VisualStudio.ProjectAggregator" />`
`101`	`101`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.dll" />`
`102`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.Data.dll" />`
	`102`	`+ <ReferenceInclude="Microsoft.VisualStudio.Text.Data, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`103`	`103`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />`
`104`	`104`	`<ReferenceInclude="Microsoft.VisualStudio.Designer.Interfaces" />`
`105`	`105`	`<ReferenceInclude="Microsoft.VisualStudio.CommonIDE" />`

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

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,18 +58,18 @@`
`58`	`58`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />`
`59`	`59`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />`
`60`	`60`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.dll" />`
`61`		`- <ReferenceInclude="Microsoft.VisualStudio.Shell.Design" />`
	`61`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`62`	`62`	`<ReferenceInclude="Microsoft.VisualStudio.ProjectAggregator" />`
`63`	`63`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.dll" />`
`64`	`64`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />`
`65`	`65`	`<ReferenceInclude="Microsoft.VisualStudio.Designer.Interfaces" />`
`66`	`66`	`<ReferenceInclude="Microsoft.VisualStudio.VSHelp.dll" />`
`67`		`- <ReferenceInclude="Microsoft.VisualStudio.CoreUtility" />`
`68`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.Data" />`
`69`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.UI" />`
`70`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.UI.Wpf" />`
`71`		`- <ReferenceInclude="Microsoft.VisualStudio.ComponentModelHost" />`
`72`		`- <ReferenceInclude="Microsoft.VisualStudio.Editor" />`
	`67`	`+ <ReferenceInclude="Microsoft.VisualStudio.CoreUtility, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`68`	`+ <ReferenceInclude="Microsoft.VisualStudio.Text.Data, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`69`	`+ <ReferenceInclude="Microsoft.VisualStudio.Text.UI, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`70`	`+ <ReferenceInclude="Microsoft.VisualStudio.Text.UI.Wpf, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`71`	`+ <ReferenceInclude="Microsoft.VisualStudio.ComponentModelHost, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`72`	`+ <ReferenceInclude="Microsoft.VisualStudio.Editor, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`73`	`73`	`<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">`
`74`	`74`	`<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>`
`75`	`75`	`<Name>FSharp.Core</Name>`

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

Lines changed: 10 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,8 @@`
`69`	`69`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />`
`70`	`70`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />`
`71`	`71`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />`
`72`		`- <ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />`
`73`	`72`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.dll" />`
`74`		`- <ReferenceInclude="Microsoft.VisualStudio.Shell.Design" />`
	`73`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`75`	`74`	`<ReferenceInclude="Microsoft.VisualStudio.Package.LanguageService.$(VisualStudioVersion)" />`
`76`	`75`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.11.0" />`
`77`	`76`	`<ReferenceInclude="Microsoft.VisualStudio.ProjectAggregator" />`
`@@ -86,17 +85,16 @@`
`86`	`85`	`<ReferenceInclude="System.Xml" />`
`87`	`86`	`<ReferenceInclude="System.Xml.Linq" />`
`88`	`87`	`<ReferenceInclude="Microsoft.VisualStudio.VSHelp.dll" />`
`89`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.UI" />`
`90`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.UI.Wpf" />`
`91`		`- <ReferenceInclude="Microsoft.VisualStudio.CoreUtility" />`
`92`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.Data" />`
`93`		`- <ReferenceInclude="Microsoft.VisualStudio.Editor" />`
`94`		`- <ReferenceInclude="Microsoft.VisualStudio.Language.StandardClassification" />`
`95`		`- <ReferenceInclude="Microsoft.VisualStudio.ExtensibilityHosting" />`
`96`		`- <ReferenceInclude="Microsoft.VisualStudio.ComponentModelHost" />`
	`88`	`+ <ReferenceInclude="Microsoft.VisualStudio.Text.Logic, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`89`	`+ <ReferenceInclude="Microsoft.VisualStudio.Text.UI, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`90`	`+ <ReferenceInclude="Microsoft.VisualStudio.Text.UI.Wpf, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`91`	`+ <ReferenceInclude="Microsoft.VisualStudio.CoreUtility, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`92`	`+ <ReferenceInclude="Microsoft.VisualStudio.Text.Data, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`93`	`+ <ReferenceInclude="Microsoft.VisualStudio.Editor, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`94`	`+ <ReferenceInclude="Microsoft.VisualStudio.Language.StandardClassification, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`95`	`+ <ReferenceInclude="Microsoft.VisualStudio.ExtensibilityHosting, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`96`	`+ <ReferenceInclude="Microsoft.VisualStudio.ComponentModelHost, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`97`	`97`	`<ReferenceInclude="System.ComponentModel.Composition" />`
`98`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.UI.Wpf" />`
`99`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.Logic" />`
`100`	`98`	`<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">`
`101`	`99`	`<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>`
`102`	`100`	`<Name>FSharp.Core</Name>`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@`
`69`	`69`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />`
`70`	`70`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.12.0.dll" />`
`71`	`71`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.dll" />`
`72`		`- <ReferenceInclude="Microsoft.VisualStudio.Shell.Design" />`
	`72`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`73`	`73`	`<ReferenceInclude="Microsoft.VisualStudio.ProjectAggregator" />`
`74`	`74`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.dll" />`
`75`	`75`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />`

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,15 +51,15 @@`
`51`	`51`	`<ReferenceInclude="VSLangProj" />`
`52`	`52`	`<ReferenceInclude="VSLangProj80" />`
`53`	`53`	`<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />`
`54`		`- <ReferenceInclude="Microsoft.VisualStudio.Threading" />`
	`54`	`+ <ReferenceInclude="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`55`	`55`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />`
`56`	`56`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />`
`57`	`57`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />`
`58`	`58`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />`
`59`	`59`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />`
`60`	`60`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />`
`61`	`61`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.dll" />`
`62`		`- <ReferenceInclude="Microsoft.VisualStudio.Shell.Design" />`
	`62`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`63`	`63`	`<ReferenceInclude="Microsoft.VisualStudio.ProjectAggregator" />`
`64`	`64`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.dll" />`
`65`	`65`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />`

`‎vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj‎`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,26 +47,26 @@`
`47`	`47`	`<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />`
`48`	`48`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />`
`49`	`49`	`<ReferenceInclude="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"Condition="'$(VisualStudioVersion)' != '12.0'" />`
`50`		`- <ReferenceInclude="Microsoft.VisualStudio.Threading" />`
	`50`	`+ <ReferenceInclude="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`51`	`51`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />`
`52`	`52`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />`
`53`	`53`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />`
`54`	`54`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />`
`55`	`55`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.dll" />`
`56`		`- <ReferenceInclude="Microsoft.VisualStudio.Shell.Design" />`
	`56`	`+ <ReferenceInclude="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`57`	`57`	`<ReferenceInclude="Microsoft.VisualStudio.ProjectAggregator" />`
`58`	`58`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.dll" />`
`59`	`59`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />`
`60`	`60`	`<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.10.0.dll" />`
`61`	`61`	`<ReferenceInclude="Microsoft.VisualStudio.Designer.Interfaces" />`
`62`	`62`	`<ReferenceInclude="Microsoft.VisualStudio.VSHelp.dll" />`
`63`		`- <ReferenceInclude="Microsoft.VisualStudio.CoreUtility" />`
`64`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.Data" />`
`65`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.Logic" />`
`66`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.UI" />`
`67`		`- <ReferenceInclude="Microsoft.VisualStudio.Text.UI.Wpf" />`
`68`		`- <ReferenceInclude="Microsoft.VisualStudio.ComponentModelHost" />`
`69`		`- <ReferenceInclude="Microsoft.VisualStudio.Editor" />`
	`63`	`+ <ReferenceInclude="Microsoft.VisualStudio.CoreUtility, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`64`	`+ <ReferenceInclude="Microsoft.VisualStudio.Text.Data, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`65`	`+ <ReferenceInclude="Microsoft.VisualStudio.Text.Logic, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`66`	`+ <ReferenceInclude="Microsoft.VisualStudio.Text.UI, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`67`	`+ <ReferenceInclude="Microsoft.VisualStudio.Text.UI.Wpf, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`68`	`+ <ReferenceInclude="Microsoft.VisualStudio.ComponentModelHost, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
	`69`	`+ <ReferenceInclude="Microsoft.VisualStudio.Editor, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />`
`70`	`70`	`<ReferenceInclude="mscorlib" />`
`71`	`71`	`<ReferenceInclude="System"/>`
`72`	`72`	`<ReferenceInclude="PresentationFramework"/>`

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!

Commitf6d830b

File tree

7 files changed

7 files changed

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

`‎vsintegration/src/unittests/Unittests.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.VS.FSI/FSHarp.VS.FSI.fsproj‎`

0 commit comments