xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[tests] Move bindings-test[-mac].csproj to their own directory.

This commit is contained in:
Rolf Bjarne Kvinge 2020-07-21 14:17:54 +02:00
Родитель 6d26599997
Коммит cff47214ec
13 изменённых файлов: 79 добавлений и 75 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

61
tests/bindings-test/bindings-test.csproj → tests/bindings-test/iOS/bindings-test.csproj
Просмотреть файл

@ -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>
@ -47,70 +47,71 @@
<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" />
<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" />
<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>
<TestLibrariesDirectory>..\..\..\tests\test-libraries</TestLibrariesDirectory>
</PropertyGroup>
<ItemGroup>
<ObjcBindingNativeLibrary Include="..\..\tests\test-libraries\.libs\ios-fat\libtest.a">
<ObjcBindingNativeLibrary Include="..\..\..\tests\test-libraries\.libs\ios-fat\libtest.a">
<Link>libtest.a</Link>
</ObjcBindingNativeLibrary>
</ItemGroup>
<ItemGroup>
<Compile Include="..\common\ConditionalCompilation.cs">
<Compile Include="..\..\common\ConditionalCompilation.cs">
<Link>ConditionalCompilation.cs</Link>
</Compile>
<Compile Include="libtest.linkwith.cs">
<Compile Include="..\libtest.linkwith.cs">
<DependentUpon>libtest.a</DependentUpon>
</Compile>
<Compile Include="ProtocolTest.cs" />
<Compile Include="..\api-shared\ObjCRuntime\Registrar.cs">
<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">
<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" />
<Compile Include="..\RuntimeTest.cs" />
<Compile Include="..\CodeBehind.cs" />
<Compile Include="..\Messaging.cs" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\tests\test-libraries\libtest.m">
<None Include="..\..\..\tests\test-libraries\libtest.m">
<Link>libtest.m</Link>
</None>
<None Include="..\..\tests\test-libraries\libtest.h">
<None Include="..\..\..\tests\test-libraries\libtest.h">
<Link>libtest.h</Link>
</None>
<None Include="..\..\tests\test-libraries\libtest.structs.h">
<None Include="..\..\..\tests\test-libraries\libtest.structs.h">
<Link>libtest.structs.h</Link>
</None>
<None Include="..\..\tests\test-libraries\libtest.properties.h">
<None Include="..\..\..\tests\test-libraries\libtest.properties.h">
<Link>libtest.properties.h</Link>
</None>
<None Include="..\..\tests\test-libraries\testgenerator.cs">
<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" />
<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>

65
tests/bindings-test/bindings-test-mac.csproj → tests/bindings-test/macOS/bindings-test.csproj
Просмотреть файл

@ -7,7 +7,7 @@
<ProjectTypeGuids>{810C163F-4746-4721-8B8E-88A3673A62EA};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>bindingstestmac</RootNamespace>
<AssemblyName>bindings-test-mac</AssemblyName>
<AssemblyName>bindings-test</AssemblyName>
<MacResourcePrefix>Resources</MacResourcePrefix>
<LangVersion>latest</LangVersion>
</PropertyGroup>
@ -35,71 +35,71 @@
<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" />
<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" />
<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>
<TestLibrariesDirectory>..\..\..\tests\test-libraries</TestLibrariesDirectory>
</PropertyGroup>
<ItemGroup>
<ObjcBindingNativeLibrary Include="..\..\tests\test-libraries\.libs\macos\libtest.a">
<ObjcBindingNativeLibrary Include="..\..\..\tests\test-libraries\.libs\macos\libtest.a">
<Link>libtest.a</Link>
</ObjcBindingNativeLibrary>
</ItemGroup>
<ItemGroup>
<Compile Include="..\common\ConditionalCompilation.cs">
<Compile Include="..\..\common\ConditionalCompilation.cs">
<Link>ConditionalCompilation.cs</Link>
</Compile>
<Compile Include="libtest.linkwith.cs">
<Compile Include="..\libtest.linkwith.cs">
<DependentUpon>libtest.a</DependentUpon>
</Compile>
<Compile Include="ProtocolTest.cs" />
<Compile Include="..\api-shared\ObjCRuntime\Registrar.cs">
<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">
<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" />
<Compile Include="..\RuntimeTest.cs" />
<Compile Include="..\CodeBehind.cs" />
<Compile Include="..\Messaging.cs" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\tests\test-libraries\libtest.m">
<None Include="..\..\..\tests\test-libraries\libtest.m">
<Link>libtest.m</Link>
</None>
<None Include="..\..\tests\test-libraries\libtest.h">
<None Include="..\..\..\tests\test-libraries\libtest.h">
<Link>libtest.h</Link>
</None>
<None Include="..\..\tests\test-libraries\libtest.structs.h">
<None Include="..\..\..\tests\test-libraries\libtest.structs.h">
<Link>libtest.structs.h</Link>
</None>
<None Include="..\..\tests\test-libraries\libtest.properties.h">
<None Include="..\..\..\tests\test-libraries\libtest.properties.h">
<Link>libtest.properties.h</Link>
</None>
<None Include="..\..\tests\test-libraries\testgenerator.cs">
<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" />
<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">
<ProjectReference Include="..\..\..\external\guiunit\src\framework\GuiUnit_xammac_mobile.csproj">
<Project>{EACFD119-769E-4E6C-89B7-A6CE3757C431}</Project>
<Name>GuiUnit_xammac_mobile</Name>
</ProjectReference>
@ -107,4 +107,5 @@
<Target Name="BeforeBuild" Inputs="@(GeneratedTestInput)" Outputs="@(GeneratedTestOutput)">
<Exec Command="make -j8 -C $(TestLibrariesDirectory)" />
</Target>
</Project>
</Project>

