Some test projects have checked in cs\vb files as test assets. Group them with...

Some test projects have checked in cs\vb files as test assets. Group them with None\Content and add comments to the effect that they are valid removes.

Some test projects have checked in cs\vb files as test assets. Group them with...
Some test projects have checked in cs\vb files as test assets. Group them with None\Content and add comments to the effect that they are valid removes.
d1021e51 · Srivatsn Narayanan · 98e1c1a2 · d1021e51 · d1021e51 · d1021e51
9 changed file
--- a/src/Compilers/Test/Resources/Core/CompilerTestResources.csproj
+++ b/src/Compilers/Test/Resources/Core/CompilerTestResources.csproj
@@ -10,6 +10,7 @@
    <AssemblyName>Roslyn.Compilers.Test.Resources</AssemblyName>
    <TargetFramework>netstandard1.3</TargetFramework>
    <RootNamespace></RootNamespace>
+    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
@@ -391,6 +392,9 @@
    <EmbeddedResource Include="NetFX\ValueTuple\TupleElementNamesAttribute.cs" />
    <Content Include="SymbolsTests\CustomModifiers\GenericMethodWithModifiers.cpp" />
    <None Include="SymbolsTests\Metadata\public-and-private.cs" />
+    <Compile Include="ResourceLoader.cs" />
+    <Compile Include="TestKeys.cs" />
+    <Compile Include="TestResources.cs" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="SymbolsTests\nativeCOFFResources.obj" />
@@ -398,63 +402,5 @@
  <ItemGroup>
    <PackageReference Include="System.Xml.ReaderWriter" Version="$(SystemXmlReaderWriterVersion)" />
  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Analyzers\FaultyAnalyzer.cs" />
-    <Compile Remove="AssemblyLoadTests\Alpha.cs" />
-    <Compile Remove="AssemblyLoadTests\Beta.cs" />
-    <Compile Remove="AssemblyLoadTests\Delta.cs" />
-    <Compile Remove="AssemblyLoadTests\Gamma.cs" />
-    <Compile Remove="DiagnosticTests\ErrTestLib01.cs" />
-    <Compile Remove="DiagnosticTests\ErrTestLib02.cs" />
-    <Compile Remove="DiagnosticTests\ErrTestLib11.cs" />
-    <Compile Remove="DiagnosticTests\ErrTestMod01.cs" />
-    <Compile Remove="DiagnosticTests\ErrTestMod02.cs" />
-    <Compile Remove="Encoding\sjis.cs" />
-    <Compile Remove="MetadataTests\InterfaceAndClass\CSClasses01.cs" />
-    <Compile Remove="MetadataTests\InterfaceAndClass\CSInterfaces01.cs" />
-    <Compile Remove="MetadataTests\Interop\Interop.Mock01.cs" />
-    <Compile Remove="MetadataTests\Interop\Interop.Mock01.Impl.cs" />
-    <Compile Remove="MetadataTests\Invalid\LongTypeFormInSignature.cs" />
-    <Compile Remove="MetadataTests\Members.cs" />
-    <Compile Remove="MetadataTests\NetModule01\AppCS.cs" />
-    <Compile Remove="MetadataTests\NetModule01\ModuleCS00.cs" />
-    <Compile Remove="MetadataTests\NetModule01\ModuleCS01.cs" />
-    <Compile Remove="NetFX\aacorlib\aacorlib.v15.0.3928.cs" />
-    <Compile Remove="NetFX\Minimal\minasync.cs" />
-    <Compile Remove="NetFX\Minimal\mincorlib.cs" />
-    <Compile Remove="NetFX\ValueTuple\TupleElementNamesAttribute.cs" />
-    <Compile Remove="NetFX\ValueTuple\ValueTuple.cs" />
-    <Compile Remove="PerfTests\CSPerfTest.cs" />
-    <Compile Remove="SymbolsTests\BigVisitor.cs" />
-    <Compile Remove="SymbolsTests\CustomModifiers\ModoptTestOrignal.cs" />
-    <Compile Remove="SymbolsTests\DifferByCase\Consumer.cs" />
-    <Compile Remove="SymbolsTests\DifferByCase\CsharpCaseSen.cs" />
-    <Compile Remove="SymbolsTests\DifferByCase\CSharpDifferCaseOverloads.cs" />
-    <Compile Remove="SymbolsTests\DifferByCase\TypeAndNamespaceDifferByCase.cs" />
-    <Compile Remove="SymbolsTests\ExplicitInterfaceImplementation\CSharpExplicitInterfaceImplementation.cs" />
-    <Compile Remove="SymbolsTests\ExplicitInterfaceImplementation\CSharpExplicitInterfaceImplementationEvents.cs" />
-    <Compile Remove="SymbolsTests\ExplicitInterfaceImplementation\CSharpExplicitInterfaceImplementationProperties.cs" />
-    <Compile Remove="SymbolsTests\Fields\CSFields.cs" />
-    <Compile Remove="SymbolsTests\InheritIComparable.cs" />
-    <Compile Remove="SymbolsTests\Interface\MDInterfaceMapping.cs" />
-    <Compile Remove="SymbolsTests\Metadata\AttributeInterop01.cs" />
-    <Compile Remove="SymbolsTests\Metadata\AttributeInterop02.cs" />
-    <Compile Remove="SymbolsTests\Metadata\AttributeTestDef01.cs" />
-    <Compile Remove="SymbolsTests\Metadata\AttributeTestLib01.cs" />
-    <Compile Remove="SymbolsTests\Metadata\DynamicAttribute.cs" />
-    <Compile Remove="SymbolsTests\Metadata\public-and-private.cs" />
-    <Compile Remove="SymbolsTests\Methods\CSMethods.cs" />
-    <Compile Remove="SymbolsTests\netModule\hash_module.cs" />
-    <Compile Remove="SymbolsTests\NoPia\MissingPIAAttributes.cs" />
-    <Compile Remove="SymbolsTests\NoPia\ParametersWithoutNames.cs" />
-    <Compile Remove="SymbolsTests\TypeForwarders\TypeForwarder1.cs" />
-    <Compile Remove="SymbolsTests\TypeForwarders\TypeForwarder2.cs" />
-    <Compile Remove="SymbolsTests\TypeForwarders\TypeForwarder3.cs" />
-    <Compile Remove="SymbolsTests\UseSiteErrors\CSharpErrors.cs" />
-    <Compile Remove="SymbolsTests\UseSiteErrors\Unavailable.cs" />
-    <Compile Remove="SymbolsTests\Versioning\AR_SA.cs" />
-    <Compile Remove="SymbolsTests\Versioning\EN_US.cs" />
-    <Compile Remove="WinRt\WinMDPrefixing.cs" />
-  </ItemGroup>
  <Import Project="..\..\..\..\..\build\Targets\Imports.targets" />
 </Project>
