-
Notifications
You must be signed in to change notification settings - Fork 533
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[One .NET] Add Microsoft.Android-Tests unit tests
A new version of Mono.Android-Tests has been added to run against the .NET 6 SDK: * `tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj` To support this, new .NET .csproj files have been added alongside all of the existing legacy Xamarin.Android unit test library projects. These projects target `net5.0-android` and build against our .NET 6 SDK: * `src/Mono.Android/Test/Java.Interop-Tests/Java.Interop-Tests.NET.csproj` * `src/Mono.Android/Test/Mono.Android-Test.Library/Mono.Android-Test.Library.NET.csproj` * `src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.NET.csproj` * `tests/TestRunner.Core/TestRunner.Core.NET.csproj` * `tests/TestRunner.NUnit/TestRunner.NUnit.NET.csproj` The `_CreateAar` target was being skipped for the new Java.Interop-Tests.NET project, as it had no inputs. As a result, the `Mono.Android-Test-classes.jar` file required by these tests was not being included in the application project. To fix this, I've added `@(AndroidJavaLibrary)` to `@(_CreateAarInputs)` so that these items will also be considered as inputs for this target/task.
- Loading branch information
Showing
27 changed files
with
280 additions
and
297 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
35 changes: 35 additions & 0 deletions
35
src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.NET.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
<Project Sdk="Microsoft.NET.Sdk" > | ||
|
||
<PropertyGroup> | ||
<TargetFramework>net5.0-android</TargetFramework> | ||
<OutputType>Library</OutputType> | ||
<RootNamespace>Xamarin.Android.NUnitLite</RootNamespace> | ||
<SignAssembly>true</SignAssembly> | ||
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile> | ||
<AndroidApplication>false</AndroidApplication> | ||
<NoStdLib>true</NoStdLib> | ||
<!-- Disable XML doc warnings: | ||
CS1570: XML comment has badly formed XML - 'Whitespace is not allowed at this location.' | ||
CS1572: XML comment has a param tag for 'Bar', but there is no parameter by that name | ||
CS1591: Missing XML comment for publicly visible type or member 'Foo' | ||
--> | ||
<NoWarn>1570;1572;1591</NoWarn> | ||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> | ||
</PropertyGroup> | ||
|
||
<Import Project="..\..\build-tools\scripts\MonoAndroidFramework.props" /> | ||
|
||
<PropertyGroup> | ||
<DebugSymbols>true</DebugSymbols> | ||
<Optimize>false</Optimize> | ||
<OutputPath>..\..\bin\$(Configuration)\lib\xamarin.android\xbuild-frameworks\Microsoft.Android\</OutputPath> | ||
<DefineConstants>$(DefineConstants);NUNITLITE;CLR_4_0;NET_4_5;__MOBILE__;MONOTOUCH</DefineConstants> | ||
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
<GenerateDocumentation>True</GenerateDocumentation> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<Compile Include="..\..\src-ThirdParty\NUnitLite\**\*.cs" /> | ||
</ItemGroup> | ||
|
||
</Project> |
Oops, something went wrong.