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

Commitdaacde6

Browse files
committed
convert FSharp.ProjectSystem.Base to the dotnet SDK
This also includes removing a bunch of dead code that was incorrectly getting globbed into the <Compile> group.
1 parent1b6a9cf commitdaacde6

File tree

28 files changed

+81
-3603
lines changed

28 files changed

+81
-3603
lines changed

‎build/targets/PackageVersions.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,23 @@
1313

1414
<!-- Visual Studio packages-->
1515
<EnvDTE80PackageVersion>8.0.1</EnvDTE80PackageVersion>
16+
<MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalPackageVersion>14.0.25420</MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalPackageVersion>
1617
<MicrosoftVisualStudioComponentModelHostPackageVersion>15.0.26201-alpha</MicrosoftVisualStudioComponentModelHostPackageVersion>
1718
<MicrosoftVisualStudioDesignerInterfacesPackageVersion>1.1.4322</MicrosoftVisualStudioDesignerInterfacesPackageVersion>
1819
<MicrosoftVisualStudioEditorPackageVersion>15.0.26201</MicrosoftVisualStudioEditorPackageVersion>
1920
<MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>15.0.26201</MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>
2021
<MicrosoftVisualStudioLanguageIntellisensePackageVersion>15.0.26201</MicrosoftVisualStudioLanguageIntellisensePackageVersion>
2122
<MicrosoftVisualStudioPackageLanguageService150PackageVersion>15.0.26201</MicrosoftVisualStudioPackageLanguageService150PackageVersion>
2223
<MicrosoftVisualStudioProjectAggregatorPackageVersion>8.0.50727</MicrosoftVisualStudioProjectAggregatorPackageVersion>
24+
<MicrosoftVisualStudioShell140PackageVersion>14.3.25407</MicrosoftVisualStudioShell140PackageVersion>
2325
<MicrosoftVisualStudioShell150PackageVersion>15.0.26201</MicrosoftVisualStudioShell150PackageVersion>
2426
<MicrosoftVisualStudioShellDesignPackageVersion>15.0.26201</MicrosoftVisualStudioShellDesignPackageVersion>
2527
<MicrosoftVisualStudioShellImmutable100PackageVersion>10.0.30319</MicrosoftVisualStudioShellImmutable100PackageVersion>
2628
<MicrosoftVisualStudioShellImmutable110PackageVersion>11.0.50727</MicrosoftVisualStudioShellImmutable110PackageVersion>
2729
<MicrosoftVisualStudioShellImmutable150PackageVersion>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150PackageVersion>
2830
<MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioShellInterop100PackageVersion>
2931
<MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61030</MicrosoftVisualStudioShellInterop110PackageVersion>
32+
<MicrosoftVisualStudioShellInterop120PackageVersion>12.0.30110</MicrosoftVisualStudioShellInterop120PackageVersion>
3033
<MicrosoftVisualStudioTextManagerInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioTextManagerInterop100PackageVersion>
3134
<MicrosoftVSSDKBuildToolsPackageVersion>15.1.192</MicrosoftVSSDKBuildToolsPackageVersion>
3235
<VSSDKDebuggerVisualizersPackageVersion>12.0.4</VSSDKDebuggerVisualizersPackageVersion>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<SdkProjectsInclude="src\FSharp.Editor\FSharp.Editor.fsproj" />
2121
<SdkProjectsInclude="src\FSharp.LanguageService\FSharp.LanguageService.fsproj" />
2222
<SdkProjectsInclude="src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj" />
23+
<SdkProjectsInclude="src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj" />
2324
<SdkProjectsInclude="src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj" />
2425
<SdkProjectsInclude="src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj" />
2526
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
99
<ImportVsSDK>true</ImportVsSDK>
1010
<CreateVsixContainer>false</CreateVsixContainer>
11-
<NoWarn>$(NoWarn);1570;3001,3002,3003</NoWarn>
11+
<NoWarn>$(NoWarn);1570;1574;1587;1591;3001,3002,3003</NoWarn>
1212
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1313
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
1414
</PropertyGroup>

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/AssemblyInfo.cs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,5 @@
55
usingSystem.Runtime.CompilerServices;
66
usingSystem.Runtime.InteropServices;
77

8-
/* F# additions: begin. */
9-
[assembly:AssemblyDescription("FSharp.ProjectSystem.Base.dll")]
10-
[assembly:AssemblyCompany("Microsoft Corporation")]
11-
[assembly:AssemblyTitle("FSharp.ProjectSystem.Base.dll")]
12-
[assembly:AssemblyCopyright("\x00a9 Microsoft Corporation. All rights reserved.")]
13-
[assembly:AssemblyProduct("Microsoft\x00ae F#")]
14-
[assembly:AssemblyConfiguration("")]
15-
[assembly:AssemblyCulture("")]
168
[assembly:ComVisible(false)]
17-
18-
/* Make internals visible to other project system DLLs */
19-
[assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.ProjectSystem.FSharp, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
20-
[assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.ProjectSystem.PropertyPages, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
21-
[assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Salsa, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
22-
[assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
23-
249
[assembly:Microsoft.VisualStudio.Shell.ProvideCodeBase(CodeBase=@"$PackageFolder$\FSharp.ProjectSystem.Base.dll")]

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/AssemblyReferenceNode.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ public override object GetProperty(int propId)
666666
{
667667
varobjectBrowserGuid=VSProjectConstants.guidObjectBrowser;
668668
varlogicalViewGuid=VSConstants.LOGVIEWID.Primary_guid;
669-
IVsUIShellOpenDocument3shellOpenDocument3=Package.GetGlobalService(typeof(SVsUIShellOpenDocument))asIVsUIShellOpenDocument3;
669+
IVsUIShellOpenDocument3shellOpenDocument3=Microsoft.VisualStudio.Shell.Package.GetGlobalService(typeof(SVsUIShellOpenDocument))asIVsUIShellOpenDocument3;
670670
returnshellOpenDocument3.GetProvisionalViewingStatusForEditor(refobjectBrowserGuid,reflogicalViewGuid);
671671
}
672672

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/Diagrams/AutomationClasses.cd‎

Lines changed: 0 additions & 85 deletions
This file was deleted.

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/Diagrams/ConfigurationClasses.cd‎

Lines changed: 0 additions & 154 deletions
This file was deleted.

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/Diagrams/DocumentManagerClasses.cd‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

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