Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit204fa02

Browse files
committed
convert FSharp.LanguageService to the dotnet SDK
1 parentb280da9 commit204fa02

File tree

8 files changed

+74
-204
lines changed

8 files changed

+74
-204
lines changed

‎VisualFSharp.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Server.Shar
1414
EndProject
1515
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core","src\fsharp\FSharp.Core\FSharp.Core.fsproj","{DED3BBD7-53F4-428A-8C9F-27968E768605}"
1616
EndProject
17-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.LanguageService","vsintegration\src\FSharp.LanguageService\FSharp.LanguageService.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}"
17+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="FSharp.LanguageService","vsintegration\src\FSharp.LanguageService\FSharp.LanguageService.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}"
1818
EndProject
1919
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="FSharp.LanguageService.Base","vsintegration\src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj","{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}"
2020
EndProject
@@ -202,10 +202,10 @@ Global
202202
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Debug|Any CPU.Build.0=Debug|Any CPU
203203
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Debug|x86.ActiveCfg=Debug|Any CPU
204204
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Debug|x86.Build.0=Debug|Any CPU
205-
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
206-
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|Any CPU.Build.0=Proto|Any CPU
207-
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|x86.ActiveCfg=Proto|Any CPU
208-
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|x86.Build.0=Proto|Any CPU
205+
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|Any CPU.ActiveCfg=Release|Any CPU
206+
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|Any CPU.Build.0=Release|Any CPU
207+
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|x86.ActiveCfg=Release|Any CPU
208+
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|x86.Build.0=Release|Any CPU
209209
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Release|Any CPU.ActiveCfg=Release|Any CPU
210210
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Release|Any CPU.Build.0=Release|Any CPU
211211
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Release|x86.ActiveCfg=Release|Any CPU

‎build/targets/PackageVersions.props‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,28 @@
1212
<MicrosoftVisualStudioLanguageServicesPackageVersion>2.3.0-beta2-61719-01</MicrosoftVisualStudioLanguageServicesPackageVersion>
1313

1414
<!-- Visual Studio packages-->
15-
<EnvDTEPackageVersion>8.0.1</EnvDTEPackageVersion>
1615
<EnvDTE80PackageVersion>8.0.1</EnvDTE80PackageVersion>
1716
<MicrosoftVisualStudioComponentModelHostPackageVersion>15.0.26201-alpha</MicrosoftVisualStudioComponentModelHostPackageVersion>
17+
<MicrosoftVisualStudioDesignerInterfacesPackageVersion>1.1.4322</MicrosoftVisualStudioDesignerInterfacesPackageVersion>
1818
<MicrosoftVisualStudioEditorPackageVersion>15.0.26201</MicrosoftVisualStudioEditorPackageVersion>
1919
<MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>15.0.26201</MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>
2020
<MicrosoftVisualStudioLanguageIntellisensePackageVersion>15.0.26201</MicrosoftVisualStudioLanguageIntellisensePackageVersion>
2121
<MicrosoftVisualStudioPackageLanguageService150PackageVersion>15.0.26201</MicrosoftVisualStudioPackageLanguageService150PackageVersion>
2222
<MicrosoftVisualStudioProjectAggregatorPackageVersion>8.0.50727</MicrosoftVisualStudioProjectAggregatorPackageVersion>
23+
<MicrosoftVisualStudioShell150PackageVersion>15.0.26201</MicrosoftVisualStudioShell150PackageVersion>
2324
<MicrosoftVisualStudioShellDesignPackageVersion>15.0.26201</MicrosoftVisualStudioShellDesignPackageVersion>
25+
<MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioShellInterop100PackageVersion>
2426
<MicrosoftVisualStudioShellImmutable100PackageVersion>10.0.30319</MicrosoftVisualStudioShellImmutable100PackageVersion>
2527
<MicrosoftVisualStudioShellImmutable110PackageVersion>11.0.50727</MicrosoftVisualStudioShellImmutable110PackageVersion>
2628
<MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61030</MicrosoftVisualStudioShellInterop110PackageVersion>
27-
<MicrosoftVisualStudioTextManagerInteropPackageVersion>7.10.6070</MicrosoftVisualStudioTextManagerInteropPackageVersion>
28-
<MicrosoftVisualStudioTextManagerInterop80PackageVersion>8.0.50727</MicrosoftVisualStudioTextManagerInterop80PackageVersion>
2929
<MicrosoftVSSDKBuildToolsPackageVersion>15.1.192</MicrosoftVSSDKBuildToolsPackageVersion>
3030
<VSSDKVSLangProjPackageVersion>7.0.4</VSSDKVSLangProjPackageVersion>
31+
<VSSDKVSLangProj8PackageVersion>8.0.4</VSSDKVSLangProj8PackageVersion>
32+
<VSSDKVSHelpPackageVersion>7.0.4</VSSDKVSHelpPackageVersion>
3133

3234
<!-- other packages-->
3335
<MicrosoftCompositionPackageVersion>1.0.30</MicrosoftCompositionPackageVersion>
36+
<MicrosoftVisualFSharpMSBuild150PackageVersion>1.0.1</MicrosoftVisualFSharpMSBuild150PackageVersion>
3437
<NewtonsoftJsonPackageVersion>10.0.2</NewtonsoftJsonPackageVersion>
3538
<XliffTasksPackageVersion>0.2.0-beta-000081</XliffTasksPackageVersion>
3639

‎vsintegration/FSharp.Directory.Build.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
<UseVsMicroBuildAssemblyVersion>true</UseVsMicroBuildAssemblyVersion>
77
</PropertyGroup>
88

9-
<ImportProject="$(NuGetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.props"
10-
Condition="'$(ImportVsSDK)' == 'true'" />
11-
129
</Project>

‎vsintegration/FSharp.Directory.Build.targets‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
<ImportProject="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
44

5+
<ImportProject="$(NuGetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.props"
6+
Condition="'$(ImportVsSDK)' == 'true'" />
57
<ImportProject="$(NugetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.targets"
68
Condition="'$(ImportVsSDK)' == 'true'" />
79
<ImportProject="$(NugetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\tools\vssdk\Microsoft.VsSDK.targets"

‎vsintegration/fsharp-vsintegration-src-build.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
<ItemGroup>
2020
<SdkProjectsInclude="src\FSharp.Editor\FSharp.Editor.fsproj" />
21+
<SdkProjectsInclude="src\FSharp.LanguageService\FSharp.LanguageService.fsproj" />
2122
</ItemGroup>
2223

2324
<ImportProject="..\src\root.traversal.targets"/>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<ImportProject="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
3+
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<ImportProject="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
3+
</Project>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp