Skip to content

Commit

Permalink
Added tests for Xamarin.Android / Removed support for .NET Standard 1.3
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

commit f3b64ce50f74e6a8c23bdfa8299ba666a478b297
Author: Shad Storhaug <[email protected]>
Date:   Fri Mar 5 22:30:11 2021 +0700

    Added NuGet.config to solution items

commit 6deb2ef782bc63b5277994ff408477e3e1965ce2
Author: Shad Storhaug <[email protected]>
Date:   Fri Mar 5 21:40:56 2021 +0700

    azure-pipelines.yml: Reduced maximumAllowedFailures to 9 for MonoAndroid90 and MonoAndroid100

commit 36e6e6c5420b15960ddc23ecdefeb687e3149409
Author: Shad Storhaug <[email protected]>
Date:   Fri Mar 5 21:04:04 2021 +0700

    Xamarin Android: Added CJK and Rare encodings due to test failures.

commit 25a18870e29633d0bb5f66e6f033fbfbd1dcb014
Author: Shad Storhaug <[email protected]>
Date:   Sat Jan 30 07:55:13 2021 +0700

    Directory.Build.targets: Added BUG_DICTIONARY_TRIMEXCESS_INVALIDATES_ENUMERATION to exclude broken tests on Xamarin.Android

commit 9cd24aa3772fdcd585bb8445b71db992e5d875de
Author: Shad Storhaug <[email protected]>
Date:   Sat Jan 30 07:17:43 2021 +0700

    Directory.Build.targets: Added BUG_DICTIONARY_ENSURECAPACITY_INVALIDATES_ENUMERATION to exclude broken tests on Xamarin.Android

commit 1533c322c9e2bfff31d15b931ebcd5b513934034
Author: Shad Storhaug <[email protected]>
Date:   Sat Jan 30 03:28:36 2021 +0700

    Directory.Build.targets: FEATURE_DICTIONARY_MODIFY_CONTINUEENUMERATION is only valid for .NET Core 3.x, not all of .NET Standard 2.1

commit b9cf4a217f93197ced7f5cbffcaa557ea5e89c4b
Author: Shad Storhaug <[email protected]>
Date:   Sat Jan 30 01:33:41 2021 +0700

    Xunit2TestAssemblyRunner: Fixed build warnings

commit a1d8fdd8e1387b2b755dfbadd1edcc252257505c
Author: Shad Storhaug <[email protected]>
Date:   Sat Jan 30 01:21:56 2021 +0700

    azure-pipelines.yml: Fixed script to run tests on MonoAndroid100

commit b2010123ea7997dcce7cdfed110f271f11ea02a8
Author: Shad Storhaug <[email protected]>
Date:   Sat Dec 26 05:09:17 2020 +0700

    Xamarin XUnit Runner: Fixed bug where document was being closed prematurely, added passed and executed attributes to counters

commit 11c4512eccd541ca25576dfeb581d5cb1b5f015f
Author: Shad Storhaug <[email protected]>
Date:   Sat Dec 26 03:41:27 2020 +0700

    run-tests-on-android.yml: Cleaned up code

commit 58c718051aafd8bcc99393325f283887e267d5f4
Author: Shad Storhaug <[email protected]>
Date:   Sat Dec 26 00:48:14 2020 +0700

    Xamarin Android: Consolidated shared files

commit 75dcba7eb254a4150833eb244496595a860c57c1
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 22:57:25 2020 +0700

    tests/Xamarin/Directory.Build.props: Don't allow publishing

commit 6c9cb232ae6254131d6e47b93ace9b06e9ec49e5
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 22:31:49 2020 +0700

    Xunit Runner: changed namespace and moved to a central location where it can be used by all Xamarin test projects

commit 58c175e2f2d90d1f84751c81ca5f34c1ed653004
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 22:03:04 2020 +0700

    xUnit Runner: Removed unneeded commented code

commit 834cc071c7046432a9109def0c350c70e2bc4ab2
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 15:08:38 2020 +0700

    azure-pipelines.yml: Added tests for MonoAndroid100 and set maximum allowed failures to 11

commit 1f23ee0a86642726d278f4bfa1eeb9e0e85f2ffd
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 14:35:26 2020 +0700

    run-tests-on-android.yml: Updated to call publish-test-results-for-target-frameworks.yml to publish results, run multiple target frameworks

commit 86d77dd1a2fdb644ffc44d505f51d5b92b4ebc41
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 14:31:47 2020 +0700

    publish-test-results: Updated to include MonoAndroid90 and MonoAndroid100 targets and to parse NUnit XML format

commit 0993fe35abd1b1002aa36370132114147a3342f3
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 13:12:59 2020 +0700

    run-tests-on-os/publish-test-results: Allow passing different test platforms and displaying in test results

commit d748a03221dbf7d414a3fe7ecfd7bdbb2bdd0888
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 12:02:16 2020 +0700

    Exclude Xamarin targets from release build

commit 9a18e54f6c3876d3d1edafda70c58b2b34982cc6
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 11:47:05 2020 +0700

    Xamarin Android: Created separate projects for MonoAndroid90 and MonoAndroid100, since the build tools don't seem to understand how to compile when passed parameters to change the target.

commit bcc61fce004867e4a170eb5b6ecea7bb37d4483a
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 08:29:54 2020 +0700

    Xamarin Android: Use __TargetFrameworkVersion instead of TargetFrameworkVersion to prevent issues with collisions

commit b9577924e9482bffb206dadab5d9d6719a19427b
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 08:05:53 2020 +0700

    J2N.Tests.Android: Fixed resources for v10.0

commit aa3cdc8aea2e15e4ce82c432dfbf0fc56f9a0abf
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 08:02:10 2020 +0700

    Xamarin Android: Modified test projects to use a separate manifest for v9.0 and v10.0 and confirmed compilation works on v10.0

commit aef8070f4a8112fe7a2c3d1838125d1a7264504f
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 06:47:41 2020 +0700

    Attempting netstandard2.0 as the referenced target framework

commit 5533897171467305443106b0a8e3ba5bda3cc470
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 05:56:18 2020 +0700

    Xamarin Android: Allow TargetFrameworkVersion to be overridden by caller

commit 63308e13f5a3a6eb5647f75687fa1317d43429b0
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 05:41:52 2020 +0700

    azure-pipelines.yml: Build for Android 10 to test .NET Standard 2.1

commit cb373963c65513db15c3e52b6336e03ac66f2c04
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 05:35:58 2020 +0700

    Revert "J2N.Tests.Android.xUnit: Ported several types from XUnit to fix unique ID problem with their XML format"

    This reverts commit 65ce1cc434aef72783ca1a566643da9820972255.

commit 925941488df08a2b05bfd2347df4b8c6a4a92517
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 05:35:28 2020 +0700

    J2N.Tests.Android.xUnit: Ported several types from XUnit to fix unique ID problem with their XML format

commit b0ffc8f2847954b7c7e66e482e9a7d65c7dbad6a
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 25 04:51:48 2020 +0700

    J2N.Tests.Android.xUnit: Switched back to using TRX format, but make sure that the list of test IDs is unique.

commit 5e15b4af9d963b69c9e9e4ca4eae356e9fe30479
Author: Shad Storhaug <[email protected]>
Date:   Thu Dec 24 22:43:04 2020 +0700

    J2N.Tests.Android.xUnit: Enabled PreEnumerateTheories to generate a unique test ID per run

commit c28455fa5a7e3f166e32b76483762906aa43f557
Author: Shad Storhaug <[email protected]>
Date:   Thu Dec 24 18:46:35 2020 +0700

    J2N.Tests.Android.xUnit: Added top level assemblies element as per https://xunit.net/docs/format-xml-v2

commit 4da5374049b26b6c27bffe6a55febfc3f6bbebe9
Author: Shad Storhaug <[email protected]>
Date:   Thu Dec 24 17:34:05 2020 +0700

    J2N.Tests.Android.xUnit: Converted to use Xunit's DelegatingXmlCreationSink to produce Xunit 2/3 XML format

commit 6be736e0df82043007143167145f4d783ad43fe1
Author: Shad Storhaug <[email protected]>
Date:   Thu Dec 24 08:54:46 2020 +0700

    J2N.Tests.Android.xUnit: Fixed XML definition to correctly nest elements

commit b220c3d46e9faa7541bfc06aa57a6f009e7e9b77
Author: Shad Storhaug <[email protected]>
Date:   Thu Dec 24 06:14:01 2020 +0700

    J2N.Tests.Android.xUnit: Filter out duplicate test names. XUnit's unique id is not unique.

commit dba8a7bf7c6be6b7616998d2178308a520ff694c
Author: Shad Storhaug <[email protected]>
Date:   Thu Dec 24 05:11:19 2020 +0700

    Xamarin.Android: Fixed several issues with TestInstrumentation that were causing it not to complete and error out

commit 48d2eeb16d1674d06df550459b91bcfdb3c193a0
Author: Shad Storhaug <[email protected]>
Date:   Thu Dec 24 00:43:43 2020 +0700

    run-tests-on-android.yml: Update AVD configuration to provide more RAM, SDCard space, and VM heap space

commit 1cfc779fc670dac802107aa5fe4f5887c00dbd17
Author: Shad Storhaug <[email protected]>
Date:   Wed Dec 23 01:57:14 2020 +0700

    run-tests-on-android.yml: Increased RAM to 8192

commit de6392d8fabcc21ae46922397cbb58e398e81457
Author: Shad Storhaug <[email protected]>
Date:   Wed Dec 23 00:15:09 2020 +0700

    run-tests-on-android.yml: Updated documentation

commit 18799e81abecabad88d2473cc6fe739f5028967b
Author: Shad Storhaug <[email protected]>
Date:   Wed Dec 23 00:14:01 2020 +0700

    azure-pipelines.yml:  Fixed typo in ABI

commit 6efe2ec3978dda8c1761d91364b25e4ab4e62d10
Author: Shad Storhaug <[email protected]>
Date:   Tue Dec 22 23:41:37 2020 +0700

    run-tests-on-android.yml: Upgraded to android sdk 28

commit 24e8c7192ccd9c483d57a9a77f4ff75e3bfafb19
Author: Shad Storhaug <[email protected]>
Date:   Tue Dec 22 19:28:08 2020 +0700

    run-tests-on-android.yml: Revert installing AVD files to original

commit 37e99028baaa60479fd5eadb2d42ba339633a134
Author: Shad Storhaug <[email protected]>
Date:   Tue Dec 22 18:58:28 2020 +0700

    run-tests-on-android.yml: Parameterized Android ABI

commit 22fdd3f79378acf4f6b8e4f1f5ba99263eabe3e0
Author: Shad Storhaug <[email protected]>
Date:   Tue Dec 22 17:26:06 2020 +0700

    run-tests-on-android.yml: Run emulator with 4GB of RAM

commit f1c4d07f00d4b6ff3375cc1069563f926e156409
Author: Shad Storhaug <[email protected]>
Date:   Tue Dec 22 09:33:13 2020 +0700

    J2N.Tests.Android.xUnit: Added AndroidSupportedAbis element

commit 693fbeb66afb442b6a00f9108f34b3b3b28f880d
Author: Shad Storhaug <[email protected]>
Date:   Tue Dec 22 09:01:18 2020 +0700

    run-tests-on-android.yml: Added task to publish the test results of J2N.Tests.xUnit

commit 4a2242c52ada3d484a05eb4b9b01f086c899e8da
Author: Shad Storhaug <[email protected]>
Date:   Tue Dec 22 08:58:07 2020 +0700

    run-tests-on-os.yml: Fixed regular expression for results file so it works for either NUnit or XUnit

commit 0a2c2a86d326f7ea91a7b8072e36b8f8e4d51aa9
Author: Shad Storhaug <[email protected]>
Date:   Tue Dec 22 08:41:46 2020 +0700

    run-tests-on-android.yml: Run all test projects

commit 3bd74cb54aae72453cc3e47dd5569185335f3dca
Author: Shad Storhaug <[email protected]>
Date:   Tue Dec 22 08:38:29 2020 +0700

    J2N.Tests.Android.xUnit: Added output result to test instrumentation

commit 5a36d1a43bbbd927e6bf8c8ba2402796bee71d39
Author: Shad Storhaug <[email protected]>
Date:   Tue Dec 22 07:41:40 2020 +0700

    J2N.Tests.Android.xUnit: Added a crude test runner, since xunit.runner.devices won't scale and does not include test instrumentation for Android

commit 37d2803a8e56b70b22acaa9d96e0860cdac87c6f
Author: Shad Storhaug <[email protected]>
Date:   Sun Dec 20 03:01:16 2020 +0700

    run-tests-on-android.yml: Use match instead of equality for locating blame-crash-path

commit 755920ec344eac5abf2f3b0936722ae00349476b
Author: Shad Storhaug <[email protected]>
Date:   Sun Dec 20 02:35:28 2020 +0700

    run-tests-on-android.yml: Removed results parsing since something is causing the loop to fail

commit 133d9c9afe5c2f9a071cf6a53d502a18b2c7bb61
Author: Shad Storhaug <[email protected]>
Date:   Sun Dec 20 02:09:30 2020 +0700

    run-tests-on-android.yml: Show errors in powershell

commit cdc0bbd8d5e608a31d3b3ac6ce59eff26b34214d
Author: Shad Storhaug <[email protected]>
Date:   Sun Dec 20 02:07:57 2020 +0700

    run-tests-on-android.yml: Wait until the end of the loop to display cmd output of test run

commit 83a89f889a0a74c6e9b901545d4ebfea31cbca0d
Author: Shad Storhaug <[email protected]>
Date:   Sun Dec 20 01:23:47 2020 +0700

    run-tests-on-android.yml: Output the file paths for troubleshooting

commit c091e244fd030e753d3ae4152ef4e090ef7c405c
Author: Shad Storhaug <[email protected]>
Date:   Sun Dec 20 00:27:00 2020 +0700

    run-tests-on-android.yml: Fixed project name and added test run counts to results

