Movatterモバイル変換

Skip to content

Pateldisolution/fsharp-1Public

forked fromfsharp/fsharp

NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitc06e62c

brettfo

committed

normalize VS package versions

1 parentfe01408 commitc06e62cCopy full SHA for c06e62c

File tree

11 files changed

+18

-10

lines changed

src
- FSharpSource.Settings.targets
- fsharp/FSharp.LanguageService.Compiler
  - FSharp.LanguageService.Compiler.fsproj
vsintegration
- packages.config
- src
  - FSharp.Editor
    - FSharp.Editor.fsproj
  - FSharp.LanguageService.Base
    - FSharp.LanguageService.Base.csproj
  - FSharp.LanguageService
    - FSharp.LanguageService.fsproj
  - FSharp.ProjectSystem.FSharp
    - ProjectSystem.fsproj
  - FSharp.ProjectSystem.PropertyPages
    - FSharp.PropertiesPages.vbproj
  - FSharp.VS.FSI
    - FSHarp.VS.FSI.fsproj
- tests
  - Salsa
    - VisualFSharp.Salsa.fsproj
  - unittests
    - VisualFSharp.Unittests.fsproj

11 files changed

+18

-10

lines changed

`‎src/FSharpSource.Settings.targets‎`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,10 @@`
`37`	`37`	`<RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>`
`38`	`38`	`<!--<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26124-RC3</VSSDK_BUILDTOOLS_VERSION>-->`
`39`	`39`	`<!--<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.$(RoslynVSPackagesVersion)</VSSDK_BUILDTOOLS_VERSION>-->`
`40`		`- <VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26201</VSSDK_BUILDTOOLS_VERSION>`
	`40`	`+ <VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26201</VSSDK_BUILDTOOLS_VERSION>`
	`41`	`+`
	`42`	`+ <MicrosoftVisualStudioThreadingVersion>15.0.240</MicrosoftVisualStudioThreadingVersion>`
	`43`	`+ <MicrosoftVisualStudioValidationVersion>15.0.82</MicrosoftVisualStudioValidationVersion>`
`41`	`44`
`42`	`45`	`<!-- Always qualify the IntermediateOutputPath by the TargetFramework if any exists-->`
`43`	`46`	`<IntermediateOutputPath>obj\$(Configuration)\$(TargetFramework)\</IntermediateOutputPath>`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -646,7 +646,7 @@`
`646`	`646`	`<Private>True</Private>`
`647`	`647`	`</Reference>`
`648`	`648`	`<ReferenceInclude="Microsoft.VisualStudio.Threading">`
`649`		`- <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
	`649`	`+ <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.$(MicrosoftVisualStudioThreadingVersion)\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
`650`	`650`	`</Reference>`
`651`	`651`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Design, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">`
`652`	`652`	`<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Design.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Design.dll</HintPath>`

`‎vsintegration/packages.config‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@`
`45`	`45`
`46`	`46`	`<packageid="Microsoft.VisualStudio.Shell.Immutable.15.0"version="15.0.25123-Dev15Preview"targetFramework="net46" />`
`47`	`47`	`<packageid="Microsoft.VisualStudio.Threading"version="15.0.240"targetFramework="net46" />`
	`48`	`+ <packageid="Microsoft.VisualStudio.Validation"version="15.0.82"targetFramework="net46" />`
`48`	`49`	`<packageid="Microsoft.VisualStudio.Shell.Design"version="15.0.26201"targetFramework="net46" />`
`49`	`50`	`<packageid="Microsoft.VisualStudio.Package.LanguageService.15.0"version="15.0.26201"targetFramework="net46" />`
`50`	`51`	`<packageid="Microsoft.VisualStudio.Editor"version="15.0.26201"targetFramework="net46" />`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@`
`148`	`148`	`<Private>True</Private>`
`149`	`149`	`</Reference>`
`150`	`150`	`<ReferenceInclude="Microsoft.VisualStudio.Threading">`
`151`		`- <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
	`151`	`+ <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.$(MicrosoftVisualStudioThreadingVersion)\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
`152`	`152`	`</Reference>`
`153`	`153`	`<ReferenceInclude="Microsoft.VisualStudio.Editor, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">`
`154`	`154`	`<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Editor.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Editor.dll</HintPath>`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@`
`133`	`133`	`<Private>True</Private>`
`134`	`134`	`</Reference>`
`135`	`135`	`<ReferenceInclude="Microsoft.VisualStudio.Threading">`
`136`		`- <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
	`136`	`+ <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.$(MicrosoftVisualStudioThreadingVersion)\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
`137`	`137`	`</Reference>`
`138`	`138`	`<ReferenceInclude="Microsoft.VisualStudio.Shell.Framework, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">`
`139`	`139`	`<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Framework.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@`
`156`	`156`	`<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Framework.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>`
`157`	`157`	`</Reference>`
`158`	`158`	`<ReferenceInclude="Microsoft.VisualStudio.Threading">`
`159`		`- <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
	`159`	`+ <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.$(MicrosoftVisualStudioThreadingVersion)\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
`160`	`160`	`</Reference>`
`161`	`161`	`<ReferenceInclude="Microsoft.VisualStudio.Editor, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">`
`162`	`162`	`<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Editor.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Editor.dll</HintPath>`

`‎vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@`
`181`	`181`	`<Private>True</Private>`
`182`	`182`	`</Reference>`
`183`	`183`	`<ReferenceInclude="Microsoft.VisualStudio.Threading">`
`184`		`- <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
	`184`	`+ <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.$(MicrosoftVisualStudioThreadingVersion)\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
`185`	`185`	`</Reference>`
`186`	`186`	`<ReferenceInclude="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">`
`187`	`187`	`<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll</HintPath>`

`‎vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@`
`140`	`140`	`<Private>True</Private>`
`141`	`141`	`</Reference>`
`142`	`142`	`<ReferenceInclude="Microsoft.VisualStudio.Threading">`
`143`		`- <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
	`143`	`+ <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.$(MicrosoftVisualStudioThreadingVersion)\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
`144`	`144`	`</Reference>`
`145`	`145`	`<ReferenceInclude="Microsoft.VisualStudio.Utilities, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">`
`146`	`146`	`<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Utilities.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@`
`173`	`173`	`<Private>True</Private>`
`174`	`174`	`</Reference>`
`175`	`175`	`<ReferenceInclude="Microsoft.VisualStudio.Threading">`
`176`		`- <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
	`176`	`+ <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.$(MicrosoftVisualStudioThreadingVersion)\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
`177`	`177`	`</Reference>`
`178`	`178`	`<ReferenceInclude="Microsoft.VisualStudio.Editor, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">`
`179`	`179`	`<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Editor.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Editor.dll</HintPath>`

`‎vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@`
`128`	`128`	`<Private>True</Private>`
`129`	`129`	`</Reference>`
`130`	`130`	`<ReferenceInclude="Microsoft.VisualStudio.Threading">`
`131`		`- <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
	`131`	`+ <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.$(MicrosoftVisualStudioThreadingVersion)\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>`
`132`	`132`	`</Reference>`
`133`	`133`	`<ReferenceInclude="Microsoft.VisualStudio.Text.UI.Wpf, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">`
`134`	`134`	`<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp