Rename compatibility to api compat (#26927)

* git mv src/compatibility to src/apicompat * Manual path updates
dotnet · Aug 2, 2022 · 616e220 · 616e220
1 parent 4777411
commit 616e220
Show file tree

Hide file tree

Showing 139 changed files with 47 additions and 47 deletions.
diff --git a/.github/fabricbot.json b/.github/fabricbot.json
@@ -117,7 +117,7 @@
             {
               "name": "labelAdded",
               "parameters": {
-                "label": "Area-Compatibility"
+                "label": "Area-ApiCompat"
               }
             }
           ]
@@ -127,12 +127,12 @@
           "issues",
           "project_card"
         ],
-        "taskName": "Notify compatibility of new untriaged bugs",
+        "taskName": "Notify apicompat of new untriaged bugs",
         "actions": [
           {
             "name": "addReply",
             "parameters": {
-              "comment": "@dotnet/area-infrastructure-libraries a new issue has been filed in the Compatibility area, please triage"
+              "comment": "@dotnet/area-infrastructure-libraries a new issue has been filed in the ApiCompat area, please triage"
             }
           }
         ]

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -67,9 +67,9 @@
 /src/Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/       @captainsafia @mkArtakMSFT
 /src/BuiltInTools/   @captainsafia @mkArtakMSFT
 
-# Compatibility tools owned by runtime team
-# Area-Compatibility
-/src/Compatibility/ @ericstj @dotnet/area-infrastructure-libraries @joperezr 
+# ApiCompat tools owned by runtime team
+# Area-ApiCompat
+/src/ApiCompat/ @ericstj @dotnet/area-infrastructure-libraries @joperezr 
 /src/Tests/Microsoft.DotNet.ApiCompatibility*/ @ericstj @dotnet/area-infrastructure-libraries @joperezr 
 /src/Tests/Microsoft.DotNet.ApiCompat*/ @ericstj @dotnet/area-infrastructure-libraries @joperezr 
 /src/Tests/Microsoft.DotNet.PackageValidation*/ @ericstj @dotnet/area-infrastructure-libraries @joperezr 
