-
Notifications
You must be signed in to change notification settings - Fork 515
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[tests/dotnet] Add .NET/Mac Catalyst test projects for dont link, lin…
…k sdk and link all. (#12154) * Add proper .NET project files for dont link, link sdk and link all. This includes a Mac Catalyst variant, and adding helpful Makefile targets for simple execution. * Adjust various tests to work with Mac Catalyst. * Add the new Mac Catalyst variants to xharness. This is a partial fix for #10833.
- Loading branch information
Showing
35 changed files
with
508 additions
and
453 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"[]> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>CFBundleDisplayName</key> | ||
| <string>DontLinkTest</string> | ||
| <key>CFBundleIdentifier</key> | ||
| <string>com.xamarin.dontlink</string> | ||
| <key>LSMinimumSystemVersion</key> | ||
| <string>10.15</string> | ||
| </dict> | ||
| </plist> |
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 @@ | ||
| include ../shared.mk |
15 changes: 15 additions & 0 deletions
15
tests/linker/ios/dont link/dotnet/MacCatalyst/dont link.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,15 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net6.0-maccatalyst</TargetFramework> | ||
| <AssetTargetFallback>xamarinios10;$(AssetTargetFallback)</AssetTargetFallback> | ||
| <RootTestsDirectory>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..\..\..\..'))</RootTestsDirectory> <!-- this can't be in shared.csproj, because xharness won't see it there --> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <!-- this empty item group is here for xharness --> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="$(RootTestsDirectory)/linker/ios/dont link/dotnet/shared.csproj" /> | ||
|
|
||
| </Project> |
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,4 @@ | ||
| include ../shared.mk | ||
|
|
||
| dev: | ||
| $(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY) /p:RuntimeIdentifier=ios-arm64 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project> | ||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <DefineConstants>NET;$(DefineConstants)</DefineConstants> | ||
| <LangVersion>latest</LangVersion> | ||
| <RootNamespace>dontlink</RootNamespace> | ||
| <AssemblyName>dont link</AssemblyName> | ||
| <MtouchLink>None</MtouchLink> | ||
| <ThisTestDirectory>$(RootTestsDirectory)\linker\ios\dont link</ThisTestDirectory> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="NUnitLite" Version="3.12.0" /> | ||
| <ProjectReference Include="$(RootTestsDirectory)\..\external\Touch.Unit\Touch.Client\dotnet\$(_PlatformName)\Touch.Client-$(_PlatformName).dotnet.csproj" /> | ||
| <!-- MonoTouch.Dialog references System.Json, which isn't shipped with .NET5, so reference the NuGet instead --> | ||
| <PackageReference Include="System.Json" Version="4.7.1" /> | ||
| <ProjectReference Include="$(RootTestsDirectory)\BundledResources\dotnet\$(_PlatformName)\BundledResources.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="Info.plist" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="$(ThisTestDirectory)\Main.cs" /> | ||
| <Compile Include="$(ThisTestDirectory)\AppDelegate.cs" /> | ||
| <Compile Include="$(ThisTestDirectory)\DontLinkRegressionTests.cs" /> | ||
| <Compile Include="$(ThisTestDirectory)\TableViewSourceTest.cs" /> | ||
| <Compile Include="$(ThisTestDirectory)\CalendarTest.cs" /> | ||
| <Compile Include="$(ThisTestDirectory)\..\..\CommonDontLinkTest.cs"> | ||
| <Link>CommonDontLinkTest.cs</Link> | ||
| </Compile> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <InterfaceDefinition Include="$(ThisTestDirectory)\LaunchScreen.storyboard" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ImageAsset Include="$(ThisTestDirectory)\Assets.xcassets\AppIcons.appiconset\Contents.json" /> | ||
| <ImageAsset Include="$(ThisTestDirectory)\Assets.xcassets\AppIcons.appiconset\Icon-app-60%403x.png" /> | ||
| <ImageAsset Include="$(ThisTestDirectory)\Assets.xcassets\AppIcons.appiconset\icon-app-57.png" /> | ||
| <ImageAsset Include="$(ThisTestDirectory)\Assets.xcassets\AppIcons.appiconset\icon-app-57%402x.png" /> | ||
| <ImageAsset Include="$(ThisTestDirectory)\Assets.xcassets\AppIcons.appiconset\icon-app-60%402x.png" /> | ||
| <ImageAsset Include="$(ThisTestDirectory)\Assets.xcassets\AppIcons.appiconset\icon-app-72.png" /> | ||
| <ImageAsset Include="$(ThisTestDirectory)\Assets.xcassets\AppIcons.appiconset\icon-app-72%402x.png" /> | ||
| <ImageAsset Include="$(ThisTestDirectory)\Assets.xcassets\AppIcons.appiconset\icon-app-76.png" /> | ||
| <ImageAsset Include="$(ThisTestDirectory)\Assets.xcassets\AppIcons.appiconset\icon-app-76%402x.png" /> | ||
| <ImageAsset Include="$(ThisTestDirectory)\Assets.xcassets\AppIcons.appiconset\icon-app-83.5%402x.png" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Include="$(ThisTestDirectory)\BoardingPass.pkpass"> | ||
| <Link>BoardingPass.pkpass</Link> | ||
| </Content> | ||
| </ItemGroup> | ||
| </Project> |
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,30 @@ | ||
| TOP=../../../../../.. | ||
|
|
||
| include $(TOP)/Make.config | ||
| include $(TOP)/mk/colors.mk | ||
|
|
||
| reload: | ||
| $(Q) rm -Rf $(TOP)/tests/dotnet/packages | ||
| $(Q) $(MAKE) -C $(TOP) -j8 all | ||
| $(Q) $(MAKE) -C $(TOP) -j8 install | ||
| $(Q) git clean -xfdq | ||
|
|
||
| prepare: | ||
| $(Q) $(MAKE) -C $(TOP)/tests/dotnet copy-dotnet-config | ||
|
|
||
| reload-and-build: | ||
| $(Q) $(MAKE) reload | ||
| $(Q) $(MAKE) build | ||
|
|
||
| reload-and-run: | ||
| $(Q) $(MAKE) reload | ||
| $(Q) $(MAKE) run | ||
|
|
||
| build: prepare | ||
| $(DOTNET6) build /bl:$@.binlog *.csproj $(MSBUILD_VERBOSITY) | ||
|
|
||
| run: prepare | ||
| $(DOTNET6) build /bl:$@.binlog *.csproj /v:diag -t:Run | ||
|
|
||
| diag: | ||
| $(DOTNET6) build /v:diag msbuild.binlog |
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 @@ | ||
| include ../shared.mk |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"[]> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>CFBundleDisplayName</key> | ||
| <string>LinkAll</string> | ||
| <key>CFBundleIdentifier</key> | ||
| <string>com.xamarin.linkall</string> | ||
| <key>LSMinimumSystemVersion</key> | ||
| <string>10.15</string> | ||
| </dict> | ||
| </plist> |
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 @@ | ||
| include ../shared.mk |
14 changes: 14 additions & 0 deletions
14
tests/linker/ios/link all/dotnet/MacCatalyst/link all.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,14 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net6.0-maccatalyst</TargetFramework> | ||
| <AssetTargetFallback>xamarinios10;$(AssetTargetFallback)</AssetTargetFallback> | ||
| <RootTestsDirectory>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..\..\..\..'))</RootTestsDirectory> <!-- this can't be in shared.csproj, because xharness won't see it there --> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <!-- this empty item group is here for xharness --> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="$(RootTestsDirectory)/linker/ios/link all/dotnet/shared.csproj" /> | ||
| </Project> |
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,4 @@ | ||
| include ../shared.mk | ||
|
|
||
| dev: | ||
| $(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY) /p:RuntimeIdentifier=ios-arm64 |
Oops, something went wrong.
de7f08dThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✅ [CI Build] Tests passed on Build. ✅
Tests passed on Build.
API diff
✅ API Diff from stable
View API diff
API & Generator diff
✅ API Diff (from PR only) (no change)
✅ Generator Diff (no change)
Packages generated
View packages
🎉 All 224 tests passed 🎉
Pipeline on Agent XAMBOT-1033.BigSur'
[tests/dotnet] Add .NET/Mac Catalyst test projects for dont link, link sdk and link all. (#12154)
de7f08dThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🔥 Tests failed catastrophically on VSTS: device tests tvOS 🔥
Not enough free space in the host.
Pipeline on Agent
[tests/dotnet] Add .NET/Mac Catalyst test projects for dont link, link sdk and link all. (#12154)
de7f08dThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.
Pipeline on Agent
[tests/dotnet] Add .NET/Mac Catalyst test projects for dont link, link sdk and link all. (#12154)
de7f08dThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.
Pipeline on Agent
[tests/dotnet] Add .NET/Mac Catalyst test projects for dont link, link sdk and link all. (#12154)
de7f08dThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✅ Tests passed on macOS Mac Catalina (10.15) ✅
Tests passed
All tests on macOS X Mac Catalina (10.15) passed.
Pipeline on Agent
[tests/dotnet] Add .NET/Mac Catalyst test projects for dont link, link sdk and link all. (#12154)
de7f08dThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✅ Tests passed on macOS Mac Mojave (10.14) ✅
Tests passed
All tests on macOS X Mac Mojave (10.14) passed.
Pipeline on Agent
[tests/dotnet] Add .NET/Mac Catalyst test projects for dont link, link sdk and link all. (#12154)
de7f08dThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✅ Tests passed on macOS Mac High Sierra (10.13) ✅
Tests passed
All tests on macOS X Mac High Sierra (10.13) passed.
Pipeline on Agent
[tests/dotnet] Add .NET/Mac Catalyst test projects for dont link, link sdk and link all. (#12154)