From 5ebe34fca53262703b2eb52f7ef49fea3f8c26a1 Mon Sep 17 00:00:00 2001 From: Simon Rozsival Date: Tue, 7 Jul 2026 18:21:25 +0200 Subject: [PATCH] [tests] Fix Xamarin.Android-Tests solution Update Xamarin.Android-Tests.sln to reference current .NET test projects and remove stale legacy Mono test metadata. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/skills/update-tpn/SKILL.md | 1 - Documentation/guides/profiling.md | 4 +- Documentation/guides/vscode-support.md | 4 +- Documentation/workflow/DevelopmentTips.md | 44 +-- Documentation/workflow/UnitTests.md | 8 +- Xamarin.Android-Tests.sln | 300 +++++++----------- .../RenameTestCases.cs | 4 +- .../Properties/AssemblyInfo.cs.in | 3 - .../Tasks/GetDependenciesTests.cs | 2 +- .../Resources/layout/FragmentFixup.axml | 4 +- ...Result-Mono.Android_Tests-values-Debug.csv | 2 - ...sult-Mono.Android_Tests-values-Release.csv | 2 - ...ono.Android_TestsMultiDex-values-Debug.csv | 2 - ...o.Android_TestsMultiDex-values-Release.csv | 2 - 14 files changed, 145 insertions(+), 237 deletions(-) delete mode 100644 tests/apk-sizes-reference/TestResult-Mono.Android_Tests-values-Debug.csv delete mode 100644 tests/apk-sizes-reference/TestResult-Mono.Android_Tests-values-Release.csv delete mode 100644 tests/apk-sizes-reference/TestResult-Mono.Android_TestsMultiDex-values-Debug.csv delete mode 100644 tests/apk-sizes-reference/TestResult-Mono.Android_TestsMultiDex-values-Release.csv diff --git a/.github/skills/update-tpn/SKILL.md b/.github/skills/update-tpn/SKILL.md index 8bf5cc18b7a..75e060c2078 100644 --- a/.github/skills/update-tpn/SKILL.md +++ b/.github/skills/update-tpn/SKILL.md @@ -73,7 +73,6 @@ List contents of `src-ThirdParty/` directory. Current vendored code and license | `android-platform-tools-base/` | android/platform/tools/base | https://android.googlesource.com/platform/tools/base/+/refs/heads/main/sdk-common/NOTICE (Apache 2.0) | | `bionic/` | google/bionic | https://android.googlesource.com/platform/bionic/ (Apache 2.0) | | `crc32.net/` | force-net/crc32.net | https://github.com/force-net/Crc32.NET (MIT) | -| `NUnitLite/` | nunit/nunitlite | https://github.com/nunit/nunitlite/ (MIT) | | `StrongNameSigner/` | brutaldev/StrongNameSigner | https://github.com/brutaldev/StrongNameSigner/ (Apache 2.0) | Note: `Mono.Security.Cryptography/`, `System.Diagnostics.CodeAnalysis/`, `System.Runtime.CompilerServices/`, and `dotnet/` are Microsoft-owned and do not need TPN entries. diff --git a/Documentation/guides/profiling.md b/Documentation/guides/profiling.md index db6d86a2291..0a472694917 100644 --- a/Documentation/guides/profiling.md +++ b/Documentation/guides/profiling.md @@ -439,8 +439,8 @@ This prints out a breakdown for evaluation, and every MSBuild task & target: Project Evaluation Performance Summary: - 12 ms samples\HelloWorld\HelloLibrary\HelloLibrary.csproj 1 calls - 98 ms samples\HelloWorld\HelloWorld.csproj 1 calls + 12 ms samples\HelloWorld\HelloLibrary\HelloLibrary.DotNet.csproj 1 calls + 98 ms samples\HelloWorld\HelloWorld.DotNet.csproj 1 calls Target Performance Summary: 275 ms _UpdateAndroidResgen 2 calls diff --git a/Documentation/guides/vscode-support.md b/Documentation/guides/vscode-support.md index 6d0a2d94620..ebaa1e57bee 100644 --- a/Documentation/guides/vscode-support.md +++ b/Documentation/guides/vscode-support.md @@ -111,10 +111,9 @@ in `.vscode/tasks.json`. // in vscode. "id": "project", "type": "pickString", - "default": "samples/HelloWorld/HelloWorld/HelloWorld.csproj", + "default": "samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj", "description": "Pick the Project you want to build.", "options": [ - "samples/HelloWorld/HelloWorld/HelloWorld.csproj", "samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj", "samples/VSAndroidApp/VSAndroidApp.csproj" ] @@ -125,4 +124,3 @@ you can add your own projects here and they will run with the .NET for Android you have built locally. - diff --git a/Documentation/workflow/DevelopmentTips.md b/Documentation/workflow/DevelopmentTips.md index 2aa76ea9a41..a30b3e0be13 100644 --- a/Documentation/workflow/DevelopmentTips.md +++ b/Documentation/workflow/DevelopmentTips.md @@ -20,15 +20,15 @@ When a .NET for Android app launches on an Android device, and the app was built in the `Debug` configuration, it will create an "update" directory during process startup, printing the created directory to `adb logcat`: - W/monodroid( 2796): Creating public update directory: `/data/data/Mono.Android_Tests/files/.__override__` + W/monodroid( 2796): Creating public update directory: `/data/data/Mono.Android.NET_Tests/files/.__override__` When the app needs to resolve native libraries and assemblies, it will look for those files within the update directory *first*. This includes the Mono runtime library and BCL assemblies. -Note that the update directory is *per-app*. The above mentioned `Mono.Android_Tests` +Note that the update directory is *per-app*. The above mentioned `Mono.Android.NET_Tests` directory is created when running the -[`Mono.Android-Tests.csproj`](../../tests/Mono.Android-Tests/Mono.Android-Tests.csproj) +[`Mono.Android.NET-Tests.csproj`](../../tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj) unit tests. The update directory is not used in `Release` configuration builds. @@ -43,16 +43,16 @@ mono/x86 bug and need to quickly update the app on the device to test $ make -C src/mono-runtimes/obj/Debug/x86 && \ adb push src/mono-runtimes/obj/Debug/x86/mono/mini/.libs/libmonosgen-2.0.so \ /data/local/tmp/ && \ - adb shell run-as Mono.Android_Tests cp /data/local/tmp/libmonosgen-2.0.so \ - /data/data/Mono.Android_Tests/files/.__override__/ + adb shell run-as Mono.Android.NET_Tests cp /data/local/tmp/libmonosgen-2.0.so \ + /data/data/Mono.Android.NET_Tests/files/.__override__/ Alternatively, if you're working on an `mscorlib.dll` bug: $ make -C external/mono/mcs/class/corlib PROFILE=monodroid && \ adb push external/mono/mcs/class/lib/monodroid/mscorlib.dll \ /data/local/tmp/ && \ - adb shell run-as Mono.Android_Tests cp /data/local/tmp/mscorlib.dll \ - /data/data/Mono.Android_Tests/files/.__override__/ + adb shell run-as Mono.Android.NET_Tests cp /data/local/tmp/mscorlib.dll \ + /data/data/Mono.Android.NET_Tests/files/.__override__/ On some devices, the `run-as` command might not have permission to read the files in `/data/local/tmp/`. In that case, you can use a `cat` command that @@ -62,8 +62,8 @@ files in `/data/local/tmp/`. In that case, you can use a `cat` command that adb push external/mono/mcs/class/lib/monodroid/mscorlib.dll \ /data/local/tmp/ && \ adb shell "cat /data/local/tmp/mscorlib.dll | \ - run-as Mono.Android_Tests sh -c \ - 'cat > /data/data/Mono.Android_Tests/files/.__override__/mscorlib.dll'" + run-as Mono.Android.NET_Tests sh -c \ + 'cat > /data/data/Mono.Android.NET_Tests/files/.__override__/mscorlib.dll'" # Attaching LLDB using mono/lldb-binaries on macOS @@ -166,14 +166,14 @@ little care to complete the `adb` steps correctly on the command line. $ adb push libmonosgen-2.0.d.so \ /data/local/tmp/libmonosgen-2.0.so && \ - adb shell run-as Mono.Android_Tests cp /data/local/tmp/libmonosgen-2.0.so \ - /data/data/Mono.Android_Tests/files/.__override__/ + adb shell run-as Mono.Android.NET_Tests cp /data/local/tmp/libmonosgen-2.0.so \ + /data/data/Mono.Android.NET_Tests/files/.__override__/ 2. Ensure all users have execute permissions on the application's data directory: - $ adb shell run-as Mono.Android_Tests \ - chmod a+x /data/data/Mono.Android_Tests/ + $ adb shell run-as Mono.Android.NET_Tests \ + chmod a+x /data/data/Mono.Android.NET_Tests/ This will allow LLDB to re-download `libmonosgen-2.0.so` and load the symbols from it. @@ -278,7 +278,7 @@ installed and don't currently have the Android NDK installed. window](../images/android-studio-start-window.png) 3. If you skipped the **Android Studio Setup Wizard**, navigate to **File > - Project Structure > Modules > Mono.Android_Tests-Signed > Dependencies**, + Project Structure > Modules > Mono.Android.NET_Tests-Signed > Dependencies**, click **New > Android SDK** next to the **Module SDK**. ![New SDK in the Android Studio Project Structure Modules Dependencies @@ -334,35 +334,35 @@ steps rely on having the Android NDK installed. $ adb push ~/Library/Developer/Xamarin/android-sdk-macosx/ndk-bundle/prebuilt/android-arm64/gdbserver/gdbserver \ /data/local/tmp/ && \ - adb shell run-as Mono.Android_Tests cp /data/local/tmp/gdbserver ./ && \ - adb shell run-as Mono.Android_Tests chmod +x ./gdbserver + adb shell run-as Mono.Android.NET_Tests cp /data/local/tmp/gdbserver ./ && \ + adb shell run-as Mono.Android.NET_Tests chmod +x ./gdbserver 2. Ensure all users have execute permissions on the application's data directory: - $ adb shell run-as Mono.Android_Tests \ - chmod a+x /data/data/Mono.Android_Tests/ + $ adb shell run-as Mono.Android.NET_Tests \ + chmod a+x /data/data/Mono.Android.NET_Tests/ 3. Start the app, for example by launching it with or without managed debugging from Visual Studio, or by tapping the app on the device. 4. Find the process ID of the running app, for example by using `adb shell ps`: - $ adb shell ps | grep -F 'Mono.Android_Tests' + $ adb shell ps | grep -F 'Mono.Android.NET_Tests' Example output: - u0_a247 15087 336 780568 69200 SyS_epoll_ 00000000 S Mono.Android_Tests + u0_a247 15087 336 780568 69200 SyS_epoll_ 00000000 S Mono.Android.NET_Tests 5. Start `gdbserver`, attaching it to the running app process: - $ adb shell run-as Mono.Android_Tests ./gdbserver \ + $ adb shell run-as Mono.Android.NET_Tests ./gdbserver \ +debug_socket --attach 15087 6. In another console window, use `adb` to forward the `debug_socket` UNIX domain socket to a TCP port on the local host: - $ adb forward tcp:50999 localfilesystem:/data/data/Mono.Android_Tests/debug_socket + $ adb forward tcp:50999 localfilesystem:/data/data/Mono.Android.NET_Tests/debug_socket 7. Pull the appropriate `app_process*` file for the application to a local location. For example, if debugging an arm64-v8a app: diff --git a/Documentation/workflow/UnitTests.md b/Documentation/workflow/UnitTests.md index 283000ac362..3959d357b3f 100644 --- a/Documentation/workflow/UnitTests.md +++ b/Documentation/workflow/UnitTests.md @@ -437,7 +437,7 @@ testing the `Android.App.Application` class. ## Other Tests -[`tests/CodeBehind/BuildTests/CodeBehindBuildTests.csproj`](../../tests/CodeBehind/BuildTests/CodeBehindBuildTests.csproj) -is used to test [Layout CodeBehind](../guides/LayoutCodeBehind.md). -If it builds, the test is considered successful, and is built via inclusion -in the [`Xamarin.Android-Tests.sln` project](../../Xamarin.Android-Tests.sln). +[Layout CodeBehind](../guides/LayoutCodeBehind.md) is tested by the +`CodeBehindTests` fixture in `Xamarin.Android.Build.Tests`. The fixture copies +and patches the template projects under `tests/CodeBehind/` for each runtime +configuration before building them. diff --git a/Xamarin.Android-Tests.sln b/Xamarin.Android-Tests.sln index 32722a8c8aa..9d02cd37835 100644 --- a/Xamarin.Android-Tests.sln +++ b/Xamarin.Android-Tests.sln @@ -1,15 +1,8 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29411.108 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Android-Tests", "tests\Mono.Android-Tests\Mono.Android-Tests.csproj", "{40EAD437-216B-4DF4-8258-3F47E1672C3A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "samples\HelloWorld\HelloWorld\HelloWorld.csproj", "{2305B00D-DE81-4744-B0DA-357835CAFE5A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloLibrary", "samples\HelloWorld\HelloLibrary\HelloLibrary.csproj", "{6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{43A4FB09-279A-4138-8027-EC1E1CED2E8A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{EFBC4DC0-DBFF-4DAA-B0B8-6D0CB02A25F5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeGen-Binding", "CodeGen-Binding", "{2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4}" @@ -28,37 +21,45 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.JcwGen-Test EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Performance.Integration", "tests\Xamarin.Forms-Performance-Integration\Xamarin.Forms.Performance.Integration.csproj", "{195BE9C2-1F91-40DC-BD6D-DE860BF083FB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Performance.Integration.Droid", "tests\Xamarin.Forms-Performance-Integration\Droid\Xamarin.Forms.Performance.Integration.Droid.csproj", "{576312CC-83FF-48B1-A473-488CDC7121AD}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeBehind", "CodeBehind", "{9B63992C-2201-4BB0-BD00-D637B481A995}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestRunner.Core", "tests\TestRunner.Core\TestRunner.Core.csproj", "{3CC4E384-4985-4D93-A34C-73F69A379FA7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.ProjectTools", "src\Xamarin.Android.Build.Tasks\Tests\Xamarin.ProjectTools\Xamarin.ProjectTools.csproj", "{2DD1EE75-6D8D-4653-A800-0A24367F7F38}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeBehindBuildTests", "tests\CodeBehind\BuildTests\CodeBehindBuildTests.csproj", "{95012FA9-ED51-4004-8F36-91DB361C892B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop", "external\Java.Interop\src\Java.Interop\Java.Interop.csproj", "{94BD81F7-B06F-4295-9636-F8A3B6BDC762}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonSampleLibrary", "tests\CodeBehind\CommonSampleLibrary\CommonSampleLibrary.csproj", "{7A5FB23C-6B26-461A-8BBD-02392DCE3C11}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB3BF05-4346-4AA6-1389-037BE0695223}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeBehind", "CodeBehind", "{9B63992C-2201-4BB0-BD00-D637B481A995}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartupHook", "tests\StartupHook\StartupHook.csproj", "{3220BC41-7332-49A7-9286-5131477808EF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.ProjectTools", "src\Xamarin.Android.Build.Tasks\Tests\Xamarin.ProjectTools\Xamarin.ProjectTools.csproj", "{2DD1EE75-6D8D-4653-A800-0A24367F7F38}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5D20AA90-6969-D8BD-9DCD-8634F4692FDA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Performance-Tests", "Performance-Tests", "{68B8E272-5B12-47AA-8923-550B9CE535C7}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HelloWorld", "HelloWorld", "{2633B698-A9AF-DF75-F94C-9021C604CA0C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "timing", "build-tools\timing\timing.csproj", "{37CAA28C-40BE-4253-BA68-CC5D7316A617}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HelloWorld", "HelloWorld", "{00F1FAFB-D484-5C99-D022-F523885E2C79}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Mono.Android-Test.Shared", "tests\Mono.Android-Tests\Mono.Android-Test.Shared.shproj", "{0AB4956E-6FB9-4DA0-9D49-AB65A3FF403A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld.DotNet", "samples\HelloWorld\HelloWorld\HelloWorld.DotNet.csproj", "{42E4D469-9EF9-4EF5-963C-26E2B8EBA764}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Android-Test.Library", "tests\Mono.Android-Tests\Mono.Android-Test.Library\Mono.Android-Test.Library.csproj", "{8CB5FF58-FF95-43B9-9064-9ACE9525866F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HelloLibrary", "HelloLibrary", "{812A42AA-CEFD-0CC9-C72F-A51A839857CF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Android-TestsMultiDex", "tests\Mono.Android-Tests\Runtime-MultiDex\Mono.Android-TestsMultiDex.csproj", "{9ECBEA14-B79F-4F92-9266-495C03A32571}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloLibrary.DotNet", "samples\HelloWorld\HelloLibrary\HelloLibrary.DotNet.csproj", "{DDEE988E-4DB5-4142-8FB7-ABA710383443}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.GenericMarshaler", "external\Java.Interop\src\Java.Interop.GenericMarshaler\Java.Interop.GenericMarshaler.csproj", "{D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mono.Android-Tests", "Mono.Android-Tests", "{1499463E-D19F-820D-85F7-F11C7A9BA00B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop-Tests", "tests\Mono.Android-Tests\Java.Interop-Tests\Java.Interop-Tests.csproj", "{6CB00820-A66B-43E5-8785-ED456C6E9F39}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mono.Android-Test.Library", "Mono.Android-Test.Library", "{6C8A5080-5ECA-E9AA-017D-0EE1DFF4A187}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop", "external\Java.Interop\src\Java.Interop\Java.Interop.csproj", "{94BD81F7-B06F-4295-9636-F8A3B6BDC762}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Android-Test.Library.NET", "tests\Mono.Android-Tests\Mono.Android-Test.Library\Mono.Android-Test.Library.NET.csproj", "{45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB3BF05-4346-4AA6-1389-037BE0695223}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Java.Interop-Tests", "Java.Interop-Tests", "{1BA4C691-ACB6-D031-D2EB-7CA277E85BEB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartupHook", "tests\StartupHook\StartupHook.csproj", "{3220BC41-7332-49A7-9286-5131477808EF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop-Tests.NET", "tests\Mono.Android-Tests\Java.Interop-Tests\Java.Interop-Tests.NET.csproj", "{83E25890-BFC5-494A-BFF7-C3021C4272AF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mono.Android-Tests", "Mono.Android-Tests", "{5569B99A-9837-0E0F-C6F1-1926591449D0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Android.NET-Tests", "tests\Mono.Android-Tests\Mono.Android-Tests\Mono.Android.NET-Tests.csproj", "{B2DA401C-F837-4B48-A4A5-A922C2993153}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestRunner.Core", "TestRunner.Core", "{0EAFBB29-6531-FC4E-66AB-EBFD77419ADE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestRunner.Core.NET", "tests\TestRunner.Core\TestRunner.Core.NET.csproj", "{C21BE43B-EA20-4E4C-A997-76FCD907AD37}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -70,44 +71,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Debug|x64.ActiveCfg = Debug|Any CPU - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Debug|x64.Build.0 = Debug|Any CPU - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Debug|x86.ActiveCfg = Debug|Any CPU - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Debug|x86.Build.0 = Debug|Any CPU - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Release|Any CPU.Build.0 = Release|Any CPU - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Release|Any CPU.Deploy.0 = Release|Any CPU - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Release|x64.ActiveCfg = Release|Any CPU - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Release|x64.Build.0 = Release|Any CPU - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Release|x86.ActiveCfg = Release|Any CPU - {40EAD437-216B-4DF4-8258-3F47E1672C3A}.Release|x86.Build.0 = Release|Any CPU - {2305B00D-DE81-4744-B0DA-357835CAFE5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2305B00D-DE81-4744-B0DA-357835CAFE5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2305B00D-DE81-4744-B0DA-357835CAFE5A}.Debug|x64.ActiveCfg = Debug|Any CPU - {2305B00D-DE81-4744-B0DA-357835CAFE5A}.Debug|x64.Build.0 = Debug|Any CPU - {2305B00D-DE81-4744-B0DA-357835CAFE5A}.Debug|x86.ActiveCfg = Debug|Any CPU - {2305B00D-DE81-4744-B0DA-357835CAFE5A}.Debug|x86.Build.0 = Debug|Any CPU - {2305B00D-DE81-4744-B0DA-357835CAFE5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2305B00D-DE81-4744-B0DA-357835CAFE5A}.Release|Any CPU.Build.0 = Release|Any CPU - {2305B00D-DE81-4744-B0DA-357835CAFE5A}.Release|x64.ActiveCfg = Release|Any CPU - {2305B00D-DE81-4744-B0DA-357835CAFE5A}.Release|x64.Build.0 = Release|Any CPU - {2305B00D-DE81-4744-B0DA-357835CAFE5A}.Release|x86.ActiveCfg = Release|Any CPU - {2305B00D-DE81-4744-B0DA-357835CAFE5A}.Release|x86.Build.0 = Release|Any CPU - {6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Debug|x64.ActiveCfg = Debug|Any CPU - {6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Debug|x64.Build.0 = Debug|Any CPU - {6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Debug|x86.ActiveCfg = Debug|Any CPU - {6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Debug|x86.Build.0 = Debug|Any CPU - {6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Release|Any CPU.Build.0 = Release|Any CPU - {6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Release|x64.ActiveCfg = Release|Any CPU - {6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Release|x64.Build.0 = Release|Any CPU - {6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Release|x86.ActiveCfg = Release|Any CPU - {6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Release|x86.Build.0 = Release|Any CPU {EF798EB3-D639-4E09-9DB0-233E67F727B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EF798EB3-D639-4E09-9DB0-233E67F727B0}.Debug|Any CPU.Build.0 = Debug|Any CPU {EF798EB3-D639-4E09-9DB0-233E67F727B0}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -192,54 +155,6 @@ Global {195BE9C2-1F91-40DC-BD6D-DE860BF083FB}.Release|x64.Build.0 = Release|Any CPU {195BE9C2-1F91-40DC-BD6D-DE860BF083FB}.Release|x86.ActiveCfg = Release|Any CPU {195BE9C2-1F91-40DC-BD6D-DE860BF083FB}.Release|x86.Build.0 = Release|Any CPU - {576312CC-83FF-48B1-A473-488CDC7121AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {576312CC-83FF-48B1-A473-488CDC7121AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {576312CC-83FF-48B1-A473-488CDC7121AD}.Debug|x64.ActiveCfg = Debug|Any CPU - {576312CC-83FF-48B1-A473-488CDC7121AD}.Debug|x64.Build.0 = Debug|Any CPU - {576312CC-83FF-48B1-A473-488CDC7121AD}.Debug|x86.ActiveCfg = Debug|Any CPU - {576312CC-83FF-48B1-A473-488CDC7121AD}.Debug|x86.Build.0 = Debug|Any CPU - {576312CC-83FF-48B1-A473-488CDC7121AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {576312CC-83FF-48B1-A473-488CDC7121AD}.Release|Any CPU.Build.0 = Release|Any CPU - {576312CC-83FF-48B1-A473-488CDC7121AD}.Release|x64.ActiveCfg = Release|Any CPU - {576312CC-83FF-48B1-A473-488CDC7121AD}.Release|x64.Build.0 = Release|Any CPU - {576312CC-83FF-48B1-A473-488CDC7121AD}.Release|x86.ActiveCfg = Release|Any CPU - {576312CC-83FF-48B1-A473-488CDC7121AD}.Release|x86.Build.0 = Release|Any CPU - {3CC4E384-4985-4D93-A34C-73F69A379FA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3CC4E384-4985-4D93-A34C-73F69A379FA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3CC4E384-4985-4D93-A34C-73F69A379FA7}.Debug|x64.ActiveCfg = Debug|Any CPU - {3CC4E384-4985-4D93-A34C-73F69A379FA7}.Debug|x64.Build.0 = Debug|Any CPU - {3CC4E384-4985-4D93-A34C-73F69A379FA7}.Debug|x86.ActiveCfg = Debug|Any CPU - {3CC4E384-4985-4D93-A34C-73F69A379FA7}.Debug|x86.Build.0 = Debug|Any CPU - {3CC4E384-4985-4D93-A34C-73F69A379FA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3CC4E384-4985-4D93-A34C-73F69A379FA7}.Release|Any CPU.Build.0 = Release|Any CPU - {3CC4E384-4985-4D93-A34C-73F69A379FA7}.Release|x64.ActiveCfg = Release|Any CPU - {3CC4E384-4985-4D93-A34C-73F69A379FA7}.Release|x64.Build.0 = Release|Any CPU - {3CC4E384-4985-4D93-A34C-73F69A379FA7}.Release|x86.ActiveCfg = Release|Any CPU - {3CC4E384-4985-4D93-A34C-73F69A379FA7}.Release|x86.Build.0 = Release|Any CPU - {95012FA9-ED51-4004-8F36-91DB361C892B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95012FA9-ED51-4004-8F36-91DB361C892B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95012FA9-ED51-4004-8F36-91DB361C892B}.Debug|x64.ActiveCfg = Debug|Any CPU - {95012FA9-ED51-4004-8F36-91DB361C892B}.Debug|x64.Build.0 = Debug|Any CPU - {95012FA9-ED51-4004-8F36-91DB361C892B}.Debug|x86.ActiveCfg = Debug|Any CPU - {95012FA9-ED51-4004-8F36-91DB361C892B}.Debug|x86.Build.0 = Debug|Any CPU - {95012FA9-ED51-4004-8F36-91DB361C892B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95012FA9-ED51-4004-8F36-91DB361C892B}.Release|Any CPU.Build.0 = Release|Any CPU - {95012FA9-ED51-4004-8F36-91DB361C892B}.Release|x64.ActiveCfg = Release|Any CPU - {95012FA9-ED51-4004-8F36-91DB361C892B}.Release|x64.Build.0 = Release|Any CPU - {95012FA9-ED51-4004-8F36-91DB361C892B}.Release|x86.ActiveCfg = Release|Any CPU - {95012FA9-ED51-4004-8F36-91DB361C892B}.Release|x86.Build.0 = Release|Any CPU - {7A5FB23C-6B26-461A-8BBD-02392DCE3C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A5FB23C-6B26-461A-8BBD-02392DCE3C11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A5FB23C-6B26-461A-8BBD-02392DCE3C11}.Debug|x64.ActiveCfg = Debug|Any CPU - {7A5FB23C-6B26-461A-8BBD-02392DCE3C11}.Debug|x64.Build.0 = Debug|Any CPU - {7A5FB23C-6B26-461A-8BBD-02392DCE3C11}.Debug|x86.ActiveCfg = Debug|Any CPU - {7A5FB23C-6B26-461A-8BBD-02392DCE3C11}.Debug|x86.Build.0 = Debug|Any CPU - {7A5FB23C-6B26-461A-8BBD-02392DCE3C11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A5FB23C-6B26-461A-8BBD-02392DCE3C11}.Release|Any CPU.Build.0 = Release|Any CPU - {7A5FB23C-6B26-461A-8BBD-02392DCE3C11}.Release|x64.ActiveCfg = Release|Any CPU - {7A5FB23C-6B26-461A-8BBD-02392DCE3C11}.Release|x64.Build.0 = Release|Any CPU - {7A5FB23C-6B26-461A-8BBD-02392DCE3C11}.Release|x86.ActiveCfg = Release|Any CPU - {7A5FB23C-6B26-461A-8BBD-02392DCE3C11}.Release|x86.Build.0 = Release|Any CPU {2DD1EE75-6D8D-4653-A800-0A24367F7F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2DD1EE75-6D8D-4653-A800-0A24367F7F38}.Debug|Any CPU.Build.0 = Debug|Any CPU {2DD1EE75-6D8D-4653-A800-0A24367F7F38}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -252,68 +167,6 @@ Global {2DD1EE75-6D8D-4653-A800-0A24367F7F38}.Release|x64.Build.0 = Release|Any CPU {2DD1EE75-6D8D-4653-A800-0A24367F7F38}.Release|x86.ActiveCfg = Release|Any CPU {2DD1EE75-6D8D-4653-A800-0A24367F7F38}.Release|x86.Build.0 = Release|Any CPU - {37CAA28C-40BE-4253-BA68-CC5D7316A617}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37CAA28C-40BE-4253-BA68-CC5D7316A617}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37CAA28C-40BE-4253-BA68-CC5D7316A617}.Debug|x64.ActiveCfg = Debug|Any CPU - {37CAA28C-40BE-4253-BA68-CC5D7316A617}.Debug|x64.Build.0 = Debug|Any CPU - {37CAA28C-40BE-4253-BA68-CC5D7316A617}.Debug|x86.ActiveCfg = Debug|Any CPU - {37CAA28C-40BE-4253-BA68-CC5D7316A617}.Debug|x86.Build.0 = Debug|Any CPU - {37CAA28C-40BE-4253-BA68-CC5D7316A617}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37CAA28C-40BE-4253-BA68-CC5D7316A617}.Release|Any CPU.Build.0 = Release|Any CPU - {37CAA28C-40BE-4253-BA68-CC5D7316A617}.Release|x64.ActiveCfg = Release|Any CPU - {37CAA28C-40BE-4253-BA68-CC5D7316A617}.Release|x64.Build.0 = Release|Any CPU - {37CAA28C-40BE-4253-BA68-CC5D7316A617}.Release|x86.ActiveCfg = Release|Any CPU - {37CAA28C-40BE-4253-BA68-CC5D7316A617}.Release|x86.Build.0 = Release|Any CPU - {8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Debug|x64.ActiveCfg = Debug|Any CPU - {8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Debug|x64.Build.0 = Debug|Any CPU - {8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Debug|x86.ActiveCfg = Debug|Any CPU - {8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Debug|x86.Build.0 = Debug|Any CPU - {8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Release|Any CPU.Build.0 = Release|Any CPU - {8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Release|x64.ActiveCfg = Release|Any CPU - {8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Release|x64.Build.0 = Release|Any CPU - {8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Release|x86.ActiveCfg = Release|Any CPU - {8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Release|x86.Build.0 = Release|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Debug|x64.ActiveCfg = Debug|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Debug|x64.Build.0 = Debug|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Debug|x86.ActiveCfg = Debug|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Debug|x86.Build.0 = Debug|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Release|Any CPU.Build.0 = Release|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Release|Any CPU.Deploy.0 = Release|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Release|x64.ActiveCfg = Release|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Release|x64.Build.0 = Release|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Release|x86.ActiveCfg = Release|Any CPU - {9ECBEA14-B79F-4F92-9266-495C03A32571}.Release|x86.Build.0 = Release|Any CPU - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}.Debug|x64.ActiveCfg = Debug|Any CPU - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}.Debug|x64.Build.0 = Debug|Any CPU - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}.Debug|x86.ActiveCfg = Debug|Any CPU - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}.Debug|x86.Build.0 = Debug|Any CPU - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}.Release|Any CPU.Build.0 = Release|Any CPU - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}.Release|x64.ActiveCfg = Release|Any CPU - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}.Release|x64.Build.0 = Release|Any CPU - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}.Release|x86.ActiveCfg = Release|Any CPU - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}.Release|x86.Build.0 = Release|Any CPU - {6CB00820-A66B-43E5-8785-ED456C6E9F39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CB00820-A66B-43E5-8785-ED456C6E9F39}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CB00820-A66B-43E5-8785-ED456C6E9F39}.Debug|x64.ActiveCfg = Debug|Any CPU - {6CB00820-A66B-43E5-8785-ED456C6E9F39}.Debug|x64.Build.0 = Debug|Any CPU - {6CB00820-A66B-43E5-8785-ED456C6E9F39}.Debug|x86.ActiveCfg = Debug|Any CPU - {6CB00820-A66B-43E5-8785-ED456C6E9F39}.Debug|x86.Build.0 = Debug|Any CPU - {6CB00820-A66B-43E5-8785-ED456C6E9F39}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CB00820-A66B-43E5-8785-ED456C6E9F39}.Release|Any CPU.Build.0 = Release|Any CPU - {6CB00820-A66B-43E5-8785-ED456C6E9F39}.Release|x64.ActiveCfg = Release|Any CPU - {6CB00820-A66B-43E5-8785-ED456C6E9F39}.Release|x64.Build.0 = Release|Any CPU - {6CB00820-A66B-43E5-8785-ED456C6E9F39}.Release|x86.ActiveCfg = Release|Any CPU - {6CB00820-A66B-43E5-8785-ED456C6E9F39}.Release|x86.Build.0 = Release|Any CPU {94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Debug|Any CPU.Build.0 = Debug|Any CPU {94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -338,39 +191,108 @@ Global {3220BC41-7332-49A7-9286-5131477808EF}.Release|x64.Build.0 = Release|Any CPU {3220BC41-7332-49A7-9286-5131477808EF}.Release|x86.ActiveCfg = Release|Any CPU {3220BC41-7332-49A7-9286-5131477808EF}.Release|x86.Build.0 = Release|Any CPU + {42E4D469-9EF9-4EF5-963C-26E2B8EBA764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42E4D469-9EF9-4EF5-963C-26E2B8EBA764}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42E4D469-9EF9-4EF5-963C-26E2B8EBA764}.Debug|x64.ActiveCfg = Debug|Any CPU + {42E4D469-9EF9-4EF5-963C-26E2B8EBA764}.Debug|x64.Build.0 = Debug|Any CPU + {42E4D469-9EF9-4EF5-963C-26E2B8EBA764}.Debug|x86.ActiveCfg = Debug|Any CPU + {42E4D469-9EF9-4EF5-963C-26E2B8EBA764}.Debug|x86.Build.0 = Debug|Any CPU + {42E4D469-9EF9-4EF5-963C-26E2B8EBA764}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42E4D469-9EF9-4EF5-963C-26E2B8EBA764}.Release|Any CPU.Build.0 = Release|Any CPU + {42E4D469-9EF9-4EF5-963C-26E2B8EBA764}.Release|x64.ActiveCfg = Release|Any CPU + {42E4D469-9EF9-4EF5-963C-26E2B8EBA764}.Release|x64.Build.0 = Release|Any CPU + {42E4D469-9EF9-4EF5-963C-26E2B8EBA764}.Release|x86.ActiveCfg = Release|Any CPU + {42E4D469-9EF9-4EF5-963C-26E2B8EBA764}.Release|x86.Build.0 = Release|Any CPU + {DDEE988E-4DB5-4142-8FB7-ABA710383443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DDEE988E-4DB5-4142-8FB7-ABA710383443}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DDEE988E-4DB5-4142-8FB7-ABA710383443}.Debug|x64.ActiveCfg = Debug|Any CPU + {DDEE988E-4DB5-4142-8FB7-ABA710383443}.Debug|x64.Build.0 = Debug|Any CPU + {DDEE988E-4DB5-4142-8FB7-ABA710383443}.Debug|x86.ActiveCfg = Debug|Any CPU + {DDEE988E-4DB5-4142-8FB7-ABA710383443}.Debug|x86.Build.0 = Debug|Any CPU + {DDEE988E-4DB5-4142-8FB7-ABA710383443}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DDEE988E-4DB5-4142-8FB7-ABA710383443}.Release|Any CPU.Build.0 = Release|Any CPU + {DDEE988E-4DB5-4142-8FB7-ABA710383443}.Release|x64.ActiveCfg = Release|Any CPU + {DDEE988E-4DB5-4142-8FB7-ABA710383443}.Release|x64.Build.0 = Release|Any CPU + {DDEE988E-4DB5-4142-8FB7-ABA710383443}.Release|x86.ActiveCfg = Release|Any CPU + {DDEE988E-4DB5-4142-8FB7-ABA710383443}.Release|x86.Build.0 = Release|Any CPU + {45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200}.Debug|Any CPU.Build.0 = Debug|Any CPU + {45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200}.Debug|x64.ActiveCfg = Debug|Any CPU + {45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200}.Debug|x64.Build.0 = Debug|Any CPU + {45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200}.Debug|x86.ActiveCfg = Debug|Any CPU + {45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200}.Debug|x86.Build.0 = Debug|Any CPU + {45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200}.Release|Any CPU.ActiveCfg = Release|Any CPU + {45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200}.Release|Any CPU.Build.0 = Release|Any CPU + {45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200}.Release|x64.ActiveCfg = Release|Any CPU + {45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200}.Release|x64.Build.0 = Release|Any CPU + {45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200}.Release|x86.ActiveCfg = Release|Any CPU + {45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200}.Release|x86.Build.0 = Release|Any CPU + {83E25890-BFC5-494A-BFF7-C3021C4272AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83E25890-BFC5-494A-BFF7-C3021C4272AF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83E25890-BFC5-494A-BFF7-C3021C4272AF}.Debug|x64.ActiveCfg = Debug|Any CPU + {83E25890-BFC5-494A-BFF7-C3021C4272AF}.Debug|x64.Build.0 = Debug|Any CPU + {83E25890-BFC5-494A-BFF7-C3021C4272AF}.Debug|x86.ActiveCfg = Debug|Any CPU + {83E25890-BFC5-494A-BFF7-C3021C4272AF}.Debug|x86.Build.0 = Debug|Any CPU + {83E25890-BFC5-494A-BFF7-C3021C4272AF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83E25890-BFC5-494A-BFF7-C3021C4272AF}.Release|Any CPU.Build.0 = Release|Any CPU + {83E25890-BFC5-494A-BFF7-C3021C4272AF}.Release|x64.ActiveCfg = Release|Any CPU + {83E25890-BFC5-494A-BFF7-C3021C4272AF}.Release|x64.Build.0 = Release|Any CPU + {83E25890-BFC5-494A-BFF7-C3021C4272AF}.Release|x86.ActiveCfg = Release|Any CPU + {83E25890-BFC5-494A-BFF7-C3021C4272AF}.Release|x86.Build.0 = Release|Any CPU + {B2DA401C-F837-4B48-A4A5-A922C2993153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B2DA401C-F837-4B48-A4A5-A922C2993153}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B2DA401C-F837-4B48-A4A5-A922C2993153}.Debug|x64.ActiveCfg = Debug|Any CPU + {B2DA401C-F837-4B48-A4A5-A922C2993153}.Debug|x64.Build.0 = Debug|Any CPU + {B2DA401C-F837-4B48-A4A5-A922C2993153}.Debug|x86.ActiveCfg = Debug|Any CPU + {B2DA401C-F837-4B48-A4A5-A922C2993153}.Debug|x86.Build.0 = Debug|Any CPU + {B2DA401C-F837-4B48-A4A5-A922C2993153}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B2DA401C-F837-4B48-A4A5-A922C2993153}.Release|Any CPU.Build.0 = Release|Any CPU + {B2DA401C-F837-4B48-A4A5-A922C2993153}.Release|x64.ActiveCfg = Release|Any CPU + {B2DA401C-F837-4B48-A4A5-A922C2993153}.Release|x64.Build.0 = Release|Any CPU + {B2DA401C-F837-4B48-A4A5-A922C2993153}.Release|x86.ActiveCfg = Release|Any CPU + {B2DA401C-F837-4B48-A4A5-A922C2993153}.Release|x86.Build.0 = Release|Any CPU + {C21BE43B-EA20-4E4C-A997-76FCD907AD37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C21BE43B-EA20-4E4C-A997-76FCD907AD37}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C21BE43B-EA20-4E4C-A997-76FCD907AD37}.Debug|x64.ActiveCfg = Debug|Any CPU + {C21BE43B-EA20-4E4C-A997-76FCD907AD37}.Debug|x64.Build.0 = Debug|Any CPU + {C21BE43B-EA20-4E4C-A997-76FCD907AD37}.Debug|x86.ActiveCfg = Debug|Any CPU + {C21BE43B-EA20-4E4C-A997-76FCD907AD37}.Debug|x86.Build.0 = Debug|Any CPU + {C21BE43B-EA20-4E4C-A997-76FCD907AD37}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C21BE43B-EA20-4E4C-A997-76FCD907AD37}.Release|Any CPU.Build.0 = Release|Any CPU + {C21BE43B-EA20-4E4C-A997-76FCD907AD37}.Release|x64.ActiveCfg = Release|Any CPU + {C21BE43B-EA20-4E4C-A997-76FCD907AD37}.Release|x64.Build.0 = Release|Any CPU + {C21BE43B-EA20-4E4C-A997-76FCD907AD37}.Release|x86.ActiveCfg = Release|Any CPU + {C21BE43B-EA20-4E4C-A997-76FCD907AD37}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {40EAD437-216B-4DF4-8258-3F47E1672C3A} = {EFBC4DC0-DBFF-4DAA-B0B8-6D0CB02A25F5} - {2305B00D-DE81-4744-B0DA-357835CAFE5A} = {43A4FB09-279A-4138-8027-EC1E1CED2E8A} - {6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2} = {43A4FB09-279A-4138-8027-EC1E1CED2E8A} {EF798EB3-D639-4E09-9DB0-233E67F727B0} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4} {9553ED9D-92EA-411B-ADFF-21C5608CCD16} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4} {91105023-9421-4E56-A87B-64BC62525D55} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4} {7B9D9F32-973F-49CF-A8F8-05BDFC75556C} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4} {B7476528-C166-40BF-931F-EAEB02247879} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4} {9479B71F-19FE-48F9-AB3F-AE764D76038A} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4} - {3CC4E384-4985-4D93-A34C-73F69A379FA7} = {EFBC4DC0-DBFF-4DAA-B0B8-6D0CB02A25F5} - {95012FA9-ED51-4004-8F36-91DB361C892B} = {9B63992C-2201-4BB0-BD00-D637B481A995} - {7A5FB23C-6B26-461A-8BBD-02392DCE3C11} = {9B63992C-2201-4BB0-BD00-D637B481A995} {2DD1EE75-6D8D-4653-A800-0A24367F7F38} = {9B63992C-2201-4BB0-BD00-D637B481A995} - {37CAA28C-40BE-4253-BA68-CC5D7316A617} = {68B8E272-5B12-47AA-8923-550B9CE535C7} - {0AB4956E-6FB9-4DA0-9D49-AB65A3FF403A} = {EFBC4DC0-DBFF-4DAA-B0B8-6D0CB02A25F5} - {8CB5FF58-FF95-43B9-9064-9ACE9525866F} = {EFBC4DC0-DBFF-4DAA-B0B8-6D0CB02A25F5} - {9ECBEA14-B79F-4F92-9266-495C03A32571} = {EFBC4DC0-DBFF-4DAA-B0B8-6D0CB02A25F5} - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF} = {EFBC4DC0-DBFF-4DAA-B0B8-6D0CB02A25F5} - {6CB00820-A66B-43E5-8785-ED456C6E9F39} = {EFBC4DC0-DBFF-4DAA-B0B8-6D0CB02A25F5} {94BD81F7-B06F-4295-9636-F8A3B6BDC762} = {EFBC4DC0-DBFF-4DAA-B0B8-6D0CB02A25F5} {3220BC41-7332-49A7-9286-5131477808EF} = {0AB3BF05-4346-4AA6-1389-037BE0695223} + {2633B698-A9AF-DF75-F94C-9021C604CA0C} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA} + {00F1FAFB-D484-5C99-D022-F523885E2C79} = {2633B698-A9AF-DF75-F94C-9021C604CA0C} + {42E4D469-9EF9-4EF5-963C-26E2B8EBA764} = {00F1FAFB-D484-5C99-D022-F523885E2C79} + {812A42AA-CEFD-0CC9-C72F-A51A839857CF} = {2633B698-A9AF-DF75-F94C-9021C604CA0C} + {DDEE988E-4DB5-4142-8FB7-ABA710383443} = {812A42AA-CEFD-0CC9-C72F-A51A839857CF} + {1499463E-D19F-820D-85F7-F11C7A9BA00B} = {0AB3BF05-4346-4AA6-1389-037BE0695223} + {6C8A5080-5ECA-E9AA-017D-0EE1DFF4A187} = {1499463E-D19F-820D-85F7-F11C7A9BA00B} + {45CDA4A2-ED2E-4DFC-B317-4D66D7FAD200} = {6C8A5080-5ECA-E9AA-017D-0EE1DFF4A187} + {1BA4C691-ACB6-D031-D2EB-7CA277E85BEB} = {1499463E-D19F-820D-85F7-F11C7A9BA00B} + {83E25890-BFC5-494A-BFF7-C3021C4272AF} = {1BA4C691-ACB6-D031-D2EB-7CA277E85BEB} + {5569B99A-9837-0E0F-C6F1-1926591449D0} = {1499463E-D19F-820D-85F7-F11C7A9BA00B} + {B2DA401C-F837-4B48-A4A5-A922C2993153} = {5569B99A-9837-0E0F-C6F1-1926591449D0} + {0EAFBB29-6531-FC4E-66AB-EBFD77419ADE} = {0AB3BF05-4346-4AA6-1389-037BE0695223} + {C21BE43B-EA20-4E4C-A997-76FCD907AD37} = {0EAFBB29-6531-FC4E-66AB-EBFD77419ADE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8643CD20-B195-4919-8135-27549488237E} EndGlobalSection - GlobalSection(SharedMSBuildProjectFiles) = preSolution - tests\Mono.Android-Tests\Mono.Android-Test.Shared.projitems*{0ab4956e-6fb9-4da0-9d49-ab65a3ff403a}*SharedItemsImports = 13 - tests\Mono.Android-Tests\Mono.Android-Test.Shared.projitems*{40ead437-216b-4df4-8258-3f47e1672c3a}*SharedItemsImports = 4 - tests\Mono.Android-Tests\Mono.Android-Test.Shared.projitems*{9ecbea14-b79f-4f92-9266-495c03a32571}*SharedItemsImports = 4 - EndGlobalSection EndGlobal diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RenameTestCases.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RenameTestCases.cs index 592de31731a..d8cbd2a5e00 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RenameTestCases.cs +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RenameTestCases.cs @@ -156,11 +156,11 @@ static void CreateErrorResultsFile (string sourceFile, string destFile, string c } // Example `SourceFile`: - // /Users/builder/jenkins/workspace/xamarin-android-pr-builder-release/xamarin-android/bin/TestRelease/TestResult-Mono.Android_Tests.xml + // /Users/builder/jenkins/workspace/xamarin-android-pr-builder-release/xamarin-android/bin/TestRelease/TestResult-Mono.Android.NET_Tests.xml // Example `DestinationFolder`: // /Users/builder/jenkins/workspace/xamarin-android-pr-builder-release/xamarin-android/ // Example `adb logcat`: - // /Users/builder/jenkins/workspace/xamarin-android-pr-builder-release/xamarin-android/bin/TestRelease/logcat-Release-Mono.Android_Tests.txt + // /Users/builder/jenkins/workspace/xamarin-android-pr-builder-release/xamarin-android/bin/TestRelease/logcat-Release-Mono.Android.NET_Tests.txt // // We need to extract the "base" test name from `SourceFile`, and use that to construct `logcatPath` static void GetTestCaseInfo (string sourceFile, string destinationFolder, string config, string flavor, Action logDebugMessage, out string testSuiteName, out string testCaseName, out string logcatPath) diff --git a/src/Mono.Android/Properties/AssemblyInfo.cs.in b/src/Mono.Android/Properties/AssemblyInfo.cs.in index f083dafcd92..83f0d81ca8e 100644 --- a/src/Mono.Android/Properties/AssemblyInfo.cs.in +++ b/src/Mono.Android/Properties/AssemblyInfo.cs.in @@ -40,10 +40,7 @@ using System.Runtime.Versioning; #pragma warning restore RS0016 // Symbol is not part of the declared API [assembly: InternalsVisibleTo("Mono.Android.Export, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")] -[assembly: InternalsVisibleTo("Mono.Android-Tests, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")] [assembly: InternalsVisibleTo("Java.Interop-Tests, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")] -[assembly: InternalsVisibleTo("Mono.Android-TestsMultiDex, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")] -[assembly: InternalsVisibleTo("Mono.Android-TestsAppBundle, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")] [assembly: InternalsVisibleTo("Mono.Android.NET-Tests, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")] [assembly: InternalsVisibleTo("Microsoft.Android.Runtime.NativeAOT, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")] diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GetDependenciesTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GetDependenciesTests.cs index e466de20a98..f1493655651 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GetDependenciesTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GetDependenciesTests.cs @@ -102,7 +102,7 @@ public void ManifestFileExists () Directory.CreateDirectory (path); var manifestFile = Path.Combine (path, "AndroidManifest.xml"); File.WriteAllText (manifestFile, @" - + "); diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Resources/layout/FragmentFixup.axml b/tests/Mono.Android-Tests/Mono.Android-Tests/Resources/layout/FragmentFixup.axml index 51c6dbaeb93..c1e9edfffd3 100644 --- a/tests/Mono.Android-Tests/Mono.Android-Tests/Resources/layout/FragmentFixup.axml +++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Resources/layout/FragmentFixup.axml @@ -18,13 +18,13 @@ android:layout_height="wrap_content" />