Skip to content

Commit

Permalink
[tests] Rework the bindings-test and fsharplibrary test projects to f…
Browse files Browse the repository at this point in the history 
…ollow the pattern of the other .NET test projects. (#12431)

* [tests] Make fsharplibrary follow the pattern of the rest.

* [tests] Make bindings-test follow the pattern of the rest.
  • Loading branch information
@rolfbjarne
rolfbjarne committed Aug 14, 2021
1 parent 874a6f9 commit 77a838a
Show file tree
Hide file tree
Showing 17 changed files with 94 additions and 29 deletions.
9 changes: 7 additions & 2 deletions tests/bindings-test/dotnet/MacCatalyst/bindings-test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-maccatalyst</TargetFramework>
<NativeLibName>maccatalyst-fat</NativeLibName>
</PropertyGroup>
<Import Project="..\shared.targets" />

<!-- Imports of the form '../shared.fsproj' will be processed by xharness -->
<Import Project="../shared.csproj" />

<ItemGroup>
<!-- this empty item group is here for xharness -->
</ItemGroup>
</Project>
9 changes: 7 additions & 2 deletions tests/bindings-test/dotnet/iOS/bindings-test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<NativeLibName>ios-fat</NativeLibName>
</PropertyGroup>
<Import Project="..\shared.targets" />

<!-- Imports of the form '../shared.fsproj' will be processed by xharness -->
<Import Project="../shared.csproj" />

<ItemGroup>
<!-- this empty item group is here for xharness -->
</ItemGroup>
</Project>
9 changes: 7 additions & 2 deletions tests/bindings-test/dotnet/macOS/bindings-test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-macos</TargetFramework>
<NativeLibName>macos-fat</NativeLibName>
</PropertyGroup>
<Import Project="..\shared.targets" />

<!-- Imports of the form '../shared.fsproj' will be processed by xharness -->
<Import Project="../shared.csproj" />

<ItemGroup>
<!-- this empty item group is here for xharness -->
</ItemGroup>
</Project>
4 changes: 3 additions & 1 deletion tests/bindings-test/dotnet/shared.targets → tests/bindings-test/dotnet/shared.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
<LangVersion>latest</LangVersion>
<IsBindingProject>true</IsBindingProject>

<RootTestsDirectory>$(MSBuildThisFileDirectory)\..\..</RootTestsDirectory>
<RootTestsDirectory>$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\..\..\..'))</RootTestsDirectory>
<BindingsTestDirectory>$(RootTestsDirectory)\bindings-test</BindingsTestDirectory>
<TestLibrariesDirectory>$(RootTestsDirectory)\test-libraries</TestLibrariesDirectory>
</PropertyGroup>

<Import Project="$(RootTestsDirectory)/common/shared-dotnet.csproj" />

<ItemGroup>
<PackageReference Include="NUnitLite" Version="3.12.0" />
</ItemGroup>
Expand Down
9 changes: 7 additions & 2 deletions tests/bindings-test/dotnet/tvOS/bindings-test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-tvos</TargetFramework>
<NativeLibName>tvos-fat</NativeLibName>
</PropertyGroup>
<Import Project="..\shared.targets" />

<!-- Imports of the form '../shared.fsproj' will be processed by xharness -->
<Import Project="../shared.csproj" />

<ItemGroup>
<!-- this empty item group is here for xharness -->
</ItemGroup>
</Project>
8 changes: 0 additions & 8 deletions tests/bindings-test/dotnet/watchOS/bindings-test.csproj
View file

This file was deleted.

1 change: 1 addition & 0 deletions tests/fsharplibrary/dotnet/MacCatalyst/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
8 changes: 7 additions & 1 deletion tests/fsharplibrary/dotnet/MacCatalyst/fsharplibrary.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@
<PropertyGroup>
<TargetFramework>net6.0-maccatalyst</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.targets" />

<!-- Imports of the form '../shared.fsproj' will be processed by xharness -->
<Import Project="../shared.fsproj" />

<ItemGroup>
<!-- this empty item group is here for xharness -->
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions tests/fsharplibrary/dotnet/iOS/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
8 changes: 7 additions & 1 deletion tests/fsharplibrary/dotnet/iOS/fsharplibrary.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.targets" />

<!-- Imports of the form '../shared.fsproj' will be processed by xharness -->
<Import Project="../shared.fsproj" />

<ItemGroup>
<!-- this empty item group is here for xharness -->
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions tests/fsharplibrary/dotnet/macOS/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
8 changes: 7 additions & 1 deletion tests/fsharplibrary/dotnet/macOS/fsharplibrary.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@
<PropertyGroup>
<TargetFramework>net6.0-macos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.targets" />

<!-- Imports of the form '../shared.fsproj' will be processed by xharness -->
<Import Project="../shared.fsproj" />

<ItemGroup>
<!-- this empty item group is here for xharness -->
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion tests/fsharplibrary/dotnet/shared.targets → tests/fsharplibrary/dotnet/shared.fsproj
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<GenerateTailCalls>true</GenerateTailCalls>

<RootTestsDirectory>$(MSBuildThisFileDirectory)\..\..</RootTestsDirectory>
<RootTestsDirectory>$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\..\..\..'))</RootTestsDirectory>
<FSharpLibraryDirectory>$(RootTestsDirectory)\fsharplibrary</FSharpLibraryDirectory>

<AssemblyOriginatorKeyFile>$(RootTestsDirectory)\..\product.snk</AssemblyOriginatorKeyFile>
Expand Down
29 changes: 29 additions & 0 deletions tests/fsharplibrary/dotnet/shared.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
TOP=../../../..
include $(TOP)/Make.config
include $(TOP)/mk/colors.mk

prepare:
$(Q) $(MAKE) -C $(TOP)/tests/dotnet copy-dotnet-config

reload:
$(Q) rm -Rf $(TOP)/tests/dotnet/packages
$(Q) $(MAKE) -C $(TOP) -j8 all
$(Q) $(MAKE) -C $(TOP) -j8 install
$(Q) git clean -xfdq

reload-and-build:
$(Q) $(MAKE) reload
$(Q) $(MAKE) build

reload-and-run:
$(Q) $(MAKE) reload
$(Q) $(MAKE) run

build: prepare
$(Q) $(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY) $(BUILD_ARGUMENTS)

run: prepare
$(Q) $(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY) $(BUILD_ARGUMENTS) -t:Run

diag: prepare
$(Q) $(DOTNET6) build /v:diag msbuild.binlog
1 change: 1 addition & 0 deletions tests/fsharplibrary/dotnet/tvOS/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
8 changes: 7 additions & 1 deletion tests/fsharplibrary/dotnet/tvOS/fsharplibrary.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@
<PropertyGroup>
<TargetFramework>net6.0-tvos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.targets" />

<!-- Imports of the form '../shared.fsproj' will be processed by xharness -->
<Import Project="../shared.fsproj" />

<ItemGroup>
<!-- this empty item group is here for xharness -->
</ItemGroup>
</Project>
7 changes: 0 additions & 7 deletions tests/fsharplibrary/dotnet/watchOS/fsharplibrary.fsproj
View file

This file was deleted.

6 comments on commit 77a838a

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ Status for 'xamarin-macios - sample testing (build)': failure.

  • ❌ Debug_iPhone_AF: Failed
  • ❌ Debug_iPhone_GR: Failed
  • ❌ Debug_iPhone_SZ: Failed
  • ❌ Debug_iPhoneSimulator: Failed
  • ❌ Release_iPhone_AF: Failed
  • ❌ Release_iPhone_GR: Failed
  • ❌ Release_iPhone_SZ: Failed
  • ❌ Release_iPhoneSimulator: Failed
  • ❌ Debug_Mac: Failed
  • ❌ Release_Mac: Failed
  • ❌ PublishPerformanceData: Failed

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ [CI Build] Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

✅ API Diff (from PR only) (no change)
✅ Generator Diff (only version changes)

Packages generated

View packages

Test results

2 tests failed, 242 tests passed.

Failed tests

  • monotouch-test/iOS Unified 64-bits - simulator/Release (all optimizations): Failed
  • Documentation/All: Failed

Pipeline on Agent XAMBOT-1038.BigSur'
[tests] Rework the bindings-test and fsharplibrary test projects to follow the pattern of the other .NET test projects. (#12431)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests tvOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[tests] Rework the bindings-test and fsharplibrary test projects to follow the pattern of the other .NET test projects. (#12431)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests iOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[tests] Rework the bindings-test and fsharplibrary test projects to follow the pattern of the other .NET test projects. (#12431)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ Tests failed on macOS M1 - Mac Big Sur (11.5) ❌

Tests failed on M1 - Mac Big Sur (11.5).

Failed tests are:

  • xammac_tests

Pipeline on Agent
[tests] Rework the bindings-test and fsharplibrary test projects to follow the pattern of the other .NET test projects. (#12431)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (Build). ⚠️

Results were skipped for this run Azure Devops.

Pipeline on Agent
[tests] Rework the bindings-test and fsharplibrary test projects to follow the pattern of the other .NET test projects. (#12431)

  • [tests] Make fsharplibrary follow the pattern of the rest.

  • [tests] Make bindings-test follow the pattern of the rest.

Please sign in to comment.