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

Submodule MonoTouch.Dialog. #13058

Merged
merged 11 commits into from
Oct 26, 2021
Merged

Submodule MonoTouch.Dialog. #13058

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ac3148c
Submodule MonoTouch.Dialog.
rolfbjarne Oct 20, 2021
c053946
Use relative path for submodule.
rolfbjarne Oct 21, 2021
4079ab7
Don't use 'RootTestsDirectory' when it might not be defined yet.
rolfbjarne Oct 21, 2021
988aa20
[tests] Our test projects don't need to reference MonoTouch.Dialog di…
rolfbjarne Oct 22, 2021
df04bb8
[tests] Only validate unique errors in the .NET unit tests.
rolfbjarne Oct 22, 2021
3d726e7
[tests] No need to reference System.Json anymore, that's handled dire…
rolfbjarne Oct 22, 2021
6b3e9be
[tests] Reference nunit.framework.targets so we get a workaround for …
rolfbjarne Oct 22, 2021
a345aa4
Merge remote-tracking branch 'origin/main' into submodule-monotouch-d…
rolfbjarne Oct 22, 2021
382b4e2
[msbuild] Only try to create a package if we're able to create an app…
rolfbjarne Oct 25, 2021
75d0a34
[tests] Adjust PackTest.BindingXcFrameworksProject to not set the Ass…
rolfbjarne Oct 25, 2021
63a17e6
Merge remote-tracking branch 'origin/main' into submodule-monotouch-d…
rolfbjarne Oct 25, 2021
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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@
path = external/Xamarin.MacDev
url = ../../xamarin/Xamarin.MacDev
branch = main
[submodule "external/MonoTouch.Dialog"]
path = external/MonoTouch.Dialog
url = [email protected]:migueldeicaza/MonoTouch.Dialog
1 change: 1 addition & 0 deletions Make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
MACCORE_PATH=$(TOP)/../maccore
MACIOS_BINARIES_PATH=$(TOP)/external/macios-binaries
IKVM_PATH=$(TOP)/external/ikvm-fork
MONOTOUCH_DIALOG_PATH=$(TOP)/external/MonoTouch.Dialog

MONO_PREFIX ?= /Library/Frameworks/Mono.framework/Versions/Current
SYSTEM_MCS=$(MONO_PREFIX)/bin/mcs
Expand Down
1 change: 1 addition & 0 deletions external/MonoTouch.Dialog
Open in desktop
Submodule MonoTouch.Dialog added at 8e60f8
2 changes: 1 addition & 1 deletion external/Touch.Unit
Open in desktop
Submodule Touch.Unit updated from 3345db to cbda70
1 change: 1 addition & 0 deletions mk/versions.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ $(eval $(call CheckSubmoduleTemplate,opentk,OPENTK))
$(eval $(call CheckSubmoduleTemplate,Xamarin.MacDev,XAMARIN_MACDEV))
$(eval $(call CheckSubmoduleTemplate,macios-binaries,MACIOS_BINARIES))
$(eval $(call CheckSubmoduleTemplate,ikvm-fork,IKVM))
$(eval $(call CheckSubmoduleTemplate,MonoTouch.Dialog,MONOTOUCH_DIALOG))

include $(TOP)/mk/xamarin.mk

Expand Down
13 changes: 8 additions & 5 deletions tests/common/Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,20 +769,23 @@ public static void FixupTestFiles (string directory, string mode)
}
}

public static string [] CopyDotNetSupportingFiles (string targetDirectory)
public static string [] CopyDotNetSupportingFiles (params string[] targetDirectories)
{
var srcDirectory = Path.Combine (SourceRoot, "tests", "dotnet");
var files = new string [] { "global.json", "NuGet.config" };
var targets = new string [files.Length];
var targets = new List<string> ();
for (var i = 0; i < files.Length; i++) {
var fn = files [i];
targets [i] = Path.Combine (targetDirectory, fn);
var src = Path.Combine (srcDirectory, fn);
if (!File.Exists (src))
ExecutionHelper.Execute ("make", new [] { "-C", srcDirectory, fn });
File.Copy (src, targets [i], true);
foreach (var targetDirectory in targetDirectories) {
var target = Path.Combine (targetDirectory, fn);
File.Copy (src, target, true);
targets.Add (target);
}
}
return targets;
return targets.ToArray ();
}

public static Dictionary<string, string> GetBuildEnvironment (ApplePlatform platform)
Expand Down
10 changes: 8 additions & 2 deletions tests/common/shared-dotnet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
</PropertyGroup>
<ItemGroup Condition="'$(_PlatformName)' == 'iOS'">
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" />
<ProjectReference Include="$(RootTestsDirectory)/../external/MonoTouch.Dialog/MonoTouch.Dialog/dotnet/$(_PlatformName)/MonoTouch.Dialog.csproj" />
</ItemGroup>

<!-- Logic for tvOS -->
Expand All @@ -22,7 +22,7 @@
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
</PropertyGroup>
<ItemGroup Condition="$(TargetFramework.EndsWith('-tvos'))">
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" />
<ProjectReference Include="$(RootTestsDirectory)/../external/MonoTouch.Dialog/MonoTouch.Dialog/dotnet/$(_PlatformName)/MonoTouch.Dialog.csproj" />
</ItemGroup>

