Add F# support

src/DeployTestDependencies/DeployTestDependencies.csproj

@@ -21,6 +21,8 @@
     <ProjectReference Include="..\Microsoft.VisualStudio.Editors\Microsoft.VisualStudio.Editors.vbproj" />
     <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.CSharp.VS\Microsoft.VisualStudio.ProjectSystem.CSharp.VS.csproj" />
     <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.CSharp\Microsoft.VisualStudio.ProjectSystem.CSharp.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.FSharp.VS\Microsoft.VisualStudio.ProjectSystem.FSharp.VS.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.FSharp\Microsoft.VisualStudio.ProjectSystem.FSharp.csproj" />
     <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.TestServices\Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.csproj" />
     <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.VS\Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj" />
     <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed\Microsoft.VisualStudio.ProjectSystem.Managed.csproj" />

src/Microsoft.VisualStudio.ProjectSystem.FSharp.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.UnitTests.csproj

@@ -0,0 +1,41 @@
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project>
+  <Import Project="..\..\build\Targets\VSL.Settings.targets" />
+  <PropertyGroup>
+    <RootNamespace>Microsoft.VisualStudio</RootNamespace>
+    <TargetFramework>net46</TargetFramework>  
+    <SignAssembly>true</SignAssembly>
+    <Nonshipping>true</Nonshipping>
+    <UseCommonOutputDirectory>true</UseCommonOutputDirectory>
+    <OutDir>$(OutDir)Tests\</OutDir>
+    <ProjectSystemLayer>HostAgnostic</ProjectSystemLayer>
+    <ProjectSystemProjectType>Test</ProjectSystemProjectType>
+  </PropertyGroup>
+  <ItemGroup>
+    <InternalsVisibleToTest Include="Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests" />
+    <InternalsVisibleToMoq Include="DynamicProxyGenAssembly2" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DeployTestDependencies\DeployTestDependencies.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.FSharp\Microsoft.VisualStudio.ProjectSystem.FSharp.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.TestServices\Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests\Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed\Microsoft.VisualStudio.ProjectSystem.Managed.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests\Properties\AssemblyAttributes.cs">
+      <Link>Properties\AssemblyAttributes.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Common\Test\App.config">
+      <Link>App.config</Link>
+    </None>
+  </ItemGroup>
+  <Import Project="..\..\build\Targets\VSL.Imports.targets" />
+</Project>

src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests.csproj

@@ -0,0 +1,44 @@
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project>
+  <Import Project="..\..\build\Targets\VSL.Settings.targets" />
+  <PropertyGroup>
+    <RootNamespace>Microsoft.VisualStudio</RootNamespace>
+    <TargetFramework>net46</TargetFramework>
+    <SignAssembly>true</SignAssembly>
+    <Nonshipping>true</Nonshipping>
+    <UseCommonOutputDirectory>true</UseCommonOutputDirectory>
+    <OutDir>$(OutDir)Tests\</OutDir>
+    <ProjectSystemLayer>VisualStudio</ProjectSystemLayer>
+    <ProjectSystemProjectType>Test</ProjectSystemProjectType>
+  </PropertyGroup>
+  <ItemGroup>
+    <InternalsVisibleToMoq Include="DynamicProxyGenAssembly2" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DeployTestDependencies\DeployTestDependencies.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.FSharp.VS\Microsoft.VisualStudio.ProjectSystem.FSharp.VS.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.FSharp\Microsoft.VisualStudio.ProjectSystem.FSharp.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.TestServices\Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests\Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests\Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.VS\Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed\Microsoft.VisualStudio.ProjectSystem.Managed.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests\Properties\AssemblyAttributes.cs">
+      <Link>Properties\AssemblyAttributes.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Common\Test\App.config">
+      <Link>App.config</Link>
+    </None>
+  </ItemGroup>
+  <Import Project="..\..\build\Targets\VSL.Imports.targets" />
+  <Import Project="..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
+</Project>

src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests/Packaging/FSharpProjectSystemPackageTests.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using Xunit;
+
+namespace Microsoft.VisualStudio.Packaging
+{
+    [ProjectSystemTrait]
+    public class FSharpProjectSystemPackageTests
+    {
+        [Fact]
+        public void Constructor_DoesNotThrow()
+        {
+            new FSharpProjectSystemPackage();
+        }
+    }
+}

src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests/ProjectSystem/VS/Imaging/FSharpProjectImageProviderTests.cs