commit 2c0a3a69d8e50cfb2cf25a0ea5bb3af4b60750c4
Author: Shad Storhaug <[email protected]>
Date:   Sat Dec 19 23:34:32 2020 +0700

    run-tests-on-android.yml: Output the command line results from the runner to the screen

commit 1649deda994cb4f54b82f32827d1fa0bd6a49d22
Author: Shad Storhaug <[email protected]>
Date:   Sat Dec 19 22:48:11 2020 +0700

    run-tests-on-os.yml: Fixed replace statement

commit 8bd9b965f7512d4e30d1fde75657bc80451b92eb
Author: Shad Storhaug <[email protected]>
Date:   Sat Dec 19 21:56:58 2020 +0700

    Xamarin.Android: Set up runner to detect crashes and fail the build when one occurs

commit b1b50643c6af15ae2e5601cb9d77a688fc951c7a
Author: Shad Storhaug <[email protected]>
Date:   Sat Dec 19 18:20:56 2020 +0700

    run-tests-on-os.yml: Fail the build on a crashed run

commit e214c61aac5240f6f00a876b3f05b18c30b41d13
Author: Shad Storhaug <[email protected]>
Date:   Sat Dec 19 18:08:53 2020 +0700

    run-tests-on-android.yml: Fixed test result path to upload results

commit fab75f67e8e45e18a0296f41f4fb9c6779170a02
Author: Shad Storhaug <[email protected]>
Date:   Sat Dec 19 02:14:59 2020 +0700

    run-tests-on-android.yml: Fixed filename of test results file (NUnit3 rather than TRX format)

commit 0f7cd4e43dbda2f85652fd74fb842afe6004745a
Author: Shad Storhaug <[email protected]>
Date:   Sat Dec 19 01:43:02 2020 +0700

    azure-pipelines.yml: comment out TargetFrameworkVersion to test other parts of the script

commit ebcfe0c299e0f58fdecb11778770a13187d7625c
Author: Shad Storhaug <[email protected]>
Date:   Sat Dec 19 01:37:27 2020 +0700

    Added template to run Android tests

commit 1448ebb5200ad25bd723e12f6eb8ec6120d25e0c
Author: Shad Storhaug <[email protected]>
Date:   Sat Dec 19 00:31:52 2020 +0700

    azure-pipelines.yml: fixup target version

commit 392b870ba37a1e4ac00c91c72fbc93bbd53792c9
Author: Shad Storhaug <[email protected]>
Date:   Sat Dec 19 00:11:36 2020 +0700

    fixup build arguments Xamarin Android

commit 7f2ae8990207ce622b8dd1da0609ce0f676a8f51
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 18 23:20:16 2020 +0700

    azure-pipelines.yml: Fixed build arguments

commit dfe885c1f998c16b8ad630aa4779ee89ec54f46b
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 18 22:32:47 2020 +0700

    azure-pipelines.yml: Trying TargetFramework instead of TargetFrameworkVersion

commit 16aeb6bea80f4e79700499b2b1cdea773aa11018
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 18 22:30:57 2020 +0700

    azure-pipelines.yml: Trying a single project

commit 7319fa22780b903ee085b33375b6dd9d47bf83e3
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 18 22:05:01 2020 +0700

    azure-pipelines.yml: Fixed Xamarin Android output

commit cad1e1ae15531a579d3df44c8bcd62d4326ae1f0
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 18 21:46:03 2020 +0700

    azure-pipelines.yml: Moved artifact publish step so it occurs after the Xamarin build

commit 1e01103a012e04f98e4e43b78f1b563efd5f2fcf
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 18 21:16:10 2020 +0700

    azure-pipelines.yml: Restore targets for Xamarin Android

commit 3b03a52663ecca7ad6a4c94e4ba0136954ad8569
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 18 20:57:03 2020 +0700

    azure-pipelines.yml: Added task to build Xamarin.Android tests

commit 455a123943c063ffa04d4149fef2f20fddcbde68
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 18 20:39:16 2020 +0700

    Added test projects and configuration for Xamarin Android

commit 7b0be774ff361ba96dbf1a142453f5cdec8f9cff
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 18 16:45:13 2020 +0700

    Only add package reference for Nerdbank.GitVersioning to projects in src folder

commit 207d7db06329fb7e83d8493ca5c1bbefaafe717a
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 18 16:08:27 2020 +0700

    build/dependencies.props: Upgraded Nerdbank.GitVersioning to 3.3.37

commit 4f770011552067b5291400a73f9741a6e8c57ebd
Author: Shad Storhaug <[email protected]>
Date:   Fri Dec 18 15:42:19 2020 +0700

    Dropped support for .NET Standard 1.3

commit ed56ccc2251fb1d977c092a03d2327d7fead2f3c
Author: Shad Storhaug <[email protected]>
Date:   Wed Dec 16 04:16:24 2020 +0700

    J2N.Tests.Text.TestStringExtensions: Added comments on tests that await fix

