Get portable BasicFeatures building

45fcd92a · Dustin Campbell · a00085ce · 45fcd92a · 45fcd92a · 45fcd92a
6 changed file
--- a/src/Features/VisualBasic/Portable/BasicFeatures.vbproj
+++ b/src/Features/VisualBasic/Portable/BasicFeatures.vbproj
@@ -19,7 +19,30 @@
    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <ItemGroup Label="File References">
-    <Reference Include="..\..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll" />
+    <Reference Include="System.Collections.Immutable">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.AttributedModel">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Convention">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Hosting">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Runtime">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.TypedParts">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
+    </Reference>
  </ItemGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
@@ -65,35 +88,6 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DogfoodRelease|AnyCPU'">
    <DocumentationFile>Microsoft.CodeAnalysis.VisualBasic.Features.xml</DocumentationFile>
  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Composition.AttributedModel">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Composition.Convention">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Composition.Hosting">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Composition.Runtime">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Composition.TypedParts">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
  <ItemGroup>
    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.EditorFeatures" />
    <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.VisualBasic" />
@@ -112,9 +106,7 @@
    <Import Include="Microsoft.VisualBasic" />
    <Import Include="Roslyn.Utilities" />
    <Import Include="System" />
-    <Import Include="System.Collections" />
    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
    <Import Include="System.Diagnostics" />
    <Import Include="System.Linq" />
    <Import Include="System.Threading.Tasks" />
@@ -441,4 +433,4 @@
    <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
    <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
  </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
--- a/src/Features/VisualBasic/Portable/CodeFixes/CorrectNextControlVariable/CorrectNextControlVariableCodeFixProvider.vb
+++ b/src/Features/VisualBasic/Portable/CodeFixes/CorrectNextControlVariable/CorrectNextControlVariableCodeFixProvider.vb
@@ -85,7 +85,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeFixes.CorrectNextControlVariabl
                    controlVariable = forEachStatement.ControlVariable
                    Exit Select
                Case Else
-                    Debug.Fail("Unknown next statement")
+                    Debug.Assert(False, "Unknown next statement")
                    Return Nothing
            End Select

@@ -98,7 +98,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeFixes.CorrectNextControlVariabl
                Case SyntaxKind.VariableDeclarator
                    Return DirectCast(controlVariable, VariableDeclaratorSyntax).Names.Single().Identifier
                Case Else
-                    Debug.Fail("Unknown control variable expression")
+                    Debug.Assert(False, "Unknown control variable expression")
                    Return Nothing
            End Select
        End Function

--- a/src/Features/VisualBasic/Portable/CodeFixes/GenerateEndConstruct/GenerateEndConstructCodeFixProvider.vb
+++ b/src/Features/VisualBasic/Portable/CodeFixes/GenerateEndConstruct/GenerateEndConstructCodeFixProvider.vb
 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 Imports System.Collections.Immutable
+Imports System.Composition
 Imports System.Threading
-Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Imports Microsoft.CodeAnalysis.Text
 Imports Microsoft.CodeAnalysis.CodeActions
 Imports Microsoft.CodeAnalysis.CodeFixes
-Imports Microsoft.CodeAnalysis.CodeGeneration
 Imports Microsoft.CodeAnalysis.Editing
 Imports Microsoft.CodeAnalysis.Formatting
-Imports System.Composition
+Imports Microsoft.CodeAnalysis.Text
+Imports Microsoft.CodeAnalysis.VisualBasic.Syntax

 Namespace Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateEndConstruct
    <ExportCodeFixProvider(LanguageNames.VisualBasic, Name:=PredefinedCodeFixProviderNames.GenerateEndConstruct), [Shared]>
@@ -166,11 +165,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateEndConstruct
            Dim gen = document.GetLanguageService(Of SyntaxGenerator)()

            If getter Is Nothing AndAlso Not updatedProperty.PropertyStatement.Modifiers.Any(SyntaxKind.WriteOnlyKeyword) Then
