Target Framework selector for F# App Property Page, now supports netcore and netstandard. (#6551)

KevinRansom · web-flow · commit b5d0ab6528eb · 2019-04-16T09:25:04.000-07:00
diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.vb b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.vb
@@ -22,6 +22,7 @@ Imports VslangProj90
 Imports VslangProj100
 Imports System.Runtime.Versioning
 Imports Microsoft.VisualStudio.FSharp.ProjectSystem
+Imports Microsoft.VisualStudio.Shell
 
 Namespace Microsoft.VisualStudio.Editors.PropertyPages
 
@@ -362,6 +363,9 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages
                 OutputType = CType(value, VSLangProj.prjOutputType)
                 Me.OutputType.SelectedIndex = OutputType
                 PopulateControlSet(OutputType)
+
+                'Populate the target framework combobox
+                PopulateTargetFrameworkAssemblies()
             Else
                 '// We're indeterminate 
                 Me.OutputType.SelectedIndex = INDEX_INVALID
@@ -457,8 +461,6 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages
                 Me.Win32ResourceFileBrowse.Enabled = False
             End If
 
-            'Populate the target framework combobox
-            PopulateTargetFrameworkAssemblies()
             ' Populate list of possible versions of FSharp.Core
             PopulateAvailableFSharpCoreVersions()
         End Sub
@@ -503,6 +505,10 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages
 
             Me.PopulateControlSet(OutputType)
 
+            PopulateTargetFrameworkAssemblies()
+
+            SetDirty(VsProjPropId.VBPROJPROPID_OutputType, False)
+            SetDirty(True) 'True forces Apply
             SetIconAndWin32ResourceFile()
         End Sub
 
@@ -569,15 +575,19 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages
         ''' </summary>
         ''' <remarks></remarks>
         Private Function ValidateTargetFrameworkMoniker(ByVal moniker As String) As Boolean
-            If moniker = "" Or moniker = Nothing Then
+            If String.IsNullOrWhiteSpace(moniker) Then
                 Return False
-            End If
-            ' .NET Core and .NETStandard don't need redists to be installed.
-            If moniker.StartsWith(".NETCoreApp") OrElse moniker.StartsWith(".NETStandard") Then
-                Return True
-            End If
-            ' With the latest tooling, if we have editors the redist is installed by definition
-            If moniker.Contains("v2") Or moniker.Contains("v3.0") Or moniker.Contains("v3.5") Or moniker.Contains("v4") Then
+            ElseIf moniker.StartsWith(".NETCoreApp", StringComparison.OrdinalIgnoreCase) Then
+                If Me.OutputType.SelectedIndex <> INDEX_INVALID Then    ' NetCore always include
+                    ' .NET Core and .NETStandard don't need redists to be installed.
+                    Return True
+                End If
+            ElseIf moniker.StartsWith(".NETStandard", StringComparison.OrdinalIgnoreCase) Then
+                If Me.OutputType.SelectedIndex = 2 Then                 ' NetStandard ClassLibrary only
+                    Return True
+                End If
+            ElseIf moniker.Contains("v2") OrElse moniker.Contains("v3.0") OrElse moniker.Contains("v3.5") OrElse moniker.Contains("v4") Then
+                ' With the latest tooling, if we have editors the redist is installed by definition
                 Return True
             End If
             Return False
@@ -612,7 +622,7 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages
 
         Private Sub PopulateAvailableFSharpCoreVersions()
             TargetFSharpCoreVersion.Items.Clear()
-            TargetFSharpCoreVersion.SelectedIndex = -1
+            TargetFSharpCoreVersion.SelectedIndex = INDEX_INVALID
 
             Dim currentFrameworkName As FrameworkName = GetCurrentFrameworkName(DTEProject)
             Dim siteServiceProvider As Microsoft.VisualStudio.OLE.Interop.IServiceProvider = Nothing
@@ -647,21 +657,32 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages
 
         Private Sub PopulateTargetFrameworkAssemblies()
             Dim targetFrameworkSupported As Boolean = False
+            Dim selectedItem As String = Nothing
+            If Me.TargetFramework.SelectedIndex <> INDEX_INVALID Then
+                selectedItem = Me.TargetFramework.Text
+            End If
             Me.TargetFramework.Items.Clear()
-            Me.TargetFramework.SelectedIndex = -1
+            Me.TargetFramework.SelectedIndex = INDEX_INVALID
 
             Try
                 Dim sp As System.IServiceProvider = GetServiceProvider()
 
                 Dim vsFrameworkMultiTargeting As IVsFrameworkMultiTargeting = TryCast(sp.GetService(GetType(SVsFrameworkMultiTargeting)), IVsFrameworkMultiTargeting)
