diff --git a/.github/skills/update-tpn/SKILL.md b/.github/skills/update-tpn/SKILL.md index 8bf5cc18b7a..9ea65f56b14 100644 --- a/.github/skills/update-tpn/SKILL.md +++ b/.github/skills/update-tpn/SKILL.md @@ -63,7 +63,6 @@ Read `.gitmodules` for all submodules. Current submodules and their license file | libunwind | https://github.com/libunwind/libunwind | `external/libunwind/LICENSE` | | xamarin-android-tools | https://github.com/dotnet/android-tools | (not a third-party dep) | | android-api-docs | https://github.com/dotnet/android-api-docs | (not a third-party dep) | -| debugger-libs | https://github.com/mono/debugger-libs | (not a third-party dep — internal) | #### Vendored Source (`src-ThirdParty/`) List contents of `src-ThirdParty/` directory. Current vendored code and license sources: diff --git a/.gitmodules b/.gitmodules index ae4a5871b6e..58f2a96b51f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,10 +6,6 @@ path = external/constexpr-xxh3 url = https://github.com/chys87/constexpr-xxh3.git branch = main -[submodule "external/debugger-libs"] - path = external/debugger-libs - url = https://github.com/mono/debugger-libs - branch = main [submodule "external/libunwind"] path = external/libunwind url = https://github.com/libunwind/libunwind.git diff --git a/NuGet.config b/NuGet.config index dec1baffe92..739c5cfacf7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,8 +15,6 @@ - - diff --git a/Xamarin.Android.Build.Tasks.sln b/Xamarin.Android.Build.Tasks.sln index 4bef4d8fbc9..7183ac2fe46 100644 --- a/Xamarin.Android.Build.Tasks.sln +++ b/Xamarin.Android.Build.Tasks.sln @@ -15,12 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "external", "external", "{38 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSBuildDeviceIntegration", "tests\MSBuildDeviceIntegration\MSBuildDeviceIntegration.csproj", "{16DB2680-399B-4111-AA26-6CDBBFA334D8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Debugging", "external\debugger-libs\Mono.Debugging\Mono.Debugging.csproj", "{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Debugger.Soft", "external\debugger-libs\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj", "{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Debugging.Soft", "external\debugger-libs\Mono.Debugging.Soft\Mono.Debugging.Soft.csproj", "{DE40756E-57F6-4AF2-B155-55E3A88CCED8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vswhere", "tools\vswhere\vswhere.csproj", "{DBDC804F-8406-4F5E-83C6-720CB0CB6C6F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Android.Build.BaseTasks", "external\xamarin-android-tools\src\Microsoft.Android.Build.BaseTasks\Microsoft.Android.Build.BaseTasks.csproj", "{3DE17662-DCD6-4F49-AF06-D39AACC8649A}" @@ -62,18 +56,6 @@ Global {16DB2680-399B-4111-AA26-6CDBBFA334D8}.Debug|Any CPU.Build.0 = Debug|Any CPU {16DB2680-399B-4111-AA26-6CDBBFA334D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {16DB2680-399B-4111-AA26-6CDBBFA334D8}.Release|Any CPU.Build.0 = Release|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|Any CPU.Build.0 = Release|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.Build.0 = Release|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.Build.0 = Release|Any CPU {DBDC804F-8406-4F5E-83C6-720CB0CB6C6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DBDC804F-8406-4F5E-83C6-720CB0CB6C6F}.Debug|Any CPU.Build.0 = Debug|Any CPU {DBDC804F-8406-4F5E-83C6-720CB0CB6C6F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -102,9 +84,6 @@ Global {53E4ABF0-1085-45F9-B964-DCAE4B819998} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} {2DD1EE75-6D8D-4653-A800-0A24367F7F38} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} {16DB2680-399B-4111-AA26-6CDBBFA334D8} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2} = {385E71CC-BAE5-488B-805E-ACAE55F01DF5} - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E} = {385E71CC-BAE5-488B-805E-ACAE55F01DF5} - {DE40756E-57F6-4AF2-B155-55E3A88CCED8} = {385E71CC-BAE5-488B-805E-ACAE55F01DF5} {DBDC804F-8406-4F5E-83C6-720CB0CB6C6F} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} {3DE17662-DCD6-4F49-AF06-D39AACC8649A} = {385E71CC-BAE5-488B-805E-ACAE55F01DF5} {E34BCFA0-CAA4-412C-AA1C-75DB8D67D157} = {385E71CC-BAE5-488B-805E-ACAE55F01DF5} diff --git a/Xamarin.Android.sln b/Xamarin.Android.sln index 0e45244d18c..e84d501e11a 100644 --- a/Xamarin.Android.sln +++ b/Xamarin.Android.sln @@ -107,12 +107,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSBuildDeviceIntegration", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "external", "external", "{05C3B1D6-A4CE-4534-A9E4-E9117591ADF7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Debugger.Soft", "external\debugger-libs\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj", "{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Debugging", "external\debugger-libs\Mono.Debugging\Mono.Debugging.csproj", "{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Debugging.Soft", "external\debugger-libs\Mono.Debugging.Soft\Mono.Debugging.Soft.csproj", "{DE40756E-57F6-4AF2-B155-55E3A88CCED8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jnienv-gen", "external\Java.Interop\build-tools\jnienv-gen\jnienv-gen.csproj", "{6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "check-boot-times", "build-tools\check-boot-times\check-boot-times.csproj", "{D28957BF-5E66-4D60-B528-22820C60AC82}" @@ -729,42 +723,6 @@ Global {16DB2680-399B-4111-AA26-6CDBBFA334D8}.Release|x64.Build.0 = Release|Any CPU {16DB2680-399B-4111-AA26-6CDBBFA334D8}.Release|x86.ActiveCfg = Release|Any CPU {16DB2680-399B-4111-AA26-6CDBBFA334D8}.Release|x86.Build.0 = Release|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|x64.ActiveCfg = Debug|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|x64.Build.0 = Debug|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|x86.ActiveCfg = Debug|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|x86.Build.0 = Debug|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.Build.0 = Release|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|x64.ActiveCfg = Release|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|x64.Build.0 = Release|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|x86.ActiveCfg = Release|Any CPU - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|x86.Build.0 = Release|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|x64.ActiveCfg = Debug|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|x64.Build.0 = Debug|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|x86.ActiveCfg = Debug|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|x86.Build.0 = Debug|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|Any CPU.Build.0 = Release|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|x64.ActiveCfg = Release|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|x64.Build.0 = Release|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|x86.ActiveCfg = Release|Any CPU - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|x86.Build.0 = Release|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|x64.ActiveCfg = Debug|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|x64.Build.0 = Debug|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|x86.ActiveCfg = Debug|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|x86.Build.0 = Debug|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.Build.0 = Release|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|x64.ActiveCfg = Release|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|x64.Build.0 = Release|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|x86.ActiveCfg = Release|Any CPU - {DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|x86.Build.0 = Release|Any CPU {6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}.Debug|Any CPU.Build.0 = Debug|Any CPU {6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1102,9 +1060,6 @@ Global {3E45D81B-4C4A-4E3F-B891-A0D8A3E2F0C1} = {04E3E11E-B47D-4599-8AFC-50515A95E715} {F3CFF31C-037B-450F-B22D-1D6E529B2DCC} = {864062D3-A415-4A6F-9324-5820237BA058} {16DB2680-399B-4111-AA26-6CDBBFA334D8} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483} - {372E8E3E-29D5-4B4D-88A2-4711CD628C4E} = {05C3B1D6-A4CE-4534-A9E4-E9117591ADF7} - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2} = {05C3B1D6-A4CE-4534-A9E4-E9117591ADF7} - {DE40756E-57F6-4AF2-B155-55E3A88CCED8} = {05C3B1D6-A4CE-4534-A9E4-E9117591ADF7} {6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A} = {05C3B1D6-A4CE-4534-A9E4-E9117591ADF7} {D28957BF-5E66-4D60-B528-22820C60AC82} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62} {1FED3F23-1175-42AA-BE87-EF1E8DB52F8B} = {04E3E11E-B47D-4599-8AFC-50515A95E715} diff --git a/external/debugger-libs b/external/debugger-libs deleted file mode 160000 index e7fbb713d15..00000000000 --- a/external/debugger-libs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7fbb713d156d11193ed404783ad6fe9c4042a6d diff --git a/external/debugger-libs.override.props b/external/debugger-libs.override.props deleted file mode 100644 index 845483a4384..00000000000 --- a/external/debugger-libs.override.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - true - - https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-2b2a06c8/nuget/v3/index.json; - - - diff --git a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj index 051786dd116..aaf12f6298e 100644 --- a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj +++ b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj @@ -55,9 +55,6 @@ - - - diff --git a/tests/MSBuildDeviceIntegration/Tests/MonoAndroidExportTest.cs b/tests/MSBuildDeviceIntegration/Tests/MonoAndroidExportTest.cs index bcf142ef9f5..525df019578 100644 --- a/tests/MSBuildDeviceIntegration/Tests/MonoAndroidExportTest.cs +++ b/tests/MSBuildDeviceIntegration/Tests/MonoAndroidExportTest.cs @@ -4,8 +4,6 @@ using System.Threading; using System.Threading.Tasks; using System.Net; -using Mono.Debugging.Client; -using Mono.Debugging.Soft; using NUnit.Framework; using Xamarin.ProjectTools; using Xamarin.Android.Tasks;