Skip to content

Commit

Permalink
Bump Touch.Unit.
Browse files Browse the repository at this point in the history
This also required adding System.Core.dll to the MonoTouch.NUnitLite.dll, and fixing a csproj path.

New commits in spouliot/Touch.Unit:

* xamarin/Touch.Unit@dafdf9f [Touch.Client] Add API to exclude tests based on categories.
* xamarin/Touch.Unit@e6fb7d7 [Touch.Client] Fix paths in the .NET project files.
* xamarin/Touch.Unit@9266732 [Touch.Client] Add support for macOS. (xamarin#80)
* xamarin/Touch.Unit@2d556a5 [TouchRunner] Fix network logging to log if we're logging to a file even if EnableNetwork is false. (xamarin#79)
* xamarin/Touch.Unit@1f85e16 [TouchOptions] Fix a few issues related to command-line parsing. (xamarin#78)
* xamarin/Touch.Unit@1c272a9 [TouchRunner] Rename TestElement.Update to TestElement.TestFinished to make it clearer when it's used. (xamarin#73)
* xamarin/Touch.Unit@9a654ca [TouchRunner] Fix running multiple test assemblies in NUnitLite mode. (xamarin#76)
* xamarin/Touch.Unit@55c747f [TouchRunner] Print test output to the console. (xamarin#75)
* xamarin/Touch.Unit@ab5dce0 [TouchRunner] Keep track of the last shown test suite, and return to it when the app is relaunched. (xamarin#74)
* xamarin/Touch.Unit@1a7068c [TouchRunner] Only update the UI for a single test after the test has finished running. (xamarin#72)
* xamarin/Touch.Unit@ba93ddf [TouchRunner] Fix unused variable warning by only defining the variable when it's used. (xamarin#71)
* xamarin/Touch.Unit@ab2aaa5 [TouchRunner] Always show 'Run all'. (xamarin#70)
* xamarin/Touch.Unit@af58317 Move every Touch.Client projects to its own folder. (xamarin#69)
* xamarin/Touch.Unit@8a0ec0d [TouchRunner] Improve name printing in NuGet mode. (xamarin#68)
* xamarin/Touch.Unit@c7f8ff0 Ignore any 'packages' directory. (xamarin#67)

Diff: https://github.com/spouliot/Touch.Unit/compare/b4e8606a85255f2456b0b20d5a0732298fa1ad36..dafdf9f44f8fada4e47e2abd0c95c9e494377a8c
  • Loading branch information
rolfbjarne committed Jul 31, 2020
1 parent 53e35c5 commit 6bee237
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion external/Touch.Unit
3 changes: 3 additions & 0 deletions src/Makefile
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: 1 addition & 1 deletion tests/introspection/iOS/introspection-ios-dotnet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ItemGroup>
<PackageReference Include="NUnitLite" Version="3.12.0" />
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" />
<ProjectReference Include="..\..\..\external\Touch.Unit\Touch.Client\Touch.Client-iOS.dotnet.csproj" />
<ProjectReference Include="..\..\..\external\Touch.Unit\Touch.Client\dotnet\iOS\Touch.Client-iOS.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" />
<!-- The linker resolves some assembly references too eagerly, and fails when it can't find them, so work around this by referencing the missing assemblies-->
Expand Down

0 comments on commit 6bee237

Please sign in to comment.