Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Xharness] Bring xharness changes to d16-8 #9951

Merged
merged 116 commits into from
Oct 26, 2020
Merged

[Xharness] Bring xharness changes to d16-8 #9951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
e077d61
[xharness] Add support for skipping more test variations.
rolfbjarne Jun 30, 2020
4d53e87
[xharness] Add the dotnet introspection project file to our list of p…
rolfbjarne Jun 19, 2020
dae4118
[xharness] Clearly label .NET projects as such.
rolfbjarne Jun 30, 2020
2073ff0
[xharness] Disable project generation for .NET projects for now.
rolfbjarne Jun 19, 2020
c109ae3
[xharness] Create DotNetBuildTasks when we need to build .NET projects.
rolfbjarne Jun 19, 2020
4e7030a
[xharness] Improve project cloning to take into account default inclu…
rolfbjarne Jun 19, 2020
1741973
[xharness] Add a GetDotNetExecutable callback and an MSBuildPath prop…
rolfbjarne Jun 19, 2020
4d48c5e
[xharness] Retrieve a .NET project's OutputPath by running MSBuild.
rolfbjarne Jun 19, 2020
a91875c
[xharness] Skip the old simulator variation for introspection/dotnet …
rolfbjarne Jun 30, 2020
4d67ad1
[xharness] Try to not have log directories with spaces in them. (#8976)
rolfbjarne Jul 1, 2020
c0543d1
[xharness] Don't generate makefile targets for .NET projects.
rolfbjarne Jul 3, 2020
1958699
[xharness] Add support for generating a tvOS version of .NET iOS proj…
rolfbjarne Jul 13, 2020
89f9e39
[xharness] Use Cecil to inspect assemblies, instead of Reflection. (#…
rolfbjarne Jul 15, 2020
a6b36d6
[xharness] Don't group simulators when running in server mode. (#9098)
rolfbjarne Jul 16, 2020
a125dd5
[xharness] Fix finding testable types in test assemblies. Fixes #xama…
rolfbjarne Jul 16, 2020
9497374
[xharness] Parse NUnit v2 xml reports correctly. (#9110)
rolfbjarne Jul 17, 2020
0030b9f
[xharness] De-asyncify template expansion. (#9104)
rolfbjarne Jul 17, 2020
4f54eec
[xharness] Improve code to not throw exceptions in the first place in…
rolfbjarne Jul 17, 2020
d79f2f6
[xharness] Try harder to make lldb quit after trying to get a backtra…
rolfbjarne Jul 17, 2020
8d096ad
[xharness] Improve process killing a bit. (#9120)
rolfbjarne Jul 17, 2020
3e303f1
[xharness] Don't try to write cleaned xml into the same file as the d…
rolfbjarne Jul 20, 2020
b79a97b
[xharness] Don't replace existing files, instead add new files, when …
rolfbjarne Jul 20, 2020
f0435c4
[xharness] Fix BCL project generation for watchOS projects. (#9131)
rolfbjarne Jul 20, 2020
77dad96
[xharness] Only try to parse the build log if we have a build log. (#…
rolfbjarne Jul 20, 2020
fb77ec5
[xharness] Don't generate into the same directory/files for macOS Mod…
rolfbjarne Jul 21, 2020
936c056
[xharness] Disable default inclusion behavior for the introspection .…
rolfbjarne Jul 21, 2020
e435bfa
[xharness] Generate BCL projects asynchronously. (#9083)
rolfbjarne Jul 21, 2020
37d82a5
[xharness] Document the test loading process a little bit.
rolfbjarne Jul 21, 2020
e9c2e41
[xharness] Generate projects into a subdirectory for each project.
rolfbjarne Jul 17, 2020
ceb22f8
[xharness] Remove a lot of special-casing for the mono-native tests.
rolfbjarne Jul 20, 2020
c069f60
[xharness] Store attribute in local variable instead of fetching it t…
rolfbjarne Jul 20, 2020
24409ed
[xharness] Make ProjectFileExtensions.GetInfoPListInclude a bit clearer.
rolfbjarne Jul 21, 2020
163d808
[xharness] Add support for specifying whether variations should be ge…
rolfbjarne Jul 20, 2020
b537ab0
[xharness] Don't generate variations for BCL projects using the norma…
rolfbjarne Jul 20, 2020
176a9b3
[xharness] Add a TestPlatform value to TestProject, and use it to ind…
rolfbjarne Jul 20, 2020
c35e900
[xharness] Make the templates path an input parameter for the BCL tem…
rolfbjarne Jul 20, 2020
e2f8aed
[xharness] Make the BCL project generation generate each project file…
rolfbjarne Jul 20, 2020
1240d6a
[tests] Put the iOS and macOS mono-native templates in their own dire…
rolfbjarne Jul 21, 2020
82e7111
[xharness] Simplify the MonoNativeInfo class a bit by removing the cu…
rolfbjarne Jul 21, 2020
17728e3
[tests] Move bindings-test[-mac].csproj to their own directory.
rolfbjarne Jul 21, 2020
5d8f06f
[xharness] Fix compiler warning. (#9147)
rolfbjarne Jul 22, 2020
a0702a3
[xharness] Fix logic to not create makefile targets to run BCL tests.…
rolfbjarne Jul 22, 2020
137fe63
[tests] Set the correct mono-native link mode and flavor defines in t…
rolfbjarne Jul 22, 2020
0eeecdd
[xharness] Remove a redundant ToArray.
rolfbjarne Jul 22, 2020
15c8b00
[xharness] Allow for null environment variables to mlaunch. (#9140)
rolfbjarne Jul 22, 2020
4492eac
[xharness] Generate makefile targets for non-executable projects. (#9…
rolfbjarne Jul 23, 2020
b9d0ec5
[xharness] Backport Touch.Unit fix for command line parsing. (#9165)
rolfbjarne Jul 23, 2020
c28aecc
[tests] Info.plists should be inside LogicalName, not Link.
rolfbjarne Jul 23, 2020
d15c0dd
Merge remote-tracking branch 'origin/main' into xharness-a-directory-…
rolfbjarne Jul 23, 2020
7e302e3
[xharness] Fix finding Info.plist, and add some tests too.
rolfbjarne Jul 24, 2020
9bcbe6f
[xharness] Fix how .NET projects are ignored. (#9168)
rolfbjarne Jul 24, 2020
c76ddf3
Merge remote-tracking branch 'origin/main' into xharness-a-directory-…
rolfbjarne Jul 27, 2020
5ff31fb
[xharness] If we're not generating projects in the Target class, the …
rolfbjarne Jul 27, 2020
705e863
[xharness] Make restoring nugets the default for all test projects. (…
rolfbjarne Jul 30, 2020
767d20f
[xharness] Improve restoring NuGets for Xamarin.Mac projects in the m…
rolfbjarne Jul 30, 2020
78b822d
[tests] Migrate the sample tests to use package references. (#9244)
rolfbjarne Jul 31, 2020
989e042
[tests] Switch msbuild-mac to use package references. (#9245)
rolfbjarne Jul 31, 2020
a1a5291
[xharness] Mark the .NET tests project as a .NET project so that we d…
rolfbjarne Jul 31, 2020
3a6ccf3
[xharness] Resolve relative project references using the referencing …
rolfbjarne Jul 31, 2020
2290261
[xharness] Don't try to parse a build log that doesn't exist. (#9253)
rolfbjarne Jul 31, 2020
fe29c77
[xharness] Add support for generating/duplicating projects with a Tou…
rolfbjarne Jul 14, 2020
519e0c6
[tests] Remove dead code related to GuiUnit and the GuiUnit submodule.
rolfbjarne Jul 16, 2020
89e0f16
[xharness] Change how we run macOS unit tests to work with Touch.Client.
rolfbjarne Jul 16, 2020
4bae1d2
[xharness] Add the Touch.Client projects to our solutions instead of …
rolfbjarne Jul 17, 2020
c6c8753
[tests] The upstream NUnitLine isn't linker safe, so add an xml file …
rolfbjarne Jul 30, 2020
7257372
[xharness] Add support for finding/setting the main Xamarin import am…
rolfbjarne Jul 31, 2020
ab0eab1
[xharness] Use LogFile instead of ResultFile in macOS BCL tests to ma…
rolfbjarne Jul 31, 2020
bd2e76a
[tests] Restore projects before building them from the command line.
rolfbjarne Aug 3, 2020
740a12e
[xharness] Implement Log.GetReader for all loggers. (#9257)
rolfbjarne Aug 3, 2020
6110664
[xharness] Fix main log parsing by not requiring it to come from a fi…
rolfbjarne Aug 3, 2020
6fbf213
[xharness] Improve parsing of NUnitV2 xml reports to fix an issue wit…
rolfbjarne Aug 3, 2020
d4ed26a
Merge remote-tracking branch 'origin/main' into HEAD
rolfbjarne Aug 4, 2020
206154b
Remove wrongly added dir. (#9301)
mandel-macaque Aug 6, 2020
34fd853
[Harness] Fix some typos. (#9303)
mandel-macaque Aug 6, 2020
8b10a7a
[xharness] Make it possible to include .NET tests by setting a label.…
rolfbjarne Aug 7, 2020
df35a56
[xharness] Look at the exact NUnit version an NUnit project is refere…
rolfbjarne Aug 10, 2020
8b82663
[xharness] Add support for adding PropertyGroups for unknown platform…
rolfbjarne Aug 12, 2020
10b6f27
[xharness] Add support for getting the default AssemblyName for proje…
rolfbjarne Aug 14, 2020
d087d37
[xharness] Add the .NET version of interdependent-binding-projects to…
rolfbjarne Aug 12, 2020
4fd3a30
[xharness] Enhance ResolveAllPaths to understand $(RootTestsDirectory).
rolfbjarne Aug 13, 2020
758773b
[xharness] Do not mark DeviceLoaders as loaded when loading fails (#9…
premun Aug 17, 2020
f30da91
[xharness] Make sure MSBUILD_EXE_PATH is not set when executing dotnet.
rolfbjarne Aug 17, 2020
2604460
[xharness] Bump timeout for the .NET tests.
rolfbjarne Aug 17, 2020
5c6d5e2
[xharness] Don't clone the same project multiple times when reached t…
rolfbjarne Aug 18, 2020
8c2b577
[dotnet] Add support for consuming binding projects. (#9376)
rolfbjarne Aug 20, 2020
160de0f
[xharness] Make it possible to make a project ignored by default from…
rolfbjarne Aug 21, 2020
fbb60e0
[xharness] Add monotouch-test to the .NET lineup.
rolfbjarne Jul 17, 2020
90040e0
[xharness] Improve resolving paths in project files.
rolfbjarne Aug 21, 2020
32e52f2
[xharness] Process '$(RootTestsDirectory)' before bailing due to any …
rolfbjarne Aug 24, 2020
3f17cc3
[tests] Port dont link to .NET (#9488)
rolfbjarne Aug 25, 2020
c9885c2
[xharness] don't link is now green on .NET!
rolfbjarne Aug 25, 2020
61f7702
[tests] Port link sdk to .NET
rolfbjarne Jul 23, 2020
594668b
[xharness] link sdk is now green on .NET!
rolfbjarne Aug 26, 2020
e4d14ad
[tests] Port link all to .NET (#9515)
rolfbjarne Aug 27, 2020
f45c0a2
[xharness] Use the local 'ignore' variable instead of fetching 'test.…
rolfbjarne Aug 27, 2020
dc7bbce
[xharness] Enable monotouch-test/.NET by default, but ignore all vari…
rolfbjarne Aug 27, 2020
3b1a771
[xharness] Enable the .NET tests when a file containing 'dotnet' is m…
rolfbjarne Aug 27, 2020
4846e28
[dotnet] Use net5.0-[ios|tvos|watchos|macos] TargetFrameworks. (#9532)
rolfbjarne Aug 31, 2020
282dbda
[dotnet] Pass the Optimize flags from the extra bundler arguments to …
rolfbjarne Sep 9, 2020
83fb8df
[dotnet-linker] Add OptimizeGeneratedCodeSubStep into the pipeline. (…
rolfbjarne Sep 10, 2020
6a998eb
[xharness] Add support for adding PropertyGroups if none are applicab…
rolfbjarne Sep 10, 2020
15b9e3c
[tests] Ignore a few link sdk tests in .NET for now. (#9614)
rolfbjarne Sep 10, 2020
4edd25a
[xharness] The linkall tests are green for .NET/Release now. (#9629)
rolfbjarne Sep 14, 2020
a715b6f
[xharness] Skip the 'dont link / AssemblyBuildTarget: SDK framework (…
rolfbjarne Sep 18, 2020
a71c489
[src] Build the .NET version of our product assemblies using a .NET 5…
rolfbjarne Sep 21, 2020
165c0b7
[xharness] Fix typo in test case creating two identical test cases. (…
rolfbjarne Sep 25, 2020
8166964
[xharness] Use XmlReaderSettings to ignore stuff we don't care about …
rolfbjarne Sep 25, 2020
2d85331
[xharness] Fix rendering human-readable results for parameterized tes…
rolfbjarne Sep 25, 2020
50dd4f9
[dotnet-linker] Add a CollectUnmarkedMembersStep that will keep linke…
rolfbjarne Sep 29, 2020
1a78355
[xharness] Only run xammac variations if macOS tests are included. (#…
rolfbjarne Sep 30, 2020
51f2f49
[xharness] The dotnet version of introspection/iOS 10.3 works fine no…
rolfbjarne Sep 30, 2020
1ab64e5
[xharness] Disable iOS 32-bit simulator tests, they don't work on Xco…
rolfbjarne Sep 30, 2020
eb098b0
Undo does changes that ship and we do not want to bring with us.
mandel-macaque Oct 21, 2020
15662be
Fix issues that do not allow compilation.
mandel-macaque Oct 21, 2020
64c6a7a
Fix mtouch tests.
mandel-macaque Oct 22, 2020
153cb06
Ignore generated files.
mandel-macaque Oct 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/Touch.Unit
Open in desktop
Submodule Touch.Unit updated from 6c5bb9 to 89afaf
3 changes: 3 additions & 0 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ $(IOS_BUILD_DIR)/reference%MonoTouch.NUnitLite.dll $(IOS_BUILD_DIR)/reference%Mo
$(call Q_PROF_CSC,ios) $(IOS_CSC) -nologo -out:$(basename $@).dll -target:library -debug:portable -optimize -publicsign \
-deterministic \
-keyfile:$(PRODUCT_KEY_PATH) -r:$(IOS_BUILD_DIR)/reference/Xamarin.iOS.dll -define:MONO -r:$(IOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll -r:$(MONOTOUCH_MONO_PATH)/System.dll -r:$(MONOTOUCH_MONO_PATH)/System.Xml.dll \
-r:$(MONOTOUCH_MONO_PATH)/System.Core.dll \
-nowarn:3006,612,649,414,1635,659 \
-define:NUNITLITE,CLR_4_0,NET_4_5,__MOBILE__,MONO $(IOS_DEFINES) \
-define:XAMCORE_2_0,__UNIFIED__ \
Expand Down Expand Up @@ -838,6 +839,7 @@ $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.pdb: $(WATCH_BUILD_DIR)/watch-32/Xa
$(WATCH_BUILD_DIR)/reference/MonoTouch.NUnitLite%dll $(WATCH_BUILD_DIR)/reference/MonoTouch.NUnitLite%pdb: $(WATCHOS_TOUCHUNIT_SOURCES) $(PRODUCT_KEY_PATH) $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll
$(call Q_PROF_CSC,watch) $(SYSTEM_CSC) -features:strict -nologo -out:$(basename $@).dll -target:library -debug:portable -optimize -publicsign -noconfig -nostdlib \
-keyfile:$(PRODUCT_KEY_PATH) -r:$(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/mscorlib.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/System.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/System.Xml.dll \
-r:$(MONOTOUCH_WATCH_MONO_PATH)/System.Core.dll \
-nowarn:3006,612,649,414,1635,659 \
-define:NUNITLITE,CLR_4_0,NET_4_5,__MOBILE__,MONO $(WATCH_DEFINES) \
-define:XAMCORE_2_0,__UNIFIED__ \
Expand Down Expand Up @@ -1069,6 +1071,7 @@ $(TVOS_BUILD_DIR)/reference/Xamarin.TVOS.pdb: $(TVOS_BUILD_DIR)/tvos-64/Xamarin.
$(TVOS_BUILD_DIR)/reference/MonoTouch.NUnitLite%dll $(TVOS_BUILD_DIR)/reference/MonoTouch.NUnitLite%pdb: $(TVOS_TOUCHUNIT_SOURCES) $(PRODUCT_KEY_PATH) $(TVOS_BUILD_DIR)/reference/Xamarin.TVOS.dll $(TVOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll
$(call Q_PROF_CSC,tvos) $(SYSTEM_CSC) -features:strict -nologo -r:$(MONOTOUCH_TV_MONO_PATH)/mscorlib.dll -out:$(basename $@).dll -target:library -debug:portable -optimize -noconfig -nostdlib -publicsign \
-keyfile:$(PRODUCT_KEY_PATH) -r:$(TVOS_BUILD_DIR)/reference/Xamarin.TVOS.dll -r:$(TVOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.Xml.dll \
-r:$(MONOTOUCH_TV_MONO_PATH)/System.Core.dll \
-nowarn:3006,612,649,414,1635,659 \
-define:NUNITLITE,CLR_4_0,NET_4_5,__MOBILE__,MONO $(TVOS_DEFINES) \
-define:XAMCORE_2_0,__UNIFIED__ \
Expand Down
2 changes: 2 additions & 0 deletions tests/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
NuGet.config
generated-projects
*index.html
*.log
*TestResult*.xml
Expand Down
117 changes: 117 additions & 0 deletions tests/bindings-test/iOS/bindings-test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D6667423-EDD8-4B50-9D98-1AC5D8A8A4EA}</ProjectGuid>
<ProjectTypeGuids>{8FFB629D-F513-41CE-95D2-7ECE97B6EEEC};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>bindingstest</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>bindings-test</AssemblyName>
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\product.snk</AssemblyOriginatorKeyFile>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
<DefineConstants></DefineConstants>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' Or '$(Configuration)' == 'Debug64_32' ">
<DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Any CPU\$(Configuration)-unified</OutputPath>
<DefineConstants>DO_NOT_REMOVE;DEBUG;;$(DefineConstants)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' Or '$(Configuration)' == 'Release32' Or '$(Configuration)' == 'Release64' Or '$(Configuration)' == 'Release-bitcode' Or '$(Configuration)' == 'Release64_32' ">
<DebugType>none</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\Any CPU\$(Configuration)-unified</OutputPath>
<DefineConstants>DO_NOT_REMOVE;$(DefineConstants)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
<Reference Include="MonoTouch.NUnitLite" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
<ItemGroup>
<ObjcBindingApiDefinition Include="..\ApiDefinition.cs" />
<ObjcBindingApiDefinition Include="..\..\generator\tests\ref-out-parameters.cs" />
<ObjcBindingApiDefinition Include="..\ApiDefinition.generated.cs" />
<ObjcBindingApiDefinition Include="..\ApiProtocol.cs" />
</ItemGroup>
<ItemGroup>
<ObjcBindingCoreSource Include="..\StructsAndEnums.cs" />
<ObjcBindingCoreSource Include="..\StructsAndEnums.generated.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.ObjCBinding.CSharp.targets" />
<PropertyGroup>
<TestLibrariesDirectory>..\..\..\tests\test-libraries</TestLibrariesDirectory>
</PropertyGroup>
<ItemGroup>
<ObjcBindingNativeLibrary Include="..\..\..\tests\test-libraries\.libs\ios-fat\libtest.a">
<Link>libtest.a</Link>
</ObjcBindingNativeLibrary>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\common\ConditionalCompilation.cs">
<Link>ConditionalCompilation.cs</Link>
</Compile>
<Compile Include="..\libtest.linkwith.cs">
<DependentUpon>libtest.a</DependentUpon>
</Compile>
<Compile Include="..\ProtocolTest.cs" />
<Compile Include="..\..\api-shared\ObjCRuntime\Registrar.cs">
<Link>Registrar.cs</Link>
</Compile>
<Compile Include="..\RegistrarBindingTest.cs" />
<Compile Include="..\..\common\TestRuntime.cs">
<Link>TestRuntime.cs</Link>
</Compile>
<Compile Include="..\RuntimeTest.cs" />
<Compile Include="..\CodeBehind.cs" />
<Compile Include="..\Messaging.cs" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\tests\test-libraries\libtest.m">
<Link>libtest.m</Link>
</None>
<None Include="..\..\..\tests\test-libraries\libtest.h">
<Link>libtest.h</Link>
</None>
<None Include="..\..\..\tests\test-libraries\libtest.structs.h">
<Link>libtest.structs.h</Link>
</None>
<None Include="..\..\..\tests\test-libraries\libtest.properties.h">
<Link>libtest.properties.h</Link>
</None>
<None Include="..\..\..\tests\test-libraries\testgenerator.cs">
<Link>testgenerator.cs</Link>
</None>
</ItemGroup>
<ItemGroup>
<GeneratedTestInput Include="..\..\..\tests\test-libraries\*.m" />
<GeneratedTestInput Include="..\..\..\tests\test-libraries\*.h" />
<GeneratedTestInput Include="..\..\..\tests\test-libraries\*.cs" />
<GeneratedTestInput Include="..\..\..\tests\test-libraries\Makefile" />
<GeneratedTestOutput Include="..\..\..\tests\test-libraries\.libs\ios-fat\libtest.a" />
<GeneratedTestOutput Include="..\ApiDefinition.generated.cs" />
<GeneratedTestOutput Include="..\StructsAndEnums.generated.cs" />
</ItemGroup>
<Target Name="BeforeBuild" Inputs="@(GeneratedTestInput)" Outputs="@(GeneratedTestOutput)">
<Exec Command="make -j8 -C $(TestLibrariesDirectory)" />
</Target>
</Project>

111 changes: 111 additions & 0 deletions tests/bindings-test/macOS/bindings-test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{20BEA313-7E2D-4209-93C0-E4D99C72695A}</ProjectGuid>
<ProjectTypeGuids>{810C163F-4746-4721-8B8E-88A3673A62EA};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>bindingstestmac</RootNamespace>
<AssemblyName>bindings-test</AssemblyName>
<MacResourcePrefix>Resources</MacResourcePrefix>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<DefineConstants></DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
</ItemGroup>
<ItemGroup>
<ObjcBindingApiDefinition Include="..\ApiDefinition.cs" />
<ObjcBindingApiDefinition Include="..\..\generator\tests\ref-out-parameters.cs" />
<ObjcBindingApiDefinition Include="..\ApiDefinition.generated.cs" />
<ObjcBindingApiDefinition Include="..\ApiProtocol.cs" />
</ItemGroup>
<ItemGroup>
<ObjcBindingCoreSource Include="..\StructsAndEnums.cs" />
<ObjcBindingCoreSource Include="..\StructsAndEnums.generated.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.ObjcBinding.CSharp.targets" />
<PropertyGroup>
<TestLibrariesDirectory>..\..\..\tests\test-libraries</TestLibrariesDirectory>
</PropertyGroup>
<ItemGroup>
<ObjcBindingNativeLibrary Include="..\..\..\tests\test-libraries\.libs\macos\libtest.a">
<Link>libtest.a</Link>
</ObjcBindingNativeLibrary>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\common\ConditionalCompilation.cs">
<Link>ConditionalCompilation.cs</Link>
</Compile>
<Compile Include="..\libtest.linkwith.cs">
<DependentUpon>libtest.a</DependentUpon>
</Compile>
<Compile Include="..\ProtocolTest.cs" />
<Compile Include="..\..\api-shared\ObjCRuntime\Registrar.cs">
<Link>Registrar.cs</Link>
</Compile>
<Compile Include="..\RegistrarBindingTest.cs" />
<Compile Include="..\..\common\TestRuntime.cs">
<Link>TestRuntime.cs</Link>
</Compile>
<Compile Include="..\RuntimeTest.cs" />
<Compile Include="..\CodeBehind.cs" />
<Compile Include="..\Messaging.cs" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\tests\test-libraries\libtest.m">
<Link>libtest.m</Link>
</None>
<None Include="..\..\..\tests\test-libraries\libtest.h">
<Link>libtest.h</Link>
</None>
<None Include="..\..\..\tests\test-libraries\libtest.structs.h">
<Link>libtest.structs.h</Link>
</None>
<None Include="..\..\..\tests\test-libraries\libtest.properties.h">
<Link>libtest.properties.h</Link>
</None>
<None Include="..\..\..\tests\test-libraries\testgenerator.cs">
<Link>testgenerator.cs</Link>
</None>
</ItemGroup>
<ItemGroup>
<GeneratedTestInput Include="..\..\..\tests\test-libraries\*.m" />
<GeneratedTestInput Include="..\..\..\tests\test-libraries\*.h" />
<GeneratedTestInput Include="..\..\..\tests\test-libraries\*.cs" />
<GeneratedTestInput Include="..\..\..\tests\test-libraries\Makefile" />
<GeneratedTestOutput Include="..\..\..\tests\test-libraries\.libs\macos\libtest.a" />
<GeneratedTestOutput Include="..\ApiDefinition.generated.cs" />
<GeneratedTestOutput Include="..\StructsAndEnums.generated.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\external\guiunit\src\framework\GuiUnit_xammac_mobile.csproj">
<Project>{EACFD119-769E-4E6C-89B7-A6CE3757C431}</Project>
<Name>GuiUnit_xammac_mobile</Name>
</ProjectReference>
</ItemGroup>
<Target Name="BeforeBuild" Inputs="@(GeneratedTestInput)" Outputs="@(GeneratedTestOutput)">
<Exec Command="make -j8 -C $(TestLibrariesDirectory)" />
</Target>
</Project>

4 changes: 2 additions & 2 deletions tests/bindings-test2/bindings-test2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -87,7 +87,7 @@
<Exec Command="make -j8 -C $(TestLibrariesDirectory)" />
</Target>
<ItemGroup>
<ProjectReference Include="..\bindings-test\bindings-test.csproj">
<ProjectReference Include="..\bindings-test\iOS\bindings-test.csproj">
<Project>{48585BC2-D604-4CF2-A827-D887BEA51FD6}</Project>
<Name>bindings-test</Name>
</ProjectReference>
Expand Down
Loading