<!-- Logic for macOS -->
Expand All @@ -40,4 +40,10 @@
</PropertyGroup>

<!-- Logic for all test suites -->
<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" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions tests/dotnet/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,4 @@ copy-dotnet-config: $(TARGETS)
$(CP) -c NuGet.config global.json "$$dir"; \
done
$(Q) $(CP) -c NuGet.config global.json $(TOP)/external/Touch.Unit/Touch.Client/dotnet
$(Q) $(CP) -c NuGet.config global.json $(TOP)/external/MonoTouch.Dialog/MonoTouch.Dialog/dotnet
5 changes: 4 additions & 1 deletion tests/dotnet/UnitTests/ProjectTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,10 @@ public void BuildInterdependentBindingProjects (string platform)
Configuration.CopyDotNetSupportingFiles (dotnet_bindings_dir);
Configuration.CopyDotNetSupportingFiles (dotnet_bindings_dir.Replace (assemblyName, "bindings-test"));
Configuration.CopyDotNetSupportingFiles (dotnet_bindings_dir.Replace (assemblyName, "bindings-test2"));
var cleanupSupportFiles = Configuration.CopyDotNetSupportingFiles (Path.Combine (Configuration.SourceRoot, "external", "Touch.Unit", "Touch.Client/dotnet"));
var cleanupSupportFiles = Configuration.CopyDotNetSupportingFiles (
Path.Combine (Configuration.SourceRoot, "external", "Touch.Unit", "Touch.Client", "dotnet"),
Path.Combine (Configuration.SourceRoot, "external", "MonoTouch.Dialog", "MonoTouch.Dialog", "dotnet")
);
try {
var result = DotNet.AssertBuild (project_path, verbosity);
var lines = BinLog.PrintToLines (result.BinLogPath);
Expand Down
5 changes: 0 additions & 5 deletions tests/framework-test/dotnet/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@
<Import Project="$(RootTestsDirectory)/common/shared-dotnet.csproj" />

<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)\bindings-framework-test\dotnet\$(_PlatformName)\bindings-framework-test.csproj" />
</ItemGroup>

Expand Down
4 changes: 0 additions & 4 deletions tests/fsharp/dotnet/shared.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
<Import Project="$(RootTestsDirectory)/common/shared-dotnet.csproj" />

<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" />
<PackageReference Include="FSharp.Core" Version="5.0.0" />
</ItemGroup>

Expand Down
5 changes: 0 additions & 5 deletions tests/interdependent-binding-projects/dotnet/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
<Import Project="$(RootTestsDirectory)\nunit.framework.targets" />

<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)\bindings-test\dotnet\$(_PlatformName)\bindings-test.csproj" />
<ProjectReference Include="$(RootTestsDirectory)\bindings-test2\dotnet\$(_PlatformName)\bindings-test2.csproj" />
</ItemGroup>
Expand Down
7 changes: 0 additions & 7 deletions tests/introspection/dotnet/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@
<Import Project="$(RootTestsDirectory)/common/shared-dotnet.csproj" />
<Import Project="$(RootTestsDirectory)\nunit.framework.targets" />

<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" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.EndsWith('-macos'))">
<Compile Include="$(IntrospectionTestDirectory)\Mac\MacApiCtorInitTest.cs" />
<Compile Include="$(IntrospectionTestDirectory)\Mac\MacApiFieldTest.cs" />
Expand Down
4 changes: 0 additions & 4 deletions tests/linker/ios/dont link/dotnet/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
<Import Project="$(RootTestsDirectory)\nunit.framework.targets" />

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

Expand Down
4 changes: 0 additions & 4 deletions tests/linker/ios/link all/dotnet/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@

<ItemGroup>
<PackageReference Include="System.ComponentModel.Composition" Version="4.7.0" />
<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" />
<ProjectReference Include="$(RootTestsDirectory)\bindings-test\dotnet\$(_PlatformName)\bindings-test.csproj" />
</ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions tests/linker/ios/link sdk/dotnet/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
<HintPath>$(ThisTestDirectory)/support.dll</HintPath>
</Reference>

<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" />
<ProjectReference Include="$(RootTestsDirectory)\bindings-test\dotnet\$(_PlatformName)\bindings-test.csproj" />
</ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions tests/monotouch-test/dotnet/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@
<Import Project="$(RootTestsDirectory)/common/shared-dotnet.csproj" />

<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)\EmbeddedResources\dotnet\$(_PlatformName)\EmbeddedResources.csproj" />
<ProjectReference Include="$(RootTestsDirectory)\bindings-test\dotnet\$(_PlatformName)\bindings-test.csproj" />
<ProjectReference Include="$(RootTestsDirectory)\fsharplibrary\dotnet\$(_PlatformName)\fsharplibrary.fsproj" />
Expand Down
5 changes: 0 additions & 5 deletions tests/xcframework-test/dotnet/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@
<Import Project="$(RootTestsDirectory)/common/shared-dotnet.csproj" />

<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)\bindings-xcframework-test\dotnet\$(_PlatformName)\bindings-xcframework-test.csproj" />
</ItemGroup>

Expand Down