diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 413521f64..8b29cab85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: matrix: configuration: [ 'Debug', 'Release' ] os: [ 'windows-latest' ] - test: [ 'Test', 'Test.CSharp7', 'Test.CSharp8', 'Test.CSharp9', 'Test.CSharp10', 'Test.CSharp11', 'Test.CSharp12', 'Test.CSharp13', 'Test.CSharp14' ] + testversion: [ '6', '7', '8', '9', '10', '11', '12', '13', '14' ] fail-fast: false runs-on: ${{ matrix.os }} @@ -31,4 +31,4 @@ jobs: uses: actions/setup-dotnet@v5 - name: Build & Test - run: dotnet test StyleCop.Analyzers/StyleCop.Analyzers.${{matrix.test}}/StyleCop.Analyzers.${{matrix.test}}.csproj -c ${{matrix.configuration}} --verbosity normal + run: dotnet test StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp${{matrix.testversion}}/StyleCop.Analyzers.Test.CSharp${{matrix.testversion}}.csproj -c ${{matrix.configuration}} --verbosity normal diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/Properties/AssemblyInfo.cs b/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/Properties/AssemblyInfo.cs index 51fe83698..51a4b5bfa 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/Properties/AssemblyInfo.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -[assembly: InternalsVisibleTo("StyleCop.Analyzers.Test")] +[assembly: InternalsVisibleTo("StyleCop.Analyzers.Test.CSharp6")] [assembly: InternalsVisibleTo("StyleCop.Analyzers.Test.CSharp7")] [assembly: InternalsVisibleTo("StyleCop.Analyzers.Test.CSharp8")] [assembly: InternalsVisibleTo("StyleCop.Analyzers.Test.CSharp9")] diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.PrivateAnalyzers/DerivedTestGenerator.cs b/StyleCop.Analyzers/StyleCop.Analyzers.PrivateAnalyzers/DerivedTestGenerator.cs index 4f2f6410e..39da6e295 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers.PrivateAnalyzers/DerivedTestGenerator.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers.PrivateAnalyzers/DerivedTestGenerator.cs @@ -17,7 +17,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context) var testData = context.CompilationProvider.Select((compilation, cancellationToken) => { var currentAssemblyName = compilation.AssemblyName ?? string.Empty; - if (!Regex.IsMatch(currentAssemblyName, @"^StyleCop\.Analyzers\.Test\.CSharp\d+$")) + if (!Regex.IsMatch(currentAssemblyName, @"^StyleCop\.Analyzers\.Test\.CSharp\d+$") || currentAssemblyName.EndsWith("CSharp6")) { // This is not a test project where derived test classes are expected return null; @@ -25,16 +25,8 @@ public void Initialize(IncrementalGeneratorInitializationContext context) var currentVersion = int.Parse(currentAssemblyName["StyleCop.Analyzers.Test.CSharp".Length..]); var currentTestString = "CSharp" + currentVersion; - var previousTestString = currentVersion switch - { - 7 => string.Empty, - _ => "CSharp" + (currentVersion - 1).ToString(), - }; - var previousAssemblyName = previousTestString switch - { - "" => "StyleCop.Analyzers.Test", - _ => "StyleCop.Analyzers.Test." + previousTestString, - }; + var previousTestString = "CSharp" + (currentVersion - 1).ToString(); + var previousAssemblyName = "StyleCop.Analyzers.Test." + previousTestString; return new TestData(previousTestString, previousAssemblyName, currentTestString, currentAssemblyName); }); diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.PrivateAnalyzers/IncludeTestClassesAnalyzer.cs b/StyleCop.Analyzers/StyleCop.Analyzers.PrivateAnalyzers/IncludeTestClassesAnalyzer.cs index 001f3a51b..d0908aa64 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers.PrivateAnalyzers/IncludeTestClassesAnalyzer.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers.PrivateAnalyzers/IncludeTestClassesAnalyzer.cs @@ -28,7 +28,7 @@ public override void Initialize(AnalysisContext context) context.RegisterCompilationStartAction(context => { var assemblyName = context.Compilation.AssemblyName ?? string.Empty; - if (!Regex.IsMatch(assemblyName, @"^StyleCop\.Analyzers\.Test\.CSharp\d+$")) + if (!Regex.IsMatch(assemblyName, @"^StyleCop\.Analyzers\.Test\.CSharp\d+$") || assemblyName.EndsWith("CSharp6")) { // This is not a test project where derived test classes are expected return; @@ -54,16 +54,8 @@ public override void Initialize(AnalysisContext context) { var currentVersion = int.Parse(assemblyName["StyleCop.Analyzers.Test.CSharp".Length..]); var currentTestString = "CSharp" + currentVersion; - var previousTestString = currentVersion switch - { - 7 => string.Empty, - _ => "CSharp" + (currentVersion - 1).ToString(), - }; - var previousAssemblyName = previousTestString switch - { - "" => "StyleCop.Analyzers.Test", - _ => "StyleCop.Analyzers.Test." + previousTestString, - }; + var previousTestString = "CSharp" + (currentVersion - 1).ToString(); + var previousAssemblyName = "StyleCop.Analyzers.Test." + previousTestString; var previousAssembly = context.Compilation.Assembly.Modules.First().ReferencedAssemblySymbols.First( symbol => symbol.Identity.Name == previousAssemblyName); diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/AnalyzerConfigurationUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/AnalyzerConfigurationUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/AnalyzerConfigurationUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/AnalyzerConfigurationUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/AnalyzerExtensionsTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/AnalyzerExtensionsTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/AnalyzerExtensionsTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/AnalyzerExtensionsTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/AttributeTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/AttributeTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/AttributeTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/AttributeTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/FileHeaderTestBase.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/FileHeaderTestBase.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/FileHeaderTestBase.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/FileHeaderTestBase.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/InheritdocCodeFixProviderUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/InheritdocCodeFixProviderUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/InheritdocCodeFixProviderUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/InheritdocCodeFixProviderUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/NoXmlFileHeaderUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/NoXmlFileHeaderUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/NoXmlFileHeaderUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/NoXmlFileHeaderUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1600UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1600UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1600UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1600UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1601UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1601UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1601UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1601UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1602UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1602UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1602UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1602UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1603UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1603UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1603UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1603UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1604UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1604UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1604UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1604UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1605UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1605UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1605UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1605UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1606UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1606UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1606UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1606UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1607UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1607UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1607UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1607UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1608UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1608UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1608UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1608UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1609UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1609UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1609UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1609UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1610UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1610UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1610UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1610UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1611UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1611UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1611UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1611UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1612UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1612UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1612UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1612UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1613UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1613UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1613UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1613UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1614UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1614UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1614UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1614UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1615UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1615UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1615UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1615UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1616UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1616UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1616UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1616UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1617UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1617UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1617UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1617UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1618UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1618UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1618UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1618UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1619UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1619UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1619UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1619UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1620UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1620UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1620UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1620UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1621UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1621UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1621UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1621UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1622UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1622UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1622UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1622UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1623UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1623UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1623UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1623UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1624UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1624UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1624UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1624UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1625UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1625UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1625UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1625UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1626UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1626UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1626UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1626UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1627UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1627UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1627UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1627UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1628UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1628UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1628UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1628UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1629UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1629UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1629UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1629UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1630UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1630UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1630UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1630UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1631UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1631UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1631UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1631UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1632UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1632UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1632UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1632UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1633UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1633UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1633UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1633UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1634UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1634UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1634UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1634UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1635UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1635UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1635UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1635UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1636UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1636UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1636UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1636UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1637UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1637UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1637UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1637UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1638UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1638UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1638UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1638UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1639UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1639UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1639UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1639UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1640UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1640UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1640UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1640UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1641UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1641UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1641UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1641UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1642UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1642UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1642UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1642UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1643UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1643UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1643UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1643UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1644UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1644UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1644UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1644UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1645UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1645UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1645UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1645UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1646UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1646UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1646UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1646UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1647UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1647UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1647UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1647UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1648UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1648UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1648UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1648UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1649UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1649UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1649UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1649UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1650UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1650UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1650UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1650UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1651UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1651UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1651UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/DocumentationRules/SA1651UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ExclusionTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ExclusionTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ExclusionTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ExclusionTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ExportCodeFixProviderAttributeNameTest.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ExportCodeFixProviderAttributeNameTest.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ExportCodeFixProviderAttributeNameTest.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ExportCodeFixProviderAttributeNameTest.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/AccessLevelHelperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/AccessLevelHelperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/AccessLevelHelperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/AccessLevelHelperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/IndentationHelperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/IndentationHelperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/IndentationHelperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/IndentationHelperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/ObjectPools/ObjectPoolTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/ObjectPools/ObjectPoolTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/ObjectPools/ObjectPoolTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/ObjectPools/ObjectPoolTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/ObjectPools/SharedPoolsTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/ObjectPools/SharedPoolsTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/ObjectPools/SharedPoolsTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/ObjectPools/SharedPoolsTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/RequiresTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/RequiresTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/RequiresTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/RequiresTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/SymbolNameHelpersUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/SymbolNameHelpersUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/SymbolNameHelpersUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/SymbolNameHelpersUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/TokenHelperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/TokenHelperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/TokenHelperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/TokenHelperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/TriviaHelperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/TriviaHelperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/TriviaHelperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/TriviaHelperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/XmlSyntaxFactoryTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/XmlSyntaxFactoryTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/XmlSyntaxFactoryTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/HelperTests/XmlSyntaxFactoryTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/CommonMemberData.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Helpers/CommonMemberData.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/CommonMemberData.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Helpers/CommonMemberData.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/ExclusionTestAnalyzer.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Helpers/ExclusionTestAnalyzer.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/ExclusionTestAnalyzer.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Helpers/ExclusionTestAnalyzer.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/JsonTestHelper.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Helpers/JsonTestHelper.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/JsonTestHelper.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Helpers/JsonTestHelper.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/LanguageVersionTestExtensions.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Helpers/LanguageVersionTestExtensions.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/LanguageVersionTestExtensions.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Helpers/LanguageVersionTestExtensions.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/StringExtensions.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Helpers/StringExtensions.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/StringExtensions.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Helpers/StringExtensions.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/UseCultureAttribute.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Helpers/UseCultureAttribute.cs old mode 100755 new mode 100644 similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/UseCultureAttribute.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Helpers/UseCultureAttribute.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.ArrayInitializers.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.ArrayInitializers.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.ArrayInitializers.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.ArrayInitializers.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Blocks.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Blocks.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Blocks.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Blocks.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Constructors.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Constructors.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Constructors.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Constructors.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.DataTypes.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.DataTypes.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.DataTypes.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.DataTypes.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Delegates.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Delegates.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Delegates.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Delegates.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Destructors.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Destructors.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Destructors.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Destructors.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.DoWhiles.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.DoWhiles.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.DoWhiles.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.DoWhiles.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Enums.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Enums.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Enums.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Enums.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Events.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Events.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Events.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Events.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Ifs.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Ifs.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Ifs.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Ifs.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Indexers.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Indexers.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Indexers.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Indexers.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Interfaces.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Interfaces.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Interfaces.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Interfaces.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.LambdaExpressions.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.LambdaExpressions.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.LambdaExpressions.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.LambdaExpressions.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Methods.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Methods.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Methods.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Methods.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Namespaces.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Namespaces.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Namespaces.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Namespaces.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.ObjectInitializers.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.ObjectInitializers.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.ObjectInitializers.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.ObjectInitializers.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Properties.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Properties.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Properties.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Properties.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.StatementBlocks.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.StatementBlocks.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.StatementBlocks.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.StatementBlocks.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Switches.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Switches.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Switches.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.Switches.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.TryCatchFinallys.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.TryCatchFinallys.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.TryCatchFinallys.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.TryCatchFinallys.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1500/SA1500UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1501UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1501UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1501UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1501UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Constructors.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Constructors.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Constructors.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Constructors.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Destructors.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Destructors.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Destructors.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Destructors.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Enums.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Enums.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Enums.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Enums.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Events.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Events.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Events.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Events.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Indexers.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Indexers.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Indexers.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Indexers.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Interfaces.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Interfaces.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Interfaces.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Interfaces.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Methods.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Methods.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Methods.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Methods.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Namespaces.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Namespaces.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Namespaces.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Namespaces.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Operators.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Operators.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Operators.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Operators.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Properties.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Properties.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Properties.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.Properties.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.TypeDeclarations.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.TypeDeclarations.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.TypeDeclarations.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.TypeDeclarations.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1502/SA1502UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1503UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1503UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1503UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1503UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1504UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1504UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1504UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1504UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1505UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1505UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1505UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1505UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1506UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1506UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1506UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1506UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1507UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1507UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1507UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1507UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1508UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1508UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1508UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1508UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1509UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1509UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1509UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1509UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1510UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1510UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1510UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1510UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1511UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1511UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1511UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1511UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1512UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1512UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1512UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1512UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1513UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1513UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1513UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1513UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1514UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1514UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1514UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1514UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1515UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1515UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1515UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1515UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1516UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1516UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1516UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1516UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1516UsingGroupsUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1516UsingGroupsUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1516UsingGroupsUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1516UsingGroupsUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1517UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1517UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1517UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1517UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1518UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1518UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1518UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1518UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1519UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1519UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1519UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1519UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1520UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1520UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1520UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LayoutRules/SA1520UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/JsonArrayTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/JsonArrayTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/JsonArrayTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/JsonArrayTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/JsonObjectTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/JsonObjectTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/JsonObjectTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/JsonObjectTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/JsonValueTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/JsonValueTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/JsonValueTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/JsonValueTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/Serialization/JsonParseExceptionTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/Serialization/JsonParseExceptionTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/Serialization/JsonParseExceptionTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/Serialization/JsonParseExceptionTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/Serialization/JsonReaderTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/Serialization/JsonReaderTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/Serialization/JsonReaderTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/Serialization/JsonReaderTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/Serialization/JsonSerializationExceptionTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/Serialization/JsonSerializationExceptionTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/Serialization/JsonSerializationExceptionTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/Serialization/JsonSerializationExceptionTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/Serialization/JsonWriterTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/Serialization/JsonWriterTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/Serialization/JsonWriterTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/Serialization/JsonWriterTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/Serialization/TextScannerTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/Serialization/TextScannerTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/Serialization/TextScannerTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LightJson/Serialization/TextScannerTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/AccessorDeclarationSyntaxExtensionsTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/AccessorDeclarationSyntaxExtensionsTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/AccessorDeclarationSyntaxExtensionsTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/AccessorDeclarationSyntaxExtensionsTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ArgumentSyntaxExtensionsTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ArgumentSyntaxExtensionsTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ArgumentSyntaxExtensionsTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ArgumentSyntaxExtensionsTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/AutoWrapSeparatedSyntaxListTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/AutoWrapSeparatedSyntaxListTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/AutoWrapSeparatedSyntaxListTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/AutoWrapSeparatedSyntaxListTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/BaseMethodDeclarationSyntaxExtensionsTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/BaseMethodDeclarationSyntaxExtensionsTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/BaseMethodDeclarationSyntaxExtensionsTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/BaseMethodDeclarationSyntaxExtensionsTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/CasePatternSwitchLabelSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/CasePatternSwitchLabelSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/CasePatternSwitchLabelSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/CasePatternSwitchLabelSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/CommonForEachStatementSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/CommonForEachStatementSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/CommonForEachStatementSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/CommonForEachStatementSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ConstantPatternSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ConstantPatternSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ConstantPatternSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ConstantPatternSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ConstructorDeclarationSyntaxExtensionsTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ConstructorDeclarationSyntaxExtensionsTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ConstructorDeclarationSyntaxExtensionsTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ConstructorDeclarationSyntaxExtensionsTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/CrefParameterSyntaxExtensionsTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/CrefParameterSyntaxExtensionsTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/CrefParameterSyntaxExtensionsTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/CrefParameterSyntaxExtensionsTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/DeclarationExpressionSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/DeclarationExpressionSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/DeclarationExpressionSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/DeclarationExpressionSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/DeclarationPatternSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/DeclarationPatternSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/DeclarationPatternSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/DeclarationPatternSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/DestructorDeclarationSyntaxExtensionsTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/DestructorDeclarationSyntaxExtensionsTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/DestructorDeclarationSyntaxExtensionsTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/DestructorDeclarationSyntaxExtensionsTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/DiscardDesignationSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/DiscardDesignationSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/DiscardDesignationSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/DiscardDesignationSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/IImportScopeWrapperUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/IImportScopeWrapperUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/IImportScopeWrapperUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/IImportScopeWrapperUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/INamedTypeSymbolExtensionsTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/INamedTypeSymbolExtensionsTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/INamedTypeSymbolExtensionsTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/INamedTypeSymbolExtensionsTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ITypeParameterSymbolExtensionsTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ITypeParameterSymbolExtensionsTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ITypeParameterSymbolExtensionsTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ITypeParameterSymbolExtensionsTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ImplicitStackAllocArrayCreationExpressionSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ImplicitStackAllocArrayCreationExpressionSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ImplicitStackAllocArrayCreationExpressionSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ImplicitStackAllocArrayCreationExpressionSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/IsPatternExpressionSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/IsPatternExpressionSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/IsPatternExpressionSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/IsPatternExpressionSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/LanguageVersionExUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/LanguageVersionExUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/LanguageVersionExUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/LanguageVersionExUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/LightupHelpersUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/LightupHelpersUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/LightupHelpersUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/LightupHelpersUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/LocalFunctionStatementSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/LocalFunctionStatementSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/LocalFunctionStatementSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/LocalFunctionStatementSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/MethodKindExUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/MethodKindExUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/MethodKindExUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/MethodKindExUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ParenthesizedVariableDesignationSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ParenthesizedVariableDesignationSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ParenthesizedVariableDesignationSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ParenthesizedVariableDesignationSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/PatternSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/PatternSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/PatternSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/PatternSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/RefExpressionSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/RefExpressionSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/RefExpressionSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/RefExpressionSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/RefTypeSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/RefTypeSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/RefTypeSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/RefTypeSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SeparatedSyntaxListWrapperTestBase.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SeparatedSyntaxListWrapperTestBase.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SeparatedSyntaxListWrapperTestBase.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SeparatedSyntaxListWrapperTestBase.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SingleVariableDesignationSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SingleVariableDesignationSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SingleVariableDesignationSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SingleVariableDesignationSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/StackAllocArrayCreationExpressionSyntaxExtensionsTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/StackAllocArrayCreationExpressionSyntaxExtensionsTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/StackAllocArrayCreationExpressionSyntaxExtensionsTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/StackAllocArrayCreationExpressionSyntaxExtensionsTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SwitchExpressionArmSyntaxWrapperUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SwitchExpressionArmSyntaxWrapperUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SwitchExpressionArmSyntaxWrapperUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SwitchExpressionArmSyntaxWrapperUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SwitchExpressionSyntaxWrapperUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SwitchExpressionSyntaxWrapperUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SwitchExpressionSyntaxWrapperUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SwitchExpressionSyntaxWrapperUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SyntaxKindExUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SyntaxKindExUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SyntaxKindExUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SyntaxKindExUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SyntaxWrapperHelperUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SyntaxWrapperHelperUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SyntaxWrapperHelperUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SyntaxWrapperHelperUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/SyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/SyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ThrowExpressionSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ThrowExpressionSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/ThrowExpressionSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/ThrowExpressionSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/TupleElementSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/TupleElementSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/TupleElementSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/TupleElementSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/TupleExpressionSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/TupleExpressionSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/TupleExpressionSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/TupleExpressionSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/TupleTypeSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/TupleTypeSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/TupleTypeSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/TupleTypeSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/UnsupportedSyntaxListTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/UnsupportedSyntaxListTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/UnsupportedSyntaxListTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/UnsupportedSyntaxListTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/VariableDesignationSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/VariableDesignationSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/VariableDesignationSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/VariableDesignationSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/WhenClauseSyntaxWrapperTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/WhenClauseSyntaxWrapperTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Lightup/WhenClauseSyntaxWrapperTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Lightup/WhenClauseSyntaxWrapperTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LinqHelpers/SyntaxTriviaListEnumerableTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LinqHelpers/SyntaxTriviaListEnumerableTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/LinqHelpers/SyntaxTriviaListEnumerableTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/LinqHelpers/SyntaxTriviaListEnumerableTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/DebugMessagesUnitTestsBase.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/DebugMessagesUnitTestsBase.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/DebugMessagesUnitTestsBase.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/DebugMessagesUnitTestsBase.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/FileMayOnlyContainTestBase.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/FileMayOnlyContainTestBase.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/FileMayOnlyContainTestBase.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/FileMayOnlyContainTestBase.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1119UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1119UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1119UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1119UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1400UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1400UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1400UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1400UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1401UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1401UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1401UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1401UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForBlockDeclarationUnitTestsBase.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForBlockDeclarationUnitTestsBase.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForBlockDeclarationUnitTestsBase.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForBlockDeclarationUnitTestsBase.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForClassUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForClassUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForClassUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForClassUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForDelegateUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForDelegateUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForDelegateUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForDelegateUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForEnumUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForEnumUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForEnumUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForEnumUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForInterfaceUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForInterfaceUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForInterfaceUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForInterfaceUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForNonBlockDeclarationUnitTestsBase.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForNonBlockDeclarationUnitTestsBase.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForNonBlockDeclarationUnitTestsBase.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForNonBlockDeclarationUnitTestsBase.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForStructUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForStructUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForStructUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402ForStructUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402SettingsConfiguration.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402SettingsConfiguration.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402SettingsConfiguration.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402SettingsConfiguration.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402SettingsConfigurationExtensions.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402SettingsConfigurationExtensions.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402SettingsConfigurationExtensions.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1402SettingsConfigurationExtensions.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1403UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1403UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1403UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1403UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1404UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1404UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1404UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1404UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1405UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1405UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1405UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1405UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1406UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1406UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1406UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1406UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1407UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1407UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1407UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1407UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1408UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1408UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1408UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1408UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1409UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1409UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1409UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1409UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1410UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1410UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1410UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1410UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1411UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1411UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1411UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1411UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1412UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1412UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1412UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1412UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1413UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1413UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1413UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/MaintainabilityRules/SA1413UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1300UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1300UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1300UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1300UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1301UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1301UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1301UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1301UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1302UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1302UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1302UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1302UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1303UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1303UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1303UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1303UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1304UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1304UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1304UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1304UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1305UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1305UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1305UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1305UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1306UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1306UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1306UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1306UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1307UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1307UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1307UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1307UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1308UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1308UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1308UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1308UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1309UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1309UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1309UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1309UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1310UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1310UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1310UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1310UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1311UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1311UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1311UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1311UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1312UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1312UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1312UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1312UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1313UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1313UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1313UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1313UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1314UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1314UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1314UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SA1314UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SX1309SUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SX1309SUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SX1309SUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SX1309SUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SX1309UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SX1309UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SX1309UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/NamingRules/SX1309UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/CombinedUsingDirectivesVerifier.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/CombinedUsingDirectivesVerifier.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/CombinedUsingDirectivesVerifier.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/CombinedUsingDirectivesVerifier.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1200OutsideNamespaceUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1200OutsideNamespaceUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1200OutsideNamespaceUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1200OutsideNamespaceUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1200PreserveUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1200PreserveUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1200PreserveUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1200PreserveUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1200UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1200UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1200UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1200UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1201UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1201UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1201UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1201UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1202UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1202UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1202UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1202UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1203UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1203UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1203UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1203UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1204UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1204UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1204UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1204UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1205UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1205UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1205UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1205UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1206CodeFixProviderUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1206CodeFixProviderUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1206CodeFixProviderUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1206CodeFixProviderUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1206UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1206UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1206UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1206UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1207UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1207UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1207UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1207UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1208UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1208UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1208UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1208UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1209UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1209UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1209UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1209UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1210CombinedSystemDirectivesUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1210CombinedSystemDirectivesUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1210CombinedSystemDirectivesUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1210CombinedSystemDirectivesUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1210UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1210UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1210UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1210UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1211UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1211UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1211UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1211UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1212UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1212UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1212UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1212UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1213UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1213UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1213UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1213UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1214UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1214UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1214UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1214UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1215UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1215UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1215UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1215UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1216UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1216UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1216UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1216UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1217UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1217UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1217UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/SA1217UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/UsingCodeFixProviderCombinedSystemDirectivesUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/UsingCodeFixProviderCombinedSystemDirectivesUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/UsingCodeFixProviderCombinedSystemDirectivesUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/UsingCodeFixProviderCombinedSystemDirectivesUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/UsingCodeFixProviderGroupSeparationUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/UsingCodeFixProviderGroupSeparationUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/UsingCodeFixProviderGroupSeparationUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/UsingCodeFixProviderGroupSeparationUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/UsingCodeFixProviderRegressionUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/UsingCodeFixProviderRegressionUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/UsingCodeFixProviderRegressionUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/UsingCodeFixProviderRegressionUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/UsingCodeFixProviderUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/UsingCodeFixProviderUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/UsingCodeFixProviderUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/OrderingRules/UsingCodeFixProviderUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Properties/AssemblyInfo.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Properties/AssemblyInfo.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Properties/AssemblyInfo.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Properties/AssemblyInfo.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1100UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1100UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1100UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1100UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1101UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1101UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1101UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1101UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1102UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1102UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1102UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1102UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1103UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1103UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1103UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1103UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1104UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1104UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1104UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1104UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1105UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1105UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1105UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1105UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1106UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1106UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1106UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1106UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1107UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1107UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1107UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1107UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1108UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1108UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1108UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1108UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1109UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1109UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1109UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1109UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1110UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1110UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1110UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1110UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1111UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1111UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1111UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1111UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1112UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1112UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1112UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1112UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1113UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1113UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1113UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1113UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1114UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1114UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1114UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1114UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1115UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1115UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1115UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1115UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1116UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1116UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1116UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1116UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1117UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1117UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1117UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1117UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1118UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1118UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1118UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1118UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1120UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1120UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1120UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1120UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1121UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1121UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1121UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1121UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1122UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1122UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1122UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1122UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1123UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1123UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1123UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1123UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1124UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1124UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1124UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1124UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1125UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1125UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1125UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1125UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1126UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1126UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1126UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1126UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1127UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1127UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1127UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1127UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1128UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1128UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1128UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1128UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1129UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1129UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1129UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1129UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1130UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1130UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1130UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1130UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1131UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1131UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1131UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1131UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1132UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1132UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1132UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1132UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1133UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1133UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1133UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1133UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1134UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1134UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1134UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1134UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1135UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1135UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1135UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1135UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1136UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1136UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1136UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1136UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1137UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1137UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1137UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1137UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1139UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1139UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1139UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1139UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1141UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1141UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1141UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SA1141UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SX1101UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SX1101UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SX1101UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/ReadabilityRules/SX1101UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SequentialTestCollection.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SequentialTestCollection.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SequentialTestCollection.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SequentialTestCollection.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Settings/SettingsFileCodeFixProviderUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Settings/SettingsFileCodeFixProviderUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Settings/SettingsFileCodeFixProviderUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Settings/SettingsFileCodeFixProviderUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Settings/SettingsUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Settings/SettingsUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Settings/SettingsUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Settings/SettingsUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/NumberSignSpacingTestBase.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/NumberSignSpacingTestBase.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/NumberSignSpacingTestBase.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/NumberSignSpacingTestBase.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1000UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1000UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1000UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1000UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1001UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1001UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1001UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1001UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1002UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1002UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1002UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1002UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1003UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1003UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1003UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1003UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1004UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1004UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1004UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1004UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1005UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1005UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1005UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1005UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1006UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1006UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1006UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1006UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1007UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1007UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1007UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1007UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1008UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1008UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1008UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1008UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1009UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1009UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1009UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1009UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1010UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1010UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1010UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1010UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1011UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1011UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1011UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1011UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1012UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1012UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1012UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1012UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1013UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1013UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1013UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1013UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1014UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1014UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1014UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1014UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1015UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1015UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1015UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1015UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1016UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1016UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1016UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1016UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1017UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1017UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1017UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1017UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1018UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1018UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1018UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1018UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1019UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1019UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1019UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1019UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1020UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1020UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1020UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1020UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1021UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1021UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1021UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1021UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1022UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1022UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1022UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1022UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1023UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1023UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1023UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1023UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1024UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1024UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1024UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1024UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1025UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1025UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1025UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1025UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1026UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1026UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1026UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1026UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1027AlternateIndentationUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1027AlternateIndentationUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1027AlternateIndentationUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1027AlternateIndentationUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1027UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1027UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1027UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1027UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1027UseTabsUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1027UseTabsUnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1027UseTabsUnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1027UseTabsUnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1028UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1028UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1028UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpacingRules/SA1028UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpecialRules/SA0001UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpecialRules/SA0001UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpecialRules/SA0001UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpecialRules/SA0001UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpecialRules/SA0002UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpecialRules/SA0002UnitTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/SpecialRules/SA0002UnitTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/SpecialRules/SA0002UnitTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/StyleCop.Analyzers.Test.CSharp6.csproj similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/StyleCop.Analyzers.Test.CSharp6.csproj diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CustomDiagnosticVerifier`1.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Verifiers/CustomDiagnosticVerifier`1.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CustomDiagnosticVerifier`1.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Verifiers/CustomDiagnosticVerifier`1.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/DiagnosticVerifierTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Verifiers/DiagnosticVerifierTests.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/DiagnosticVerifierTests.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Verifiers/DiagnosticVerifierTests.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/GenericAnalyzerTest.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Verifiers/GenericAnalyzerTest.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/GenericAnalyzerTest.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Verifiers/GenericAnalyzerTest.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Verifiers/StyleCopCodeFixVerifier`2.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Verifiers/StyleCopCodeFixVerifier`2.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopDiagnosticVerifier`1.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Verifiers/StyleCopDiagnosticVerifier`1.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopDiagnosticVerifier`1.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/Verifiers/StyleCopDiagnosticVerifier`1.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/WorkItemAttribute.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/WorkItemAttribute.cs similarity index 100% rename from StyleCop.Analyzers/StyleCop.Analyzers.Test/WorkItemAttribute.cs rename to StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp6/WorkItemAttribute.cs diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/StyleCop.Analyzers.Test.CSharp7.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/StyleCop.Analyzers.Test.CSharp7.csproj index 766e55d91..2cb17beb2 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/StyleCop.Analyzers.Test.CSharp7.csproj +++ b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/StyleCop.Analyzers.Test.CSharp7.csproj @@ -20,8 +20,8 @@ - + \ No newline at end of file diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Properties/AssemblyInfo.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Properties/AssemblyInfo.cs index c0b111ac7..fddb574f9 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/Properties/AssemblyInfo.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/Properties/AssemblyInfo.cs @@ -16,7 +16,7 @@ [assembly: ComVisible(false)] [assembly: InternalsVisibleTo("StyleCop.Analyzers.CodeFixes")] -[assembly: InternalsVisibleTo("StyleCop.Analyzers.Test")] +[assembly: InternalsVisibleTo("StyleCop.Analyzers.Test.CSharp6")] [assembly: InternalsVisibleTo("StyleCop.Analyzers.Test.CSharp7")] [assembly: InternalsVisibleTo("StyleCop.Analyzers.Test.CSharp8")] [assembly: InternalsVisibleTo("StyleCop.Analyzers.Test.CSharp9")] diff --git a/StyleCopAnalyzers.sln b/StyleCopAnalyzers.sln index c3742cab3..845c9162f 100644 --- a/StyleCopAnalyzers.sln +++ b/StyleCopAnalyzers.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.31907.60 +# Visual Studio Version 18 +VisualStudioVersion = 18.6.11828.311 oobstable MinimumVisualStudioVersion = 17.0.31903.59 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StyleCop.Analyzers", "StyleCop.Analyzers\StyleCop.Analyzers\StyleCop.Analyzers.csproj", "{3B052737-06CE-4182-AE0F-08EB82DFA73E}" EndProject @@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{E359E4 .nuget\packages.config = .nuget\packages.config EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StyleCop.Analyzers.Test", "StyleCop.Analyzers\StyleCop.Analyzers.Test\StyleCop.Analyzers.Test.csproj", "{3EB54B68-A7AA-45E8-A97B-A0746712140B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StyleCop.Analyzers.Test.CSharp6", "StyleCop.Analyzers\StyleCop.Analyzers.Test.CSharp6\StyleCop.Analyzers.Test.CSharp6.csproj", "{3EB54B68-A7AA-45E8-A97B-A0746712140B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5F9532E9-B126-402A-B338-54431A4882B2}" ProjectSection(SolutionItems) = preProject