@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using Microsoft.VisualStudio.ProjectSystem.Imaging;
+using Xunit;
+
+namespace Microsoft.VisualStudio.ProjectSystem.VS.Imaging
+{
+    [ProjectSystemTrait]
+    public class FSharpProjectImageProviderTests
+    {
+        [Fact]
+        public void Constructor_DoesNotThrow()
+        {
+            new FSharpProjectImageProvider();
+        }
+
+        [Fact]
+        public void GetProjectImage_NullAsKey_ThrowsArgumentNull()
+        {
+            var provider = CreateInstance();
+
+            Assert.Throws<ArgumentNullException>("key", () => {
+
+                provider.GetProjectImage((string)null);
+            });
+        }
+
+
+        [Fact]
+        public void GetProjectImage_EmptyAsKey_ThrowsArgument()
+        {
+            var provider = CreateInstance();
+
+            Assert.Throws<ArgumentException>("key", () => {
+
+                provider.GetProjectImage(string.Empty);
+            });
+        }
+
+        [Fact]
+        public void GetProjectImage_UnrecognizedKeyAsKey_ReturnsNull()
+        {
+            var provider = CreateInstance();
+
+            var result = provider.GetProjectImage("Unrecognized");
+
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData(ProjectImageKey.ProjectRoot)]
+        [InlineData(ProjectImageKey.AppDesignerFolder)]
+        public void GetProjectImage_RecognizedKeyAsKey_ReturnsNonNull(string key)
+        {
+            var provider = CreateInstance();
+
+            var result = provider.GetProjectImage(key);
+
+            Assert.NotNull(result);
+        }
+
+        private static FSharpProjectImageProvider CreateInstance()
+        {
+            return new FSharpProjectImageProvider();
+        }
+    }
+}

src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests/ProjectSystem/VS/Properties/FSharpProjectDesignerPageProviderTests.cs

@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.VisualStudio.ProjectSystem.VS.Properties
+{
+    [ProjectSystemTrait]
+    public class FSharpProjectDesignerPageProviderTests
+    {
+        [Fact]
+        public void Constructor_DoesNotThrow()
+        {
+            CreateInstance();
+        }
+
+        [Fact]
+        public async Task GetPagesAsync_ReturnsPagesInOrder()
+        {
+            var provider = CreateInstance();
+            var pages = await provider.GetPagesAsync();
+
+            Assert.Equal(pages.Count(), 5);
+            Assert.Same(pages.ElementAt(0), FSharpProjectDesignerPage.Application);
+            Assert.Same(pages.ElementAt(1), FSharpProjectDesignerPage.Build);
+            Assert.Same(pages.ElementAt(2), FSharpProjectDesignerPage.BuildEvents);
+            Assert.Same(pages.ElementAt(3), FSharpProjectDesignerPage.Debug);
+            Assert.Same(pages.ElementAt(4), FSharpProjectDesignerPage.ReferencePaths);
+        }
+
+        [Fact]
+        public async Task GetPagesAsync_WithPackCapability()
+        {
+            var provider = CreateInstance(ProjectCapability.Pack);
+            var pages = await provider.GetPagesAsync();
+
+            Assert.Equal(pages.Count(), 6);
+            Assert.Same(pages.ElementAt(0), FSharpProjectDesignerPage.Application);
+            Assert.Same(pages.ElementAt(1), FSharpProjectDesignerPage.Build);
+            Assert.Same(pages.ElementAt(2), FSharpProjectDesignerPage.BuildEvents);
+            Assert.Same(pages.ElementAt(3), FSharpProjectDesignerPage.Debug);
+            Assert.Same(pages.ElementAt(4), FSharpProjectDesignerPage.Package);
+            Assert.Same(pages.ElementAt(5), FSharpProjectDesignerPage.ReferencePaths);
+        }
+
+        private static FSharpProjectDesignerPageProvider CreateInstance(params string[] capabilities)
+        {
+            Func<string, bool> containsCapability = c => capabilities.Contains(c);
+            var capabilitiesService = IProjectCapabilitiesServiceFactory.ImplementsContains(containsCapability);
+            return new FSharpProjectDesignerPageProvider(capabilitiesService);
+        }
+    }
+}

src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS/GlobalSuppressions.cs

@@ -0,0 +1,11 @@
+
+// This file is used by Code Analysis to maintain SuppressMessage 
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given 
+// a specific target and scoped to a namespace, type, member, etc.
+
+// workaround for https://github.com/dotnet/roslyn-analyzers/issues/955
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage(
+                "Reliability",
+                "RS0006:Do not mix attributes from different versions of MEF",
+                Justification = "<Pending>")]

src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.csproj