diff --git a/sdk.sln b/sdk.sln
@@ -341,9 +341,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DotNet
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.NativeWrapper", "src\Resolvers\Microsoft.DotNet.NativeWrapper\Microsoft.DotNet.NativeWrapper.csproj", "{E97E9E7F-11B4-42F7-8B55-D0451F5E82A0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compatibility", "Compatibility", "{AF683E5C-421E-4DE0-ADD7-9841E5D12BFA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiCompat", "ApiCompat", "{AF683E5C-421E-4DE0-ADD7-9841E5D12BFA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiCompatibility", "src\Compatibility\Microsoft.DotNet.ApiCompatibility\Microsoft.DotNet.ApiCompatibility.csproj", "{3F5A028C-C51B-434A-8C10-37680CD2635C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiCompatibility", "src\ApiCompat\Microsoft.DotNet.ApiCompatibility\Microsoft.DotNet.ApiCompatibility.csproj", "{3F5A028C-C51B-434A-8C10-37680CD2635C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiCompatibility.Tests", "src\Tests\Microsoft.DotNet.ApiCompatibility.Tests\Microsoft.DotNet.ApiCompatibility.Tests.csproj", "{24F084ED-35BB-401E-89F5-63E5E22C3B3B}"
 EndProject
@@ -353,19 +353,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Msi.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Msi.Manual.Tests", "src\Tests\Microsoft.Win32.Msi.Manual.Tests\Microsoft.Win32.Msi.Manual.Tests.csproj", "{EEF4C7DD-CDC9-44B6-8B4F-725647D54ED8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.PackageValidation", "src\Compatibility\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj", "{E56BEA9A-B52A-4781-9FF4-217439923319}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.PackageValidation", "src\ApiCompat\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj", "{E56BEA9A-B52A-4781-9FF4-217439923319}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.PackageValidation.Tests", "src\Tests\Microsoft.DotNet.PackageValidation.Tests\Microsoft.DotNet.PackageValidation.Tests.csproj", "{69C03400-12AC-4E4D-B970-6A880616BF68}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DotNetDeltaApplier.Tests", "src\Tests\Microsoft.Extensions.DotNetDeltaApplier.Tests\Microsoft.Extensions.DotNetDeltaApplier.Tests.csproj", "{FAAC2E23-A460-40FE-9207-C10EEE5A6A07}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests", "src\Tests\Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests\Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests.csproj", "{920F6448-C2D0-4B01-AC25-16214C5A6006}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.DotNet.ApiCompat.Shared", "src\Compatibility\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.shproj", "{9D36039F-D0A1-462F-85B4-81763C6B02CB}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.DotNet.ApiCompat.Shared", "src\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.shproj", "{9D36039F-D0A1-462F-85B4-81763C6B02CB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiCompat.Task", "src\Compatibility\Microsoft.DotNet.ApiCompat.Task\Microsoft.DotNet.ApiCompat.Task.csproj", "{03C5A84A-982B-4F38-AC73-AB832C645C4A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiCompat.Task", "src\ApiCompat\Microsoft.DotNet.ApiCompat.Task\Microsoft.DotNet.ApiCompat.Task.csproj", "{03C5A84A-982B-4F38-AC73-AB832C645C4A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiCompat.Tool", "src\Compatibility\Microsoft.DotNet.ApiCompat.Tool\Microsoft.DotNet.ApiCompat.Tool.csproj", "{0A3C9AFD-F6E6-4A5D-83FB-93BF66732696}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiCompat.Tool", "src\ApiCompat\Microsoft.DotNet.ApiCompat.Tool\Microsoft.DotNet.ApiCompat.Tool.csproj", "{0A3C9AFD-F6E6-4A5D-83FB-93BF66732696}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "trustedroots.Tests", "src\Tests\trustedroots.Tests\trustedroots.Tests.csproj", "{08A18C0B-8985-49EE-AC80-EFEEDF18BCC5}"
 EndProject
@@ -826,9 +826,9 @@ Global
 		SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6}
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		src\Compatibility\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{03c5a84a-982b-4f38-ac73-ab832c645c4a}*SharedItemsImports = 5
-		src\Compatibility\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{0a3c9afd-f6e6-4a5d-83fb-93bf66732696}*SharedItemsImports = 5
-		src\Compatibility\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{9d36039f-d0a1-462f-85b4-81763c6b02cb}*SharedItemsImports = 13
-		src\Compatibility\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{a9103b98-d888-4260-8a05-fa36f640698a}*SharedItemsImports = 5
+		src\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{03c5a84a-982b-4f38-ac73-ab832c645c4a}*SharedItemsImports = 5
+		src\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{0a3c9afd-f6e6-4a5d-83fb-93bf66732696}*SharedItemsImports = 5
+		src\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{9d36039f-d0a1-462f-85b4-81763c6b02cb}*SharedItemsImports = 13
+		src\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{a9103b98-d888-4260-8a05-fa36f640698a}*SharedItemsImports = 5
 	EndGlobalSection
 EndGlobal
diff --git a/source-build.slnf b/source-build.slnf
@@ -13,10 +13,10 @@
       "src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj",
       "src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj",
       "src\\Cli\\dotnet\\dotnet.csproj",
-      "src\\Compatibility\\Microsoft.DotNet.ApiCompat.Shared\\Microsoft.DotNet.ApiCompat.Shared.shproj",
-      "src\\Compatibility\\Microsoft.DotNet.ApiCompat.Task\\Microsoft.DotNet.ApiCompat.Task.csproj",
-      "src\\Compatibility\\Microsoft.DotNet.ApiCompatibility\\Microsoft.DotNet.ApiCompatibility.csproj",
-      "src\\Compatibility\\Microsoft.DotNet.PackageValidation\\Microsoft.DotNet.PackageValidation.csproj",
+      "src\\ApiCompat\\Microsoft.DotNet.ApiCompat.Shared\\Microsoft.DotNet.ApiCompat.Shared.shproj",
+      "src\\ApiCompat\\Microsoft.DotNet.ApiCompat.Task\\Microsoft.DotNet.ApiCompat.Task.csproj",
+      "src\\ApiCompat\\Microsoft.DotNet.ApiCompatibility\\Microsoft.DotNet.ApiCompatibility.csproj",
+      "src\\ApiCompat\\Microsoft.DotNet.PackageValidation\\Microsoft.DotNet.PackageValidation.csproj",
       "src\\Layout\\redist\\redist.csproj",
       "src\\Layout\\tool_fsharp\\tool_fsc.csproj",
       "src\\Layout\\tool_msbuild\\tool_msbuild.csproj",

diff --git a/...Net.ApiCompat.Shared/CommonResources.resx → ...Net.ApiCompat.Shared/CommonResources.resx b/...Net.ApiCompat.Shared/CommonResources.resx → ...Net.ApiCompat.Shared/CommonResources.resx
diff --git a/...crosoft.DotNet.ApiCompat.Shared.projitems → ...crosoft.DotNet.ApiCompat.Shared.projitems b/...crosoft.DotNet.ApiCompat.Shared.projitems → ...crosoft.DotNet.ApiCompat.Shared.projitems
diff --git a/.../Microsoft.DotNet.ApiCompat.Shared.shproj → .../Microsoft.DotNet.ApiCompat.Shared.shproj b/.../Microsoft.DotNet.ApiCompat.Shared.shproj → .../Microsoft.DotNet.ApiCompat.Shared.shproj
diff --git a/...piCompat.Shared/RegexStringTransformer.cs → ...piCompat.Shared/RegexStringTransformer.cs b/...piCompat.Shared/RegexStringTransformer.cs → ...piCompat.Shared/RegexStringTransformer.cs
diff --git a/...DotNet.ApiCompat.Shared/RoslynResolver.cs → ...DotNet.ApiCompat.Shared/RoslynResolver.cs b/...DotNet.ApiCompat.Shared/RoslynResolver.cs → ...DotNet.ApiCompat.Shared/RoslynResolver.cs
diff --git a/...ApiCompat.Shared/SuppressionFileHelper.cs → ...ApiCompat.Shared/SuppressionFileHelper.cs b/...ApiCompat.Shared/SuppressionFileHelper.cs → ...ApiCompat.Shared/SuppressionFileHelper.cs
diff --git a/...et.ApiCompat.Shared/ValidateAssemblies.cs → ...et.ApiCompat.Shared/ValidateAssemblies.cs b/...et.ApiCompat.Shared/ValidateAssemblies.cs → ...et.ApiCompat.Shared/ValidateAssemblies.cs
diff --git a/...otNet.ApiCompat.Shared/ValidatePackage.cs → ...otNet.ApiCompat.Shared/ValidatePackage.cs b/...otNet.ApiCompat.Shared/ValidatePackage.cs → ...otNet.ApiCompat.Shared/ValidatePackage.cs
diff --git a/...iCompat.Shared/xlf/CommonResources.cs.xlf → ...iCompat.Shared/xlf/CommonResources.cs.xlf b/...iCompat.Shared/xlf/CommonResources.cs.xlf → ...iCompat.Shared/xlf/CommonResources.cs.xlf
diff --git a/...iCompat.Shared/xlf/CommonResources.de.xlf → ...iCompat.Shared/xlf/CommonResources.de.xlf b/...iCompat.Shared/xlf/CommonResources.de.xlf → ...iCompat.Shared/xlf/CommonResources.de.xlf
diff --git a/...iCompat.Shared/xlf/CommonResources.es.xlf → ...iCompat.Shared/xlf/CommonResources.es.xlf b/...iCompat.Shared/xlf/CommonResources.es.xlf → ...iCompat.Shared/xlf/CommonResources.es.xlf
diff --git a/...iCompat.Shared/xlf/CommonResources.fr.xlf → ...iCompat.Shared/xlf/CommonResources.fr.xlf b/...iCompat.Shared/xlf/CommonResources.fr.xlf → ...iCompat.Shared/xlf/CommonResources.fr.xlf
diff --git a/...iCompat.Shared/xlf/CommonResources.it.xlf → ...iCompat.Shared/xlf/CommonResources.it.xlf b/...iCompat.Shared/xlf/CommonResources.it.xlf → ...iCompat.Shared/xlf/CommonResources.it.xlf
diff --git a/...iCompat.Shared/xlf/CommonResources.ja.xlf → ...iCompat.Shared/xlf/CommonResources.ja.xlf b/...iCompat.Shared/xlf/CommonResources.ja.xlf → ...iCompat.Shared/xlf/CommonResources.ja.xlf
diff --git a/...iCompat.Shared/xlf/CommonResources.ko.xlf → ...iCompat.Shared/xlf/CommonResources.ko.xlf b/...iCompat.Shared/xlf/CommonResources.ko.xlf → ...iCompat.Shared/xlf/CommonResources.ko.xlf
diff --git a/...iCompat.Shared/xlf/CommonResources.pl.xlf → ...iCompat.Shared/xlf/CommonResources.pl.xlf b/...iCompat.Shared/xlf/CommonResources.pl.xlf → ...iCompat.Shared/xlf/CommonResources.pl.xlf
diff --git a/...mpat.Shared/xlf/CommonResources.pt-BR.xlf → ...mpat.Shared/xlf/CommonResources.pt-BR.xlf b/...mpat.Shared/xlf/CommonResources.pt-BR.xlf → ...mpat.Shared/xlf/CommonResources.pt-BR.xlf
diff --git a/...iCompat.Shared/xlf/CommonResources.ru.xlf → ...iCompat.Shared/xlf/CommonResources.ru.xlf b/...iCompat.Shared/xlf/CommonResources.ru.xlf → ...iCompat.Shared/xlf/CommonResources.ru.xlf
diff --git a/...iCompat.Shared/xlf/CommonResources.tr.xlf → ...iCompat.Shared/xlf/CommonResources.tr.xlf b/...iCompat.Shared/xlf/CommonResources.tr.xlf → ...iCompat.Shared/xlf/CommonResources.tr.xlf
diff --git a/...at.Shared/xlf/CommonResources.zh-Hans.xlf → ...at.Shared/xlf/CommonResources.zh-Hans.xlf b/...at.Shared/xlf/CommonResources.zh-Hans.xlf → ...at.Shared/xlf/CommonResources.zh-Hans.xlf
diff --git a/...at.Shared/xlf/CommonResources.zh-Hant.xlf → ...at.Shared/xlf/CommonResources.zh-Hant.xlf b/...at.Shared/xlf/CommonResources.zh-Hant.xlf → ...at.Shared/xlf/CommonResources.zh-Hant.xlf
diff --git a/...Compat.Task/MSBuildCompatibilityLogger.cs → ...Compat.Task/MSBuildCompatibilityLogger.cs b/...Compat.Task/MSBuildCompatibilityLogger.cs → ...Compat.Task/MSBuildCompatibilityLogger.cs
diff --git a/...sk/Microsoft.DotNet.ApiCompat.Task.csproj → ...sk/Microsoft.DotNet.ApiCompat.Task.csproj b/...sk/Microsoft.DotNet.ApiCompat.Task.csproj → ...sk/Microsoft.DotNet.ApiCompat.Task.csproj
diff --git a/....ApiCompat.Task/ValidateAssembliesTask.cs → ....ApiCompat.Task/ValidateAssembliesTask.cs b/....ApiCompat.Task/ValidateAssembliesTask.cs → ....ApiCompat.Task/ValidateAssembliesTask.cs
diff --git a/...Net.ApiCompat.Task/ValidatePackageTask.cs → ...Net.ApiCompat.Task/ValidatePackageTask.cs b/...Net.ApiCompat.Task/ValidatePackageTask.cs → ...Net.ApiCompat.Task/ValidatePackageTask.cs
diff --git a/...d/Microsoft.DotNet.ApiCompat.Task.targets → ...d/Microsoft.DotNet.ApiCompat.Task.targets b/...d/Microsoft.DotNet.ApiCompat.Task.targets → ...d/Microsoft.DotNet.ApiCompat.Task.targets
diff --git a/...iCompat.ValidateAssemblies.Common.targets → ...iCompat.ValidateAssemblies.Common.targets b/...iCompat.ValidateAssemblies.Common.targets → ...iCompat.ValidateAssemblies.Common.targets
diff --git a/...ValidateAssemblies.CrossTargeting.targets → ...ValidateAssemblies.CrossTargeting.targets b/...ValidateAssemblies.CrossTargeting.targets → ...ValidateAssemblies.CrossTargeting.targets
diff --git a/...idateAssemblies.NonCrossTargeting.targets → ...idateAssemblies.NonCrossTargeting.targets b/...idateAssemblies.NonCrossTargeting.targets → ...idateAssemblies.NonCrossTargeting.targets
diff --git a/...g/Microsoft.DotNet.ApiCompat.Task.targets → ...g/Microsoft.DotNet.ApiCompat.Task.targets b/...g/Microsoft.DotNet.ApiCompat.Task.targets → ...g/Microsoft.DotNet.ApiCompat.Task.targets
diff --git a/...Compat.Tool/ConsoleCompatibilityLogger.cs → ...Compat.Tool/ConsoleCompatibilityLogger.cs b/...Compat.Tool/ConsoleCompatibilityLogger.cs → ...Compat.Tool/ConsoleCompatibilityLogger.cs
diff --git a/...ol/Microsoft.DotNet.ApiCompat.Tool.csproj → ...ol/Microsoft.DotNet.ApiCompat.Tool.csproj b/...ol/Microsoft.DotNet.ApiCompat.Tool.csproj → ...ol/Microsoft.DotNet.ApiCompat.Tool.csproj
diff --git a/...icrosoft.DotNet.ApiCompat.Tool/Program.cs → ...icrosoft.DotNet.ApiCompat.Tool/Program.cs b/...icrosoft.DotNet.ApiCompat.Tool/Program.cs → ...icrosoft.DotNet.ApiCompat.Tool/Program.cs
diff --git a/...tibility/Abstractions/CompatDifference.cs → ...tibility/Abstractions/CompatDifference.cs b/...tibility/Abstractions/CompatDifference.cs → ...tibility/Abstractions/CompatDifference.cs
diff --git a/...patibility/Abstractions/DifferenceType.cs → ...patibility/Abstractions/DifferenceType.cs b/...patibility/Abstractions/DifferenceType.cs → ...patibility/Abstractions/DifferenceType.cs
diff --git a/...tibility/Abstractions/ElementContainer.cs → ...tibility/Abstractions/ElementContainer.cs b/...tibility/Abstractions/ElementContainer.cs → ...tibility/Abstractions/ElementContainer.cs
diff --git a/...y/Abstractions/Filtering/ISymbolFilter.cs → ...y/Abstractions/Filtering/ISymbolFilter.cs b/...y/Abstractions/Filtering/ISymbolFilter.cs → ...y/Abstractions/Filtering/ISymbolFilter.cs
diff --git a/...ltering/SymbolAccessibilityBasedFilter.cs → ...ltering/SymbolAccessibilityBasedFilter.cs b/...ltering/SymbolAccessibilityBasedFilter.cs → ...ltering/SymbolAccessibilityBasedFilter.cs
diff --git a/...Compatibility/Abstractions/IDiagnostic.cs → ...Compatibility/Abstractions/IDiagnostic.cs b/...Compatibility/Abstractions/IDiagnostic.cs → ...Compatibility/Abstractions/IDiagnostic.cs
diff --git a/...et.ApiCompatibility/Abstractions/IRule.cs → ...et.ApiCompatibility/Abstractions/IRule.cs b/...et.ApiCompatibility/Abstractions/IRule.cs → ...et.ApiCompatibility/Abstractions/IRule.cs
diff --git a/...Compatibility/Abstractions/IRuleRunner.cs → ...Compatibility/Abstractions/IRuleRunner.cs b/...Compatibility/Abstractions/IRuleRunner.cs → ...Compatibility/Abstractions/IRuleRunner.cs
diff --git a/...mpatibility/Abstractions/MapperVisitor.cs → ...mpatibility/Abstractions/MapperVisitor.cs b/...mpatibility/Abstractions/MapperVisitor.cs → ...mpatibility/Abstractions/MapperVisitor.cs
diff --git a/...ty/Abstractions/Mappers/AssemblyMapper.cs → ...ty/Abstractions/Mappers/AssemblyMapper.cs b/...ty/Abstractions/Mappers/AssemblyMapper.cs → ...ty/Abstractions/Mappers/AssemblyMapper.cs
diff --git a/...Abstractions/Mappers/AssemblySetMapper.cs → ...Abstractions/Mappers/AssemblySetMapper.cs b/...Abstractions/Mappers/AssemblySetMapper.cs → ...Abstractions/Mappers/AssemblySetMapper.cs
diff --git a/...ity/Abstractions/Mappers/ElementMapper.cs → ...ity/Abstractions/Mappers/ElementMapper.cs b/...ity/Abstractions/Mappers/ElementMapper.cs → ...ity/Abstractions/Mappers/ElementMapper.cs
diff --git a/...ility/Abstractions/Mappers/ElementSide.cs → ...ility/Abstractions/Mappers/ElementSide.cs b/...ility/Abstractions/Mappers/ElementSide.cs → ...ility/Abstractions/Mappers/ElementSide.cs
diff --git a/...lity/Abstractions/Mappers/MemberMapper.cs → ...lity/Abstractions/Mappers/MemberMapper.cs b/...lity/Abstractions/Mappers/MemberMapper.cs → ...lity/Abstractions/Mappers/MemberMapper.cs
diff --git a/...y/Abstractions/Mappers/NamespaceMapper.cs → ...y/Abstractions/Mappers/NamespaceMapper.cs b/...y/Abstractions/Mappers/NamespaceMapper.cs → ...y/Abstractions/Mappers/NamespaceMapper.cs
diff --git a/...bility/Abstractions/Mappers/TypeMapper.cs → ...bility/Abstractions/Mappers/TypeMapper.cs b/...bility/Abstractions/Mappers/TypeMapper.cs → ...bility/Abstractions/Mappers/TypeMapper.cs
diff --git a/...ility/Abstractions/MetadataInformation.cs → ...ility/Abstractions/MetadataInformation.cs b/...ility/Abstractions/MetadataInformation.cs → ...ility/Abstractions/MetadataInformation.cs
diff --git a/...ft.DotNet.ApiCompatibility/ApiComparer.cs → ...ft.DotNet.ApiCompatibility/ApiComparer.cs b/...ft.DotNet.ApiCompatibility/ApiComparer.cs → ...ft.DotNet.ApiCompatibility/ApiComparer.cs
diff --git a/...et.ApiCompatibility/ApiComparerFactory.cs → ...et.ApiCompatibility/ApiComparerFactory.cs b/...et.ApiCompatibility/ApiComparerFactory.cs → ...et.ApiCompatibility/ApiComparerFactory.cs
diff --git a/...t.ApiCompatibility/AssemblyLoadWarning.cs → ...t.ApiCompatibility/AssemblyLoadWarning.cs b/...t.ApiCompatibility/AssemblyLoadWarning.cs → ...t.ApiCompatibility/AssemblyLoadWarning.cs
diff --git a/....ApiCompatibility/AssemblySymbolLoader.cs → ....ApiCompatibility/AssemblySymbolLoader.cs b/....ApiCompatibility/AssemblySymbolLoader.cs → ....ApiCompatibility/AssemblySymbolLoader.cs
diff --git a/...patibility/AssemblySymbolLoaderFactory.cs → ...patibility/AssemblySymbolLoaderFactory.cs b/...patibility/AssemblySymbolLoaderFactory.cs → ...patibility/AssemblySymbolLoaderFactory.cs
diff --git a/...Net.ApiCompatibility/ComparingSettings.cs → ...Net.ApiCompatibility/ComparingSettings.cs b/...Net.ApiCompatibility/ComparingSettings.cs → ...Net.ApiCompatibility/ComparingSettings.cs
diff --git a/...ibility/DefaultSymbolsEqualityComparer.cs → ...ibility/DefaultSymbolsEqualityComparer.cs b/...ibility/DefaultSymbolsEqualityComparer.cs → ...ibility/DefaultSymbolsEqualityComparer.cs
diff --git a/....DotNet.ApiCompatibility/DiagnosticIds.cs → ....DotNet.ApiCompatibility/DiagnosticIds.cs b/....DotNet.ApiCompatibility/DiagnosticIds.cs → ....DotNet.ApiCompatibility/DiagnosticIds.cs
diff --git a/...Net.ApiCompatibility/DifferenceVisitor.cs → ...Net.ApiCompatibility/DifferenceVisitor.cs b/...Net.ApiCompatibility/DifferenceVisitor.cs → ...Net.ApiCompatibility/DifferenceVisitor.cs
diff --git a/...ility/Extensions/CollectionsExtensions.cs → ...ility/Extensions/CollectionsExtensions.cs b/...ility/Extensions/CollectionsExtensions.cs → ...ility/Extensions/CollectionsExtensions.cs
diff --git a/...patibility/Extensions/SymbolExtensions.cs → ...patibility/Extensions/SymbolExtensions.cs b/...patibility/Extensions/SymbolExtensions.cs → ...patibility/Extensions/SymbolExtensions.cs
diff --git a/...t.DotNet.ApiCompatibility/IApiComparer.cs → ...t.DotNet.ApiCompatibility/IApiComparer.cs b/...t.DotNet.ApiCompatibility/IApiComparer.cs → ...t.DotNet.ApiCompatibility/IApiComparer.cs
diff --git a/...t.ApiCompatibility/IApiComparerFactory.cs → ...t.ApiCompatibility/IApiComparerFactory.cs b/...t.ApiCompatibility/IApiComparerFactory.cs → ...t.ApiCompatibility/IApiComparerFactory.cs
diff --git a/...ApiCompatibility/IAssemblySymbolLoader.cs → ...ApiCompatibility/IAssemblySymbolLoader.cs b/...ApiCompatibility/IAssemblySymbolLoader.cs → ...ApiCompatibility/IAssemblySymbolLoader.cs
diff --git a/...atibility/IAssemblySymbolLoaderFactory.cs → ...atibility/IAssemblySymbolLoaderFactory.cs b/...atibility/IAssemblySymbolLoaderFactory.cs → ...atibility/IAssemblySymbolLoaderFactory.cs
diff --git a/...iCompatibility/IMetadataStreamProvider.cs → ...iCompatibility/IMetadataStreamProvider.cs b/...iCompatibility/IMetadataStreamProvider.cs → ...iCompatibility/IMetadataStreamProvider.cs
diff --git a/...atibility/Logging/ICompatibilityLogger.cs → ...atibility/Logging/ICompatibilityLogger.cs b/...atibility/Logging/ICompatibilityLogger.cs → ...atibility/Logging/ICompatibilityLogger.cs
diff --git a/...mpatibility/Logging/ISuppressionEngine.cs → ...mpatibility/Logging/ISuppressionEngine.cs b/...mpatibility/Logging/ISuppressionEngine.cs → ...mpatibility/Logging/ISuppressionEngine.cs
diff --git a/...ompatibility/Logging/MessageImportance.cs → ...ompatibility/Logging/MessageImportance.cs b/...ompatibility/Logging/MessageImportance.cs → ...ompatibility/Logging/MessageImportance.cs
diff --git a/...t.ApiCompatibility/Logging/Suppression.cs → ...t.ApiCompatibility/Logging/Suppression.cs b/...t.ApiCompatibility/Logging/Suppression.cs → ...t.ApiCompatibility/Logging/Suppression.cs
diff --git a/...ompatibility/Logging/SuppressionEngine.cs → ...ompatibility/Logging/SuppressionEngine.cs b/...ompatibility/Logging/SuppressionEngine.cs → ...ompatibility/Logging/SuppressionEngine.cs
diff --git a/...piCompatibility/MetadataStreamProvider.cs → ...piCompatibility/MetadataStreamProvider.cs b/...piCompatibility/MetadataStreamProvider.cs → ...piCompatibility/MetadataStreamProvider.cs
diff --git a/.../Microsoft.DotNet.ApiCompatibility.csproj → .../Microsoft.DotNet.ApiCompatibility.csproj b/.../Microsoft.DotNet.ApiCompatibility.csproj → .../Microsoft.DotNet.ApiCompatibility.csproj
diff --git a/...ft.DotNet.ApiCompatibility/Resources.resx → ...ft.DotNet.ApiCompatibility/Resources.resx b/...ft.DotNet.ApiCompatibility/Resources.resx → ...ft.DotNet.ApiCompatibility/Resources.resx
diff --git a/...bility/Rules/AssemblyIdentityMustMatch.cs → ...bility/Rules/AssemblyIdentityMustMatch.cs b/...bility/Rules/AssemblyIdentityMustMatch.cs → ...bility/Rules/AssemblyIdentityMustMatch.cs
diff --git a/...tibility/Rules/CannotAddAbstractMember.cs → ...tibility/Rules/CannotAddAbstractMember.cs b/...tibility/Rules/CannotAddAbstractMember.cs → ...tibility/Rules/CannotAddAbstractMember.cs
diff --git a/...ility/Rules/CannotAddMemberToInterface.cs → ...ility/Rules/CannotAddMemberToInterface.cs b/...ility/Rules/CannotAddMemberToInterface.cs → ...ility/Rules/CannotAddMemberToInterface.cs
diff --git a/.../Rules/CannotAddOrRemoveVirtualKeyword.cs → .../Rules/CannotAddOrRemoveVirtualKeyword.cs b/.../Rules/CannotAddOrRemoveVirtualKeyword.cs → .../Rules/CannotAddOrRemoveVirtualKeyword.cs
diff --git a/.../Rules/CannotRemoveBaseTypeOrInterface.cs → .../Rules/CannotRemoveBaseTypeOrInterface.cs b/.../Rules/CannotRemoveBaseTypeOrInterface.cs → .../Rules/CannotRemoveBaseTypeOrInterface.cs
diff --git a/....ApiCompatibility/Rules/CannotSealType.cs → ....ApiCompatibility/Rules/CannotSealType.cs b/....ApiCompatibility/Rules/CannotSealType.cs → ....ApiCompatibility/Rules/CannotSealType.cs
diff --git a/....ApiCompatibility/Rules/EnumsMustMatch.cs → ....ApiCompatibility/Rules/EnumsMustMatch.cs b/....ApiCompatibility/Rules/EnumsMustMatch.cs → ....ApiCompatibility/Rules/EnumsMustMatch.cs
diff --git a/...piCompatibility/Rules/MembersMustExist.cs → ...piCompatibility/Rules/MembersMustExist.cs b/...piCompatibility/Rules/MembersMustExist.cs → ...piCompatibility/Rules/MembersMustExist.cs
diff --git a/...Net.ApiCompatibility/Rules/RuleLocator.cs → ...Net.ApiCompatibility/Rules/RuleLocator.cs b/...Net.ApiCompatibility/Rules/RuleLocator.cs → ...Net.ApiCompatibility/Rules/RuleLocator.cs
diff --git a/...tNet.ApiCompatibility/Rules/RuleRunner.cs → ...tNet.ApiCompatibility/Rules/RuleRunner.cs b/...tNet.ApiCompatibility/Rules/RuleRunner.cs → ...tNet.ApiCompatibility/Rules/RuleRunner.cs
diff --git a/...iCompatibility/Rules/RuleRunnerContext.cs → ...iCompatibility/Rules/RuleRunnerContext.cs b/...iCompatibility/Rules/RuleRunnerContext.cs → ...iCompatibility/Rules/RuleRunnerContext.cs
diff --git a/...iCompatibility/Rules/RuleRunnerFactory.cs → ...iCompatibility/Rules/RuleRunnerFactory.cs b/...iCompatibility/Rules/RuleRunnerFactory.cs → ...iCompatibility/Rules/RuleRunnerFactory.cs
diff --git a/...et.ApiCompatibility/Rules/RuleSettings.cs → ...et.ApiCompatibility/Rules/RuleSettings.cs b/...et.ApiCompatibility/Rules/RuleSettings.cs → ...et.ApiCompatibility/Rules/RuleSettings.cs
diff --git a/...piCompatibility/Runner/ApiCompatRunner.cs → ...piCompatibility/Runner/ApiCompatRunner.cs b/...piCompatibility/Runner/ApiCompatRunner.cs → ...piCompatibility/Runner/ApiCompatRunner.cs
diff --git a/...tibility/Runner/ApiCompatRunnerOptions.cs → ...tibility/Runner/ApiCompatRunnerOptions.cs b/...tibility/Runner/ApiCompatRunnerOptions.cs → ...tibility/Runner/ApiCompatRunnerOptions.cs
diff --git a/...ibility/Runner/ApiCompatRunnerWorkItem.cs → ...ibility/Runner/ApiCompatRunnerWorkItem.cs b/...ibility/Runner/ApiCompatRunnerWorkItem.cs → ...ibility/Runner/ApiCompatRunnerWorkItem.cs
diff --git a/...iCompatibility/Runner/IApiCompatRunner.cs → ...iCompatibility/Runner/IApiCompatRunner.cs b/...iCompatibility/Runner/IApiCompatRunner.cs → ...iCompatibility/Runner/IApiCompatRunner.cs
diff --git a/...Net.ApiCompatibility/xlf/Resources.cs.xlf → ...Net.ApiCompatibility/xlf/Resources.cs.xlf b/...Net.ApiCompatibility/xlf/Resources.cs.xlf → ...Net.ApiCompatibility/xlf/Resources.cs.xlf
diff --git a/...Net.ApiCompatibility/xlf/Resources.de.xlf → ...Net.ApiCompatibility/xlf/Resources.de.xlf b/...Net.ApiCompatibility/xlf/Resources.de.xlf → ...Net.ApiCompatibility/xlf/Resources.de.xlf
diff --git a/...Net.ApiCompatibility/xlf/Resources.es.xlf → ...Net.ApiCompatibility/xlf/Resources.es.xlf b/...Net.ApiCompatibility/xlf/Resources.es.xlf → ...Net.ApiCompatibility/xlf/Resources.es.xlf
diff --git a/...Net.ApiCompatibility/xlf/Resources.fr.xlf → ...Net.ApiCompatibility/xlf/Resources.fr.xlf b/...Net.ApiCompatibility/xlf/Resources.fr.xlf → ...Net.ApiCompatibility/xlf/Resources.fr.xlf
diff --git a/...Net.ApiCompatibility/xlf/Resources.it.xlf → ...Net.ApiCompatibility/xlf/Resources.it.xlf b/...Net.ApiCompatibility/xlf/Resources.it.xlf → ...Net.ApiCompatibility/xlf/Resources.it.xlf
diff --git a/...Net.ApiCompatibility/xlf/Resources.ja.xlf → ...Net.ApiCompatibility/xlf/Resources.ja.xlf b/...Net.ApiCompatibility/xlf/Resources.ja.xlf → ...Net.ApiCompatibility/xlf/Resources.ja.xlf
diff --git a/...Net.ApiCompatibility/xlf/Resources.ko.xlf → ...Net.ApiCompatibility/xlf/Resources.ko.xlf b/...Net.ApiCompatibility/xlf/Resources.ko.xlf → ...Net.ApiCompatibility/xlf/Resources.ko.xlf
diff --git a/...Net.ApiCompatibility/xlf/Resources.pl.xlf → ...Net.ApiCompatibility/xlf/Resources.pl.xlf b/...Net.ApiCompatibility/xlf/Resources.pl.xlf → ...Net.ApiCompatibility/xlf/Resources.pl.xlf
diff --git a/....ApiCompatibility/xlf/Resources.pt-BR.xlf → ....ApiCompatibility/xlf/Resources.pt-BR.xlf b/....ApiCompatibility/xlf/Resources.pt-BR.xlf → ....ApiCompatibility/xlf/Resources.pt-BR.xlf
diff --git a/...Net.ApiCompatibility/xlf/Resources.ru.xlf → ...Net.ApiCompatibility/xlf/Resources.ru.xlf b/...Net.ApiCompatibility/xlf/Resources.ru.xlf → ...Net.ApiCompatibility/xlf/Resources.ru.xlf
diff --git a/...Net.ApiCompatibility/xlf/Resources.tr.xlf → ...Net.ApiCompatibility/xlf/Resources.tr.xlf b/...Net.ApiCompatibility/xlf/Resources.tr.xlf → ...Net.ApiCompatibility/xlf/Resources.tr.xlf
diff --git a/...piCompatibility/xlf/Resources.zh-Hans.xlf → ...piCompatibility/xlf/Resources.zh-Hans.xlf b/...piCompatibility/xlf/Resources.zh-Hans.xlf → ...piCompatibility/xlf/Resources.zh-Hans.xlf
diff --git a/...piCompatibility/xlf/Resources.zh-Hant.xlf → ...piCompatibility/xlf/Resources.zh-Hant.xlf b/...piCompatibility/xlf/Resources.zh-Hant.xlf → ...piCompatibility/xlf/Resources.zh-Hant.xlf
diff --git a/...geValidation/ApiCompatRunnerExtensions.cs → ...geValidation/ApiCompatRunnerExtensions.cs b/...geValidation/ApiCompatRunnerExtensions.cs → ...geValidation/ApiCompatRunnerExtensions.cs
diff --git a/...DotNet.PackageValidation/DiagnosticIds.cs → ...DotNet.PackageValidation/DiagnosticIds.cs b/...DotNet.PackageValidation/DiagnosticIds.cs → ...DotNet.PackageValidation/DiagnosticIds.cs
diff --git a/...Microsoft.DotNet.PackageValidation.csproj → ...Microsoft.DotNet.PackageValidation.csproj b/...Microsoft.DotNet.PackageValidation.csproj → ...Microsoft.DotNet.PackageValidation.csproj
diff --git a/...osoft.DotNet.PackageValidation/Package.cs → ...osoft.DotNet.PackageValidation/Package.cs b/...osoft.DotNet.PackageValidation/Package.cs → ...osoft.DotNet.PackageValidation/Package.cs
diff --git a/...t.DotNet.PackageValidation/Resources.resx → ...t.DotNet.PackageValidation/Resources.resx b/...t.DotNet.PackageValidation/Resources.resx → ...t.DotNet.PackageValidation/Resources.resx
diff --git a/...on/Validators/BaselinePackageValidator.cs → ...on/Validators/BaselinePackageValidator.cs b/...on/Validators/BaselinePackageValidator.cs → ...on/Validators/BaselinePackageValidator.cs
diff --git a/.../CompatibleFrameworkInPackageValidator.cs → .../CompatibleFrameworkInPackageValidator.cs b/.../CompatibleFrameworkInPackageValidator.cs → .../CompatibleFrameworkInPackageValidator.cs
diff --git a/...tion/Validators/CompatibleTFMValidator.cs → ...tion/Validators/CompatibleTFMValidator.cs b/...tion/Validators/CompatibleTFMValidator.cs → ...tion/Validators/CompatibleTFMValidator.cs
diff --git a/...alidation/Validators/IPackageValidator.cs → ...alidation/Validators/IPackageValidator.cs b/...alidation/Validators/IPackageValidator.cs → ...alidation/Validators/IPackageValidator.cs
diff --git a/...tion/Validators/PackageValidatorOption.cs → ...tion/Validators/PackageValidatorOption.cs b/...tion/Validators/PackageValidatorOption.cs → ...tion/Validators/PackageValidatorOption.cs
diff --git a/...et.PackageValidation/xlf/Resources.cs.xlf → ...et.PackageValidation/xlf/Resources.cs.xlf b/...et.PackageValidation/xlf/Resources.cs.xlf → ...et.PackageValidation/xlf/Resources.cs.xlf
diff --git a/...et.PackageValidation/xlf/Resources.de.xlf → ...et.PackageValidation/xlf/Resources.de.xlf b/...et.PackageValidation/xlf/Resources.de.xlf → ...et.PackageValidation/xlf/Resources.de.xlf
diff --git a/...et.PackageValidation/xlf/Resources.es.xlf → ...et.PackageValidation/xlf/Resources.es.xlf b/...et.PackageValidation/xlf/Resources.es.xlf → ...et.PackageValidation/xlf/Resources.es.xlf
diff --git a/...et.PackageValidation/xlf/Resources.fr.xlf → ...et.PackageValidation/xlf/Resources.fr.xlf b/...et.PackageValidation/xlf/Resources.fr.xlf → ...et.PackageValidation/xlf/Resources.fr.xlf
diff --git a/...et.PackageValidation/xlf/Resources.it.xlf → ...et.PackageValidation/xlf/Resources.it.xlf b/...et.PackageValidation/xlf/Resources.it.xlf → ...et.PackageValidation/xlf/Resources.it.xlf
diff --git a/...et.PackageValidation/xlf/Resources.ja.xlf → ...et.PackageValidation/xlf/Resources.ja.xlf b/...et.PackageValidation/xlf/Resources.ja.xlf → ...et.PackageValidation/xlf/Resources.ja.xlf
diff --git a/...et.PackageValidation/xlf/Resources.ko.xlf → ...et.PackageValidation/xlf/Resources.ko.xlf b/...et.PackageValidation/xlf/Resources.ko.xlf → ...et.PackageValidation/xlf/Resources.ko.xlf
diff --git a/...et.PackageValidation/xlf/Resources.pl.xlf → ...et.PackageValidation/xlf/Resources.pl.xlf b/...et.PackageValidation/xlf/Resources.pl.xlf → ...et.PackageValidation/xlf/Resources.pl.xlf
diff --git a/...PackageValidation/xlf/Resources.pt-BR.xlf → ...PackageValidation/xlf/Resources.pt-BR.xlf b/...PackageValidation/xlf/Resources.pt-BR.xlf → ...PackageValidation/xlf/Resources.pt-BR.xlf
diff --git a/...et.PackageValidation/xlf/Resources.ru.xlf → ...et.PackageValidation/xlf/Resources.ru.xlf b/...et.PackageValidation/xlf/Resources.ru.xlf → ...et.PackageValidation/xlf/Resources.ru.xlf
diff --git a/...et.PackageValidation/xlf/Resources.tr.xlf → ...et.PackageValidation/xlf/Resources.tr.xlf b/...et.PackageValidation/xlf/Resources.tr.xlf → ...et.PackageValidation/xlf/Resources.tr.xlf
diff --git a/...ckageValidation/xlf/Resources.zh-Hans.xlf → ...ckageValidation/xlf/Resources.zh-Hans.xlf b/...ckageValidation/xlf/Resources.zh-Hans.xlf → ...ckageValidation/xlf/Resources.zh-Hans.xlf
diff --git a/...ckageValidation/xlf/Resources.zh-Hant.xlf → ...ckageValidation/xlf/Resources.zh-Hant.xlf b/...ckageValidation/xlf/Resources.zh-Hant.xlf → ...ckageValidation/xlf/Resources.zh-Hant.xlf
diff --git a/src/Compatibility/compatibility.slnf → src/ApiCompat/apicompat.slnf b/src/Compatibility/compatibility.slnf → src/ApiCompat/apicompat.slnf
@@ -4,11 +4,11 @@
     "projects": [
       "src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
       "src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj",
-      "src\\Compatibility\\Microsoft.DotNet.ApiCompat.Shared\\Microsoft.DotNet.ApiCompat.Shared.shproj",
-      "src\\Compatibility\\Microsoft.DotNet.ApiCompat.Task\\Microsoft.DotNet.ApiCompat.Task.csproj",
-      "src\\Compatibility\\Microsoft.DotNet.ApiCompat.Tool\\Microsoft.DotNet.ApiCompat.Tool.csproj",
-      "src\\Compatibility\\Microsoft.DotNet.ApiCompatibility\\Microsoft.DotNet.ApiCompatibility.csproj",
-      "src\\Compatibility\\Microsoft.DotNet.PackageValidation\\Microsoft.DotNet.PackageValidation.csproj",
+      "src\\ApiCompat\\Microsoft.DotNet.ApiCompat.Shared\\Microsoft.DotNet.ApiCompat.Shared.shproj",
+      "src\\ApiCompat\\Microsoft.DotNet.ApiCompat.Task\\Microsoft.DotNet.ApiCompat.Task.csproj",
+      "src\\ApiCompat\\Microsoft.DotNet.ApiCompat.Tool\\Microsoft.DotNet.ApiCompat.Tool.csproj",
+      "src\\ApiCompat\\Microsoft.DotNet.ApiCompatibility\\Microsoft.DotNet.ApiCompatibility.csproj",
+      "src\\ApiCompat\\Microsoft.DotNet.PackageValidation\\Microsoft.DotNet.PackageValidation.csproj",
       "src\\Layout\\toolset-tasks\\toolset-tasks.csproj",
       "src\\Tests\\Microsoft.DotNet.ApiCompat.IntegrationTests\\Microsoft.DotNet.ApiCompat.IntegrationTests.csproj",
       "src\\Tests\\Microsoft.DotNet.ApiCompat.Tests\\Microsoft.DotNet.ApiCompat.Tests.csproj",

diff --git a/src/Assets/TestProjects/PackageValidationTestProject/PackageValidationTestProject.csproj b/src/Assets/TestProjects/PackageValidationTestProject/PackageValidationTestProject.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(MSBuildProjectDirectory)\..\..\..\..\src\Compatibility\Microsoft.DotNet.ApiCompat.Task\Microsoft.DotNet.ApiCompat.Task.csproj" />
+    <ProjectReference Include="$(MSBuildProjectDirectory)\..\..\..\..\src\ApiCompat\Microsoft.DotNet.ApiCompat.Task\Microsoft.DotNet.ApiCompat.Task.csproj" />
     <PackageReference Include="NuGet.Frameworks" Version="6.0.0-preview.1.66" />
     <PackageReference Include="NuGet.Packaging" Version="6.0.0-preview.1.66" />
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
@@ -54,9 +54,9 @@
     <PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelVersion)" />
     <PackageReference Include="NuGet.Build.Tasks.Pack" Version="$(NuGetBuildTasksPackageVersion)" ExcludeAssets="All" />
     <PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
-    <ProjectReference Include="..\..\Compatibility\Microsoft.DotNet.ApiCompatibility\Microsoft.DotNet.ApiCompatibility.csproj" OutputItemType="ReferenceCopyLocalPaths" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\..\Compatibility\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj" OutputItemType="ReferenceCopyLocalPaths" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\..\Compatibility\Microsoft.DotNet.ApiCompat.Task\Microsoft.DotNet.ApiCompat.Task.csproj" OutputItemType="ReferenceCopyLocalPaths" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\ApiCompat\Microsoft.DotNet.ApiCompatibility\Microsoft.DotNet.ApiCompatibility.csproj" OutputItemType="ReferenceCopyLocalPaths" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\ApiCompat\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj" OutputItemType="ReferenceCopyLocalPaths" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\ApiCompat\Microsoft.DotNet.ApiCompat.Task\Microsoft.DotNet.ApiCompat.Task.csproj" OutputItemType="ReferenceCopyLocalPaths" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
 

diff --git a/src/Tasks/Microsoft.NET.slnf b/src/Tasks/Microsoft.NET.slnf
@@ -7,11 +7,11 @@
       "src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj",
       "src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj",
       "src\\Cli\\dotnet\\dotnet.csproj",
-      "src\\Compatibility\\Microsoft.DotNet.ApiCompat.Shared\\Microsoft.DotNet.ApiCompat.Shared.shproj",
-      "src\\Compatibility\\Microsoft.DotNet.ApiCompat.Task\\Microsoft.DotNet.ApiCompat.Task.csproj",
-      "src\\Compatibility\\Microsoft.DotNet.ApiCompat.Tool\\Microsoft.DotNet.ApiCompat.Tool.csproj",
-      "src\\Compatibility\\Microsoft.DotNet.ApiCompatibility\\Microsoft.DotNet.ApiCompatibility.csproj",
-      "src\\Compatibility\\Microsoft.DotNet.PackageValidation\\Microsoft.DotNet.PackageValidation.csproj",
+      "src\\ApiCompat\\Microsoft.DotNet.ApiCompat.Shared\\Microsoft.DotNet.ApiCompat.Shared.shproj",
+      "src\\ApiCompat\\Microsoft.DotNet.ApiCompat.Task\\Microsoft.DotNet.ApiCompat.Task.csproj",
+      "src\\ApiCompat\\Microsoft.DotNet.ApiCompat.Tool\\Microsoft.DotNet.ApiCompat.Tool.csproj",
+      "src\\ApiCompat\\Microsoft.DotNet.ApiCompatibility\\Microsoft.DotNet.ApiCompatibility.csproj",
+      "src\\ApiCompat\\Microsoft.DotNet.PackageValidation\\Microsoft.DotNet.PackageValidation.csproj",
       "src\\Microsoft.DotNet.TemplateLocator\\Microsoft.DotNet.TemplateLocator.csproj",
       "src\\Microsoft.Win32.Msi\\Microsoft.Win32.Msi.csproj",
       "src\\Resolvers\\Microsoft.DotNet.MSBuildSdkResolver\\Microsoft.DotNet.MSBuildSdkResolver.csproj",

diff --git a/...soft.DotNet.ApiCompat.IntegrationTests/Microsoft.DotNet.ApiCompat.IntegrationTests.csproj b/...soft.DotNet.ApiCompat.IntegrationTests/Microsoft.DotNet.ApiCompat.IntegrationTests.csproj
@@ -8,21 +8,21 @@
 
   <ItemGroup>
     <Compile Include="..\Microsoft.DotNet.PackageValidation.Tests\TestLogger.cs" />
-    <EmbeddedResource Include="..\..\Compatibility\Microsoft.DotNet.PackageValidation\Resources.resx" GenerateSource="true" />
+    <EmbeddedResource Include="..\..\ApiCompat\Microsoft.DotNet.PackageValidation\Resources.resx" GenerateSource="true" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Compatibility\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj" />
-    <ProjectReference Include="..\..\Compatibility\Microsoft.DotNet.ApiCompat.Task\Microsoft.DotNet.ApiCompat.Task.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\ApiCompat\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj" />
+    <ProjectReference Include="..\..\ApiCompat\Microsoft.DotNet.ApiCompat.Task\Microsoft.DotNet.ApiCompat.Task.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
   </ItemGroup>
 
-  <Target Name="CopyCompatibilityFilesForTests" AfterTargets="Publish">
+  <Target Name="CopyApiCompatFilesForTests" AfterTargets="Publish">
     <ItemGroup>
-      <CompatibilityFiles Include="..\..\Compatibility\Microsoft.DotNet.ApiCompat.Task\**" />
-      <CompatibilityFiles Include="..\..\Tasks\Microsoft.NET.Build.Tasks\targets\Microsoft.NET.ApiCompat.targets" />   
+      <ApiCompatFile Include="..\..\ApiCompat\Microsoft.DotNet.ApiCompat.Task\**" />
+      <ApiCompatFile Include="..\..\Tasks\Microsoft.NET.Build.Tasks\targets\Microsoft.NET.ApiCompat.targets" />   
     </ItemGroup>
-    <Copy SourceFiles="@(CompatibilityFiles)" DestinationFiles="@(CompatibilityFiles->'$(PublishDir)Compatibility\Microsoft.DotNet.ApiCompat.Task\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(ApiCompatFile)" DestinationFiles="@(ApiCompatFile->'$(PublishDir)ApiCompat\Microsoft.DotNet.ApiCompat.Task\%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 
 </Project>
diff --git a/src/Tests/Microsoft.DotNet.ApiCompat.Tests/Microsoft.DotNet.ApiCompat.Tests.csproj b/src/Tests/Microsoft.DotNet.ApiCompat.Tests/Microsoft.DotNet.ApiCompat.Tests.csproj
@@ -10,11 +10,11 @@
 
   <ItemGroup>
     <PackageReference Include="Jab" Version="$(JabVersion)" PrivateAssets="all" />
-    <ProjectReference Include="..\..\Compatibility\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj" />
-    <ProjectReference Include="..\..\Compatibility\Microsoft.DotNet.ApiCompat.Task\Microsoft.DotNet.ApiCompat.Task.csproj" />
+    <ProjectReference Include="..\..\ApiCompat\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj" />
+    <ProjectReference Include="..\..\ApiCompat\Microsoft.DotNet.ApiCompat.Task\Microsoft.DotNet.ApiCompat.Task.csproj" />
     <ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
   </ItemGroup>
 
-  <Import Project="..\..\Compatibility\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems" Label="Shared" />
+  <Import Project="..\..\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems" Label="Shared" />
 
 </Project>
diff --git a/...ts/Microsoft.DotNet.ApiCompatibility.Tests/Microsoft.DotNet.ApiCompatibility.Tests.csproj b/...ts/Microsoft.DotNet.ApiCompatibility.Tests/Microsoft.DotNet.ApiCompatibility.Tests.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Compatibility\Microsoft.DotNet.ApiCompatibility\Microsoft.DotNet.ApiCompatibility.csproj" />
+    <ProjectReference Include="..\..\ApiCompat\Microsoft.DotNet.ApiCompatibility\Microsoft.DotNet.ApiCompatibility.csproj" />
     <ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
   </ItemGroup>
 

diff --git a/.../Microsoft.DotNet.PackageValidation.Tests/Microsoft.DotNet.PackageValidation.Tests.csproj b/.../Microsoft.DotNet.PackageValidation.Tests/Microsoft.DotNet.PackageValidation.Tests.csproj
@@ -7,15 +7,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="..\..\Compatibility\Microsoft.DotNet.PackageValidation\Resources.resx" GenerateSource="true" />
+    <EmbeddedResource Include="..\..\ApiCompat\Microsoft.DotNet.PackageValidation\Resources.resx" GenerateSource="true" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Compatibility\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj" />
+    <ProjectReference Include="..\..\ApiCompat\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj" />
     <ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
   </ItemGroup>