-                updatedProperty = DirectCast(gen.WithGetAccessorStatements(updatedProperty, Array.Empty(Of SyntaxNode)()), PropertyBlockSyntax)
+                updatedProperty = DirectCast(gen.WithGetAccessorStatements(updatedProperty, SpecializedCollections.EmptyArray(Of SyntaxNode)()), PropertyBlockSyntax)
            End If

            If setter Is Nothing AndAlso Not updatedProperty.PropertyStatement.Modifiers.Any(SyntaxKind.ReadOnlyKeyword) Then
-                updatedProperty = DirectCast(gen.WithSetAccessorStatements(updatedProperty, Array.Empty(Of SyntaxNode)()), PropertyBlockSyntax)
+                updatedProperty = DirectCast(gen.WithSetAccessorStatements(updatedProperty, SpecializedCollections.EmptyArray(Of SyntaxNode)()), PropertyBlockSyntax)
            End If

            Dim updatedDocument = Await document.ReplaceNodeAsync(node, updatedProperty.WithAdditionalAnnotations(Formatter.Annotation), cancellationToken).ConfigureAwait(False)

--- a/src/Features/VisualBasic/Portable/Organizing/Organizers/TypeBlockOrganizer.vb
+++ b/src/Features/VisualBasic/Portable/Organizing/Organizers/TypeBlockOrganizer.vb
 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

+Imports System.Composition
 Imports System.Threading
 Imports Microsoft.CodeAnalysis.Organizing.Organizers
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax

 Namespace Microsoft.CodeAnalysis.VisualBasic.Organizing.Organizers
-    <ExportSyntaxNodeOrganizer(LanguageNames.VisualBasic)>
+    <ExportSyntaxNodeOrganizer(LanguageNames.VisualBasic), [Shared]>
    Friend Class TypeBlockOrganizer
        Inherits AbstractSyntaxNodeOrganizer(Of TypeBlockSyntax)


--- a/src/Features/VisualBasic/Portable/VBFeaturesResources.Designer.vb
+++ b/src/Features/VisualBasic/Portable/VBFeaturesResources.Designer.vb
@@ -12,6 +12,7 @@ Option Strict On
 Option Explicit On

 Imports System
+Imports System.Reflection

 Namespace Microsoft.CodeAnalysis.VisualBasic.VBFeaturesResources
    
@@ -39,7 +40,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.VBFeaturesResources
        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
            Get
                If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("VBFeaturesResources", GetType(VBFeaturesResources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("VBFeaturesResources", GetType(VBFeaturesResources).GetTypeInfo.Assembly)
                    resourceMan = temp
                End If
                Return resourceMan

--- a/src/Features/VisualBasic/Portable/VBFeaturesResources.resx
+++ b/src/Features/VisualBasic/Portable/VBFeaturesResources.resx
@@ -1053,117 +1053,117 @@ Sub(&lt;parameterList&gt;) &lt;statement&gt;</value>
  </data>
  <data name="TryBlock" xml:space="preserve">
    <value>Try block</value>
-    <comment>{Locked="Try"} "Try" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Try"} "Try" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="CatchClause" xml:space="preserve">
    <value>Catch clause</value>
-    <comment>{Locked="Catch"} "Catch" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Catch"} "Catch" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="FinallyClause" xml:space="preserve">
    <value>Finally clause</value>
-    <comment>{Locked="Finally"} "Finally" is a VB keyword and should not be localized.</comment>        
+    <comment>{Locked="Finally"} "Finally" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="UsingStatement" xml:space="preserve">
    <value>Using statement</value>
-    <comment>{Locked="Using"} "Using" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Using"} "Using" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="UsingBlock" xml:space="preserve">
    <value>Using block</value>
-    <comment>{Locked="Using"} "Using" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Using"} "Using" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="WithStatement" xml:space="preserve">
    <value>With statement</value>
-    <comment>{Locked="With"} "With" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="With"} "With" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="WithBlock" xml:space="preserve">
    <value>With block</value>
-    <comment>{Locked="With"} "With" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="With"} "With" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="SyncLockStatement" xml:space="preserve">
    <value>SyncLock statement</value>
-    <comment>{Locked="SyncLock"} "SyncLock" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="SyncLock"} "SyncLock" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="SyncLockBlock" xml:space="preserve">
    <value>SyncLock block</value>
-    <comment>{Locked="SyncLock"} "SyncLock" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="SyncLock"} "SyncLock" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="ForEachStatement" xml:space="preserve">
    <value>For Each statement</value>
