diff --git a/src/Analyzers/CSharp/Tests/CSharpAnalyzers.UnitTests.projitems b/src/Analyzers/CSharp/Tests/CSharpAnalyzers.UnitTests.projitems
index 7fc9450e76e5d9e2022961e7b11cf749fb80a09c..382a41cc2c33b8ec6062e2919cd54c986c0bf593 100644
--- a/src/Analyzers/CSharp/Tests/CSharpAnalyzers.UnitTests.projitems
+++ b/src/Analyzers/CSharp/Tests/CSharpAnalyzers.UnitTests.projitems
@@ -17,6 +17,7 @@
+
diff --git a/src/EditorFeatures/CSharpTest/UseExplicitTupleName/UseExplicitTupleNameTests.cs b/src/Analyzers/CSharp/Tests/UseExplicitTupleName/UseExplicitTupleNameTests.cs
similarity index 98%
rename from src/EditorFeatures/CSharpTest/UseExplicitTupleName/UseExplicitTupleNameTests.cs
rename to src/Analyzers/CSharp/Tests/UseExplicitTupleName/UseExplicitTupleNameTests.cs
index d6b67c02772d8578e24bdebe9dd7d26f16859007..928f2dbffce08b6d99a33b3708f07b71105155f1 100644
--- a/src/EditorFeatures/CSharpTest/UseExplicitTupleName/UseExplicitTupleNameTests.cs
+++ b/src/Analyzers/CSharp/Tests/UseExplicitTupleName/UseExplicitTupleNameTests.cs
@@ -4,13 +4,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CodeStyle;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Diagnostics;
using Microsoft.CodeAnalysis.Test.Utilities;
using Microsoft.CodeAnalysis.UseExplicitTupleName;
using Xunit;
+#if CODE_STYLE
+using Microsoft.CodeAnalysis.Internal.Options;
+#else
+using Microsoft.CodeAnalysis.CodeStyle;
+#endif
+
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.UseExplicitTupleName
{
public class UseExplicitTupleNameTests : AbstractCSharpDiagnosticProviderBasedUserDiagnosticTest
diff --git a/src/Analyzers/Core/Analyzers/Analyzers.projitems b/src/Analyzers/Core/Analyzers/Analyzers.projitems
index ab2962b149d6359608ce16bd60be833e539db654..fd2d2232eb06cb875dd44a180677d754f31ed81a 100644
--- a/src/Analyzers/Core/Analyzers/Analyzers.projitems
+++ b/src/Analyzers/Core/Analyzers/Analyzers.projitems
@@ -47,6 +47,7 @@
+
diff --git a/src/Features/Core/Portable/UseExplicitTupleName/UseExplicitTupleNameDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/UseExplicitTupleName/UseExplicitTupleNameDiagnosticAnalyzer.cs
similarity index 90%
rename from src/Features/Core/Portable/UseExplicitTupleName/UseExplicitTupleNameDiagnosticAnalyzer.cs
rename to src/Analyzers/Core/Analyzers/UseExplicitTupleName/UseExplicitTupleNameDiagnosticAnalyzer.cs
index da75153c5fc68a6576c94f4c94be3b81ab9a054e..ddf07b33524ceafd87b0505e469b8f06db516744 100644
--- a/src/Features/Core/Portable/UseExplicitTupleName/UseExplicitTupleNameDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/UseExplicitTupleName/UseExplicitTupleNameDiagnosticAnalyzer.cs
@@ -9,6 +9,10 @@
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.CodeAnalysis.Operations;
+#if CODE_STYLE
+using Microsoft.CodeAnalysis.Internal.Options;
+#endif
+
namespace Microsoft.CodeAnalysis.UseExplicitTupleName
{
[DiagnosticAnalyzer(LanguageNames.CSharp, LanguageNames.VisualBasic)]
@@ -19,8 +23,8 @@ internal class UseExplicitTupleNameDiagnosticAnalyzer : AbstractBuiltInCodeStyle
public UseExplicitTupleNameDiagnosticAnalyzer()
: base(IDEDiagnosticIds.UseExplicitTupleNameDiagnosticId,
CodeStyleOptions.PreferExplicitTupleNames,
- title: new LocalizableResourceString(nameof(FeaturesResources.Use_explicitly_provided_tuple_name), FeaturesResources.ResourceManager, typeof(FeaturesResources)),
- messageFormat: new LocalizableResourceString(nameof(FeaturesResources.Prefer_explicitly_provided_tuple_element_name), FeaturesResources.ResourceManager, typeof(FeaturesResources)))
+ title: new LocalizableResourceString(nameof(AnalyzersResources.Use_explicitly_provided_tuple_name), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)),
+ messageFormat: new LocalizableResourceString(nameof(AnalyzersResources.Prefer_explicitly_provided_tuple_element_name), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)))
{
}
diff --git a/src/Analyzers/Core/CodeFixes/CodeFixes.projitems b/src/Analyzers/Core/CodeFixes/CodeFixes.projitems
index 9486be620f31ba803c3c467c25d11bc3bd80f5df..9e3cc88f1ed158749c2dbe4073504df2810a34cc 100644
--- a/src/Analyzers/Core/CodeFixes/CodeFixes.projitems
+++ b/src/Analyzers/Core/CodeFixes/CodeFixes.projitems
@@ -29,6 +29,7 @@
+
diff --git a/src/Features/Core/Portable/UseExplicitTupleName/UseExplicitTupleNameCodeFixProvider.cs b/src/Analyzers/Core/CodeFixes/UseExplicitTupleName/UseExplicitTupleNameCodeFixProvider.cs
similarity index 91%
rename from src/Features/Core/Portable/UseExplicitTupleName/UseExplicitTupleNameCodeFixProvider.cs
rename to src/Analyzers/Core/CodeFixes/UseExplicitTupleName/UseExplicitTupleNameCodeFixProvider.cs
index 23bdb873cd48d91c45822cb6d2f80080f2b5f512..fbcece9241575a2b139024209c951c8cb3a2cfab 100644
--- a/src/Features/Core/Portable/UseExplicitTupleName/UseExplicitTupleNameCodeFixProvider.cs
+++ b/src/Analyzers/Core/CodeFixes/UseExplicitTupleName/UseExplicitTupleNameCodeFixProvider.cs
@@ -57,12 +57,12 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
return Task.CompletedTask;
}
- private class MyCodeAction : CodeAction.DocumentChangeAction
+ private class MyCodeAction : CustomCodeActions.DocumentChangeAction
{
public MyCodeAction(Func> createChangedDocument)
- : base(FeaturesResources.Use_explicitly_provided_tuple_name,
+ : base(AnalyzersResources.Use_explicitly_provided_tuple_name,
createChangedDocument,
- FeaturesResources.Use_explicitly_provided_tuple_name)
+ AnalyzersResources.Use_explicitly_provided_tuple_name)
{
}
}
diff --git a/src/EditorFeatures/VisualBasicTest/UseExplicitTupleName/UseExplicitTupleNameTests.vb b/src/Analyzers/VisualBasic/Tests/UseExplicitTupleName/UseExplicitTupleNameTests.vb
similarity index 100%
rename from src/EditorFeatures/VisualBasicTest/UseExplicitTupleName/UseExplicitTupleNameTests.vb
rename to src/Analyzers/VisualBasic/Tests/UseExplicitTupleName/UseExplicitTupleNameTests.vb
diff --git a/src/Analyzers/VisualBasic/Tests/VisualBasicAnalyzers.UnitTests.projitems b/src/Analyzers/VisualBasic/Tests/VisualBasicAnalyzers.UnitTests.projitems
index 669fa759fd1b9c8ef7026ea3ad784408026c29ce..2ce7e494f2321cbeaa8b440efd23dfc5b2834887 100644
--- a/src/Analyzers/VisualBasic/Tests/VisualBasicAnalyzers.UnitTests.projitems
+++ b/src/Analyzers/VisualBasic/Tests/VisualBasicAnalyzers.UnitTests.projitems
@@ -30,6 +30,7 @@
+