From 80b4f4eb578283a1eefa1f476474dccb15769e5b Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 24 Aug 2018 09:46:55 -0500 Subject: [PATCH] [build] remove XAIntegrationDebug and XAIntegrationRelease (#361) In PR: https://github.com/xamarin/java.interop/pull/360 I will likely add a new `$(Configuration)` to be used in xamarin-android, so we can build `Java.Interop` as a non-PCL. The existence of `XAIntegrationDebug` and `XAIntegrationRelease` are confusing, since they are no longer used. See: https://github.com/xamarin/java.interop/commit/54a2aff091193c0a64705b89fb6aab9d4359616e https://github.com/xamarin/xamarin-android/pull/1231 This removes `XAIntegrationDebug` and `XAIntegrationRelease` from all solutions, project files, and `Makefile`. I also let VS 2017 update the SLN file, as it was an old VS 2010 format... --- Java.Interop.sln | 282 +++++++++----------------- Makefile | 4 +- src/Java.Interop/Java.Interop.csproj | 24 +-- src/Java.Interop/Java.Interop.targets | 1 - 4 files changed, 103 insertions(+), 208 deletions(-) diff --git a/Java.Interop.sln b/Java.Interop.sln index f924d2ddc..4cb634ce9 100644 --- a/Java.Interop.sln +++ b/Java.Interop.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2003 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{C8F58966-94BF-407F-914A-8654F8B8AE3B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Linq.Expressions", "lib\mono.linq.expressions\Mono.Linq.Expressions.csproj", "{0C001D50-4176-45AE-BDC8-BA626508B0CC}" @@ -102,243 +104,161 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.AndroidSdk", "external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj", "{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}" EndProject Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + src\Java.Interop\Tests\Interop-Tests.projitems*{04e28441-36ff-4964-add7-efbb47cce406}*SharedItemsImports = 4 + src\Java.Interop\Tests\Interop-Tests.projitems*{0adb8d72-7479-49af-8809-e03ae4a4eae2}*SharedItemsImports = 13 + tests\PerformanceTests\PerformanceTests.projitems*{0fbecd2a-7c91-41ab-a4b4-b781e8ec8479}*SharedItemsImports = 13 + src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{58b564a1-570d-4da2-b02d-25bddb1a9f4f}*SharedItemsImports = 4 + tests\PerformanceTests\PerformanceTests.projitems*{6970466b-f6d1-417a-8a27-4fed8555ebd0}*SharedItemsImports = 4 + src\Java.Interop.Dynamic\Tests\Dynamic-Tests.projitems*{82b1dd53-69ca-4a61-b6b1-f06f1525ef4d}*SharedItemsImports = 4 + src\Java.Interop.Export\Tests\Export-Tests.projitems*{82f24161-f0ca-44cc-aec3-885d613605e0}*SharedItemsImports = 4 + src\Java.Interop.Export\Tests\Export-Tests.projitems*{849abedc-6a9c-44f0-8543-5298c096a3fb}*SharedItemsImports = 13 + src\Java.Interop.Dynamic\Tests\Dynamic-Tests.projitems*{8a190f28-74c7-45d8-a701-5864cdf4124a}*SharedItemsImports = 13 + src\Java.Interop.Dynamic\Tests\Dynamic-Tests.projitems*{c5176170-4025-4a87-b143-11dc64f9bdd1}*SharedItemsImports = 4 + src\Java.Interop.Export\Tests\Export-Tests.projitems*{c5176170-4025-4a87-b143-11dc64f9bdd1}*SharedItemsImports = 4 + src\Java.Interop\Tests\Interop-Tests.projitems*{c5176170-4025-4a87-b143-11dc64f9bdd1}*SharedItemsImports = 4 + tests\PerformanceTests\PerformanceTests.projitems*{c5176170-4025-4a87-b143-11dc64f9bdd1}*SharedItemsImports = 4 + src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{d1295a8f-4f42-461d-a046-564476c10002}*SharedItemsImports = 4 + src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{d18fcf91-8876-48a0-a693-2dc1e7d3d80a}*SharedItemsImports = 4 + src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{fe789f04-5e95-42c5-aef1-e33f8df06b3f}*SharedItemsImports = 13 + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU - XAIntegrationDebug|Any CPU = XAIntegrationDebug|Any CPU - XAIntegrationRelease|Any CPU = XAIntegrationRelease|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {04E28441-36FF-4964-ADD7-EFBB47CCE406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04E28441-36FF-4964-ADD7-EFBB47CCE406}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04E28441-36FF-4964-ADD7-EFBB47CCE406}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04E28441-36FF-4964-ADD7-EFBB47CCE406}.Release|Any CPU.Build.0 = Release|Any CPU - {04E28441-36FF-4964-ADD7-EFBB47CCE406}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.Release|Any CPU.Build.0 = Release|Any CPU - {07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU {0C001D50-4176-45AE-BDC8-BA626508B0CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0C001D50-4176-45AE-BDC8-BA626508B0CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C001D50-4176-45AE-BDC8-BA626508B0CC}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C001D50-4176-45AE-BDC8-BA626508B0CC}.Release|Any CPU.Build.0 = Release|Any CPU - {0C001D50-4176-45AE-BDC8-BA626508B0CC}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {1268EADF-8344-431C-81F6-FCB7CBC99F49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1268EADF-8344-431C-81F6-FCB7CBC99F49}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1268EADF-8344-431C-81F6-FCB7CBC99F49}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1268EADF-8344-431C-81F6-FCB7CBC99F49}.Release|Any CPU.Build.0 = Release|Any CPU - {1268EADF-8344-431C-81F6-FCB7CBC99F49}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {1268EADF-8344-431C-81F6-FCB7CBC99F49}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {1268EADF-8344-431C-81F6-FCB7CBC99F49}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {1268EADF-8344-431C-81F6-FCB7CBC99F49}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU + {D1295A8F-4F42-461D-A046-564476C10002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D1295A8F-4F42-461D-A046-564476C10002}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D1295A8F-4F42-461D-A046-564476C10002}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D1295A8F-4F42-461D-A046-564476C10002}.Release|Any CPU.Build.0 = Release|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7387E151-48E3-4885-B2CA-A74434A34045}.Release|Any CPU.Build.0 = Release|Any CPU {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Debug|Any CPU.Build.0 = Debug|Any CPU {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Release|Any CPU.ActiveCfg = Release|Any CPU {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Release|Any CPU.Build.0 = Release|Any CPU - {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU - {41DFB021-F795-4EB6-8E53-0D069C0BED9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41DFB021-F795-4EB6-8E53-0D069C0BED9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41DFB021-F795-4EB6-8E53-0D069C0BED9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41DFB021-F795-4EB6-8E53-0D069C0BED9F}.Release|Any CPU.Build.0 = Release|Any CPU - {41DFB021-F795-4EB6-8E53-0D069C0BED9F}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {41DFB021-F795-4EB6-8E53-0D069C0BED9F}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {41DFB021-F795-4EB6-8E53-0D069C0BED9F}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {41DFB021-F795-4EB6-8E53-0D069C0BED9F}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU - {4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Release|Any CPU.Build.0 = Release|Any CPU - {4EEAB1A7-99C1-4302-9C18-01A7B481409B}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {4EEAB1A7-99C1-4302-9C18-01A7B481409B}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {4EEAB1A7-99C1-4302-9C18-01A7B481409B}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {4EEAB1A7-99C1-4302-9C18-01A7B481409B}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU + {D14A1B5C-2060-4930-92BE-F7190256C735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D14A1B5C-2060-4930-92BE-F7190256C735}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D14A1B5C-2060-4930-92BE-F7190256C735}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D14A1B5C-2060-4930-92BE-F7190256C735}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU + {94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Release|Any CPU.Build.0 = Release|Any CPU + {BB0AB9F7-0979-41A7-B7A9-877260655F94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB0AB9F7-0979-41A7-B7A9-877260655F94}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB0AB9F7-0979-41A7-B7A9-877260655F94}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB0AB9F7-0979-41A7-B7A9-877260655F94}.Release|Any CPU.Build.0 = Release|Any CPU + {AD4468F8-8883-434B-9D4C-E1801BB3B52A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AD4468F8-8883-434B-9D4C-E1801BB3B52A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AD4468F8-8883-434B-9D4C-E1801BB3B52A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AD4468F8-8883-434B-9D4C-E1801BB3B52A}.Release|Any CPU.Build.0 = Release|Any CPU + {B501D075-6183-4E1D-92C9-F7B5002475B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B501D075-6183-4E1D-92C9-F7B5002475B1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B501D075-6183-4E1D-92C9-F7B5002475B1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B501D075-6183-4E1D-92C9-F7B5002475B1}.Release|Any CPU.Build.0 = Release|Any CPU + {5FBF138D-1119-4C29-99E1-E928B5209D06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5FBF138D-1119-4C29-99E1-E928B5209D06}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C5176170-4025-4A87-B143-11DC64F9BDD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C5176170-4025-4A87-B143-11DC64F9BDD1}.Release|Any CPU.ActiveCfg = Release|Any CPU {5887B410-D448-4257-A46B-EAC03C80BE93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5887B410-D448-4257-A46B-EAC03C80BE93}.Debug|Any CPU.Build.0 = Debug|Any CPU {5887B410-D448-4257-A46B-EAC03C80BE93}.Release|Any CPU.ActiveCfg = Release|Any CPU {5887B410-D448-4257-A46B-EAC03C80BE93}.Release|Any CPU.Build.0 = Release|Any CPU - {5887B410-D448-4257-A46B-EAC03C80BE93}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {5FBF138D-1119-4C29-99E1-E928B5209D06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FBF138D-1119-4C29-99E1-E928B5209D06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FBF138D-1119-4C29-99E1-E928B5209D06}.XAIntegrationRelease|Any CPU.ActiveCfg = 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}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}.Release|Any CPU.Build.0 = Release|Any CPU - {6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU + {B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.Release|Any CPU.Build.0 = Release|Any CPU + {07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {07BC4495-1267-4B78-9EA6-B76FEEA2A64A}.Release|Any CPU.Build.0 = Release|Any CPU + {1268EADF-8344-431C-81F6-FCB7CBC99F49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1268EADF-8344-431C-81F6-FCB7CBC99F49}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1268EADF-8344-431C-81F6-FCB7CBC99F49}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1268EADF-8344-431C-81F6-FCB7CBC99F49}.Release|Any CPU.Build.0 = Release|Any CPU + {41DFB021-F795-4EB6-8E53-0D069C0BED9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {41DFB021-F795-4EB6-8E53-0D069C0BED9F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {41DFB021-F795-4EB6-8E53-0D069C0BED9F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {41DFB021-F795-4EB6-8E53-0D069C0BED9F}.Release|Any CPU.Build.0 = Release|Any CPU + {A76309AB-98AC-4AE2-BA30-75481420C52F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A76309AB-98AC-4AE2-BA30-75481420C52F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A76309AB-98AC-4AE2-BA30-75481420C52F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A76309AB-98AC-4AE2-BA30-75481420C52F}.Release|Any CPU.Build.0 = Release|Any CPU {6970466B-F6D1-417A-8A27-4FED8555EBD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6970466B-F6D1-417A-8A27-4FED8555EBD0}.Debug|Any CPU.Build.0 = Debug|Any CPU {6970466B-F6D1-417A-8A27-4FED8555EBD0}.Release|Any CPU.ActiveCfg = Release|Any CPU {6970466B-F6D1-417A-8A27-4FED8555EBD0}.Release|Any CPU.Build.0 = Release|Any CPU - {6970466B-F6D1-417A-8A27-4FED8555EBD0}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {7387E151-48E3-4885-B2CA-A74434A34045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7387E151-48E3-4885-B2CA-A74434A34045}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7387E151-48E3-4885-B2CA-A74434A34045}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7387E151-48E3-4885-B2CA-A74434A34045}.Release|Any CPU.Build.0 = Release|Any CPU - {7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {7387E151-48E3-4885-B2CA-A74434A34045}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU + {04E28441-36FF-4964-ADD7-EFBB47CCE406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {04E28441-36FF-4964-ADD7-EFBB47CCE406}.Debug|Any CPU.Build.0 = Debug|Any CPU + {04E28441-36FF-4964-ADD7-EFBB47CCE406}.Release|Any CPU.ActiveCfg = Release|Any CPU + {04E28441-36FF-4964-ADD7-EFBB47CCE406}.Release|Any CPU.Build.0 = Release|Any CPU {82B1DD53-69CA-4A61-B6B1-F06F1525EF4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {82B1DD53-69CA-4A61-B6B1-F06F1525EF4D}.Debug|Any CPU.Build.0 = Debug|Any CPU {82B1DD53-69CA-4A61-B6B1-F06F1525EF4D}.Release|Any CPU.ActiveCfg = Release|Any CPU {82B1DD53-69CA-4A61-B6B1-F06F1525EF4D}.Release|Any CPU.Build.0 = Release|Any CPU - {82B1DD53-69CA-4A61-B6B1-F06F1525EF4D}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU {82F24161-F0CA-44CC-AEC3-885D613605E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {82F24161-F0CA-44CC-AEC3-885D613605E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {82F24161-F0CA-44CC-AEC3-885D613605E0}.Release|Any CPU.ActiveCfg = Release|Any CPU {82F24161-F0CA-44CC-AEC3-885D613605E0}.Release|Any CPU.Build.0 = Release|Any CPU - {82F24161-F0CA-44CC-AEC3-885D613605E0}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {891F2E04-5614-4A26-A78F-3778025ECF43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {891F2E04-5614-4A26-A78F-3778025ECF43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {891F2E04-5614-4A26-A78F-3778025ECF43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {891F2E04-5614-4A26-A78F-3778025ECF43}.Release|Any CPU.Build.0 = Release|Any CPU - {891F2E04-5614-4A26-A78F-3778025ECF43}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {891F2E04-5614-4A26-A78F-3778025ECF43}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {891F2E04-5614-4A26-A78F-3778025ECF43}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {891F2E04-5614-4A26-A78F-3778025ECF43}.XAIntegrationRelease|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Release|Any CPU.Build.0 = Release|Any CPU - {94BD81F7-B06F-4295-9636-F8A3B6BDC762}.XAIntegrationDebug|Any CPU.ActiveCfg = XAIntegrationDebug|Any CPU - {94BD81F7-B06F-4295-9636-F8A3B6BDC762}.XAIntegrationDebug|Any CPU.Build.0 = XAIntegrationDebug|Any CPU - {94BD81F7-B06F-4295-9636-F8A3B6BDC762}.XAIntegrationRelease|Any CPU.ActiveCfg = XAIntegrationRelease|Any CPU - {94BD81F7-B06F-4295-9636-F8A3B6BDC762}.XAIntegrationRelease|Any CPU.Build.0 = XAIntegrationRelease|Any CPU - {A76309AB-98AC-4AE2-BA30-75481420C52F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A76309AB-98AC-4AE2-BA30-75481420C52F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A76309AB-98AC-4AE2-BA30-75481420C52F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A76309AB-98AC-4AE2-BA30-75481420C52F}.Release|Any CPU.Build.0 = Release|Any CPU - {A76309AB-98AC-4AE2-BA30-75481420C52F}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {AD4468F8-8883-434B-9D4C-E1801BB3B52A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD4468F8-8883-434B-9D4C-E1801BB3B52A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD4468F8-8883-434B-9D4C-E1801BB3B52A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD4468F8-8883-434B-9D4C-E1801BB3B52A}.Release|Any CPU.Build.0 = Release|Any CPU - {AD4468F8-8883-434B-9D4C-E1801BB3B52A}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.Release|Any CPU.Build.0 = Release|Any CPU - {B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU - {B501D075-6183-4E1D-92C9-F7B5002475B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B501D075-6183-4E1D-92C9-F7B5002475B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B501D075-6183-4E1D-92C9-F7B5002475B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B501D075-6183-4E1D-92C9-F7B5002475B1}.Release|Any CPU.Build.0 = Release|Any CPU - {B501D075-6183-4E1D-92C9-F7B5002475B1}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {BB0AB9F7-0979-41A7-B7A9-877260655F94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB0AB9F7-0979-41A7-B7A9-877260655F94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB0AB9F7-0979-41A7-B7A9-877260655F94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB0AB9F7-0979-41A7-B7A9-877260655F94}.Release|Any CPU.Build.0 = Release|Any CPU - {BB0AB9F7-0979-41A7-B7A9-877260655F94}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {C5176170-4025-4A87-B143-11DC64F9BDD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5176170-4025-4A87-B143-11DC64F9BDD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5176170-4025-4A87-B143-11DC64F9BDD1}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {C9FA4492-DEB0-4932-A6B8-E2C4E0581692}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9FA4492-DEB0-4932-A6B8-E2C4E0581692}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9FA4492-DEB0-4932-A6B8-E2C4E0581692}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9FA4492-DEB0-4932-A6B8-E2C4E0581692}.Release|Any CPU.Build.0 = Release|Any CPU - {C9FA4492-DEB0-4932-A6B8-E2C4E0581692}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {C9FA4492-DEB0-4932-A6B8-E2C4E0581692}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {C9FA4492-DEB0-4932-A6B8-E2C4E0581692}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {C9FA4492-DEB0-4932-A6B8-E2C4E0581692}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU - {D1295A8F-4F42-461D-A046-564476C10002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1295A8F-4F42-461D-A046-564476C10002}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1295A8F-4F42-461D-A046-564476C10002}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1295A8F-4F42-461D-A046-564476C10002}.Release|Any CPU.Build.0 = Release|Any CPU - {D1295A8F-4F42-461D-A046-564476C10002}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU {DB05D566-0BA0-4935-868D-689E2F03688E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DB05D566-0BA0-4935-868D-689E2F03688E}.Debug|Any CPU.Build.0 = Debug|Any CPU {DB05D566-0BA0-4935-868D-689E2F03688E}.Release|Any CPU.ActiveCfg = Release|Any CPU {DB05D566-0BA0-4935-868D-689E2F03688E}.Release|Any CPU.Build.0 = Release|Any CPU - {DB05D566-0BA0-4935-868D-689E2F03688E}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {DB05D566-0BA0-4935-868D-689E2F03688E}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {DB05D566-0BA0-4935-868D-689E2F03688E}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {DB05D566-0BA0-4935-868D-689E2F03688E}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU + {C9FA4492-DEB0-4932-A6B8-E2C4E0581692}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C9FA4492-DEB0-4932-A6B8-E2C4E0581692}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C9FA4492-DEB0-4932-A6B8-E2C4E0581692}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C9FA4492-DEB0-4932-A6B8-E2C4E0581692}.Release|Any CPU.Build.0 = Release|Any CPU + {891F2E04-5614-4A26-A78F-3778025ECF43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {891F2E04-5614-4A26-A78F-3778025ECF43}.Debug|Any CPU.Build.0 = Debug|Any CPU + {891F2E04-5614-4A26-A78F-3778025ECF43}.Release|Any CPU.ActiveCfg = Release|Any CPU + {891F2E04-5614-4A26-A78F-3778025ECF43}.Release|Any CPU.Build.0 = Release|Any CPU + {4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Release|Any CPU.Build.0 = Release|Any CPU {F3ECB73D-9263-4E42-A5B4-3FC0D1D829F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F3ECB73D-9263-4E42-A5B4-3FC0D1D829F9}.Debug|Any CPU.Build.0 = Debug|Any CPU {F3ECB73D-9263-4E42-A5B4-3FC0D1D829F9}.Release|Any CPU.ActiveCfg = Release|Any CPU {F3ECB73D-9263-4E42-A5B4-3FC0D1D829F9}.Release|Any CPU.Build.0 = Release|Any CPU - {F3ECB73D-9263-4E42-A5B4-3FC0D1D829F9}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {9ECA2816-41D2-4796-8CA2-758EDCFB5C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9ECA2816-41D2-4796-8CA2-758EDCFB5C68}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ECA2816-41D2-4796-8CA2-758EDCFB5C68}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ECA2816-41D2-4796-8CA2-758EDCFB5C68}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}.Release|Any CPU.Build.0 = Release|Any CPU {D18FCF91-8876-48A0-A693-2DC1E7D3D80A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D18FCF91-8876-48A0-A693-2DC1E7D3D80A}.Debug|Any CPU.Build.0 = Debug|Any CPU {D18FCF91-8876-48A0-A693-2DC1E7D3D80A}.Release|Any CPU.ActiveCfg = Release|Any CPU {D18FCF91-8876-48A0-A693-2DC1E7D3D80A}.Release|Any CPU.Build.0 = Release|Any CPU - {D18FCF91-8876-48A0-A693-2DC1E7D3D80A}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {D18FCF91-8876-48A0-A693-2DC1E7D3D80A}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {D18FCF91-8876-48A0-A693-2DC1E7D3D80A}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {D18FCF91-8876-48A0-A693-2DC1E7D3D80A}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU {D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}.Release|Any CPU.ActiveCfg = Release|Any CPU {D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}.Release|Any CPU.Build.0 = Release|Any CPU - {D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU {64CC4E44-CE3A-4319-BF3F-6CF8BD513870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {64CC4E44-CE3A-4319-BF3F-6CF8BD513870}.Debug|Any CPU.Build.0 = Debug|Any CPU {64CC4E44-CE3A-4319-BF3F-6CF8BD513870}.Release|Any CPU.ActiveCfg = Release|Any CPU {64CC4E44-CE3A-4319-BF3F-6CF8BD513870}.Release|Any CPU.Build.0 = Release|Any CPU - {64CC4E44-CE3A-4319-BF3F-6CF8BD513870}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {64CC4E44-CE3A-4319-BF3F-6CF8BD513870}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {64CC4E44-CE3A-4319-BF3F-6CF8BD513870}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {64CC4E44-CE3A-4319-BF3F-6CF8BD513870}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU {52C7D9B6-E8C8-47D0-9471-652D278D7D77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {52C7D9B6-E8C8-47D0-9471-652D278D7D77}.Debug|Any CPU.Build.0 = Debug|Any CPU {52C7D9B6-E8C8-47D0-9471-652D278D7D77}.Release|Any CPU.ActiveCfg = Release|Any CPU {52C7D9B6-E8C8-47D0-9471-652D278D7D77}.Release|Any CPU.Build.0 = Release|Any CPU - {52C7D9B6-E8C8-47D0-9471-652D278D7D77}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {52C7D9B6-E8C8-47D0-9471-652D278D7D77}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {52C7D9B6-E8C8-47D0-9471-652D278D7D77}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {52C7D9B6-E8C8-47D0-9471-652D278D7D77}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU - {D14A1B5C-2060-4930-92BE-F7190256C735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D14A1B5C-2060-4930-92BE-F7190256C735}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D14A1B5C-2060-4930-92BE-F7190256C735}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D14A1B5C-2060-4930-92BE-F7190256C735}.Release|Any CPU.Build.0 = Release|Any CPU - {D14A1B5C-2060-4930-92BE-F7190256C735}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {D14A1B5C-2060-4930-92BE-F7190256C735}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {D14A1B5C-2060-4930-92BE-F7190256C735}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {D14A1B5C-2060-4930-92BE-F7190256C735}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU {58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.Debug|Any CPU.Build.0 = Debug|Any CPU {58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.Release|Any CPU.ActiveCfg = Release|Any CPU {58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.Release|Any CPU.Build.0 = Release|Any CPU - {58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU {15945D4B-FF56-4BCC-B598-2718D199DD08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {15945D4B-FF56-4BCC-B598-2718D199DD08}.Debug|Any CPU.Build.0 = Debug|Any CPU {15945D4B-FF56-4BCC-B598-2718D199DD08}.Release|Any CPU.ActiveCfg = Release|Any CPU {15945D4B-FF56-4BCC-B598-2718D199DD08}.Release|Any CPU.Build.0 = Release|Any CPU - {15945D4B-FF56-4BCC-B598-2718D199DD08}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {15945D4B-FF56-4BCC-B598-2718D199DD08}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {15945D4B-FF56-4BCC-B598-2718D199DD08}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {15945D4B-FF56-4BCC-B598-2718D199DD08}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU {C0487169-8F81-497F-919E-EB42B1D0243F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C0487169-8F81-497F-919E-EB42B1D0243F}.Debug|Any CPU.Build.0 = Debug|Any CPU {C0487169-8F81-497F-919E-EB42B1D0243F}.Release|Any CPU.ActiveCfg = Release|Any CPU {C0487169-8F81-497F-919E-EB42B1D0243F}.Release|Any CPU.Build.0 = Release|Any CPU - {C0487169-8F81-497F-919E-EB42B1D0243F}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {C0487169-8F81-497F-919E-EB42B1D0243F}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {C0487169-8F81-497F-919E-EB42B1D0243F}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {C0487169-8F81-497F-919E-EB42B1D0243F}.XAIntegrationRelease|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -347,18 +267,13 @@ Global {3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}.Release|Any CPU.Build.0 = Release|Any CPU - {3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU {E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Debug|Any CPU.Build.0 = Debug|Any CPU {E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Release|Any CPU.ActiveCfg = Release|Any CPU {E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Release|Any CPU.Build.0 = Release|Any CPU - {E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU - {E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU - {E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU - {E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {0C001D50-4176-45AE-BDC8-BA626508B0CC} = {C8F58966-94BF-407F-914A-8654F8B8AE3B} @@ -404,4 +319,7 @@ Global {3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A} = {172B608B-E6F3-41CC-9949-203A76BA247C} {E34BCFA0-CAA4-412C-AA1C-75DB8D67D157} = {172B608B-E6F3-41CC-9949-203A76BA247C} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {29204E0C-382A-49A0-A814-AD7FBF9774A5} + EndGlobalSection EndGlobal diff --git a/Makefile b/Makefile index a45d39c62..b3ff7979e 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ NATIVE_EXT = .so DLLMAP_OS_NAME = linux endif -XA_CONFIGURATION = XAIntegrationDebug +XA_CONFIGURATION = Debug GENDARME_URL = https://github.com/downloads/spouliot/gendarme/gendarme-2.10-bin.zip @@ -73,7 +73,7 @@ prepare-external $(PREPARE_EXTERNAL_FILES): $(PACKAGES) $(NUNIT_CONSOLE) clean: -$(MSBUILD) $(MSBUILD_FLAGS) /t:Clean - -rm -Rf bin/$(CONFIGURATION) bin/Build$(CONFIGURATION) bin/Test$(CONFIGURATION) bin/XAIntegration$(CONFIGURATION) + -rm -Rf bin/$(CONFIGURATION) bin/Build$(CONFIGURATION) bin/Test$(CONFIGURATION) -rm src/Java.Runtime.Environment/Java.Runtime.Environment.dll.config include build-tools/scripts/mono.mk diff --git a/src/Java.Interop/Java.Interop.csproj b/src/Java.Interop/Java.Interop.csproj index 8632ac6ec..1a1fb389b 100644 --- a/src/Java.Interop/Java.Interop.csproj +++ b/src/Java.Interop/Java.Interop.csproj @@ -54,28 +54,6 @@ ..\..\bin\Release\Java.Interop.xml ..\..\bin\BuildRelease - - true - full - false - ..\..\bin\XAIntegrationDebug - DEBUG;INTEROP;XA_INTEGRATION;FEATURE_JNIENVIRONMENT_JI_PINVOKES;FEATURE_JNIOBJECTREFERENCE_INTPTRS - prompt - 4 - false - true - ..\..\bin\BuildDebug - - - True - ..\..\bin\XAIntegrationRelease - INTEROP;XA_INTEGRATION;FEATURE_JNIENVIRONMENT_JI_PINVOKES;FEATURE_JNIOBJECTREFERENCE_INTPTRS - prompt - 4 - false - true - ..\..\bin\BuildRelease - @@ -117,7 +95,7 @@ - + diff --git a/src/Java.Interop/Java.Interop.targets b/src/Java.Interop/Java.Interop.targets index 001c5444b..e8d31b32c 100644 --- a/src/Java.Interop/Java.Interop.targets +++ b/src/Java.Interop/Java.Interop.targets @@ -9,7 +9,6 @@ Outputs="$(JNIEnvGenPath)\jnienv-gen.exe">