commit a5d13589347ff46807c146a0e7881ae5ff097c05
Author: Shad Storhaug <[email protected]>
Date:   Wed Dec 16 04:11:28 2020 +0700

    J2N.Tests.IO.MemoryMappedFiles.TestMemoryMappedViewByteBuffer: Added comments on tests that await fix

commit 0f555ced3a60ed25948d368b9210810cba985829
Author: Shad Storhaug <[email protected]>
Date:   Wed Dec 16 01:28:19 2020 +0700

    J2N.Tests.Collections.Concurrent.TestLurchTableThreading: Refactored hash collisions so they don't depend on the underlying implementation of System.Guid, which varies per platform.

commit 3f3a54ceefdf194ede40b935e86d9f7b623c8ba4
Author: Shad Storhaug <[email protected]>
Date:   Tue Dec 15 23:13:47 2020 +0700

    BUG: J2N.Tests.Text.TestStringExtensions: Use correct character sequence for each test method

commit 4478f1bfbb04ec81c67149c554b28b935a3f3e8a
Author: Shad Storhaug <[email protected]>
Date:   Tue Dec 15 23:09:53 2020 +0700

    BUG: J2N.Tests.Text.TestStringBuilderExtensions: Use same IndexOf/LastIndexOf overload and parameters for current culture comparison

commit a392133af78f51861f321ed7f08e33bbf6816fab
Author: Shad Storhaug <[email protected]>
Date:   Mon Dec 14 19:06:50 2020 +0700

    J2N.Tests.Collections.Generic.TestListEqualityComparer: Fixed typo in test method names

commit ba163cfbb7f5cb05cd15f5874d0973a22a658c0b
Author: Shad Storhaug <[email protected]>
Date:   Mon Dec 14 18:56:25 2020 +0700

    BUG: J2N.Collections.ArrayEqualityComparer: Fixed infinite recursion issue on Xamarin.Android due to ArrayEqualityComparer abstract base class calling itself during static initialization. Refactored to flatten the class hierarchy for easier maintenance.
  • Loading branch information
@NightOwl888
NightOwl888 committed Mar 5, 2021
1 parent 3fdfd67 commit 9fa5f07
Show file tree
Hide file tree
Showing 89 changed files with 53,681 additions and 501 deletions.
8 changes: 1 addition & 7 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<Import Project="version.props" Condition="Exists('version.props')" />
<Import Project="build\dependencies.props" Condition="Exists('build\dependencies.props')" />
<Import Project="$(MSBuildThisFileDirectory)/build/dependencies.props" Condition="Exists('$(MSBuildThisFileDirectory)/build/dependencies.props')" />

<PropertyGroup>
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
Expand Down Expand Up @@ -34,10 +34,4 @@
<Copyright>Copyright © $(CopyrightYearRange) $(Company)</Copyright>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning">
<Version>$(NerdBankGitVersioningPackageReferenceVersion)</Version>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
</Project>
13 changes: 12 additions & 1 deletion Directory.Build.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,19 @@

<!-- Features in .NET Core 3.x only -->
<PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp3.')) ">

<DefineConstants>$(DefineConstants);FEATURE_DICTIONARY_MODIFY_CONTINUEENUMERATION</DefineConstants>
<DefineConstants>$(DefineConstants);FEATURE_NUMERICBITOPERATIONS</DefineConstants>

</PropertyGroup>

<!-- Features in .NET Standard 2.1 only -->
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">

<!-- Bug in Xamarin.Android - EnsureCapacity and TrimExcess should break enumerator, but do not -->
<DefineConstants>$(DefineConstants);BUG_DICTIONARY_ENSURECAPACITY_INVALIDATES_ENUMERATION</DefineConstants>
<DefineConstants>$(DefineConstants);BUG_DICTIONARY_TRIMEXCESS_INVALIDATES_ENUMERATION</DefineConstants>

</PropertyGroup>

<!-- Features in .NET Standard 2.1 and .NET Core 3.x only -->
Expand All @@ -29,7 +41,6 @@
<DefineConstants>$(DefineConstants);FEATURE_CONDITIONALWEAKTABLE_ADDORUPDATE</DefineConstants>-->