@@ -0,0 +1,29 @@
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project>
+  <Import Project="..\..\build\Targets\VSL.Settings.targets" />
+  <PropertyGroup>
+    <RootNamespace>Microsoft.VisualStudio</RootNamespace>
+    <TargetFramework>net46</TargetFramework>
+    <GeneratePkgDefFile>true</GeneratePkgDefFile>
+    <ImportVSSDKTargets>true</ImportVSSDKTargets>
+    <CreateVsixContainer>false</CreateVsixContainer>
+    <DeployExtension>false</DeployExtension>
+    <UseCodebase>true</UseCodebase>
+    <SignAssembly>true</SignAssembly>
+    <UseCommonOutputDirectory>true</UseCommonOutputDirectory>
+    <ProjectSystemLayer>VisualStudio</ProjectSystemLayer>
+  </PropertyGroup>
+  <ItemGroup>
+    <InternalsVisibleToTest Include="Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests" />
+    <InternalsVisibleToMoq Include="DynamicProxyGenAssembly2" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.FSharp\Microsoft.VisualStudio.ProjectSystem.FSharp.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.VS\Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed\Microsoft.VisualStudio.ProjectSystem.Managed.csproj" />
+  </ItemGroup>
+  <Import Project="..\..\build\Targets\VSL.Imports.targets" />
+</Project>

src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS/Packaging/FSharpProjectSystemPackage.cs

@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.VisualStudio.Packaging;
+using Microsoft.VisualStudio.ProjectSystem.VS;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.ProjectSystem;
+
+// We register ourselves as a new CPS "project type"
+[assembly: ProjectTypeRegistration(projectTypeGuid: FSharpProjectSystemPackage.ProjectTypeGuid, displayName: "#1", displayProjectFileExtensions: "#2", defaultProjectExtension: "fsproj", language: "FSharp", resourcePackageGuid: FSharpProjectSystemPackage.PackageGuid, Capabilities = ManagedProjectSystemPackage.DefaultCapabilities + "; " + ProjectCapability.FSharp, DisableAsynchronousProjectTreeLoad = true)]
+
+namespace Microsoft.VisualStudio.Packaging
+{
+    [Guid(PackageGuid)]
+    [PackageRegistration(AllowsBackgroundLoading = true, RegisterUsing = RegistrationMethod.CodeBase, UseManagedResourcesOnly = true)]
+    [DplOptOutRegistration(ProjectTypeGuid, true)]
+    internal class FSharpProjectSystemPackage : AsyncPackage
+    {
+        public const string ProjectTypeGuid = "6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705";
+        public const string LegacyProjectTypeGuid = "F2A71F9B-5D33-465A-A702-920D77279786";
+        public const string PackageGuid = "a724c878-e8fd-4feb-b537-60baba7eda83";
+        private const string ProjectTypeGuidFormatted = "{" + ProjectTypeGuid + "}";
+
+        public FSharpProjectSystemPackage()
+        {
+        }
+    }
+}

src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS/ProjectSystem/VS/FSharpProjectGuidProvider.cs

@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.ComponentModel.Composition;
+using Microsoft.VisualStudio.Packaging;
+
+namespace Microsoft.VisualStudio.ProjectSystem.VS
+{
+    /// <summary>
+    ///     Provides the Visual Basic implementation of <see cref="IItemTypeGuidProvider"/>.
+    /// </summary>
+    [Export(typeof(IItemTypeGuidProvider))]
+    [AppliesTo(ProjectCapability.FSharp)]
+    internal class FSharpProjectGuidProvider : IItemTypeGuidProvider
+    {
+        private static readonly Guid s_fsharpProjectType = new Guid(FSharpProjectSystemPackage.LegacyProjectTypeGuid);
+
+        [ImportingConstructor]
+        public FSharpProjectGuidProvider(UnconfiguredProject unconfiguredProject)
+        {
+            Requires.NotNull(unconfiguredProject, nameof(unconfiguredProject));
+        }
+
+        public Guid ProjectTypeGuid
+        {
+            get { return s_fsharpProjectType; }
+        }
+
+    }
+}

src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS/ProjectSystem/VS/Imaging/FSharpProjectImageProvider.cs

@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.ComponentModel.Composition;
+using Microsoft.VisualStudio.Imaging;
+using Microsoft.VisualStudio.ProjectSystem.Imaging;
+
+namespace Microsoft.VisualStudio.ProjectSystem.VS.Imaging
+{
+    /// <summary>
+    ///     Provides C# project images.
+    /// </summary>
+    [Export(typeof(IProjectImageProvider))]
+    [AppliesTo(ProjectCapability.FSharp)]
+    [Order(2)]
+    internal class FSharpProjectImageProvider : IProjectImageProvider
+    {
+        [ImportingConstructor]
+        public FSharpProjectImageProvider()
+        {
+        }
+
+        public ProjectImageMoniker GetProjectImage(string key)
+        {
+            Requires.NotNullOrEmpty(key, nameof(key));
+
+            switch (key)
+            {
+                case ProjectImageKey.ProjectRoot:
+                    return KnownMonikers.FSProjectNode.ToProjectSystemType();
+
+                case ProjectImageKey.AppDesignerFolder:
+                    return KnownMonikers.Property.ToProjectSystemType();
+
+                default:
+                    return null;
+            }
+        }
+    }
+}