\ No newline at end of file
--- a/src/Compilers/VisualBasic/Portable/BasicCodeAnalysis.vbproj
+++ b/src/Compilers/VisualBasic/Portable/BasicCodeAnalysis.vbproj
@@ -37,10 +37,6 @@
      <DesignTime>True</DesignTime>
      <DependentUpon>VBResources.resx</DependentUpon>
    </Compile>
-    <EmbeddedResource Include="Symbols\EmbeddedSymbols\Embedded.vb" />
-    <EmbeddedResource Include="Symbols\EmbeddedSymbols\InternalXmlHelper.vb" />
-    <EmbeddedResource Include="Symbols\EmbeddedSymbols\VbCoreSourceText.vb" />
-    <EmbeddedResource Include="Symbols\EmbeddedSymbols\VbMyTemplateText.vb" />
    <EmbeddedResource Update="VBResources.resx">
      <CustomToolNamespace>Microsoft.CodeAnalysis.VisualBasic</CustomToolNamespace>
      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
@@ -48,6 +44,16 @@
      <LastGenOutput>VBResources.Designer.vb</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Symbols\EmbeddedSymbols\Embedded.vb" />
+    <EmbeddedResource Include="Symbols\EmbeddedSymbols\InternalXmlHelper.vb" />
+    <EmbeddedResource Include="Symbols\EmbeddedSymbols\VbCoreSourceText.vb" />
+    <EmbeddedResource Include="Symbols\EmbeddedSymbols\VbMyTemplateText.vb" />
+    <Compile Remove="Symbols\EmbeddedSymbols\Embedded.vb" />
+    <Compile Remove="Symbols\EmbeddedSymbols\InternalXmlHelper.vb" />
+    <Compile Remove="Symbols\EmbeddedSymbols\VbCoreSourceText.vb" />
+    <Compile Remove="Symbols\EmbeddedSymbols\VbMyTemplateText.vb" />
+  </ItemGroup>
  <ItemGroup>
    <BoundTreeDefinition Include="BoundTree\BoundNodes.xml">
      <SubType>Designer</SubType>
@@ -102,12 +108,6 @@
  <ItemGroup>
    <PackageReference Include="System.Threading.Tasks.Parallel" Version="$(SystemThreadingTasksParallelVersion)" />
  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Symbols\EmbeddedSymbols\Embedded.vb" />
-    <Compile Remove="Symbols\EmbeddedSymbols\InternalXmlHelper.vb" />
-    <Compile Remove="Symbols\EmbeddedSymbols\VbCoreSourceText.vb" />
-    <Compile Remove="Symbols\EmbeddedSymbols\VbMyTemplateText.vb" />
-  </ItemGroup>
  <Import Project="..\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems" Label="Shared" />
  <Import Project="..\..\..\..\build\Targets\Imports.targets" />
 </Project>