2
tests/bindings-test2/bindings-test2.csproj
Просмотреть файл

@ -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>

2
tests/interdependent-binding-projects/interdependent-binding-projects.csproj
Просмотреть файл

@ -143,7 +143,7 @@
<Project>{F88FA3CF-B8EF-4CC7-9A2C-BC59DC7B4F22}</Project>
<Name>bindings-test2</Name>
</ProjectReference>
<ProjectReference Include="..\bindings-test\bindings-test.csproj">
<ProjectReference Include="..\bindings-test\iOS\bindings-test.csproj">
<Project>{D6667423-EDD8-4B50-9D98-1AC5D8A8A4EA}</Project>
<Name>bindings-test</Name>
</ProjectReference>

2
tests/linker/ios/link all/link all.csproj
Просмотреть файл

@ -226,7 +226,7 @@
<Project>{FE6EDEE9-ADF6-4F42-BCF2-B68C0A44EC3D}</Project>
<Name>BundledResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\bindings-test\bindings-test.csproj">
<ProjectReference Include="..\..\..\bindings-test\iOS\bindings-test.csproj">
<Project>{D6667423-EDD8-4B50-9D98-1AC5D8A8A4EA}</Project>
<Name>bindings-test</Name>
</ProjectReference>

2
tests/linker/ios/link sdk/link sdk.csproj
Просмотреть файл

@ -221,7 +221,7 @@
<Project>{FE6EDEE9-ADF6-4F42-BCF2-B68C0A44EC3D}</Project>
<Name>BundledResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\bindings-test\bindings-test.csproj">
<ProjectReference Include="..\..\..\bindings-test\iOS\bindings-test.csproj">
<Project>{D6667423-EDD8-4B50-9D98-1AC5D8A8A4EA}</Project>
<Name>bindings-test</Name>
</ProjectReference>

4
tests/linker/mac/link all/link all-mac.csproj
Просмотреть файл

@ -106,9 +106,9 @@
<Project>{EACFD119-769E-4E6C-89B7-A6CE3757C431}</Project>
<Name>GuiUnit_xammac_mobile</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\bindings-test\bindings-test-mac.csproj">
<ProjectReference Include="..\..\..\bindings-test\macOS\bindings-test.csproj">
<Project>{20BEA313-7E2D-4209-93C0-E4D99C72695A}</Project>
<Name>bindings-test-mac</Name>
<Name>bindings-test</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />

2
tests/monotouch-test/monotouch-test.csproj
Просмотреть файл

@ -306,7 +306,7 @@
<Project>{676F527D-3352-42EA-9DE2-181C45003568}</Project>
<Name>EmbeddedResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\tests\bindings-test\bindings-test.csproj">
<ProjectReference Include="..\..\tests\bindings-test\iOS\bindings-test.csproj">
<Project>{D6667423-EDD8-4B50-9D98-1AC5D8A8A4EA}</Project>
<Name>bindings-test</Name>
</ProjectReference>

2
tests/package-mac-tests.sh
Просмотреть файл

