From b1aac82c388090de42d913a44d3fdeecf300d4c6 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Tue, 7 Jul 2020 15:37:17 -0400 Subject: [PATCH] Explicitly separate 3rd party IP from Microsoft IP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1139604 > Keeping Third-Party IP in a source control system separate from > Microsoft source code and other assets is the preferred engineering > practice… Begin following this preferred engineering practice: move source code which was copied into this repo into a separate `src-ThirdParty` directory, so that it is easier to track and manage them. Move the NUnitLite sources into `src-ThirdParty\NUnitLite`. Move the force-net/crc32.net sources into `src-ThirdParty\crc32.net`. Move the bazelbuild/bazel sources into `src-ThirdParty\bazel`. Move the *C# ported* android/platform/tools/base sources into `src-ThirdParty\android-platform-tools-base`. --- .../Steps/Step_Get_Windows_Binutils.cs | 70 +-- .../xaprepare/xaprepare/xaprepare.csproj | 3 + .../NUnitLite/Api/ExpectedExceptionData.cs | 0 .../NUnitLite/Api/IParameterDataSource.cs | 0 .../NUnitLite/Api/IPropertyBag.cs | 0 .../NUnitLite/Api/ITest.cs | 0 .../NUnitLite/Api/ITestAssemblyBuilder.cs | 0 .../NUnitLite/Api/ITestAssemblyRunner.cs | 0 .../NUnitLite/Api/ITestCaseData.cs | 0 .../NUnitLite/Api/ITestCaseSource.cs | 0 .../NUnitLite/Api/ITestCaseSourceProvider.cs | 0 .../NUnitLite/Api/ITestFilter.cs | 0 .../NUnitLite/Api/ITestListener.cs | 0 .../NUnitLite/Api/ITestResult.cs | 0 .../NUnitLite/Api/IXmlNodeBuilder.cs | 0 .../NUnitLite/Api/PropertyEntry.cs | 0 .../NUnitLite/Api/ResultState.cs | 0 .../NUnitLite/Api/RunState.cs | 0 .../NUnitLite/Api/TestOutput.cs | 0 .../NUnitLite/Api/TestStatus.cs | 0 .../NUnitLite/Api/XmlNode.cs | 0 .../NUnitLite/AssemblyInfo.cs | 0 .../NUnitLite/Assert.cs | 0 .../NUnitLite/AssertionHelper.cs | 0 .../NUnitLite/Assume.cs | 0 .../NUnitLite/Attributes/CategoryAttribute.cs | 0 .../Attributes/CombinatorialAttribute.cs | 0 .../NUnitLite/Attributes/CultureAttribute.cs | 0 .../NUnitLite/Attributes/DataAttribute.cs | 0 .../Attributes/DatapointAttribute.cs | 0 .../Attributes/DatapointSourceAttribute.cs | 0 .../Attributes/DatapointsAttribute.cs | 0 .../Attributes/DescriptionAttribute.cs | 0 .../Attributes/ExpectedExceptionAttribute.cs | 0 .../NUnitLite/Attributes/ExplicitAttribute.cs | 0 .../NUnitLite/Attributes/IgnoreAttribute.cs | 0 .../Attributes/IncludeExcludeAttribute.cs | 0 .../NUnitLite/Attributes/MaxTimeAttribute.cs | 0 .../NUnitLite/Attributes/NUnitAttribute.cs | 0 .../NUnitLite/Attributes/PairwiseAttribute.cs | 0 .../NUnitLite/Attributes/PlatformAttribute.cs | 0 .../NUnitLite/Attributes/PropertyAttribute.cs | 0 .../NUnitLite/Attributes/RandomAttribute.cs | 0 .../NUnitLite/Attributes/RangeAttribute.cs | 0 .../NUnitLite/Attributes/RepeatAttribute.cs | 0 .../Attributes/SequentialAttribute.cs | 0 .../Attributes/SetCultureAttribute.cs | 0 .../Attributes/SetUICultureAttribute.cs | 0 .../NUnitLite/Attributes/SetUpAttribute.cs | 0 .../NUnitLite/Attributes/TearDownAttribute.cs | 0 .../NUnitLite/Attributes/TestAttribute.cs | 0 .../NUnitLite/Attributes/TestCaseAttribute.cs | 0 .../Attributes/TestCaseSourceAttribute.cs | 0 .../Attributes/TestFixtureAttribute.cs | 0 .../Attributes/TestFixtureSetUpAttribute.cs | 0 .../TestFixtureTearDownAttribute.cs | 0 .../NUnitLite/Attributes/TheoryAttribute.cs | 0 .../NUnitLite/Attributes/TimeoutAttribute.cs | 0 .../Attributes/ValueSourceAttribute.cs | 0 .../NUnitLite/Attributes/ValuesAttribute.cs | 0 .../Compatibility/SerializableAttribute.cs | 0 .../Constraints/AllItemsConstraint.cs | 0 .../NUnitLite/Constraints/AndConstraint.cs | 0 .../Constraints/AssignableFromConstraint.cs | 0 .../Constraints/AssignableToConstraint.cs | 0 .../Constraints/AttributeConstraint.cs | 0 .../Constraints/AttributeExistsConstraint.cs | 0 .../NUnitLite/Constraints/BasicConstraint.cs | 0 .../NUnitLite/Constraints/BinaryConstraint.cs | 0 .../BinarySerializableConstraint.cs | 0 .../Constraints/CollectionConstraint.cs | 0 .../CollectionContainsConstraint.cs | 0 .../CollectionEquivalentConstraint.cs | 0 .../CollectionItemsEqualConstraint.cs | 0 .../CollectionOrderedConstraint.cs | 0 .../Constraints/CollectionSubsetConstraint.cs | 0 .../NUnitLite/Constraints/CollectionTally.cs | 0 .../Constraints/ComparisonAdapter.cs | 0 .../Constraints/ComparisonConstraint.cs | 0 .../NUnitLite/Constraints/Constraint.cs | 0 .../Constraints/ConstraintBuilder.cs | 0 .../Constraints/ConstraintExpression.cs | 0 .../Constraints/ConstraintExpressionBase.cs | 0 .../Constraints/ConstraintFactory.cs | 0 .../Constraints/ContainsConstraint.cs | 0 .../Constraints/DelayedConstraint.cs | 0 .../Constraints/EmptyCollectionConstraint.cs | 0 .../NUnitLite/Constraints/EmptyConstraint.cs | 0 .../Constraints/EmptyDirectoryConstraint.cs | 0 .../Constraints/EmptyStringConstraint.cs | 0 .../Constraints/EndsWithConstraint.cs | 0 .../NUnitLite/Constraints/EqualConstraint.cs | 0 .../NUnitLite/Constraints/EqualityAdapter.cs | 0 .../Constraints/ExactCountConstraint.cs | 0 .../Constraints/ExactTypeConstraint.cs | 0 .../Constraints/ExceptionTypeConstraint.cs | 0 .../NUnitLite/Constraints/FailurePoint.cs | 0 .../NUnitLite/Constraints/FalseConstraint.cs | 0 .../Constraints/FloatingPointNumerics.cs | 0 .../Constraints/GreaterThanConstraint.cs | 0 .../GreaterThanOrEqualConstraint.cs | 0 .../Constraints/IResolveConstraint.cs | 0 .../Constraints/InstanceOfTypeConstraint.cs | 0 .../Constraints/LessThanConstraint.cs | 0 .../Constraints/LessThanOrEqualConstraint.cs | 0 .../NUnitLite/Constraints/MessageWriter.cs | 0 .../NUnitLite/Constraints/MsgUtils.cs | 0 .../NUnitLite/Constraints/NUnitComparer.cs | 0 .../Constraints/NUnitEqualityComparer.cs | 0 .../NUnitLite/Constraints/NaNConstraint.cs | 0 .../NUnitLite/Constraints/NoItemConstraint.cs | 0 .../NUnitLite/Constraints/NotConstraint.cs | 0 .../NUnitLite/Constraints/NullConstraint.cs | 0 .../NullOrEmptyStringConstraint.cs | 0 .../NUnitLite/Constraints/Numerics.cs | 0 .../Constraints/Operators/AllOperator.cs | 0 .../Constraints/Operators/AndOperator.cs | 0 .../Operators/AttributeOperator.cs | 0 .../Constraints/Operators/BinaryOperator.cs | 0 .../Operators/CollectionOperator.cs | 0 .../Operators/ConstraintOperator.cs | 0 .../Operators/ExactCountOperator.cs | 0 .../Constraints/Operators/NoneOperator.cs | 0 .../Constraints/Operators/NotOperator.cs | 0 .../Constraints/Operators/OrOperator.cs | 0 .../Constraints/Operators/PrefixOperator.cs | 0 .../Constraints/Operators/PropOperator.cs | 0 .../Operators/SelfResolvingOperator.cs | 0 .../Constraints/Operators/SomeOperator.cs | 0 .../Constraints/Operators/ThrowsOperator.cs | 0 .../Constraints/Operators/WithOperator.cs | 0 .../NUnitLite/Constraints/OrConstraint.cs | 0 .../NUnitLite/Constraints/PathConstraint.cs | 0 .../Constraints/PredicateConstraint.cs | 0 .../NUnitLite/Constraints/PrefixConstraint.cs | 0 .../Constraints/PropertyConstraint.cs | 0 .../Constraints/PropertyExistsConstraint.cs | 0 .../NUnitLite/Constraints/RangeConstraint.cs | 0 .../NUnitLite/Constraints/RegexConstraint.cs | 0 .../ResolvableConstraintExpression.cs | 0 .../Constraints/ReusableConstraint.cs | 0 .../NUnitLite/Constraints/SameAsConstraint.cs | 0 .../Constraints/SamePathConstraint.cs | 0 .../Constraints/SamePathOrUnderConstraint.cs | 0 .../Constraints/SomeItemsConstraint.cs | 0 .../Constraints/StartsWithConstraint.cs | 0 .../NUnitLite/Constraints/StringConstraint.cs | 0 .../Constraints/SubPathConstraint.cs | 0 .../Constraints/SubstringConstraint.cs | 0 .../NUnitLite/Constraints/ThrowsConstraint.cs | 0 .../Constraints/ThrowsNothingConstraint.cs | 0 .../NUnitLite/Constraints/Tolerance.cs | 0 .../NUnitLite/Constraints/ToleranceMode.cs | 0 .../NUnitLite/Constraints/TrueConstraint.cs | 0 .../NUnitLite/Constraints/TypeConstraint.cs | 0 .../Constraints/UniqueItemsConstraint.cs | 0 .../Constraints/XmlSerializableConstraint.cs | 0 .../NUnitLite/Contains.cs | 0 .../NUnitLite/Env.cs | 0 .../Exceptions/AssertionException.cs | 0 .../NUnitLite/Exceptions/IgnoreException.cs | 0 .../Exceptions/InconclusiveException.cs | 0 .../NUnitLite/Exceptions/SuccessException.cs | 0 .../Extensibility/IParameterDataProvider.cs | 0 .../NUnitLite/Extensibility/ISuiteBuilder.cs | 0 .../Extensibility/ITestCaseBuilder.cs | 0 .../Extensibility/ITestCaseProvider.cs | 0 .../NUnitLite/GlobalSettings.cs | 0 .../NUnitLite/Guard.cs | 0 .../NUnitLite/Has.cs | 0 .../NUnitLite/IExpectException.cs | 0 .../NUnitLite/Internal/AssemblyHelper.cs | 0 .../Internal/AsyncInvocationRegion.cs | 0 .../Internal/AsyncSynchronizationContext.cs | 0 .../Builders/CombinatorialStrategy.cs | 0 .../Builders/CombinatorialTestCaseProvider.cs | 0 .../Internal/Builders/CombiningStrategy.cs | 0 .../Builders/DataAttributeTestCaseProvider.cs | 0 .../Internal/Builders/DatapointProvider.cs | 0 .../Internal/Builders/NUnitTestCaseBuilder.cs | 0 .../Builders/NUnitTestFixtureBuilder.cs | 0 .../Internal/Builders/PairwiseStrategy.cs | 0 .../Builders/ParameterDataProvider.cs | 0 .../Internal/Builders/ProviderCache.cs | 0 .../Internal/Builders/SequentialStrategy.cs | 0 .../Commands/ApplyChangesToContextCommand.cs | 0 .../Internal/Commands/CommandDecoratorList.cs | 0 .../Internal/Commands/CommandStage.cs | 0 .../Commands/DelegatingTestCommand.cs | 0 .../Commands/ExpectedExceptionCommand.cs | 0 .../Internal/Commands/ICommandDecorator.cs | 0 .../Internal/Commands/MaxTimeCommand.cs | 0 .../Internal/Commands/OneTimeSetUpCommand.cs | 0 .../Commands/OneTimeTearDownCommand.cs | 0 .../Internal/Commands/RepeatedTestCommand.cs | 0 .../Internal/Commands/SetUpTearDownCommand.cs | 0 .../Internal/Commands/SkipCommand.cs | 0 .../Internal/Commands/TestCommand.cs | 0 .../Internal/Commands/TestMethodCommand.cs | 0 .../Internal/Commands/TheoryResultCommand.cs | 0 .../NUnitLite/Internal/CultureDetector.cs | 0 .../NUnitLite/Internal/ExceptionHelper.cs | 0 .../Extensibility/ParameterDataProviders.cs | 0 .../Extensibility/TestCaseProviders.cs | 0 .../NUnitLite/Internal/Filters/AndFilter.cs | 0 .../Internal/Filters/CategoryExpression.cs | 0 .../Internal/Filters/CategoryFilter.cs | 0 .../NUnitLite/Internal/Filters/NotFilter.cs | 0 .../NUnitLite/Internal/Filters/OrFilter.cs | 0 .../Filters/SimpleCategoryExpression.cs | 0 .../Internal/Filters/SimpleNameFilter.cs | 0 .../NUnitLite/Internal/IApplyToContext.cs | 0 .../NUnitLite/Internal/IApplyToTest.cs | 0 .../Internal/InvalidTestFixtureException.cs | 0 .../NUnitLite/Internal/MethodHelper.cs | 0 .../NUnitLite/Internal/NUnitException.cs | 0 .../Internal/NUnitLiteTestAssemblyBuilder.cs | 0 .../Internal/NUnitLiteTestAssemblyRunner.cs | 0 .../NUnitLite/Internal/OSPlatform.cs | 0 .../NUnitLite/Internal/ParameterSet.cs | 0 .../NUnitLite/Internal/PlatformHelper.cs | 0 .../NUnitLite/Internal/PropertyBag.cs | 0 .../NUnitLite/Internal/PropertyNames.cs | 0 .../NUnitLite/Internal/RandomGenerator.cs | 0 .../NUnitLite/Internal/Randomizer.cs | 0 .../NUnitLite/Internal/Reflect.cs | 0 .../Internal/Results/TestCaseResult.cs | 0 .../NUnitLite/Internal/Results/TestResult.cs | 0 .../Internal/Results/TestSuiteResult.cs | 0 .../NUnitLite/Internal/RuntimeFramework.cs | 0 .../NUnitLite/Internal/StackFilter.cs | 0 .../NUnitLite/Internal/StringUtil.cs | 0 .../Internal/TestExecutionContext.cs | 0 .../NUnitLite/Internal/TestFilter.cs | 0 .../NUnitLite/Internal/TestFixtureBuilder.cs | 0 .../NUnitLite/Internal/TestListener.cs | 0 .../Tests/ParameterizedFixtureSuite.cs | 0 .../Tests/ParameterizedMethodSuite.cs | 0 .../NUnitLite/Internal/Tests/Test.cs | 0 .../NUnitLite/Internal/Tests/TestAssembly.cs | 0 .../NUnitLite/Internal/Tests/TestFixture.cs | 0 .../NUnitLite/Internal/Tests/TestMethod.cs | 0 .../NUnitLite/Internal/Tests/TestSuite.cs | 0 .../NUnitLite/Internal/TextMessageWriter.cs | 0 .../NUnitLite/Internal/ThreadUtility.cs | 0 .../NUnitLite/Internal/TypeHelper.cs | 0 .../Internal/WorkItems/CompositeWorkItem.cs | 0 .../Internal/WorkItems/CountdownEvent.cs | 0 .../Internal/WorkItems/SimpleWorkItem.cs | 0 .../NUnitLite/Internal/WorkItems/WorkItem.cs | 0 .../Internal/WorkItems/WorkItemState.cs | 0 .../NUnitLite/Is.cs | 0 .../NUnitLite/Iz.cs | 0 .../NUnitLite/ListMapper.cs | 0 .../NUnitLite/MessageMatch.cs | 0 .../NUnitLite/ObjectList.cs | 0 .../NUnitLite/Runner/CommandLineOptions.cs | 0 .../NUnitLite/Runner/ConsoleWriter.cs | 0 .../NUnitLite/Runner/DebugWriter.cs | 0 .../OutputWriters/NUnit2XmlOutputWriter.cs | 0 .../OutputWriters/NUnit3XmlOutputWriter.cs | 0 .../Runner/OutputWriters/OutputWriter.cs | 0 .../NUnitLite/Runner/ResultReporter.cs | 0 .../NUnitLite/Runner/ResultSummary.cs | 0 .../NUnitLite/Runner/TcpWriter.cs | 0 .../NUnitLite/Runner/TextUI.cs | 0 .../NUnitLite/SpecialValue.cs | 0 .../NUnitLite/TestCaseData.cs | 0 .../NUnitLite/TestContext.cs | 0 .../NUnitLite/Throws.cs | 0 .../PackagingUtils.cs | 0 .../SymbolWriter.cs | 97 ++++ .../mono/android/debug/MultiDexLoader.java | 0 .../IncrementalClassLoader.java | 0 .../mono/android/release/MultiDexLoader.java | 0 src-ThirdParty/crc32.net/SafeProxy.cs | 85 +++ .../Tasks/GenerateLibraryResources.cs | 85 +-- .../Xamarin.Android.Build.Tasks.csproj | 9 + .../Xamarin.Android.NUnitLite.csproj | 536 +++++++++--------- src/java-runtime/java-runtime.csproj | 1 + src/java-runtime/java-runtime.targets | 4 +- 281 files changed, 468 insertions(+), 422 deletions(-) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/ExpectedExceptionData.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/IParameterDataSource.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/IPropertyBag.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/ITest.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/ITestAssemblyBuilder.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/ITestAssemblyRunner.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/ITestCaseData.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/ITestCaseSource.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/ITestCaseSourceProvider.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/ITestFilter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/ITestListener.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/ITestResult.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/IXmlNodeBuilder.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/PropertyEntry.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/ResultState.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/RunState.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/TestOutput.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/TestStatus.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Api/XmlNode.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/AssemblyInfo.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Assert.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/AssertionHelper.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Assume.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/CategoryAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/CombinatorialAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/CultureAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/DataAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/DatapointAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/DatapointSourceAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/DatapointsAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/DescriptionAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/ExpectedExceptionAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/ExplicitAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/IgnoreAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/IncludeExcludeAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/MaxTimeAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/NUnitAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/PairwiseAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/PlatformAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/PropertyAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/RandomAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/RangeAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/RepeatAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/SequentialAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/SetCultureAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/SetUICultureAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/SetUpAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/TearDownAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/TestAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/TestCaseAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/TestCaseSourceAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/TestFixtureAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/TestFixtureSetUpAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/TestFixtureTearDownAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/TheoryAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/TimeoutAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/ValueSourceAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Attributes/ValuesAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Compatibility/SerializableAttribute.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/AllItemsConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/AndConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/AssignableFromConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/AssignableToConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/AttributeConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/AttributeExistsConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/BasicConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/BinaryConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/BinarySerializableConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/CollectionConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/CollectionContainsConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/CollectionEquivalentConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/CollectionItemsEqualConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/CollectionOrderedConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/CollectionSubsetConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/CollectionTally.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ComparisonAdapter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ComparisonConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Constraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ConstraintBuilder.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ConstraintExpression.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ConstraintExpressionBase.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ConstraintFactory.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ContainsConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/DelayedConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/EmptyCollectionConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/EmptyConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/EmptyDirectoryConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/EmptyStringConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/EndsWithConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/EqualConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/EqualityAdapter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ExactCountConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ExactTypeConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ExceptionTypeConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/FailurePoint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/FalseConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/FloatingPointNumerics.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/GreaterThanConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/GreaterThanOrEqualConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/IResolveConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/InstanceOfTypeConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/LessThanConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/LessThanOrEqualConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/MessageWriter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/MsgUtils.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/NUnitComparer.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/NUnitEqualityComparer.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/NaNConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/NoItemConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/NotConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/NullConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/NullOrEmptyStringConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Numerics.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/AllOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/AndOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/AttributeOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/BinaryOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/CollectionOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/ConstraintOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/ExactCountOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/NoneOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/NotOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/OrOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/PrefixOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/PropOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/SelfResolvingOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/SomeOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/ThrowsOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Operators/WithOperator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/OrConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/PathConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/PredicateConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/PrefixConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/PropertyConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/PropertyExistsConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/RangeConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/RegexConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ResolvableConstraintExpression.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ReusableConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/SameAsConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/SamePathConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/SamePathOrUnderConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/SomeItemsConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/StartsWithConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/StringConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/SubPathConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/SubstringConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ThrowsConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ThrowsNothingConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/Tolerance.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/ToleranceMode.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/TrueConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/TypeConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/UniqueItemsConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Constraints/XmlSerializableConstraint.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Contains.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Env.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Exceptions/AssertionException.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Exceptions/IgnoreException.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Exceptions/InconclusiveException.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Exceptions/SuccessException.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Extensibility/IParameterDataProvider.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Extensibility/ISuiteBuilder.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Extensibility/ITestCaseBuilder.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Extensibility/ITestCaseProvider.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/GlobalSettings.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Guard.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Has.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/IExpectException.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/AssemblyHelper.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/AsyncInvocationRegion.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/AsyncSynchronizationContext.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Builders/CombinatorialStrategy.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Builders/CombinatorialTestCaseProvider.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Builders/CombiningStrategy.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Builders/DataAttributeTestCaseProvider.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Builders/DatapointProvider.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Builders/NUnitTestCaseBuilder.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Builders/NUnitTestFixtureBuilder.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Builders/PairwiseStrategy.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Builders/ParameterDataProvider.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Builders/ProviderCache.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Builders/SequentialStrategy.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/ApplyChangesToContextCommand.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/CommandDecoratorList.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/CommandStage.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/DelegatingTestCommand.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/ExpectedExceptionCommand.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/ICommandDecorator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/MaxTimeCommand.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/OneTimeSetUpCommand.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/OneTimeTearDownCommand.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/RepeatedTestCommand.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/SetUpTearDownCommand.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/SkipCommand.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/TestCommand.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/TestMethodCommand.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Commands/TheoryResultCommand.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/CultureDetector.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/ExceptionHelper.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Extensibility/ParameterDataProviders.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Extensibility/TestCaseProviders.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Filters/AndFilter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Filters/CategoryExpression.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Filters/CategoryFilter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Filters/NotFilter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Filters/OrFilter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Filters/SimpleCategoryExpression.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Filters/SimpleNameFilter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/IApplyToContext.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/IApplyToTest.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/InvalidTestFixtureException.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/MethodHelper.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/NUnitException.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/NUnitLiteTestAssemblyBuilder.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/NUnitLiteTestAssemblyRunner.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/OSPlatform.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/ParameterSet.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/PlatformHelper.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/PropertyBag.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/PropertyNames.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/RandomGenerator.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Randomizer.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Reflect.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Results/TestCaseResult.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Results/TestResult.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Results/TestSuiteResult.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/RuntimeFramework.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/StackFilter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/StringUtil.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/TestExecutionContext.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/TestFilter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/TestFixtureBuilder.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/TestListener.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Tests/ParameterizedFixtureSuite.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Tests/ParameterizedMethodSuite.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Tests/Test.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Tests/TestAssembly.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Tests/TestFixture.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Tests/TestMethod.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/Tests/TestSuite.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/TextMessageWriter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/ThreadUtility.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/TypeHelper.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/WorkItems/CompositeWorkItem.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/WorkItems/CountdownEvent.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/WorkItems/SimpleWorkItem.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/WorkItems/WorkItem.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Internal/WorkItems/WorkItemState.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Is.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Iz.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/ListMapper.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/MessageMatch.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/ObjectList.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Runner/CommandLineOptions.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Runner/ConsoleWriter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Runner/DebugWriter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Runner/OutputWriters/NUnit2XmlOutputWriter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Runner/OutputWriters/NUnit3XmlOutputWriter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Runner/OutputWriters/OutputWriter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Runner/ResultReporter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Runner/ResultSummary.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Runner/TcpWriter.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Runner/TextUI.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/SpecialValue.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/TestCaseData.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/TestContext.cs (100%) rename {src/Xamarin.Android.NUnitLite => src-ThirdParty}/NUnitLite/Throws.cs (100%) rename {src/Xamarin.Android.Build.Tasks/Utilities => src-ThirdParty/android-platform-tools-base}/PackagingUtils.cs (100%) create mode 100644 src-ThirdParty/android-platform-tools-base/SymbolWriter.cs rename {src/java-runtime => src-ThirdParty/bazel}/java/mono/android/debug/MultiDexLoader.java (100%) rename {src/java-runtime => src-ThirdParty/bazel}/java/mono/android/incrementaldeployment/IncrementalClassLoader.java (100%) rename {src/java-runtime => src-ThirdParty/bazel}/java/mono/android/release/MultiDexLoader.java (100%) create mode 100644 src-ThirdParty/crc32.net/SafeProxy.cs diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_Get_Windows_Binutils.cs b/build-tools/xaprepare/xaprepare/Steps/Step_Get_Windows_Binutils.cs index 4f4210abe78..1a4494d9780 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_Get_Windows_Binutils.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_Get_Windows_Binutils.cs @@ -7,6 +7,8 @@ using System.Text; using System.Threading.Tasks; +using Force.Crc32; + namespace Xamarin.Android.Prepare { class Step_Get_Windows_Binutils : Step @@ -679,72 +681,4 @@ uint ReadUInt (BinaryReader br, long dataLength, ref long nread, out bool succes return (true, resp.Content.Headers.ContentLength.Value); } } - - // - // Taken from: - // https://github.com/force-net/Crc32.NET/blob/fbc1061b0cb53df2322d5aed33167a2e6335970b/Crc32.NET/SafeProxy.cs - // - // License: MIT - // https://github.com/force-net/Crc32.NET/blob/fbc1061b0cb53df2322d5aed33167a2e6335970b/LICENSE - // - class CRC32 - { - const uint Poly = 0xedb88320u; - - readonly uint[] _table = new uint[16 * 256]; - - internal CRC32 () - { - Init (Poly); - } - - protected void Init (uint poly) - { - var table = _table; - for (uint i = 0; i < 256; i++) { - uint res = i; - for (int t = 0; t < 16; t++) { - for (int k = 0; k < 8; k++) res = (res & 1) == 1 ? poly ^ (res >> 1) : (res >> 1); - table[(t * 256) + i] = res; - } - } - } - - public uint Append (uint crc, byte[] input, int offset, int length) - { - uint crcLocal = uint.MaxValue ^ crc; - - uint[] table = _table; - while (length >= 16) { - var a = table[(3 * 256) + input[offset + 12]] - ^ table[(2 * 256) + input[offset + 13]] - ^ table[(1 * 256) + input[offset + 14]] - ^ table[(0 * 256) + input[offset + 15]]; - - var b = table[(7 * 256) + input[offset + 8]] - ^ table[(6 * 256) + input[offset + 9]] - ^ table[(5 * 256) + input[offset + 10]] - ^ table[(4 * 256) + input[offset + 11]]; - - var c = table[(11 * 256) + input[offset + 4]] - ^ table[(10 * 256) + input[offset + 5]] - ^ table[(9 * 256) + input[offset + 6]] - ^ table[(8 * 256) + input[offset + 7]]; - - var d = table[(15 * 256) + ((byte)crcLocal ^ input[offset])] - ^ table[(14 * 256) + ((byte)(crcLocal >> 8) ^ input[offset + 1])] - ^ table[(13 * 256) + ((byte)(crcLocal >> 16) ^ input[offset + 2])] - ^ table[(12 * 256) + ((crcLocal >> 24) ^ input[offset + 3])]; - - crcLocal = d ^ c ^ b ^ a; - offset += 16; - length -= 16; - } - - while (--length >= 0) - crcLocal = table[(byte)(crcLocal ^ input[offset++])] ^ crcLocal >> 8; - - return crcLocal ^ uint.MaxValue; - } - } } diff --git a/build-tools/xaprepare/xaprepare/xaprepare.csproj b/build-tools/xaprepare/xaprepare/xaprepare.csproj index f9846d6bf5a..f6eeae6fd87 100644 --- a/build-tools/xaprepare/xaprepare/xaprepare.csproj +++ b/build-tools/xaprepare/xaprepare/xaprepare.csproj @@ -272,6 +272,9 @@ + + + diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/ExpectedExceptionData.cs b/src-ThirdParty/NUnitLite/Api/ExpectedExceptionData.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/ExpectedExceptionData.cs rename to src-ThirdParty/NUnitLite/Api/ExpectedExceptionData.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/IParameterDataSource.cs b/src-ThirdParty/NUnitLite/Api/IParameterDataSource.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/IParameterDataSource.cs rename to src-ThirdParty/NUnitLite/Api/IParameterDataSource.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/IPropertyBag.cs b/src-ThirdParty/NUnitLite/Api/IPropertyBag.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/IPropertyBag.cs rename to src-ThirdParty/NUnitLite/Api/IPropertyBag.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITest.cs b/src-ThirdParty/NUnitLite/Api/ITest.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITest.cs rename to src-ThirdParty/NUnitLite/Api/ITest.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestAssemblyBuilder.cs b/src-ThirdParty/NUnitLite/Api/ITestAssemblyBuilder.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestAssemblyBuilder.cs rename to src-ThirdParty/NUnitLite/Api/ITestAssemblyBuilder.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestAssemblyRunner.cs b/src-ThirdParty/NUnitLite/Api/ITestAssemblyRunner.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestAssemblyRunner.cs rename to src-ThirdParty/NUnitLite/Api/ITestAssemblyRunner.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestCaseData.cs b/src-ThirdParty/NUnitLite/Api/ITestCaseData.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestCaseData.cs rename to src-ThirdParty/NUnitLite/Api/ITestCaseData.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestCaseSource.cs b/src-ThirdParty/NUnitLite/Api/ITestCaseSource.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestCaseSource.cs rename to src-ThirdParty/NUnitLite/Api/ITestCaseSource.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestCaseSourceProvider.cs b/src-ThirdParty/NUnitLite/Api/ITestCaseSourceProvider.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestCaseSourceProvider.cs rename to src-ThirdParty/NUnitLite/Api/ITestCaseSourceProvider.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestFilter.cs b/src-ThirdParty/NUnitLite/Api/ITestFilter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestFilter.cs rename to src-ThirdParty/NUnitLite/Api/ITestFilter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestListener.cs b/src-ThirdParty/NUnitLite/Api/ITestListener.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestListener.cs rename to src-ThirdParty/NUnitLite/Api/ITestListener.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestResult.cs b/src-ThirdParty/NUnitLite/Api/ITestResult.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/ITestResult.cs rename to src-ThirdParty/NUnitLite/Api/ITestResult.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/IXmlNodeBuilder.cs b/src-ThirdParty/NUnitLite/Api/IXmlNodeBuilder.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/IXmlNodeBuilder.cs rename to src-ThirdParty/NUnitLite/Api/IXmlNodeBuilder.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/PropertyEntry.cs b/src-ThirdParty/NUnitLite/Api/PropertyEntry.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/PropertyEntry.cs rename to src-ThirdParty/NUnitLite/Api/PropertyEntry.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/ResultState.cs b/src-ThirdParty/NUnitLite/Api/ResultState.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/ResultState.cs rename to src-ThirdParty/NUnitLite/Api/ResultState.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/RunState.cs b/src-ThirdParty/NUnitLite/Api/RunState.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/RunState.cs rename to src-ThirdParty/NUnitLite/Api/RunState.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/TestOutput.cs b/src-ThirdParty/NUnitLite/Api/TestOutput.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/TestOutput.cs rename to src-ThirdParty/NUnitLite/Api/TestOutput.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/TestStatus.cs b/src-ThirdParty/NUnitLite/Api/TestStatus.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/TestStatus.cs rename to src-ThirdParty/NUnitLite/Api/TestStatus.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Api/XmlNode.cs b/src-ThirdParty/NUnitLite/Api/XmlNode.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Api/XmlNode.cs rename to src-ThirdParty/NUnitLite/Api/XmlNode.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/AssemblyInfo.cs b/src-ThirdParty/NUnitLite/AssemblyInfo.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/AssemblyInfo.cs rename to src-ThirdParty/NUnitLite/AssemblyInfo.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Assert.cs b/src-ThirdParty/NUnitLite/Assert.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Assert.cs rename to src-ThirdParty/NUnitLite/Assert.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/AssertionHelper.cs b/src-ThirdParty/NUnitLite/AssertionHelper.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/AssertionHelper.cs rename to src-ThirdParty/NUnitLite/AssertionHelper.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Assume.cs b/src-ThirdParty/NUnitLite/Assume.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Assume.cs rename to src-ThirdParty/NUnitLite/Assume.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/CategoryAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/CategoryAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/CategoryAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/CategoryAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/CombinatorialAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/CombinatorialAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/CombinatorialAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/CombinatorialAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/CultureAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/CultureAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/CultureAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/CultureAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/DataAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/DataAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/DataAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/DataAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/DatapointAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/DatapointAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/DatapointAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/DatapointAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/DatapointSourceAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/DatapointSourceAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/DatapointSourceAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/DatapointSourceAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/DatapointsAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/DatapointsAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/DatapointsAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/DatapointsAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/DescriptionAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/DescriptionAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/DescriptionAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/DescriptionAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/ExpectedExceptionAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/ExpectedExceptionAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/ExpectedExceptionAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/ExpectedExceptionAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/ExplicitAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/ExplicitAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/ExplicitAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/ExplicitAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/IgnoreAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/IgnoreAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/IgnoreAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/IgnoreAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/IncludeExcludeAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/IncludeExcludeAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/IncludeExcludeAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/IncludeExcludeAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/MaxTimeAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/MaxTimeAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/MaxTimeAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/MaxTimeAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/NUnitAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/NUnitAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/NUnitAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/NUnitAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/PairwiseAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/PairwiseAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/PairwiseAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/PairwiseAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/PlatformAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/PlatformAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/PlatformAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/PlatformAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/PropertyAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/PropertyAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/PropertyAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/PropertyAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/RandomAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/RandomAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/RandomAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/RandomAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/RangeAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/RangeAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/RangeAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/RangeAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/RepeatAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/RepeatAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/RepeatAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/RepeatAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/SequentialAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/SequentialAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/SequentialAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/SequentialAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/SetCultureAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/SetCultureAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/SetCultureAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/SetCultureAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/SetUICultureAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/SetUICultureAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/SetUICultureAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/SetUICultureAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/SetUpAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/SetUpAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/SetUpAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/SetUpAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TearDownAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/TearDownAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TearDownAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/TearDownAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TestAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/TestAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TestAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/TestAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TestCaseAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/TestCaseAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TestCaseAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/TestCaseAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TestCaseSourceAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/TestCaseSourceAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TestCaseSourceAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/TestCaseSourceAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TestFixtureAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/TestFixtureAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TestFixtureAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/TestFixtureAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TestFixtureSetUpAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/TestFixtureSetUpAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TestFixtureSetUpAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/TestFixtureSetUpAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TestFixtureTearDownAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/TestFixtureTearDownAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TestFixtureTearDownAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/TestFixtureTearDownAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TheoryAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/TheoryAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TheoryAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/TheoryAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TimeoutAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/TimeoutAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/TimeoutAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/TimeoutAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/ValueSourceAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/ValueSourceAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/ValueSourceAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/ValueSourceAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/ValuesAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/ValuesAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Attributes/ValuesAttribute.cs rename to src-ThirdParty/NUnitLite/Attributes/ValuesAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Compatibility/SerializableAttribute.cs b/src-ThirdParty/NUnitLite/Compatibility/SerializableAttribute.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Compatibility/SerializableAttribute.cs rename to src-ThirdParty/NUnitLite/Compatibility/SerializableAttribute.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/AllItemsConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/AllItemsConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/AllItemsConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/AllItemsConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/AndConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/AndConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/AndConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/AndConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/AssignableFromConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/AssignableFromConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/AssignableFromConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/AssignableFromConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/AssignableToConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/AssignableToConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/AssignableToConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/AssignableToConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/AttributeConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/AttributeConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/AttributeConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/AttributeConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/AttributeExistsConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/AttributeExistsConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/AttributeExistsConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/AttributeExistsConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/BasicConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/BasicConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/BasicConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/BasicConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/BinaryConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/BinaryConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/BinaryConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/BinaryConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/BinarySerializableConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/BinarySerializableConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/BinarySerializableConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/BinarySerializableConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/CollectionConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/CollectionConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionContainsConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/CollectionContainsConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionContainsConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/CollectionContainsConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionEquivalentConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/CollectionEquivalentConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionEquivalentConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/CollectionEquivalentConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionItemsEqualConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/CollectionItemsEqualConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionItemsEqualConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/CollectionItemsEqualConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionOrderedConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/CollectionOrderedConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionOrderedConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/CollectionOrderedConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionSubsetConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/CollectionSubsetConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionSubsetConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/CollectionSubsetConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionTally.cs b/src-ThirdParty/NUnitLite/Constraints/CollectionTally.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/CollectionTally.cs rename to src-ThirdParty/NUnitLite/Constraints/CollectionTally.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ComparisonAdapter.cs b/src-ThirdParty/NUnitLite/Constraints/ComparisonAdapter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ComparisonAdapter.cs rename to src-ThirdParty/NUnitLite/Constraints/ComparisonAdapter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ComparisonConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/ComparisonConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ComparisonConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/ComparisonConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Constraint.cs b/src-ThirdParty/NUnitLite/Constraints/Constraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Constraint.cs rename to src-ThirdParty/NUnitLite/Constraints/Constraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ConstraintBuilder.cs b/src-ThirdParty/NUnitLite/Constraints/ConstraintBuilder.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ConstraintBuilder.cs rename to src-ThirdParty/NUnitLite/Constraints/ConstraintBuilder.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ConstraintExpression.cs b/src-ThirdParty/NUnitLite/Constraints/ConstraintExpression.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ConstraintExpression.cs rename to src-ThirdParty/NUnitLite/Constraints/ConstraintExpression.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ConstraintExpressionBase.cs b/src-ThirdParty/NUnitLite/Constraints/ConstraintExpressionBase.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ConstraintExpressionBase.cs rename to src-ThirdParty/NUnitLite/Constraints/ConstraintExpressionBase.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ConstraintFactory.cs b/src-ThirdParty/NUnitLite/Constraints/ConstraintFactory.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ConstraintFactory.cs rename to src-ThirdParty/NUnitLite/Constraints/ConstraintFactory.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ContainsConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/ContainsConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ContainsConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/ContainsConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/DelayedConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/DelayedConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/DelayedConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/DelayedConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EmptyCollectionConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/EmptyCollectionConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EmptyCollectionConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/EmptyCollectionConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EmptyConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/EmptyConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EmptyConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/EmptyConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EmptyDirectoryConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/EmptyDirectoryConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EmptyDirectoryConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/EmptyDirectoryConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EmptyStringConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/EmptyStringConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EmptyStringConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/EmptyStringConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EndsWithConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/EndsWithConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EndsWithConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/EndsWithConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EqualConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/EqualConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EqualConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/EqualConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EqualityAdapter.cs b/src-ThirdParty/NUnitLite/Constraints/EqualityAdapter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/EqualityAdapter.cs rename to src-ThirdParty/NUnitLite/Constraints/EqualityAdapter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ExactCountConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/ExactCountConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ExactCountConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/ExactCountConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ExactTypeConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/ExactTypeConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ExactTypeConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/ExactTypeConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ExceptionTypeConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/ExceptionTypeConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ExceptionTypeConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/ExceptionTypeConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/FailurePoint.cs b/src-ThirdParty/NUnitLite/Constraints/FailurePoint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/FailurePoint.cs rename to src-ThirdParty/NUnitLite/Constraints/FailurePoint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/FalseConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/FalseConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/FalseConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/FalseConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/FloatingPointNumerics.cs b/src-ThirdParty/NUnitLite/Constraints/FloatingPointNumerics.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/FloatingPointNumerics.cs rename to src-ThirdParty/NUnitLite/Constraints/FloatingPointNumerics.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/GreaterThanConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/GreaterThanConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/GreaterThanConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/GreaterThanConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/GreaterThanOrEqualConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/GreaterThanOrEqualConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/GreaterThanOrEqualConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/GreaterThanOrEqualConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/IResolveConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/IResolveConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/IResolveConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/IResolveConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/InstanceOfTypeConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/InstanceOfTypeConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/InstanceOfTypeConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/InstanceOfTypeConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/LessThanConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/LessThanConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/LessThanConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/LessThanConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/LessThanOrEqualConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/LessThanOrEqualConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/LessThanOrEqualConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/LessThanOrEqualConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/MessageWriter.cs b/src-ThirdParty/NUnitLite/Constraints/MessageWriter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/MessageWriter.cs rename to src-ThirdParty/NUnitLite/Constraints/MessageWriter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/MsgUtils.cs b/src-ThirdParty/NUnitLite/Constraints/MsgUtils.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/MsgUtils.cs rename to src-ThirdParty/NUnitLite/Constraints/MsgUtils.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NUnitComparer.cs b/src-ThirdParty/NUnitLite/Constraints/NUnitComparer.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NUnitComparer.cs rename to src-ThirdParty/NUnitLite/Constraints/NUnitComparer.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NUnitEqualityComparer.cs b/src-ThirdParty/NUnitLite/Constraints/NUnitEqualityComparer.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NUnitEqualityComparer.cs rename to src-ThirdParty/NUnitLite/Constraints/NUnitEqualityComparer.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NaNConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/NaNConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NaNConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/NaNConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NoItemConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/NoItemConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NoItemConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/NoItemConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NotConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/NotConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NotConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/NotConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NullConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/NullConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NullConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/NullConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NullOrEmptyStringConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/NullOrEmptyStringConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/NullOrEmptyStringConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/NullOrEmptyStringConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Numerics.cs b/src-ThirdParty/NUnitLite/Constraints/Numerics.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Numerics.cs rename to src-ThirdParty/NUnitLite/Constraints/Numerics.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/AllOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/AllOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/AllOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/AllOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/AndOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/AndOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/AndOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/AndOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/AttributeOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/AttributeOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/AttributeOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/AttributeOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/BinaryOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/BinaryOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/BinaryOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/BinaryOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/CollectionOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/CollectionOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/CollectionOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/CollectionOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/ConstraintOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/ConstraintOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/ConstraintOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/ConstraintOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/ExactCountOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/ExactCountOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/ExactCountOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/ExactCountOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/NoneOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/NoneOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/NoneOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/NoneOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/NotOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/NotOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/NotOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/NotOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/OrOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/OrOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/OrOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/OrOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/PrefixOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/PrefixOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/PrefixOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/PrefixOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/PropOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/PropOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/PropOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/PropOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/SelfResolvingOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/SelfResolvingOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/SelfResolvingOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/SelfResolvingOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/SomeOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/SomeOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/SomeOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/SomeOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/ThrowsOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/ThrowsOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/ThrowsOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/ThrowsOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/WithOperator.cs b/src-ThirdParty/NUnitLite/Constraints/Operators/WithOperator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Operators/WithOperator.cs rename to src-ThirdParty/NUnitLite/Constraints/Operators/WithOperator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/OrConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/OrConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/OrConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/OrConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/PathConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/PathConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/PathConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/PathConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/PredicateConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/PredicateConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/PredicateConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/PredicateConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/PrefixConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/PrefixConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/PrefixConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/PrefixConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/PropertyConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/PropertyConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/PropertyConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/PropertyConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/PropertyExistsConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/PropertyExistsConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/PropertyExistsConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/PropertyExistsConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/RangeConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/RangeConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/RangeConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/RangeConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/RegexConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/RegexConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/RegexConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/RegexConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ResolvableConstraintExpression.cs b/src-ThirdParty/NUnitLite/Constraints/ResolvableConstraintExpression.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ResolvableConstraintExpression.cs rename to src-ThirdParty/NUnitLite/Constraints/ResolvableConstraintExpression.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ReusableConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/ReusableConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ReusableConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/ReusableConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/SameAsConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/SameAsConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/SameAsConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/SameAsConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/SamePathConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/SamePathConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/SamePathConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/SamePathConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/SamePathOrUnderConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/SamePathOrUnderConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/SamePathOrUnderConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/SamePathOrUnderConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/SomeItemsConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/SomeItemsConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/SomeItemsConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/SomeItemsConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/StartsWithConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/StartsWithConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/StartsWithConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/StartsWithConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/StringConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/StringConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/StringConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/StringConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/SubPathConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/SubPathConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/SubPathConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/SubPathConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/SubstringConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/SubstringConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/SubstringConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/SubstringConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ThrowsConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/ThrowsConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ThrowsConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/ThrowsConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ThrowsNothingConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/ThrowsNothingConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ThrowsNothingConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/ThrowsNothingConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Tolerance.cs b/src-ThirdParty/NUnitLite/Constraints/Tolerance.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/Tolerance.cs rename to src-ThirdParty/NUnitLite/Constraints/Tolerance.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ToleranceMode.cs b/src-ThirdParty/NUnitLite/Constraints/ToleranceMode.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/ToleranceMode.cs rename to src-ThirdParty/NUnitLite/Constraints/ToleranceMode.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/TrueConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/TrueConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/TrueConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/TrueConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/TypeConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/TypeConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/TypeConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/TypeConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/UniqueItemsConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/UniqueItemsConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/UniqueItemsConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/UniqueItemsConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/XmlSerializableConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/XmlSerializableConstraint.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Constraints/XmlSerializableConstraint.cs rename to src-ThirdParty/NUnitLite/Constraints/XmlSerializableConstraint.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Contains.cs b/src-ThirdParty/NUnitLite/Contains.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Contains.cs rename to src-ThirdParty/NUnitLite/Contains.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Env.cs b/src-ThirdParty/NUnitLite/Env.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Env.cs rename to src-ThirdParty/NUnitLite/Env.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Exceptions/AssertionException.cs b/src-ThirdParty/NUnitLite/Exceptions/AssertionException.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Exceptions/AssertionException.cs rename to src-ThirdParty/NUnitLite/Exceptions/AssertionException.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Exceptions/IgnoreException.cs b/src-ThirdParty/NUnitLite/Exceptions/IgnoreException.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Exceptions/IgnoreException.cs rename to src-ThirdParty/NUnitLite/Exceptions/IgnoreException.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Exceptions/InconclusiveException.cs b/src-ThirdParty/NUnitLite/Exceptions/InconclusiveException.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Exceptions/InconclusiveException.cs rename to src-ThirdParty/NUnitLite/Exceptions/InconclusiveException.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Exceptions/SuccessException.cs b/src-ThirdParty/NUnitLite/Exceptions/SuccessException.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Exceptions/SuccessException.cs rename to src-ThirdParty/NUnitLite/Exceptions/SuccessException.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Extensibility/IParameterDataProvider.cs b/src-ThirdParty/NUnitLite/Extensibility/IParameterDataProvider.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Extensibility/IParameterDataProvider.cs rename to src-ThirdParty/NUnitLite/Extensibility/IParameterDataProvider.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Extensibility/ISuiteBuilder.cs b/src-ThirdParty/NUnitLite/Extensibility/ISuiteBuilder.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Extensibility/ISuiteBuilder.cs rename to src-ThirdParty/NUnitLite/Extensibility/ISuiteBuilder.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Extensibility/ITestCaseBuilder.cs b/src-ThirdParty/NUnitLite/Extensibility/ITestCaseBuilder.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Extensibility/ITestCaseBuilder.cs rename to src-ThirdParty/NUnitLite/Extensibility/ITestCaseBuilder.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Extensibility/ITestCaseProvider.cs b/src-ThirdParty/NUnitLite/Extensibility/ITestCaseProvider.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Extensibility/ITestCaseProvider.cs rename to src-ThirdParty/NUnitLite/Extensibility/ITestCaseProvider.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/GlobalSettings.cs b/src-ThirdParty/NUnitLite/GlobalSettings.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/GlobalSettings.cs rename to src-ThirdParty/NUnitLite/GlobalSettings.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Guard.cs b/src-ThirdParty/NUnitLite/Guard.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Guard.cs rename to src-ThirdParty/NUnitLite/Guard.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Has.cs b/src-ThirdParty/NUnitLite/Has.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Has.cs rename to src-ThirdParty/NUnitLite/Has.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/IExpectException.cs b/src-ThirdParty/NUnitLite/IExpectException.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/IExpectException.cs rename to src-ThirdParty/NUnitLite/IExpectException.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/AssemblyHelper.cs b/src-ThirdParty/NUnitLite/Internal/AssemblyHelper.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/AssemblyHelper.cs rename to src-ThirdParty/NUnitLite/Internal/AssemblyHelper.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/AsyncInvocationRegion.cs b/src-ThirdParty/NUnitLite/Internal/AsyncInvocationRegion.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/AsyncInvocationRegion.cs rename to src-ThirdParty/NUnitLite/Internal/AsyncInvocationRegion.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/AsyncSynchronizationContext.cs b/src-ThirdParty/NUnitLite/Internal/AsyncSynchronizationContext.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/AsyncSynchronizationContext.cs rename to src-ThirdParty/NUnitLite/Internal/AsyncSynchronizationContext.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/CombinatorialStrategy.cs b/src-ThirdParty/NUnitLite/Internal/Builders/CombinatorialStrategy.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/CombinatorialStrategy.cs rename to src-ThirdParty/NUnitLite/Internal/Builders/CombinatorialStrategy.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/CombinatorialTestCaseProvider.cs b/src-ThirdParty/NUnitLite/Internal/Builders/CombinatorialTestCaseProvider.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/CombinatorialTestCaseProvider.cs rename to src-ThirdParty/NUnitLite/Internal/Builders/CombinatorialTestCaseProvider.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/CombiningStrategy.cs b/src-ThirdParty/NUnitLite/Internal/Builders/CombiningStrategy.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/CombiningStrategy.cs rename to src-ThirdParty/NUnitLite/Internal/Builders/CombiningStrategy.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/DataAttributeTestCaseProvider.cs b/src-ThirdParty/NUnitLite/Internal/Builders/DataAttributeTestCaseProvider.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/DataAttributeTestCaseProvider.cs rename to src-ThirdParty/NUnitLite/Internal/Builders/DataAttributeTestCaseProvider.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/DatapointProvider.cs b/src-ThirdParty/NUnitLite/Internal/Builders/DatapointProvider.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/DatapointProvider.cs rename to src-ThirdParty/NUnitLite/Internal/Builders/DatapointProvider.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/NUnitTestCaseBuilder.cs b/src-ThirdParty/NUnitLite/Internal/Builders/NUnitTestCaseBuilder.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/NUnitTestCaseBuilder.cs rename to src-ThirdParty/NUnitLite/Internal/Builders/NUnitTestCaseBuilder.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/NUnitTestFixtureBuilder.cs b/src-ThirdParty/NUnitLite/Internal/Builders/NUnitTestFixtureBuilder.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/NUnitTestFixtureBuilder.cs rename to src-ThirdParty/NUnitLite/Internal/Builders/NUnitTestFixtureBuilder.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/PairwiseStrategy.cs b/src-ThirdParty/NUnitLite/Internal/Builders/PairwiseStrategy.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/PairwiseStrategy.cs rename to src-ThirdParty/NUnitLite/Internal/Builders/PairwiseStrategy.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/ParameterDataProvider.cs b/src-ThirdParty/NUnitLite/Internal/Builders/ParameterDataProvider.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/ParameterDataProvider.cs rename to src-ThirdParty/NUnitLite/Internal/Builders/ParameterDataProvider.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/ProviderCache.cs b/src-ThirdParty/NUnitLite/Internal/Builders/ProviderCache.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/ProviderCache.cs rename to src-ThirdParty/NUnitLite/Internal/Builders/ProviderCache.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/SequentialStrategy.cs b/src-ThirdParty/NUnitLite/Internal/Builders/SequentialStrategy.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Builders/SequentialStrategy.cs rename to src-ThirdParty/NUnitLite/Internal/Builders/SequentialStrategy.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/ApplyChangesToContextCommand.cs b/src-ThirdParty/NUnitLite/Internal/Commands/ApplyChangesToContextCommand.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/ApplyChangesToContextCommand.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/ApplyChangesToContextCommand.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/CommandDecoratorList.cs b/src-ThirdParty/NUnitLite/Internal/Commands/CommandDecoratorList.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/CommandDecoratorList.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/CommandDecoratorList.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/CommandStage.cs b/src-ThirdParty/NUnitLite/Internal/Commands/CommandStage.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/CommandStage.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/CommandStage.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/DelegatingTestCommand.cs b/src-ThirdParty/NUnitLite/Internal/Commands/DelegatingTestCommand.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/DelegatingTestCommand.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/DelegatingTestCommand.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/ExpectedExceptionCommand.cs b/src-ThirdParty/NUnitLite/Internal/Commands/ExpectedExceptionCommand.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/ExpectedExceptionCommand.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/ExpectedExceptionCommand.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/ICommandDecorator.cs b/src-ThirdParty/NUnitLite/Internal/Commands/ICommandDecorator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/ICommandDecorator.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/ICommandDecorator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/MaxTimeCommand.cs b/src-ThirdParty/NUnitLite/Internal/Commands/MaxTimeCommand.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/MaxTimeCommand.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/MaxTimeCommand.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/OneTimeSetUpCommand.cs b/src-ThirdParty/NUnitLite/Internal/Commands/OneTimeSetUpCommand.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/OneTimeSetUpCommand.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/OneTimeSetUpCommand.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/OneTimeTearDownCommand.cs b/src-ThirdParty/NUnitLite/Internal/Commands/OneTimeTearDownCommand.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/OneTimeTearDownCommand.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/OneTimeTearDownCommand.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/RepeatedTestCommand.cs b/src-ThirdParty/NUnitLite/Internal/Commands/RepeatedTestCommand.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/RepeatedTestCommand.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/RepeatedTestCommand.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/SetUpTearDownCommand.cs b/src-ThirdParty/NUnitLite/Internal/Commands/SetUpTearDownCommand.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/SetUpTearDownCommand.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/SetUpTearDownCommand.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/SkipCommand.cs b/src-ThirdParty/NUnitLite/Internal/Commands/SkipCommand.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/SkipCommand.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/SkipCommand.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/TestCommand.cs b/src-ThirdParty/NUnitLite/Internal/Commands/TestCommand.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/TestCommand.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/TestCommand.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/TestMethodCommand.cs b/src-ThirdParty/NUnitLite/Internal/Commands/TestMethodCommand.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/TestMethodCommand.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/TestMethodCommand.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/TheoryResultCommand.cs b/src-ThirdParty/NUnitLite/Internal/Commands/TheoryResultCommand.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Commands/TheoryResultCommand.cs rename to src-ThirdParty/NUnitLite/Internal/Commands/TheoryResultCommand.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/CultureDetector.cs b/src-ThirdParty/NUnitLite/Internal/CultureDetector.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/CultureDetector.cs rename to src-ThirdParty/NUnitLite/Internal/CultureDetector.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/ExceptionHelper.cs b/src-ThirdParty/NUnitLite/Internal/ExceptionHelper.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/ExceptionHelper.cs rename to src-ThirdParty/NUnitLite/Internal/ExceptionHelper.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Extensibility/ParameterDataProviders.cs b/src-ThirdParty/NUnitLite/Internal/Extensibility/ParameterDataProviders.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Extensibility/ParameterDataProviders.cs rename to src-ThirdParty/NUnitLite/Internal/Extensibility/ParameterDataProviders.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Extensibility/TestCaseProviders.cs b/src-ThirdParty/NUnitLite/Internal/Extensibility/TestCaseProviders.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Extensibility/TestCaseProviders.cs rename to src-ThirdParty/NUnitLite/Internal/Extensibility/TestCaseProviders.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/AndFilter.cs b/src-ThirdParty/NUnitLite/Internal/Filters/AndFilter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/AndFilter.cs rename to src-ThirdParty/NUnitLite/Internal/Filters/AndFilter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/CategoryExpression.cs b/src-ThirdParty/NUnitLite/Internal/Filters/CategoryExpression.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/CategoryExpression.cs rename to src-ThirdParty/NUnitLite/Internal/Filters/CategoryExpression.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/CategoryFilter.cs b/src-ThirdParty/NUnitLite/Internal/Filters/CategoryFilter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/CategoryFilter.cs rename to src-ThirdParty/NUnitLite/Internal/Filters/CategoryFilter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/NotFilter.cs b/src-ThirdParty/NUnitLite/Internal/Filters/NotFilter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/NotFilter.cs rename to src-ThirdParty/NUnitLite/Internal/Filters/NotFilter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/OrFilter.cs b/src-ThirdParty/NUnitLite/Internal/Filters/OrFilter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/OrFilter.cs rename to src-ThirdParty/NUnitLite/Internal/Filters/OrFilter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/SimpleCategoryExpression.cs b/src-ThirdParty/NUnitLite/Internal/Filters/SimpleCategoryExpression.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/SimpleCategoryExpression.cs rename to src-ThirdParty/NUnitLite/Internal/Filters/SimpleCategoryExpression.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/SimpleNameFilter.cs b/src-ThirdParty/NUnitLite/Internal/Filters/SimpleNameFilter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Filters/SimpleNameFilter.cs rename to src-ThirdParty/NUnitLite/Internal/Filters/SimpleNameFilter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/IApplyToContext.cs b/src-ThirdParty/NUnitLite/Internal/IApplyToContext.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/IApplyToContext.cs rename to src-ThirdParty/NUnitLite/Internal/IApplyToContext.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/IApplyToTest.cs b/src-ThirdParty/NUnitLite/Internal/IApplyToTest.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/IApplyToTest.cs rename to src-ThirdParty/NUnitLite/Internal/IApplyToTest.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/InvalidTestFixtureException.cs b/src-ThirdParty/NUnitLite/Internal/InvalidTestFixtureException.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/InvalidTestFixtureException.cs rename to src-ThirdParty/NUnitLite/Internal/InvalidTestFixtureException.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/MethodHelper.cs b/src-ThirdParty/NUnitLite/Internal/MethodHelper.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/MethodHelper.cs rename to src-ThirdParty/NUnitLite/Internal/MethodHelper.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/NUnitException.cs b/src-ThirdParty/NUnitLite/Internal/NUnitException.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/NUnitException.cs rename to src-ThirdParty/NUnitLite/Internal/NUnitException.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/NUnitLiteTestAssemblyBuilder.cs b/src-ThirdParty/NUnitLite/Internal/NUnitLiteTestAssemblyBuilder.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/NUnitLiteTestAssemblyBuilder.cs rename to src-ThirdParty/NUnitLite/Internal/NUnitLiteTestAssemblyBuilder.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/NUnitLiteTestAssemblyRunner.cs b/src-ThirdParty/NUnitLite/Internal/NUnitLiteTestAssemblyRunner.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/NUnitLiteTestAssemblyRunner.cs rename to src-ThirdParty/NUnitLite/Internal/NUnitLiteTestAssemblyRunner.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/OSPlatform.cs b/src-ThirdParty/NUnitLite/Internal/OSPlatform.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/OSPlatform.cs rename to src-ThirdParty/NUnitLite/Internal/OSPlatform.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/ParameterSet.cs b/src-ThirdParty/NUnitLite/Internal/ParameterSet.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/ParameterSet.cs rename to src-ThirdParty/NUnitLite/Internal/ParameterSet.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/PlatformHelper.cs b/src-ThirdParty/NUnitLite/Internal/PlatformHelper.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/PlatformHelper.cs rename to src-ThirdParty/NUnitLite/Internal/PlatformHelper.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/PropertyBag.cs b/src-ThirdParty/NUnitLite/Internal/PropertyBag.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/PropertyBag.cs rename to src-ThirdParty/NUnitLite/Internal/PropertyBag.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/PropertyNames.cs b/src-ThirdParty/NUnitLite/Internal/PropertyNames.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/PropertyNames.cs rename to src-ThirdParty/NUnitLite/Internal/PropertyNames.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/RandomGenerator.cs b/src-ThirdParty/NUnitLite/Internal/RandomGenerator.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/RandomGenerator.cs rename to src-ThirdParty/NUnitLite/Internal/RandomGenerator.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Randomizer.cs b/src-ThirdParty/NUnitLite/Internal/Randomizer.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Randomizer.cs rename to src-ThirdParty/NUnitLite/Internal/Randomizer.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Reflect.cs b/src-ThirdParty/NUnitLite/Internal/Reflect.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Reflect.cs rename to src-ThirdParty/NUnitLite/Internal/Reflect.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Results/TestCaseResult.cs b/src-ThirdParty/NUnitLite/Internal/Results/TestCaseResult.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Results/TestCaseResult.cs rename to src-ThirdParty/NUnitLite/Internal/Results/TestCaseResult.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Results/TestResult.cs b/src-ThirdParty/NUnitLite/Internal/Results/TestResult.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Results/TestResult.cs rename to src-ThirdParty/NUnitLite/Internal/Results/TestResult.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Results/TestSuiteResult.cs b/src-ThirdParty/NUnitLite/Internal/Results/TestSuiteResult.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Results/TestSuiteResult.cs rename to src-ThirdParty/NUnitLite/Internal/Results/TestSuiteResult.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/RuntimeFramework.cs b/src-ThirdParty/NUnitLite/Internal/RuntimeFramework.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/RuntimeFramework.cs rename to src-ThirdParty/NUnitLite/Internal/RuntimeFramework.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/StackFilter.cs b/src-ThirdParty/NUnitLite/Internal/StackFilter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/StackFilter.cs rename to src-ThirdParty/NUnitLite/Internal/StackFilter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/StringUtil.cs b/src-ThirdParty/NUnitLite/Internal/StringUtil.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/StringUtil.cs rename to src-ThirdParty/NUnitLite/Internal/StringUtil.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/TestExecutionContext.cs b/src-ThirdParty/NUnitLite/Internal/TestExecutionContext.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/TestExecutionContext.cs rename to src-ThirdParty/NUnitLite/Internal/TestExecutionContext.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/TestFilter.cs b/src-ThirdParty/NUnitLite/Internal/TestFilter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/TestFilter.cs rename to src-ThirdParty/NUnitLite/Internal/TestFilter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/TestFixtureBuilder.cs b/src-ThirdParty/NUnitLite/Internal/TestFixtureBuilder.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/TestFixtureBuilder.cs rename to src-ThirdParty/NUnitLite/Internal/TestFixtureBuilder.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/TestListener.cs b/src-ThirdParty/NUnitLite/Internal/TestListener.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/TestListener.cs rename to src-ThirdParty/NUnitLite/Internal/TestListener.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/ParameterizedFixtureSuite.cs b/src-ThirdParty/NUnitLite/Internal/Tests/ParameterizedFixtureSuite.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/ParameterizedFixtureSuite.cs rename to src-ThirdParty/NUnitLite/Internal/Tests/ParameterizedFixtureSuite.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/ParameterizedMethodSuite.cs b/src-ThirdParty/NUnitLite/Internal/Tests/ParameterizedMethodSuite.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/ParameterizedMethodSuite.cs rename to src-ThirdParty/NUnitLite/Internal/Tests/ParameterizedMethodSuite.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/Test.cs b/src-ThirdParty/NUnitLite/Internal/Tests/Test.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/Test.cs rename to src-ThirdParty/NUnitLite/Internal/Tests/Test.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/TestAssembly.cs b/src-ThirdParty/NUnitLite/Internal/Tests/TestAssembly.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/TestAssembly.cs rename to src-ThirdParty/NUnitLite/Internal/Tests/TestAssembly.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/TestFixture.cs b/src-ThirdParty/NUnitLite/Internal/Tests/TestFixture.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/TestFixture.cs rename to src-ThirdParty/NUnitLite/Internal/Tests/TestFixture.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/TestMethod.cs b/src-ThirdParty/NUnitLite/Internal/Tests/TestMethod.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/TestMethod.cs rename to src-ThirdParty/NUnitLite/Internal/Tests/TestMethod.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/TestSuite.cs b/src-ThirdParty/NUnitLite/Internal/Tests/TestSuite.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/Tests/TestSuite.cs rename to src-ThirdParty/NUnitLite/Internal/Tests/TestSuite.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/TextMessageWriter.cs b/src-ThirdParty/NUnitLite/Internal/TextMessageWriter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/TextMessageWriter.cs rename to src-ThirdParty/NUnitLite/Internal/TextMessageWriter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/ThreadUtility.cs b/src-ThirdParty/NUnitLite/Internal/ThreadUtility.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/ThreadUtility.cs rename to src-ThirdParty/NUnitLite/Internal/ThreadUtility.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/TypeHelper.cs b/src-ThirdParty/NUnitLite/Internal/TypeHelper.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/TypeHelper.cs rename to src-ThirdParty/NUnitLite/Internal/TypeHelper.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/WorkItems/CompositeWorkItem.cs b/src-ThirdParty/NUnitLite/Internal/WorkItems/CompositeWorkItem.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/WorkItems/CompositeWorkItem.cs rename to src-ThirdParty/NUnitLite/Internal/WorkItems/CompositeWorkItem.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/WorkItems/CountdownEvent.cs b/src-ThirdParty/NUnitLite/Internal/WorkItems/CountdownEvent.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/WorkItems/CountdownEvent.cs rename to src-ThirdParty/NUnitLite/Internal/WorkItems/CountdownEvent.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/WorkItems/SimpleWorkItem.cs b/src-ThirdParty/NUnitLite/Internal/WorkItems/SimpleWorkItem.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/WorkItems/SimpleWorkItem.cs rename to src-ThirdParty/NUnitLite/Internal/WorkItems/SimpleWorkItem.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/WorkItems/WorkItem.cs b/src-ThirdParty/NUnitLite/Internal/WorkItems/WorkItem.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/WorkItems/WorkItem.cs rename to src-ThirdParty/NUnitLite/Internal/WorkItems/WorkItem.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Internal/WorkItems/WorkItemState.cs b/src-ThirdParty/NUnitLite/Internal/WorkItems/WorkItemState.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Internal/WorkItems/WorkItemState.cs rename to src-ThirdParty/NUnitLite/Internal/WorkItems/WorkItemState.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Is.cs b/src-ThirdParty/NUnitLite/Is.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Is.cs rename to src-ThirdParty/NUnitLite/Is.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Iz.cs b/src-ThirdParty/NUnitLite/Iz.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Iz.cs rename to src-ThirdParty/NUnitLite/Iz.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/ListMapper.cs b/src-ThirdParty/NUnitLite/ListMapper.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/ListMapper.cs rename to src-ThirdParty/NUnitLite/ListMapper.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/MessageMatch.cs b/src-ThirdParty/NUnitLite/MessageMatch.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/MessageMatch.cs rename to src-ThirdParty/NUnitLite/MessageMatch.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/ObjectList.cs b/src-ThirdParty/NUnitLite/ObjectList.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/ObjectList.cs rename to src-ThirdParty/NUnitLite/ObjectList.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Runner/CommandLineOptions.cs b/src-ThirdParty/NUnitLite/Runner/CommandLineOptions.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Runner/CommandLineOptions.cs rename to src-ThirdParty/NUnitLite/Runner/CommandLineOptions.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Runner/ConsoleWriter.cs b/src-ThirdParty/NUnitLite/Runner/ConsoleWriter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Runner/ConsoleWriter.cs rename to src-ThirdParty/NUnitLite/Runner/ConsoleWriter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Runner/DebugWriter.cs b/src-ThirdParty/NUnitLite/Runner/DebugWriter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Runner/DebugWriter.cs rename to src-ThirdParty/NUnitLite/Runner/DebugWriter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Runner/OutputWriters/NUnit2XmlOutputWriter.cs b/src-ThirdParty/NUnitLite/Runner/OutputWriters/NUnit2XmlOutputWriter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Runner/OutputWriters/NUnit2XmlOutputWriter.cs rename to src-ThirdParty/NUnitLite/Runner/OutputWriters/NUnit2XmlOutputWriter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Runner/OutputWriters/NUnit3XmlOutputWriter.cs b/src-ThirdParty/NUnitLite/Runner/OutputWriters/NUnit3XmlOutputWriter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Runner/OutputWriters/NUnit3XmlOutputWriter.cs rename to src-ThirdParty/NUnitLite/Runner/OutputWriters/NUnit3XmlOutputWriter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Runner/OutputWriters/OutputWriter.cs b/src-ThirdParty/NUnitLite/Runner/OutputWriters/OutputWriter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Runner/OutputWriters/OutputWriter.cs rename to src-ThirdParty/NUnitLite/Runner/OutputWriters/OutputWriter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Runner/ResultReporter.cs b/src-ThirdParty/NUnitLite/Runner/ResultReporter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Runner/ResultReporter.cs rename to src-ThirdParty/NUnitLite/Runner/ResultReporter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Runner/ResultSummary.cs b/src-ThirdParty/NUnitLite/Runner/ResultSummary.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Runner/ResultSummary.cs rename to src-ThirdParty/NUnitLite/Runner/ResultSummary.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Runner/TcpWriter.cs b/src-ThirdParty/NUnitLite/Runner/TcpWriter.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Runner/TcpWriter.cs rename to src-ThirdParty/NUnitLite/Runner/TcpWriter.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Runner/TextUI.cs b/src-ThirdParty/NUnitLite/Runner/TextUI.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Runner/TextUI.cs rename to src-ThirdParty/NUnitLite/Runner/TextUI.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/SpecialValue.cs b/src-ThirdParty/NUnitLite/SpecialValue.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/SpecialValue.cs rename to src-ThirdParty/NUnitLite/SpecialValue.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/TestCaseData.cs b/src-ThirdParty/NUnitLite/TestCaseData.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/TestCaseData.cs rename to src-ThirdParty/NUnitLite/TestCaseData.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/TestContext.cs b/src-ThirdParty/NUnitLite/TestContext.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/TestContext.cs rename to src-ThirdParty/NUnitLite/TestContext.cs diff --git a/src/Xamarin.Android.NUnitLite/NUnitLite/Throws.cs b/src-ThirdParty/NUnitLite/Throws.cs similarity index 100% rename from src/Xamarin.Android.NUnitLite/NUnitLite/Throws.cs rename to src-ThirdParty/NUnitLite/Throws.cs diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/PackagingUtils.cs b/src-ThirdParty/android-platform-tools-base/PackagingUtils.cs similarity index 100% rename from src/Xamarin.Android.Build.Tasks/Utilities/PackagingUtils.cs rename to src-ThirdParty/android-platform-tools-base/PackagingUtils.cs diff --git a/src-ThirdParty/android-platform-tools-base/SymbolWriter.cs b/src-ThirdParty/android-platform-tools-base/SymbolWriter.cs new file mode 100644 index 00000000000..38ce8a11542 --- /dev/null +++ b/src-ThirdParty/android-platform-tools-base/SymbolWriter.cs @@ -0,0 +1,97 @@ +using Microsoft.Build.Framework; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using Xamarin.Android.Tools; +using Xamarin.Build; + +namespace Xamarin.Android.Tasks +{ + public partial class GenerateLibraryResources + { + /// + /// NOTE: all file paths used in this method should be full paths. (Or use AsyncTask.WorkingDirectory) + /// + void GenerateJava (Package package) + { + // In some cases (such as ancient support libraries), R.txt does not exist. + // We can just use the main app's R.txt file and write *all fields* in this case. + foreach (var r_txt in package.TextFiles) { + if (!File.Exists (r_txt)) { + LogDebugMessage ($"Using main R.txt, R.txt does not exist: {r_txt}"); + package.TextFiles.Clear (); + package.TextFiles.Add (main_r_txt); + break; + } + } + + var lines = LoadValues (package); + using (var writer = MemoryStreamPool.Shared.CreateStreamWriter ()) { + // This code is based on the Android gradle plugin + // https://android.googlesource.com/platform/tools/base/+/908b391a9c006af569dfaff08b37f8fdd6c4da89/build-system/builder/src/main/java/com/android/builder/internal/SymbolWriter.java + + writer.WriteLine ("/* AUTO-GENERATED FILE. DO NOT MODIFY."); + writer.WriteLine (" *"); + writer.WriteLine (" * This class was automatically generated by"); + writer.WriteLine (" * Xamarin.Android from the resource data it found."); + writer.WriteLine (" * It should not be modified by hand."); + writer.WriteLine (" */"); + + writer.Write ("package "); + writer.Write (package.Name); + writer.WriteLine (';'); + writer.WriteLine (); + writer.WriteLine ("public final class R {"); + + string currentClass = null; + foreach (var line in lines) { + var type = line [Index.Type]; + var clazz = line [Index.Class]; + var name = line [Index.Name]; + var value = line [Index.Value]; + if (clazz != currentClass) { + // If not the first inner class + if (currentClass != null) { + writer.WriteLine ("\t}"); + } + + currentClass = clazz; + writer.Write ("\tpublic static final class "); + writer.Write (currentClass); + writer.WriteLine (" {"); + } + + writer.Write ("\t\tpublic static final "); + writer.Write (type); + writer.Write (' '); + writer.Write (name); + writer.Write (" = "); + // It may be an int[] + if (value.StartsWith ("{", StringComparison.Ordinal)) { + writer.Write ("new "); + writer.Write (type); + writer.Write (' '); + } + writer.Write (value); + writer.WriteLine (';'); + } + + // If we wrote at least one inner class + if (currentClass != null) { + writer.WriteLine ("\t}"); + } + writer.WriteLine ('}'); + + writer.Flush (); + var r_java = Path.Combine (output_directory, package.Name.Replace ('.', Path.DirectorySeparatorChar), "R.java"); + if (MonoAndroidHelper.CopyIfStreamChanged (writer.BaseStream, r_java)) { + LogDebugMessage ($"Writing: {r_java}"); + } else { + LogDebugMessage ($"Up to date: {r_java}"); + } + } + } + } +} diff --git a/src/java-runtime/java/mono/android/debug/MultiDexLoader.java b/src-ThirdParty/bazel/java/mono/android/debug/MultiDexLoader.java similarity index 100% rename from src/java-runtime/java/mono/android/debug/MultiDexLoader.java rename to src-ThirdParty/bazel/java/mono/android/debug/MultiDexLoader.java diff --git a/src/java-runtime/java/mono/android/incrementaldeployment/IncrementalClassLoader.java b/src-ThirdParty/bazel/java/mono/android/incrementaldeployment/IncrementalClassLoader.java similarity index 100% rename from src/java-runtime/java/mono/android/incrementaldeployment/IncrementalClassLoader.java rename to src-ThirdParty/bazel/java/mono/android/incrementaldeployment/IncrementalClassLoader.java diff --git a/src/java-runtime/java/mono/android/release/MultiDexLoader.java b/src-ThirdParty/bazel/java/mono/android/release/MultiDexLoader.java similarity index 100% rename from src/java-runtime/java/mono/android/release/MultiDexLoader.java rename to src-ThirdParty/bazel/java/mono/android/release/MultiDexLoader.java diff --git a/src-ThirdParty/crc32.net/SafeProxy.cs b/src-ThirdParty/crc32.net/SafeProxy.cs new file mode 100644 index 00000000000..6eb11fd6bdb --- /dev/null +++ b/src-ThirdParty/crc32.net/SafeProxy.cs @@ -0,0 +1,85 @@ +// +// Taken from: +// https://github.com/force-net/Crc32.NET/blob/fbc1061b0cb53df2322d5aed33167a2e6335970b/Crc32.NET/SafeProxy.cs +// +// License: MIT +// https://github.com/force-net/Crc32.NET/blob/fbc1061b0cb53df2322d5aed33167a2e6335970b/LICENSE +// + +/* This is .NET safe implementation of Crc32 algorithm. + * This implementation was investigated as fastest from different variants. It based on Robert Vazan native implementations of Crc32C + * Also, it is good for x64 and for x86, so, it seems, there is no sense to do 2 different realizations. + * + * Addition: some speed increase was found with splitting xor to 4 independent blocks. Also, some attempts to optimize unaligned tails was unsuccessfull (JIT limitations?). + * + * + * Max Vysokikh, 2016-2017 + */ + +namespace Force.Crc32 +{ + class CRC32 : SafeProxy + { + } + + internal class SafeProxy + { + const uint Poly = 0xedb88320u; + + readonly uint[] _table = new uint[16 * 256]; + + internal SafeProxy () + { + Init (Poly); + } + + protected void Init (uint poly) + { + var table = _table; + for (uint i = 0; i < 256; i++) { + uint res = i; + for (int t = 0; t < 16; t++) { + for (int k = 0; k < 8; k++) res = (res & 1) == 1 ? poly ^ (res >> 1) : (res >> 1); + table[(t * 256) + i] = res; + } + } + } + + public uint Append (uint crc, byte[] input, int offset, int length) + { + uint crcLocal = uint.MaxValue ^ crc; + + uint[] table = _table; + while (length >= 16) { + var a = table[(3 * 256) + input[offset + 12]] + ^ table[(2 * 256) + input[offset + 13]] + ^ table[(1 * 256) + input[offset + 14]] + ^ table[(0 * 256) + input[offset + 15]]; + + var b = table[(7 * 256) + input[offset + 8]] + ^ table[(6 * 256) + input[offset + 9]] + ^ table[(5 * 256) + input[offset + 10]] + ^ table[(4 * 256) + input[offset + 11]]; + + var c = table[(11 * 256) + input[offset + 4]] + ^ table[(10 * 256) + input[offset + 5]] + ^ table[(9 * 256) + input[offset + 6]] + ^ table[(8 * 256) + input[offset + 7]]; + + var d = table[(15 * 256) + ((byte)crcLocal ^ input[offset])] + ^ table[(14 * 256) + ((byte)(crcLocal >> 8) ^ input[offset + 1])] + ^ table[(13 * 256) + ((byte)(crcLocal >> 16) ^ input[offset + 2])] + ^ table[(12 * 256) + ((crcLocal >> 24) ^ input[offset + 3])]; + + crcLocal = d ^ c ^ b ^ a; + offset += 16; + length -= 16; + } + + while (--length >= 0) + crcLocal = table[(byte)(crcLocal ^ input[offset++])] ^ crcLocal >> 8; + + return crcLocal ^ uint.MaxValue; + } + } +} diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLibraryResources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLibraryResources.cs index f1d13b35c8e..2c1cf78c8ec 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLibraryResources.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLibraryResources.cs @@ -12,7 +12,7 @@ namespace Xamarin.Android.Tasks /// /// We used to invoke aapt/aapt2 per library (many times!), this task does the work to generate R.java for libraries without calling aapt/aapt2. /// - public class GenerateLibraryResources : AndroidAsyncTask + public partial class GenerateLibraryResources : AndroidAsyncTask { public override string TaskPrefix => "GLR"; @@ -97,89 +97,6 @@ class Package public string Name { get; set; } } - /// - /// NOTE: all file paths used in this method should be full paths. (Or use AsyncTask.WorkingDirectory) - /// - void GenerateJava (Package package) - { - // In some cases (such as ancient support libraries), R.txt does not exist. - // We can just use the main app's R.txt file and write *all fields* in this case. - foreach (var r_txt in package.TextFiles) { - if (!File.Exists (r_txt)) { - LogDebugMessage ($"Using main R.txt, R.txt does not exist: {r_txt}"); - package.TextFiles.Clear (); - package.TextFiles.Add (main_r_txt); - break; - } - } - - var lines = LoadValues (package); - using (var writer = MemoryStreamPool.Shared.CreateStreamWriter ()) { - // This code is based on the Android gradle plugin - // https://android.googlesource.com/platform/tools/base/+/908b391a9c006af569dfaff08b37f8fdd6c4da89/build-system/builder/src/main/java/com/android/builder/internal/SymbolWriter.java - - writer.WriteLine ("/* AUTO-GENERATED FILE. DO NOT MODIFY."); - writer.WriteLine (" *"); - writer.WriteLine (" * This class was automatically generated by"); - writer.WriteLine (" * Xamarin.Android from the resource data it found."); - writer.WriteLine (" * It should not be modified by hand."); - writer.WriteLine (" */"); - - writer.Write ("package "); - writer.Write (package.Name); - writer.WriteLine (';'); - writer.WriteLine (); - writer.WriteLine ("public final class R {"); - - string currentClass = null; - foreach (var line in lines) { - var type = line [Index.Type]; - var clazz = line [Index.Class]; - var name = line [Index.Name]; - var value = line [Index.Value]; - if (clazz != currentClass) { - // If not the first inner class - if (currentClass != null) { - writer.WriteLine ("\t}"); - } - - currentClass = clazz; - writer.Write ("\tpublic static final class "); - writer.Write (currentClass); - writer.WriteLine (" {"); - } - - writer.Write ("\t\tpublic static final "); - writer.Write (type); - writer.Write (' '); - writer.Write (name); - writer.Write (" = "); - // It may be an int[] - if (value.StartsWith ("{", StringComparison.Ordinal)) { - writer.Write ("new "); - writer.Write (type); - writer.Write (' '); - } - writer.Write (value); - writer.WriteLine (';'); - } - - // If we wrote at least one inner class - if (currentClass != null) { - writer.WriteLine ("\t}"); - } - writer.WriteLine ('}'); - - writer.Flush (); - var r_java = Path.Combine (output_directory, package.Name.Replace ('.', Path.DirectorySeparatorChar), "R.java"); - if (MonoAndroidHelper.CopyIfStreamChanged (writer.BaseStream, r_java)) { - LogDebugMessage ($"Writing: {r_java}"); - } else { - LogDebugMessage ($"Up to date: {r_java}"); - } - } - } - /// /// There can be multiple AndroidManifest.xml with the same package name. /// We must merge the combination of the resource IDs to be generated in a "merged" R.java file. diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj index d968ab6d293..324927af39c 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj @@ -340,6 +340,15 @@ + + + Utilities\%(Filename)%(Extension) + + + Utilities\%(Filename)%(Extension) + + + LayoutBinding.cs diff --git a/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj b/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj index 93d14b05687..1ccd1d28f74 100644 --- a/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj +++ b/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj @@ -73,278 +73,278 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java-runtime/java-runtime.csproj b/src/java-runtime/java-runtime.csproj index e7354f69d92..0d061050a31 100644 --- a/src/java-runtime/java-runtime.csproj +++ b/src/java-runtime/java-runtime.csproj @@ -20,6 +20,7 @@ + \ No newline at end of file diff --git a/src/java-runtime/java-runtime.targets b/src/java-runtime/java-runtime.targets index bcc609d6fa6..03ea68f673a 100644 --- a/src/java-runtime/java-runtime.targets +++ b/src/java-runtime/java-runtime.targets @@ -17,14 +17,14 @@ $(OutputPath)java_runtime.dex $(IntermediateOutputPath)release $(IntermediateOutputPath)release.txt - java\mono\android\debug\MultiDexLoader.java;java\mono\android\Seppuku.java;java\mono\android\debug\BuildConfig.java + ..\..\src-ThirdParty\bazel\java\mono\android\debug\MultiDexLoader.java;java\mono\android\Seppuku.java;java\mono\android\debug\BuildConfig.java <_RuntimeOutput Include="$(OutputPath)java_runtime_fastdev.jar"> $(OutputPath)java_runtime_fastdev.jar $(OutputPath)java_runtime_fastdev.dex $(IntermediateOutputPath)fastdev $(IntermediateOutputPath)fastdev.txt - java\mono\android\release\MultiDexLoader.java;java\mono\android\release\BuildConfig.java + ..\..\src-ThirdParty\bazel\java\mono\android\release\MultiDexLoader.java;java\mono\android\release\BuildConfig.java