-    <comment>{Locked="For Each"} "For Each" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="For Each"} "For Each" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="ForEachBlock" xml:space="preserve">
    <value>For Each block</value>
-    <comment>{Locked="For Each"} "For Each" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="For Each"} "For Each" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="OnErrorStatement" xml:space="preserve">
    <value>On Error statement</value>
-    <comment>{Locked="On Error"} "On Error" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="On Error"} "On Error" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="ResumeStatement" xml:space="preserve">
    <value>Resume statement</value>
-    <comment>{Locked="Resume"} "Resume" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Resume"} "Resume" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="YieldStatement" xml:space="preserve">
    <value>Yield statement</value>
-    <comment>{Locked="Yield"} "Yield" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Yield"} "Yield" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="AwaitExpression" xml:space="preserve">
    <value>Await expression</value>
-    <comment>{Locked="Await"} "Await" is a VB keyword and should not be localized.</comment>        
+    <comment>{Locked="Await"} "Await" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="LambdaExpression" xml:space="preserve">
    <value>Lambda</value>
  </data>
  <data name="WhereClause" xml:space="preserve">
    <value>Where clause</value>
-    <comment>{Locked="Where"} "Where" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Where"} "Where" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="SelectClause" xml:space="preserve">
    <value>Select clause</value>
-    <comment>{Locked="Select"} "Select" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Select"} "Select" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="FromClause" xml:space="preserve">
    <value>From clause</value>
-    <comment>{Locked="From"} "From" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="From"} "From" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="AggregateClause" xml:space="preserve">
    <value>Aggregate clause</value>
-    <comment>{Locked="Aggregate"} "Aggregate" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Aggregate"} "Aggregate" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="LetClause" xml:space="preserve">
    <value>Let clause</value>
-    <comment>{Locked="Let"} "Let" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Let"} "Let" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="SimpleJoinClause" xml:space="preserve">
    <value>Join clause</value>
-    <comment>{Locked="Join"} "Join" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Join"} "Join" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="GroupJoinClause" xml:space="preserve">
    <value>Group Join clause</value>
-    <comment>{Locked="Group Join"} "Group Join" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Group Join"} "Group Join" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="GroupByClause" xml:space="preserve">
    <value>Group By clause</value>
-    <comment>{Locked="Group By"} "Group By" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Group By"} "Group By" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="FunctionAggregation" xml:space="preserve">
    <value>Function aggregation</value>
  </data>
  <data name="TakeWhileClause" xml:space="preserve">
    <value>Take While clause</value>
-    <comment>{Locked="Take While"} "Take While" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Take While"} "Take While" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="SkipWhileClause" xml:space="preserve">
    <value>Skip While clause</value>
-    <comment>{Locked="Skip While"} "Skip While" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Skip While"} "Skip While" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="OrderingClause" xml:space="preserve">
    <value>Ordering clause</value>
-    <comment>{Locked="Ordering"} "Ordering" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="Ordering"} "Ordering" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="JoinCondition" xml:space="preserve">
    <value>Join condition</value>
-    <comment>{Locked="Join"} "Join" is a VB keyword and should not be localized.</comment>       
+    <comment>{Locked="Join"} "Join" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="OptionStatement" xml:space="preserve">
    <value>option</value>
@@ -1183,14 +1183,14 @@ Sub(&lt;parameterList&gt;) &lt;statement&gt;</value>
  </data>
  <data name="WithEventsFieldStatement" xml:space="preserve">
    <value>WithEvents field</value>
-    <comment>{Locked="WithEvents"} "WithEvents" is a VB keyword and should not be localized.</comment>      
+    <comment>{Locked="WithEvents"} "WithEvents" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="PropertyAccessor" xml:space="preserve">
    <value>property accessor</value>
  </data>
  <data name="AsClause" xml:space="preserve">
    <value>as clause</value>
-    <comment>{Locked="as"} "as" is a VB keyword and should not be localized.</comment>    
+    <comment>{Locked="as"} "as" is a VB keyword and should not be localized.</comment>
  </data>
  <data name="TypeParameterList" xml:space="preserve">
    <value>type parameters</value>