--- a/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj
+++ b/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj
@@ -65,9 +65,6 @@
    </Compile>
    <Content Include="CodeGen\ConversionsILGenTestBaseline.txt" />
    <Content Include="CodeGen\ConversionsILGenTestBaseline1.txt" />
-    <Content Include="CodeGen\ConversionsILGenTestSource.vb" />
-    <Content Include="CodeGen\ConversionsILGenTestSource1.vb" />
-    <Content Include="CodeGen\ConversionsILGenTestSource2.vb" />
    <Content Include="ExpressionTrees\Results\CheckedAndOrXor.txt" />
    <Content Include="ExpressionTrees\Results\CheckedAndUncheckedIsIsNot.txt" />
    <Content Include="ExpressionTrees\Results\CheckedAndUncheckedIsIsNotNothing.txt" />
@@ -115,12 +112,26 @@
    <Content Include="ExpressionTrees\Results\XmlLiteralsInExprLambda01_Result.txt" />
    <Content Include="ExpressionTrees\Results\XmlLiteralsInExprLambda02_Result.txt" />
    <Content Include="ExpressionTrees\Results\XmlLiteralsInExprLambda03_Result.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="CodeGen\ConversionsILGenTestSource.vb" />
+    <Content Include="CodeGen\ConversionsILGenTestSource1.vb" />
+    <Content Include="CodeGen\ConversionsILGenTestSource2.vb" />
    <Content Include="ExpressionTrees\Sources\UserDefinedBinaryOperators.vb" />
    <Content Include="ExpressionTrees\Tests\TestConversion_Narrowing_UDC.vb" />
    <Content Include="ExpressionTrees\Tests\TestConversion_TypeMatrix_UserTypes.vb" />
    <Content Include="ExpressionTrees\Tests\TestConversion_Widening_UDC.vb" />
    <Content Include="ExpressionTrees\Tests\TestUnary_UDO_IsTrueIsFalse.vb" />
    <Content Include="ExpressionTrees\Tests\TestUnary_UDO_PlusMinusNot.vb" />
+    <Compile Remove="CodeGen\ConversionsILGenTestSource.vb" />
+    <Compile Remove="CodeGen\ConversionsILGenTestSource1.vb" />
+    <Compile Remove="CodeGen\ConversionsILGenTestSource2.vb" />    
+    <Compile Remove="ExpressionTrees\Sources\UserDefinedBinaryOperators.vb" />
+    <Compile Remove="ExpressionTrees\Tests\TestConversion_Narrowing_UDC.vb" />
+    <Compile Remove="ExpressionTrees\Tests\TestConversion_TypeMatrix_UserTypes.vb" />
+    <Compile Remove="ExpressionTrees\Tests\TestConversion_Widening_UDC.vb" />
+    <Compile Remove="ExpressionTrees\Tests\TestUnary_UDO_IsTrueIsFalse.vb" />
+    <Compile Remove="ExpressionTrees\Tests\TestUnary_UDO_PlusMinusNot.vb" />
  </ItemGroup>
  <ItemGroup>
    <Import Include="IdentifierComparison = Microsoft.CodeAnalysis.CaseInsensitiveComparison" />
@@ -144,16 +155,5 @@
  <ItemGroup>
    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="CodeGen\ConversionsILGenTestSource.vb" />
-    <Compile Remove="CodeGen\ConversionsILGenTestSource1.vb" />
-    <Compile Remove="CodeGen\ConversionsILGenTestSource2.vb" />
-    <Compile Remove="ExpressionTrees\Sources\UserDefinedBinaryOperators.vb" />
-    <Compile Remove="ExpressionTrees\Tests\TestConversion_Narrowing_UDC.vb" />
-    <Compile Remove="ExpressionTrees\Tests\TestConversion_TypeMatrix_UserTypes.vb" />
-    <Compile Remove="ExpressionTrees\Tests\TestConversion_Widening_UDC.vb" />
-    <Compile Remove="ExpressionTrees\Tests\TestUnary_UDO_IsTrueIsFalse.vb" />
-    <Compile Remove="ExpressionTrees\Tests\TestUnary_UDO_PlusMinusNot.vb" />
-  </ItemGroup>
  <Import Project="..\..\..\..\..\build\Targets\Imports.targets" />
 </Project>
\ No newline at end of file
--- a/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj
+++ b/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj
@@ -76,15 +76,9 @@
    <Content Include="Semantics\BinaryOperatorsTestBaseline3.txt" />
    <Content Include="Semantics\BinaryOperatorsTestBaseline4.txt" />
    <Content Include="Semantics\BinaryOperatorsTestBaseline5.txt" />