<DefineConstants>$(DefineConstants);FEATURE_DICTIONARY_ENSURECAPACITY</DefineConstants>
<DefineConstants>$(DefineConstants);FEATURE_DICTIONARY_MODIFY_CONTINUEENUMERATION</DefineConstants>
<DefineConstants>$(DefineConstants);FEATURE_DICTIONARY_REMOVE_OUTVALUE</DefineConstants>
<DefineConstants>$(DefineConstants);FEATURE_DICTIONARY_TRIMEXCESS</DefineConstants>
<DefineConstants>$(DefineConstants);FEATURE_DICTIONARY_TRYADD</DefineConstants>
Expand Down
39 changes: 39 additions & 0 deletions J2N.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-templates", "azure-te
build\azure-templates\publish-test-results-for-target-frameworks.yml = build\azure-templates\publish-test-results-for-target-frameworks.yml
build\azure-templates\publish-test-results-for-test-projects.yml = build\azure-templates\publish-test-results-for-test-projects.yml
build\azure-templates\publish-test-results.yml = build\azure-templates\publish-test-results.yml
build\azure-templates\run-tests-on-android.yml = build\azure-templates\run-tests-on-android.yml
build\azure-templates\run-tests-on-os.yml = build\azure-templates\run-tests-on-os.yml
build\azure-templates\show-all-environment-variables.yml = build\azure-templates\show-all-environment-variables.yml
build\azure-templates\show-all-files.yml = build\azure-templates\show-all-files.yml
Expand All @@ -46,13 +47,29 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
FUNDING.yml = FUNDING.yml
NuGet.config = NuGet.config
README.md = README.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "J2N.TestFramework", "src\J2N.TestFramework\J2N.TestFramework.csproj", "{0DF2FF04-9778-4BB7-B46C-0D3DA3A25FA5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "J2N.Tests.xUnit", "tests\J2N.Tests.xUnit\J2N.Tests.xUnit.csproj", "{BE5E5DC5-2687-4440-B10C-FB9A6A338CAE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin", "Xamarin", "{51E2F026-D167-46D8-BDA4-7F32011E84AF}"
ProjectSection(SolutionItems) = preProject
tests\Xamarin\Directory.Build.props = tests\Xamarin\Directory.Build.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Android", "Android", "{8E8A62FD-68C1-427D-BA2A-781959BB85E7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "J2N.Tests.MonoAndroid90", "tests\Xamarin\Android\J2N.Tests.MonoAndroid90\J2N.Tests.MonoAndroid90.csproj", "{3C8AFABF-0DCA-43EC-93C8-FCED19161981}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "J2N.Tests.MonoAndroid100", "tests\Xamarin\Android\J2N.Tests.MonoAndroid100\J2N.Tests.MonoAndroid100.csproj", "{21C25B19-35F2-4EBA-8179-060D4E1D4FE4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "J2N.Tests.MonoAndroid90.xUnit", "tests\Xamarin\Android\J2N.Tests.MonoAndroid90.xUnit\J2N.Tests.MonoAndroid90.xUnit.csproj", "{9FD44903-EE22-4437-9AB9-A3E19DCD03EE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "J2N.Tests.MonoAndroid100.xUnit", "tests\Xamarin\Android\J2N.Tests.MonoAndroid100.xUnit\J2N.Tests.MonoAndroid100.xUnit.csproj", "{0599CD31-2FA8-4283-A777-155F81B5DB9A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -75,6 +92,22 @@ Global
{BE5E5DC5-2687-4440-B10C-FB9A6A338CAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE5E5DC5-2687-4440-B10C-FB9A6A338CAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE5E5DC5-2687-4440-B10C-FB9A6A338CAE}.Release|Any CPU.Build.0 = Release|Any CPU
{3C8AFABF-0DCA-43EC-93C8-FCED19161981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C8AFABF-0DCA-43EC-93C8-FCED19161981}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C8AFABF-0DCA-43EC-93C8-FCED19161981}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{3C8AFABF-0DCA-43EC-93C8-FCED19161981}.Release|Any CPU.ActiveCfg = Release|Any CPU
{21C25B19-35F2-4EBA-8179-060D4E1D4FE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{21C25B19-35F2-4EBA-8179-060D4E1D4FE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{21C25B19-35F2-4EBA-8179-060D4E1D4FE4}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{21C25B19-35F2-4EBA-8179-060D4E1D4FE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9FD44903-EE22-4437-9AB9-A3E19DCD03EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9FD44903-EE22-4437-9AB9-A3E19DCD03EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9FD44903-EE22-4437-9AB9-A3E19DCD03EE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{9FD44903-EE22-4437-9AB9-A3E19DCD03EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0599CD31-2FA8-4283-A777-155F81B5DB9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0599CD31-2FA8-4283-A777-155F81B5DB9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0599CD31-2FA8-4283-A777-155F81B5DB9A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{0599CD31-2FA8-4283-A777-155F81B5DB9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -85,6 +118,12 @@ Global
{878BB8E3-6B5F-4600-B93F-5EA45A4E7DDA} = {216D6502-628E-401D-AACE-1E0687164325}
{0DF2FF04-9778-4BB7-B46C-0D3DA3A25FA5} = {9F28FE5B-BE86-4A38-8534-A6555C7C53A4}
{BE5E5DC5-2687-4440-B10C-FB9A6A338CAE} = {B71E854C-1C04-4D87-8C2C-EDF62650A9AA}
{51E2F026-D167-46D8-BDA4-7F32011E84AF} = {B71E854C-1C04-4D87-8C2C-EDF62650A9AA}
{8E8A62FD-68C1-427D-BA2A-781959BB85E7} = {51E2F026-D167-46D8-BDA4-7F32011E84AF}
{3C8AFABF-0DCA-43EC-93C8-FCED19161981} = {8E8A62FD-68C1-427D-BA2A-781959BB85E7}
{21C25B19-35F2-4EBA-8179-060D4E1D4FE4} = {8E8A62FD-68C1-427D-BA2A-781959BB85E7}
{9FD44903-EE22-4437-9AB9-A3E19DCD03EE} = {8E8A62FD-68C1-427D-BA2A-781959BB85E7}
{0599CD31-2FA8-4283-A777-155F81B5DB9A} = {8E8A62FD-68C1-427D-BA2A-781959BB85E7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B477AD9F-26BF-44CF-B94C-50D89AC24836}
Expand Down
27 changes: 27 additions & 0 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>

<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

<configuration>
<packageSources>
<add key="NuGet.Xamarin.Android MyGet feed" value="https://www.myget.org/F/nunit-xamarin-android/api/v3/index.json" />
<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
89 changes: 61 additions & 28 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ name: 'vNext$(rev:.r)' # Format for build number (will be overridden)

variables:
- name: TestTargetFrameworks
value: 'netcoreapp3.1;netcoreapp3.0;netcoreapp2.1;netcoreapp1.0;net461;net452'
value: 'netcoreapp3.1;netcoreapp3.0;netcoreapp2.1;net461;net452'
- name: BinaryArtifactName
value: 'testbinaries'
- name: NuGetArtifactName
Expand Down Expand Up @@ -63,6 +63,38 @@ stages:
nugetArtifactName: '$(NuGetArtifactName)'
binaryArtifactName: '$(BinaryArtifactName)'

- task: NuGetToolInstaller@1
displayName: 'Install NuGet'

- task: NuGetCommand@2
inputs:
restoreSolution: '$(Build.SourcesDirectory)/J2N.sln'
feedsToUse: config
nugetConfigPath: '$(Build.SourcesDirectory)/NuGet.config'
displayName: 'Restore NuGet packages'

- task: XamarinAndroid@1
inputs:
projectFile: '$(Build.SourcesDirectory)/tests/Xamarin/Android/**/*.Tests.MonoAndroid90*.csproj'
outputDirectory: '$(Build.ArtifactStagingDirectory)/$(BinaryArtifactName)/MonoAndroid90'
configuration: '$(BuildConfiguration)'
target: 'SignAndroidPackage'
displayName: 'Build XamarinAndroid90'

- task: XamarinAndroid@1
inputs:
projectFile: '$(Build.SourcesDirectory)/tests/Xamarin/Android/**/*.Tests.MonoAndroid100*.csproj'
outputDirectory: '$(Build.ArtifactStagingDirectory)/$(BinaryArtifactName)/MonoAndroid100'
configuration: '$(BuildConfiguration)'
target: 'SignAndroidPackage'
displayName: 'Build XamarinAndroid100'

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: $(BinaryArtifactName)'
inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)/$(BinaryArtifactName)'
ArtifactName: '$(BinaryArtifactName)'
condition: succeededOrFailed()

- stage: Test_Stage
displayName: 'Test Stage:'
Expand Down Expand Up @@ -149,33 +181,6 @@ stages:
testResultsArtifactName: '$(TestResultsArtifactName)'
maximumAllowedFailures: $(maximumAllowedFailures)

- job: Test_netcoreapp1_0
condition: and(succeeded(), ne(variables['RunTests'], 'false'))
strategy:
matrix:
Windows:
osName: 'Windows'
imageName: 'windows-2019'
maximumAllowedFailures: 0 # Maximum allowed failures for a successful build
Linux:
osName: 'Linux'
imageName: 'ubuntu-16.04'
maximumAllowedFailures: 0 # Maximum allowed failures for a successful build
macOS:
osName: 'macOS'
imageName: 'macOS-10.14'
maximumAllowedFailures: 0 # Maximum allowed failures for a successful build
displayName: 'Test netcoreapp1.0 on'
pool:
vmImage: $(imageName)
steps:
- template: 'build/azure-templates/run-tests-on-os.yml'
parameters:
osName: $(osName)
testTargetFrameworks: 'netcoreapp1.0'
testResultsArtifactName: '$(TestResultsArtifactName)'
maximumAllowedFailures: $(maximumAllowedFailures)

- job: Test_net461
condition: and(succeeded(), ne(variables['RunTests'], 'false'))
displayName: 'Test net461 on Windows'
Expand All @@ -202,6 +207,34 @@ stages:
testResultsArtifactName: '$(TestResultsArtifactName)'
maximumAllowedFailures: 0 # Maximum allowed failures for a successful build

- job: Test_MonoAndroid90
condition: and(succeeded(), ne(variables['RunTests'], 'false'))
displayName: 'Test MonoAndroid90 on macOS'
pool:
vmImage: 'macOS-10.15'
steps:
- template: 'build/azure-templates/run-tests-on-android.yml'
parameters:
osName: 'Android'
androidAbi: 'x86_64'
testTargetFrameworks: 'MonoAndroid90'
testResultsArtifactName: '$(TestResultsArtifactName)'
maximumAllowedFailures: 9 # Maximum allowed failures for a successful build

- job: Test_MonoAndroid100
condition: and(succeeded(), ne(variables['RunTests'], 'false'))
displayName: 'Test MonoAndroid100 on macOS'
pool:
vmImage: 'macOS-10.15'
steps:
- template: 'build/azure-templates/run-tests-on-android.yml'
parameters:
osName: 'Android'
androidAbi: 'x86_64'
testTargetFrameworks: 'MonoAndroid100'
testResultsArtifactName: '$(TestResultsArtifactName)'
maximumAllowedFailures: 9 # Maximum allowed failures for a successful build


- stage: Publish_Stage
displayName: 'Publish Stage:'
Expand Down
13 changes: 11 additions & 2 deletions build/TestReferences.Common.targets
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
<Project>
<ItemGroup Label="Test Project Common References">
<!-- Test projects for Xamarin will consume the assembly as .NET Standard, so we need to adjust the dependencies -->
<PropertyGroup Condition=" !$(TargetFramework.StartsWith('netstandard')) ">
<!-- This version contains the TimeoutAttribute for .NET Core -->
<NUnitPackageReferenceVersion>3.12.0</NUnitPackageReferenceVersion>
</PropertyGroup>

<ItemGroup Label="Test Project Common References" Condition=" !$(TargetFramework.StartsWith('netstandard')) ">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageReferenceVersion)" />
<PackageReference Include="NUnit" Version="$(NUnitPackageReferenceVersion)" />
<PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3TestAdapterPackageReferenceVersion)" />
</ItemGroup>

<ItemGroup Label="Test Project Common References">
<PackageReference Include="NUnit" Version="$(NUnitPackageReferenceVersion)" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/TestTargetFramework.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<!-- Allow the build script to pass in the test frameworks to build for.
This overrides the above TargetFramework setting.
TODO: Due to a parsing bug, we cannot pass a string with a ; to dotnet msbuild, so passing true as a workaround -->
<TargetFrameworks Condition=" '$(TestAllTargetFrameworks)' == 'true' ">netcoreapp3.1;netcoreapp3.0;netcoreapp2.1;netcoreapp1.0;net461;net452</TargetFrameworks>
<TargetFrameworks Condition=" '$(TestAllTargetFrameworks)' == 'true' ">netcoreapp3.1;netcoreapp3.0;netcoreapp2.1;net461;net452;netstandard2.1;netstandard2.0</TargetFrameworks>
<TargetFramework Condition=" '$(TargetFrameworks)' != '' "></TargetFramework>
</PropertyGroup>

Expand Down
13 changes: 3 additions & 10 deletions build/azure-templates/build-pack-and-publish-libraries.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ steps:
displayName: 'Validate Template Parameters'

- task: UseDotNet@2
displayName: 'Use .NET Core sdk 3.1.404'
displayName: 'Use .NET sdk 5.0.100'
inputs:
version: 3.1.404
version: 5.0.100

# Runs dotnet build
- task: DotNetCoreCLI@2
Expand Down Expand Up @@ -99,11 +99,4 @@ steps:
Write-Host "Publishing '$framework' to '$outputPath'..."
dotnet publish --output "$outputPath" --framework "$framework" --configuration "$configuration" --no-build --no-restore --verbosity normal /p:TestAllTargetFrameworks=true
}
displayName: 'dotnet publish'

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: ${{ parameters.binaryArtifactName }}'
inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)/${{ parameters.binaryArtifactName }}'
ArtifactName: '${{ parameters.binaryArtifactName }}'
condition: succeededOrFailed()
displayName: 'dotnet publish'
2 changes: 1 addition & 1 deletion build/azure-templates/gitversioning-increment-and-persist-versions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ steps:
inputs:
command: custom
custom: tool
arguments: install nbgv --tool-path . --add-source https://api.nuget.org/v3/index.json --version 3.0.28
arguments: install nbgv --tool-path . --add-source https://api.nuget.org/v3/index.json --version 3.3.37
displayName: Install NBGV tool (GitVersioning)

- script: nbgv cloud --common-vars --all-vars
Expand Down
Loading

0 comments on commit 9fa5f07

Please sign in to comment.