@ -25,7 +25,7 @@ export MSBuildExtensionsPathFallbackPathsOverride=$MAC_DESTDIR/Library/Framework
make
make .stamp-configure-projects-mac
../tools/xibuild/xibuild -- bindings-test/bindings-test-mac.csproj
../tools/xibuild/xibuild -- bindings-test/macOS/bindings-test.csproj
make build-mac-dontlink build-mac-apitest build-mac-introspection build-mac-linksdk build-mac-linkall build-mac-xammac_tests build-mac-system-dontlink -j8
for app in */bin/x86/*/*.app linker/mac/*/bin/x86/*/*.app introspection/Mac/bin/x86/*/*.app; do

2
tests/tests-mac.sln
Просмотреть файл

@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link all-mac", "linker\mac\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link sdk-mac", "linker\mac\link sdk\link sdk-mac.csproj", "{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bindings-test-mac", "bindings-test\bindings-test-mac.csproj", "{20BEA313-7E2D-4209-93C0-E4D99C72695A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bindings-test", "bindings-test\macOS\bindings-test.csproj", "{20BEA313-7E2D-4209-93C0-E4D99C72695A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

2
tests/tests.sln
Просмотреть файл

@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BundledResources", "Bundled
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbeddedResources", "EmbeddedResources\EmbeddedResources.csproj", "{676F527D-3352-42EA-9DE2-181C45003568}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bindings-test", "bindings-test\bindings-test.csproj", "{D6667423-EDD8-4B50-9D98-1AC5D8A8A4EA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bindings-test", "bindings-test\iOS\bindings-test.csproj", "{D6667423-EDD8-4B50-9D98-1AC5D8A8A4EA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bindings-framework-test", "bindings-framework-test\bindings-framework-test.csproj", "{E40B0B77-3467-4891-9117-7AF8F248E306}"
EndProject

4
tests/xammac_tests/xammac_tests.csproj
Просмотреть файл

@ -218,9 +218,9 @@
<Project>{EACFD119-769E-4E6C-89B7-A6CE3757C431}</Project>
<Name>GuiUnit_xammac_mobile</Name>
</ProjectReference>
<ProjectReference Include="..\bindings-test\bindings-test-mac.csproj">
<ProjectReference Include="..\bindings-test\macOS\bindings-test.csproj">
<Project>{20BEA313-7E2D-4209-93C0-E4D99C72695A}</Project>
<Name>bindings-test-mac</Name>
<Name>bindings-test</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>

4
tests/xharness/Harness.cs
Просмотреть файл

@ -372,7 +372,7 @@ namespace Xharness {
void AutoConfigureIOS ()
{
var test_suites = new string [] { "monotouch-test", "framework-test", "interdependent-binding-projects" };
var library_projects = new string [] { "BundledResources", "EmbeddedResources", "bindings-test", "bindings-test2", "bindings-framework-test" };
var library_projects = new string [] { "BundledResources", "EmbeddedResources", "bindings-test2", "bindings-framework-test" };
var fsharp_test_suites = new string [] { "fsharp" };
var fsharp_library_projects = new string [] { "fsharplibrary" };
@ -385,6 +385,8 @@ namespace Xharness {
foreach (var p in fsharp_library_projects)
IOSTestProjects.Add (new iOSTestProject (Path.GetFullPath (Path.Combine (RootDirectory, p + "/" + p + ".fsproj")), false) { Name = p });
IOSTestProjects.Add (new iOSTestProject (Path.GetFullPath (Path.Combine (RootDirectory, "bindings-test", "iOS", "bindings-test.csproj")), false) { Name = "bindings-test" });
IOSTestProjects.Add (new iOSTestProject (Path.GetFullPath (Path.Combine (RootDirectory, "introspection", "iOS", "introspection-ios.csproj"))) { Name = "introspection" });
IOSTestProjects.Add (new iOSTestProject (Path.GetFullPath (Path.Combine (RootDirectory, "introspection", "iOS", "introspection-ios-dotnet.csproj"))) { Name = "introspection", IsDotNetProject = true, SkipiOSVariation = false, SkiptvOSVariation = false, SkipwatchOSVariation = true, SkipTodayExtensionVariation = true, SkipDeviceVariations = true, SkipiOS32Variation = true, });
IOSTestProjects.Add (new iOSTestProject (Path.GetFullPath (Path.Combine (RootDirectory, "linker", "ios", "dont link", "dont link.csproj"))) { Configurations = new string [] { "Debug", "Release" } });