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

Commitf1884fc

Browse files
committed
convert FSharp.ProjectSystem.FSharp to the dotnet SDK
1 parent204fa02 commitf1884fc

File tree

9 files changed

+81
-219
lines changed

9 files changed

+81
-219
lines changed

‎VisualFSharp.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectSystem.Base", "vsint
2424
EndProject
2525
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") ="FSharp.PropertiesPages","vsintegration\src\FSharp.ProjectSystem.PropertyPages\FSharp.PropertiesPages.vbproj","{FCFB214C-462E-42B3-91CA-FC557EFEE74F}"
2626
EndProject
27-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="ProjectSystem","vsintegration\src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj","{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}"
27+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="ProjectSystem","vsintegration\src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj","{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}"
2828
EndProject
2929
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="ProjectTemplates","ProjectTemplates","{C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}"
3030
EndProject
@@ -262,10 +262,10 @@ Global
262262
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|Any CPU.Build.0=Debug|Any CPU
263263
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|x86.ActiveCfg=Debug|Any CPU
264264
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|x86.Build.0=Debug|Any CPU
265-
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
266-
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|Any CPU.Build.0=Proto|Any CPU
267-
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|x86.ActiveCfg=Proto|Any CPU
268-
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|x86.Build.0=Proto|Any CPU
265+
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|Any CPU.ActiveCfg=Release|Any CPU
266+
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|Any CPU.Build.0=Release|Any CPU
267+
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|x86.ActiveCfg=Release|Any CPU
268+
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|x86.Build.0=Release|Any CPU
269269
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Release|Any CPU.ActiveCfg=Release|Any CPU
270270
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Release|Any CPU.Build.0=Release|Any CPU
271271
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Release|x86.ActiveCfg=Release|Any CPU

‎build/targets/PackageVersions.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@
2525
<MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioShellInterop100PackageVersion>
2626
<MicrosoftVisualStudioShellImmutable100PackageVersion>10.0.30319</MicrosoftVisualStudioShellImmutable100PackageVersion>
2727
<MicrosoftVisualStudioShellImmutable110PackageVersion>11.0.50727</MicrosoftVisualStudioShellImmutable110PackageVersion>
28+
<MicrosoftVisualStudioShellImmutable150PackageVersion>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150PackageVersion>
2829
<MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61030</MicrosoftVisualStudioShellInterop110PackageVersion>
2930
<MicrosoftVSSDKBuildToolsPackageVersion>15.1.192</MicrosoftVSSDKBuildToolsPackageVersion>
31+
<VSSDKDebuggerVisualizersPackageVersion>12.0.4</VSSDKDebuggerVisualizersPackageVersion>
3032
<VSSDKVSLangProjPackageVersion>7.0.4</VSSDKVSLangProjPackageVersion>
3133
<VSSDKVSLangProj8PackageVersion>8.0.4</VSSDKVSLangProj8PackageVersion>
3234
<VSSDKVSHelpPackageVersion>7.0.4</VSSDKVSHelpPackageVersion>

‎vsintegration/FSharp.Directory.Build.targets‎

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

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

5+
<PropertyGroupCondition="'$(UsePackageTargetFallbackHack)' == 'true'">
6+
<!--
7+
HACK: Necessary because FSharp.Compiler.Private has an incomplete project.json that claims to only support
8+
netstandard1.6, and one of the packages listed in that project.json only supports net462. At runtime everything
9+
will work out, but for this project's package restore we have to fake it.
10+
-->
11+
<PackageTargetFallback>net462</PackageTargetFallback>
12+
</PropertyGroup>
13+
514
<ImportProject="$(NuGetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.props"
615
Condition="'$(ImportVsSDK)' == 'true'" />
716
<ImportProject="$(NugetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.targets"

‎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.ProjectSystem.FSharp\ProjectSystem.fsproj" />
2223
</ItemGroup>
2324

2425
<ImportProject="..\src\root.traversal.targets"/>

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,7 @@
1010
<NoWarn>$(NoWarn);75</NoWarn>
1111
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1212
<OtherFlags>$(OtherFlags) --warnon:1182 --subsystemversion:6.00</OtherFlags>
13-
</PropertyGroup>
14-
15-
<PropertyGroup>
16-
<!--
17-
HACK: Necessary because FSharp.Compiler.Private has a project.json that claims to only support netstandard1.6, and
18-
one of the packages listed in that project.json only supports net462. At runtime everything will work out, but
19-
since we're mixing SDK projects and old project.json, we have to get dirty.
20-
-->
21-
<PackageTargetFallback>net462</PackageTargetFallback>
13+
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
2214
</PropertyGroup>
2315

2416
<ItemGroup>

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,7 @@
1010
<NoWarn>$(NoWarn);75</NoWarn>
1111
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1212
<OtherFlags>$(OtherFlags) --warnon:1182 --subsystemversion:6.00</OtherFlags>
13-
</PropertyGroup>
14-
15-
<PropertyGroup>
16-
<!--
17-
HACK: Necessary because FSharp.Compiler.Private has an incomplete project.json that claims to only support
18-
netstandard1.6, and one of the packages listed in that project.json only supports net462. At runtime everything
19-
will work out, but for this project's package restore we have to fake it.
20-
-->
21-
<PackageTargetFallback>net462</PackageTargetFallback>
13+
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
2214
</PropertyGroup>
2315

2416
<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