Move compatibility tools into common folder (#35964)

dotnet · Oct 10, 2023 · 1543690 · 1543690
1 parent f314348
commit 1543690
Show file tree

Hide file tree

Showing 234 changed files with 133 additions and 96 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -75,18 +75,17 @@
 /src/BuiltInTools/*   @tmat @arkalyanms @dotnet/roslyn-ide
 /src/BuiltInTools/BrowserRefresh   @dotnet/aspnet-blazor-eng
 
-# Compatibility tools (APICompat & GenAPI) owned by runtime team
-/src/Microsoft.DotNet.ApiSymbolExtensions/ @dotnet/area-infrastructure-libraries @andriipatsula
-
-# Area-ApiCompat
-/src/ApiCompat/ @dotnet/area-infrastructure-libraries
+# Compatibility tools owned by runtime team
+/src/Compatibility/ @dotnet/area-infrastructure-libraries
 /src/Tests/Microsoft.DotNet.ApiCompatibility*/ @dotnet/area-infrastructure-libraries
 /src/Tests/Microsoft.DotNet.ApiCompat*/ @dotnet/area-infrastructure-libraries
 /src/Tests/Microsoft.DotNet.PackageValidation*/ @dotnet/area-infrastructure-libraries
 
 # Area-GenAPI
-/src/GenAPI/ @dotnet/area-infrastructure-libraries @andriipatsula
+/src/Compatibility/GenAPI/ @dotnet/area-infrastructure-libraries @andriipatsula
+/src/Compatibility/Microsoft.DotNet.ApiSymbolExtensions/ @dotnet/area-infrastructure-libraries @andriipatsula
 /src/Tests/Microsoft.DotNet.GenAPI/ @dotnet/area-infrastructure-libraries @andriipatsula
+/src/Tests/Microsoft.DotNet.ApiSymbolExtensions.Tests/
 
 # Area: dotnet containers
 /src/Cli/Containers @dotnet/sdk-container-builds-maintainers

diff --git a/sdk.sln b/sdk.sln
@@ -347,7 +347,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.NativeWrap
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiCompat", "ApiCompat", "{AF683E5C-421E-4DE0-ADD7-9841E5D12BFA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiCompatibility", "src\ApiCompat\Microsoft.DotNet.ApiCompatibility\Microsoft.DotNet.ApiCompatibility.csproj", "{3F5A028C-C51B-434A-8C10-37680CD2635C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiCompatibility", "src\Compatibility\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
@@ -357,19 +357,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\ApiCompat\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj", "{E56BEA9A-B52A-4781-9FF4-217439923319}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.PackageValidation", "src\Compatibility\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\ApiCompat\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\Compatibility\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\ApiCompat\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\Compatibility\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\ApiCompat\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\Compatibility\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
@@ -397,19 +397,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{06260D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet-new", "dotnet-new", "{81003712-2EF6-47D0-904A-64E4DDD75BF7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiSymbolExtensions", "src\Microsoft.DotNet.ApiSymbolExtensions\Microsoft.DotNet.ApiSymbolExtensions.csproj", "{08238DE9-701B-4581-A414-51F94C99E44D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiSymbolExtensions", "src\Compatibility\Microsoft.DotNet.ApiSymbolExtensions\Microsoft.DotNet.ApiSymbolExtensions.csproj", "{08238DE9-701B-4581-A414-51F94C99E44D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GenAPI", "GenAPI", "{95D8B040-FD7F-4C86-8E47-341AF630EDA9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.GenAPI.Tool", "src\GenAPI\Microsoft.DotNet.GenAPI.Tool\Microsoft.DotNet.GenAPI.Tool.csproj", "{9C08C7BD-EC01-42FA-AF1B-4177686DFC64}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.GenAPI.Tool", "src\Compatibility\GenAPI\Microsoft.DotNet.GenAPI.Tool\Microsoft.DotNet.GenAPI.Tool.csproj", "{9C08C7BD-EC01-42FA-AF1B-4177686DFC64}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.GenAPI.Tests", "src\Tests\Microsoft.DotNet.GenAPI.Tests\Microsoft.DotNet.GenAPI.Tests.csproj", "{5D81D6AA-E198-4537-AE1C-549367DAF187}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiSymbolExtensions.Tests", "src\Tests\Microsoft.DotNet.ApiSymbolExtensions.Tests\Microsoft.DotNet.ApiSymbolExtensions.Tests.csproj", "{E2BC296E-2660-4692-B471-F6FCD4C19F6E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.GenAPI", "src\GenAPI\Microsoft.DotNet.GenAPI\Microsoft.DotNet.GenAPI.csproj", "{5F74AD67-A4AD-4660-A63C-844DAAF354C4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.GenAPI", "src\Compatibility\GenAPI\Microsoft.DotNet.GenAPI\Microsoft.DotNet.GenAPI.csproj", "{5F74AD67-A4AD-4660-A63C-844DAAF354C4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.GenAPI.Task", "src\GenAPI\Microsoft.DotNet.GenAPI.Task\Microsoft.DotNet.GenAPI.Task.csproj", "{C419AE2D-D318-49EB-8ECA-6A5DC13FE4EA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.GenAPI.Task", "src\Compatibility\GenAPI\Microsoft.DotNet.GenAPI.Task\Microsoft.DotNet.GenAPI.Task.csproj", "{C419AE2D-D318-49EB-8ECA-6A5DC13FE4EA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Web.Tests", "src\Tests\Microsoft.NET.Sdk.Web.Tests\Microsoft.NET.Sdk.Web.Tests.csproj", "{B8A61A5C-A9A4-45C5-97E3-CB368358682F}"
 EndProject
@@ -473,7 +473,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Build.Contain
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Build.Containers.UnitTests", "src\Tests\Microsoft.NET.Build.Containers.UnitTests\Microsoft.NET.Build.Containers.UnitTests.csproj", "{E54506B8-0B81-4FC4-99B5-5C67E19D4B09}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDDLTests", "src\Tests\SDDLTests\SDDLTests.csproj", "{FEA8B7B5-901B-4A3A-948F-7E5F54F09FF5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SDDLTests", "src\Tests\SDDLTests\SDDLTests.csproj", "{FEA8B7B5-901B-4A3A-948F-7E5F54F09FF5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compatibility", "Compatibility", "{44E564E1-AE0D-4313-A4E9-CBF2109397E3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compatibility", "Compatibility", "{3AD322BF-405B-4A53-9858-51CF66E8509F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiCompat", "ApiCompat", "{F6D8919A-CC7F-4D0D-9C54-BFD2F2380FB5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GenAPI", "GenAPI", "{85A01ACB-CC90-45EF-8F6C-AFC2B9F31126}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1003,9 +1011,9 @@ Global
 		{A117DF29-1D72-453B-A24C-3B53F47609F2} = {D64884FD-A3F3-4082-A814-A9377B661509}
 		{1BBFA19C-03F0-4D27-9D0D-0F8172642107} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
 		{E97E9E7F-11B4-42F7-8B55-D0451F5E82A0} = {8F22FBD6-BDC8-431E-8402-B7460D3A9724}
-		{AF683E5C-421E-4DE0-ADD7-9841E5D12BFA} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}
+		{AF683E5C-421E-4DE0-ADD7-9841E5D12BFA} = {44E564E1-AE0D-4313-A4E9-CBF2109397E3}
 		{3F5A028C-C51B-434A-8C10-37680CD2635C} = {AF683E5C-421E-4DE0-ADD7-9841E5D12BFA}
-		{24F084ED-35BB-401E-89F5-63E5E22C3B3B} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
+		{24F084ED-35BB-401E-89F5-63E5E22C3B3B} = {F6D8919A-CC7F-4D0D-9C54-BFD2F2380FB5}
 		{3D002392-6308-41DF-8BD5-224CCC5B049F} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}
 		{80932949-B8B2-4163-B325-76F8FDBE3897} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
 		{EEF4C7DD-CDC9-44B6-8B4F-725647D54ED8} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
@@ -1023,16 +1031,16 @@ Global
 		{92F4E400-8C28-41B9-9D7D-8E9A4535636B} = {536775E0-ABD9-4E57-AD41-F7BDDF2E7E02}
 		{AB7ADCF8-48AC-4885-9C70-16D752B97168} = {536775E0-ABD9-4E57-AD41-F7BDDF2E7E02}
 		{8868D816-C072-4B66-84D6-7E014EA16D48} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
-		{AE43BEC0-4BB7-42E1-B2B7-60A36092C61A} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
-		{A9103B98-D888-4260-8A05-FA36F640698A} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
+		{AE43BEC0-4BB7-42E1-B2B7-60A36092C61A} = {F6D8919A-CC7F-4D0D-9C54-BFD2F2380FB5}
+		{A9103B98-D888-4260-8A05-FA36F640698A} = {F6D8919A-CC7F-4D0D-9C54-BFD2F2380FB5}
 		{C37EC61D-6A88-4C15-B371-A61F23EF9072} = {81003712-2EF6-47D0-904A-64E4DDD75BF7}
 		{06260DC7-BA64-42BE-B99C-6069A1C3E70E} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
 		{81003712-2EF6-47D0-904A-64E4DDD75BF7} = {06260DC7-BA64-42BE-B99C-6069A1C3E70E}
-		{08238DE9-701B-4581-A414-51F94C99E44D} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}
-		{95D8B040-FD7F-4C86-8E47-341AF630EDA9} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}
+		{08238DE9-701B-4581-A414-51F94C99E44D} = {44E564E1-AE0D-4313-A4E9-CBF2109397E3}
+		{95D8B040-FD7F-4C86-8E47-341AF630EDA9} = {44E564E1-AE0D-4313-A4E9-CBF2109397E3}
 		{9C08C7BD-EC01-42FA-AF1B-4177686DFC64} = {95D8B040-FD7F-4C86-8E47-341AF630EDA9}
-		{5D81D6AA-E198-4537-AE1C-549367DAF187} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
-		{E2BC296E-2660-4692-B471-F6FCD4C19F6E} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
+		{5D81D6AA-E198-4537-AE1C-549367DAF187} = {85A01ACB-CC90-45EF-8F6C-AFC2B9F31126}
+		{E2BC296E-2660-4692-B471-F6FCD4C19F6E} = {3AD322BF-405B-4A53-9858-51CF66E8509F}
 		{5F74AD67-A4AD-4660-A63C-844DAAF354C4} = {95D8B040-FD7F-4C86-8E47-341AF630EDA9}
 		{C419AE2D-D318-49EB-8ECA-6A5DC13FE4EA} = {95D8B040-FD7F-4C86-8E47-341AF630EDA9}
 		{B8A61A5C-A9A4-45C5-97E3-CB368358682F} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
@@ -1056,14 +1064,18 @@ Global
 		{7DCA2BEC-B1E1-4F2B-952A-A26B5110FDA5} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
 		{E54506B8-0B81-4FC4-99B5-5C67E19D4B09} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
 		{FEA8B7B5-901B-4A3A-948F-7E5F54F09FF5} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
+		{44E564E1-AE0D-4313-A4E9-CBF2109397E3} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}
+		{3AD322BF-405B-4A53-9858-51CF66E8509F} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
+		{F6D8919A-CC7F-4D0D-9C54-BFD2F2380FB5} = {3AD322BF-405B-4A53-9858-51CF66E8509F}
+		{85A01ACB-CC90-45EF-8F6C-AFC2B9F31126} = {3AD322BF-405B-4A53-9858-51CF66E8509F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6}
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		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
+		src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{03c5a84a-982b-4f38-ac73-ab832c645c4a}*SharedItemsImports = 5
+		src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{0a3c9afd-f6e6-4a5d-83fb-93bf66732696}*SharedItemsImports = 5
+		src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{9d36039f-d0a1-462f-85b4-81763c6b02cb}*SharedItemsImports = 13
+		src\Compatibility\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
@@ -2,11 +2,6 @@
   "solution": {
     "path": "sdk.sln",
     "projects": [
-      "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\\WasmSdk\\Tasks\\Microsoft.NET.Sdk.WebAssembly.Tasks.csproj",
       "src\\BlazorWasmSdk\\Tasks\\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj",
       "src\\BlazorWasmSdk\\Tool\\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.csproj",
       "src\\BuiltInTools\\BrowserRefresh\\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj",
@@ -19,14 +14,18 @@
       "src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj",
       "src\\Cli\\Microsoft.TemplateEngine.Cli\\Microsoft.TemplateEngine.Cli.csproj",
       "src\\Cli\\dotnet\\dotnet.csproj",
+      "src\\Compatibility\\ApiCompat\\Microsoft.DotNet.ApiCompat.Shared\\Microsoft.DotNet.ApiCompat.Shared.shproj",
+      "src\\Compatibility\\ApiCompat\\Microsoft.DotNet.ApiCompat.Task\\Microsoft.DotNet.ApiCompat.Task.csproj",
+      "src\\Compatibility\\ApiCompat\\Microsoft.DotNet.ApiCompatibility\\Microsoft.DotNet.ApiCompatibility.csproj",
+      "src\\Compatibility\\ApiCompat\\Microsoft.DotNet.PackageValidation\\Microsoft.DotNet.PackageValidation.csproj",
+      "src\\Compatibility\\Microsoft.DotNet.ApiSymbolExtensions\\Microsoft.DotNet.ApiSymbolExtensions.csproj",
       "src\\Containers\\Microsoft.NET.Build.Containers\\Microsoft.NET.Build.Containers.csproj",
       "src\\Containers\\packaging\\package.csproj",
       "src\\Layout\\redist\\redist.csproj",
       "src\\Layout\\tool_fsharp\\tool_fsc.csproj",
       "src\\Layout\\tool_msbuild\\tool_msbuild.csproj",
       "src\\Layout\\tool_nuget\\tool_nuget.csproj",
       "src\\Layout\\toolset-tasks\\toolset-tasks.csproj",
-      "src\\Microsoft.DotNet.ApiSymbolExtensions\\Microsoft.DotNet.ApiSymbolExtensions.csproj",
       "src\\Microsoft.DotNet.TemplateLocator\\Microsoft.DotNet.TemplateLocator.csproj",
       "src\\Microsoft.Win32.Msi\\Microsoft.Win32.Msi.csproj",
       "src\\RazorSdk\\Tasks\\Microsoft.NET.Sdk.Razor.Tasks.csproj",
@@ -41,6 +40,7 @@
       "src\\StaticWebAssetsSdk\\Tool\\Microsoft.NET.Sdk.StaticWebAssets.Tool.csproj",
       "src\\Tasks\\Microsoft.NET.Build.Extensions.Tasks\\Microsoft.NET.Build.Extensions.Tasks.csproj",
       "src\\Tasks\\Microsoft.NET.Build.Tasks\\Microsoft.NET.Build.Tasks.csproj",
+      "src\\WasmSdk\\Tasks\\Microsoft.NET.Sdk.WebAssembly.Tasks.csproj",
       "src\\WebSdk\\ProjectSystem\\Tasks\\Microsoft.NET.Sdk.Web.ProjectSystem.Tasks.csproj",
       "src\\WebSdk\\Publish\\Tasks\\Microsoft.NET.Sdk.Publish.Tasks.csproj",
       "src\\WebSdk\\Web\\Tasks\\Microsoft.NET.Sdk.Web.Tasks.csproj",

diff --git a/src/ApiCompat/Directory.Build.props b/src/ApiCompat/Directory.Build.props
diff --git a/src/Assets/TestProjects/PackageValidationTestProject/PackageValidationTestProject.csproj b/src/Assets/TestProjects/PackageValidationTestProject/PackageValidationTestProject.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <DefineConstants Condition="'$(ForceValidationProblem)' == 'true'">$(DefineConstants);ForceValidationProblem</DefineConstants>
     <DefineConstants Condition="'$(ForceStrictModeBaselineValidationProblem)' == 'true'">$(DefineConstants);ForceStrictModeBaselineValidationProblem</DefineConstants>
     <DefineConstants Condition="'$(AddBreakingChange)' == 'true'">$(DefineConstants);AddBreakingChange</DefineConstants>
@@ -10,18 +10,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(MSBuildProjectDirectory)\..\..\..\..\src\ApiCompat\Microsoft.DotNet.ApiCompat.Task\Microsoft.DotNet.ApiCompat.Task.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Compatibility\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" />
     <PackageReference Include="Microsoft.CodeAnalysis" Version="4.0.0-1.21277.15" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildProjectDirectory)\..\..\..\..\src\Tasks\Microsoft.NET.Build.Tasks\targets\Microsoft.NET.ApiCompat.targets" />
+  <Import Project="$(RepoRoot)src\Tasks\Microsoft.NET.Build.Tasks\targets\Microsoft.NET.ApiCompat.targets" />
 
   <PropertyGroup>
     <DotNetPackageValidationTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)\bin\$(Configuration)\net472\Microsoft.DotNet.ApiCompat.Task.dll</DotNetPackageValidationTaskAssembly>
-    <DotNetPackageValidationTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)\bin\$(Configuration)\net6.0\Microsoft.DotNet.ApiCompat.Task.dll</DotNetPackageValidationTaskAssembly>
+    <DotNetPackageValidationTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)\bin\$(Configuration)\net8.0\Microsoft.DotNet.ApiCompat.Task.dll</DotNetPackageValidationTaskAssembly>
   </PropertyGroup>
 
 </Project>
diff --git a/...Compat.Shared/ApiCompatServiceProvider.cs → ...Compat.Shared/ApiCompatServiceProvider.cs b/...Compat.Shared/ApiCompatServiceProvider.cs → ...Compat.Shared/ApiCompatServiceProvider.cs
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