+                Dim slnSvc As IVsSolution = TryCast(sp.GetService(GetType(SVsSolution)), IVsSolution)
+
+                Dim hier As IVsHierarchy = Nothing
+                Dim isSdkProject = False
+                If slnSvc.GetProjectOfUniqueName(DTEProject.UniqueName, hier) = 0 Then
+                    isSdkProject = hier.IsCapabilityMatch("CPS")
+                End If
 
                 If vsFrameworkMultiTargeting IsNot Nothing Then
                     Dim currentFrameworkName As FrameworkName = GetCurrentFrameworkName(DTEProject)
                     Dim isPortable As Boolean = IsDotNetPortable(currentFrameworkName)
                     targetFrameworkSupported = True
 
                     Dim supportedTargetFrameworksDescriptor As PropertyDescriptor = GetPropertyDescriptor("SupportedTargetFrameworks")
-                    Dim supportedFrameworks As IEnumerable(Of TargetFrameworkMoniker) = TargetFrameworkMoniker.GetSupportedTargetFrameworkMonikers(vsFrameworkMultiTargeting, DTEProject, supportedTargetFrameworksDescriptor)
+                    Dim supportedFrameworks As IEnumerable(Of TargetFrameworkMoniker) = TargetFrameworkMoniker.GetSupportedTargetFrameworkMonikers(vsFrameworkMultiTargeting, DTEProject, isSdkProject, supportedTargetFrameworksDescriptor)
 
                     For Each supportedFramework As TargetFrameworkMoniker In supportedFrameworks
                         If Me.ValidateTargetFrameworkMoniker(supportedFramework.Moniker) Then
@@ -674,6 +695,12 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages
                     Next
 
                 End If
+
+                ' Put back previous value
+                If Not IsNothing(selectedItem) Then
+                    Me.TargetFramework.Text = selectedItem
+                End If
+
             Catch ex As Exception
                 targetFrameworkSupported = False
                 Me.TargetFramework.Items.Clear()
@@ -683,6 +710,7 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages
                 Me.TargetFramework.Enabled = False
             End If
         End Sub
+
         Private Function SetTargetFSharpCore(ByVal control As Control, ByVal prop As PropertyDescriptor, ByVal value As Object) As Boolean
             Dim combobox As ComboBox = CType(control, ComboBox)
             combobox.SelectedIndex = INDEX_INVALID
diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/TargetFrameworkMoniker.vb b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/TargetFrameworkMoniker.vb
@@ -78,6 +78,7 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages
         ''' <param name="vsFrameworkMultiTargeting"></param>
         Public Shared Function GetSupportedTargetFrameworkMonikers(ByVal vsFrameworkMultiTargeting As IVsFrameworkMultiTargeting,
                                                                    ByVal currentProject As Project,
+                                                                   isSdkProject As Boolean,
                                                                    ByVal supportedTargetFrameworksDescriptor As PropertyDescriptor) As IEnumerable(Of TargetFrameworkMoniker)
 
             Dim supportedFrameworksArray As Array = Nothing
@@ -99,21 +100,29 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages
 
                     ' Filter out frameworks with a different identifier since they are not applicable to the current project type
                     Dim newFrameworkName As FrameworkName = New FrameworkName(moniker)
-                    If String.Compare(newFrameworkName.Identifier, currentFrameworkName.Identifier, StringComparison.OrdinalIgnoreCase) = 0 Then
-                        ' Use DTAR to get the display name corresponding to the moniker
-                        Dim displayName As String = ""
+                    Dim displayName As String = ""
+
+                    If isSdkProject Then
                         If String.Compare(newFrameworkName.Identifier, ".NETStandard", StringComparison.Ordinal) = 0 OrElse
                            String.Compare(newFrameworkName.Identifier, ".NETCoreApp", StringComparison.Ordinal) = 0 Then
                             displayName = CStr(supportedTargetFrameworksDescriptor.Converter?.ConvertTo(moniker, GetType(String)))
+                            supportedTargetFrameworkMonikers.Add(New TargetFrameworkMoniker(moniker, displayName))
                         Else
+                            If String.Compare(newFrameworkName.Identifier, ".NETFramework", StringComparison.OrdinalIgnoreCase) = 0 And newFrameworkName.Version >= New Version(4, 5, 0, 0) Then
+                                ' Use DTAR to get the display name corresponding to the moniker
+                                VSErrorHandler.ThrowOnFailure(vsFrameworkMultiTargeting.GetDisplayNameForTargetFx(moniker, displayName))
+                                supportedTargetFrameworkMonikers.Add(New TargetFrameworkMoniker(moniker, displayName))
+                            End If
+                        End If
+                    Else
+                        If String.Compare(newFrameworkName.Identifier, currentFrameworkName.Identifier, StringComparison.OrdinalIgnoreCase) = 0 Then
+                            ' Use DTAR to get the display name corresponding to the moniker
                             VSErrorHandler.ThrowOnFailure(vsFrameworkMultiTargeting.GetDisplayNameForTargetFx(moniker, displayName))
+                            supportedTargetFrameworkMonikers.Add(New TargetFrameworkMoniker(moniker, displayName))
                         End If
-
-                        supportedTargetFrameworkMonikers.Add(New TargetFrameworkMoniker(moniker, displayName))
                     End If
                 End If
             Next
-
             Return supportedTargetFrameworkMonikers
 
         End Function