-    <Content Include="Semantics\BinaryOperatorsTestSource1.vb" />
-    <Content Include="Semantics\BinaryOperatorsTestSource2.vb" />
-    <Content Include="Semantics\BinaryOperatorsTestSource3.vb" />
-    <Content Include="Semantics\BinaryOperatorsTestSource4.vb" />
-    <Content Include="Semantics\BinaryOperatorsTestSource5.vb" />
-    <Content Include="Semantics\OverloadResolutionTestSource.vb" />
-    <Content Include="Semantics\PrintResultTestSource.vb" />
    <EmbeddedResource Include="Binding\T_1247520.cs" />
    <EmbeddedResource Include="Binding\T_68086.vb" />
+    <Compile Remove="Binding\T_68086.vb" />
    <EmbeddedResource Update="Resource.resx">
      <CustomToolNamespace>Microsoft.CodeAnalysis.VisualBasic.UnitTests.My.Resources</CustomToolNamespace>
      <Generator>ResXFileCodeGenerator</Generator>
@@ -98,7 +92,13 @@
    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Remove="Binding\T_68086.vb" />
+    <Content Include="Semantics\BinaryOperatorsTestSource1.vb" />
+    <Content Include="Semantics\BinaryOperatorsTestSource2.vb" />
+    <Content Include="Semantics\BinaryOperatorsTestSource3.vb" />
+    <Content Include="Semantics\BinaryOperatorsTestSource4.vb" />
+    <Content Include="Semantics\BinaryOperatorsTestSource5.vb" />
+    <Content Include="Semantics\OverloadResolutionTestSource.vb" />
+    <Content Include="Semantics\PrintResultTestSource.vb" />
    <Compile Remove="Semantics\BinaryOperatorsTestSource1.vb" />
    <Compile Remove="Semantics\BinaryOperatorsTestSource2.vb" />
    <Compile Remove="Semantics\BinaryOperatorsTestSource3.vb" />

--- a/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj
+++ b/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj
@@ -71,6 +71,7 @@
    </Compile>
    <Content Include="Syntax\VBAllInOne.txt" />
    <None Include="Resources\VBAllInOne.vb" />
+    <Compile Remove="Resources\VBAllInOne.vb" />
  </ItemGroup>
  <ItemGroup>
    <Import Include="IdentifierComparison = Microsoft.CodeAnalysis.CaseInsensitiveComparison" />
@@ -90,8 +91,5 @@
  <ItemGroup>
    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Resources\VBAllInOne.vb" />
-  </ItemGroup>
  <Import Project="..\..\..\..\..\build\Targets\Imports.targets" />
 </Project>
\ No newline at end of file
--- a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj
+++ b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj
@@ -321,6 +321,7 @@
  <ItemGroup>
    <InternalsVisibleToTest Include="Roslyn.Services.Editor.CSharp.UnitTests2" />
  </ItemGroup>
+  <!-- These are None\content items above. Don't pass them to the compiler. -->
  <ItemGroup>
    <Compile Remove="Interactive\CommandArgumentsParsingTest.cs" />
    <Compile Remove="PerfTests\Sources\CSharpClassesAtEndBase.cs" />

--- a/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj
+++ b/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj
@@ -279,6 +279,7 @@
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
  </ItemGroup>
+  <!-- These are None\Content items from above. Don't pass them to the compiler -->
  <ItemGroup>
    <Compile Remove="PerfTests\Sources\BasicClassesAtEndBase.vb" />
    <Compile Remove="PerfTests\Sources\IndividualDS.vb" />

--- a/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj
+++ b/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj
@@ -338,14 +338,7 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
-    <Compile Remove="TestFiles\CSharpProject_App.xaml.cs" />
-    <Compile Remove="TestFiles\CSharpProject_AssemblyInfo.cs" />
-    <Compile Remove="TestFiles\CSharpProject_CSharpClass.cs" />
-    <Compile Remove="TestFiles\CSharpProject_CSharpClass_WithConditionalAttributes.cs" />
-    <Compile Remove="TestFiles\CSharpProject_CSharpConsole.cs" />
-    <Compile Remove="TestFiles\CSharpProject_CSharpExternAlias.cs" />
-    <Compile Remove="TestFiles\CSharpProject_MainWindow.xaml.cs" />
-    <Compile Remove="TestFiles\OtherStuff_Foo.cs" />
+    <Compile Remove="TestFiles\*.cs" />
  </ItemGroup>
  <Import Project="..\..\..\build\Targets\Imports.targets" />
 </Project>
\ No newline at end of file
--- a/src/glob.bat
+++ b/src/glob.bat