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

Commit1b6a9cf

Browse files
committed
convert FSharp.LanguageService.Base to the dotnet SDK
1 parentbff5665 commit1b6a9cf

File tree

9 files changed

+66
-277
lines changed

9 files changed

+66
-277
lines changed

‎VisualFSharp.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Core", "src\fsharp\F
1616
EndProject
1717
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="FSharp.LanguageService","vsintegration\src\FSharp.LanguageService\FSharp.LanguageService.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="FSharp.LanguageService.Base","vsintegration\src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj","{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="FSharp.LanguageService.Base","vsintegration\src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj","{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}"
2020
EndProject
2121
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="FSharp.Editor","vsintegration\src\FSharp.Editor\FSharp.Editor.fsproj","{65E0E82A-EACE-4787-8994-888674C2FE87}"
2222
EndProject
@@ -214,10 +214,10 @@ Global
214214
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Debug|Any CPU.Build.0=Debug|Any CPU
215215
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Debug|x86.ActiveCfg=Debug|Any CPU
216216
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Debug|x86.Build.0=Debug|Any CPU
217-
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
218-
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|Any CPU.Build.0=Proto|Any CPU
219-
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|x86.ActiveCfg=Proto|Any CPU
220-
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|x86.Build.0=Proto|Any CPU
217+
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|Any CPU.ActiveCfg=Release|Any CPU
218+
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|Any CPU.Build.0=Release|Any CPU
219+
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|x86.ActiveCfg=Release|Any CPU
220+
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|x86.Build.0=Release|Any CPU
221221
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Release|Any CPU.ActiveCfg=Release|Any CPU
222222
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Release|Any CPU.Build.0=Release|Any CPU
223223
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Release|x86.ActiveCfg=Release|Any CPU

‎build/targets/GenerateInternalsVisibleTo.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
<WriteCodeFragmentAssemblyAttributes="@(_InternalsVisibleToAttribute)"
3636
Language="$(Language)"
3737
OutputFile="$(GeneratedFSharpInternalsVisibleToFile)">
38-
<OutputTaskParameter="OutputFile"ItemName="CompileBefore" />
38+
<OutputTaskParameter="OutputFile"ItemName="CompileBefore"Condition="'$(Language)' == 'F#'" />
39+
<OutputTaskParameter="OutputFile"ItemName="Compile"Condition="'$(Language)' != 'F#'" />
3940
<OutputTaskParameter="OutputFile"ItemName="FileWrites" />
4041
</WriteCodeFragment>
4142
</Target>

‎build/targets/PackageVersions.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<MicrosoftVisualStudioProjectAggregatorPackageVersion>8.0.50727</MicrosoftVisualStudioProjectAggregatorPackageVersion>
2323
<MicrosoftVisualStudioShell150PackageVersion>15.0.26201</MicrosoftVisualStudioShell150PackageVersion>
2424
<MicrosoftVisualStudioShellDesignPackageVersion>15.0.26201</MicrosoftVisualStudioShellDesignPackageVersion>
25-
<MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioShellInterop100PackageVersion>
2625
<MicrosoftVisualStudioShellImmutable100PackageVersion>10.0.30319</MicrosoftVisualStudioShellImmutable100PackageVersion>
2726
<MicrosoftVisualStudioShellImmutable110PackageVersion>11.0.50727</MicrosoftVisualStudioShellImmutable110PackageVersion>
2827
<MicrosoftVisualStudioShellImmutable150PackageVersion>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150PackageVersion>
28+
<MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioShellInterop100PackageVersion>
2929
<MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61030</MicrosoftVisualStudioShellInterop110PackageVersion>
3030
<MicrosoftVisualStudioTextManagerInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioTextManagerInterop100PackageVersion>
3131
<MicrosoftVSSDKBuildToolsPackageVersion>15.1.192</MicrosoftVSSDKBuildToolsPackageVersion>
@@ -36,6 +36,7 @@
3636

3737
<!-- other packages-->
3838
<MicrosoftCompositionPackageVersion>1.0.30</MicrosoftCompositionPackageVersion>
39+
<MicrosoftMSXMLPackageVersion>8.0.0-alpha</MicrosoftMSXMLPackageVersion>
3940
<MicrosoftVisualFSharpMSBuild150PackageVersion>1.0.1</MicrosoftVisualFSharpMSBuild150PackageVersion>
4041
<NewtonsoftJsonPackageVersion>10.0.2</NewtonsoftJsonPackageVersion>
4142
<XliffTasksPackageVersion>0.2.0-beta-000081</XliffTasksPackageVersion>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<ItemGroup>
2020
<SdkProjectsInclude="src\FSharp.Editor\FSharp.Editor.fsproj" />
2121
<SdkProjectsInclude="src\FSharp.LanguageService\FSharp.LanguageService.fsproj" />
22+
<SdkProjectsInclude="src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj" />
2223
<SdkProjectsInclude="src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj" />
2324
<SdkProjectsInclude="src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj" />
2425
</ItemGroup>
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