Skip to content

[tests] Fix building the custom-type-assembly assembly from inside a project file. #21347

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

Merged
rolfbjarne merged 1 commit into from
Oct 2, 2024
Merged

[tests] Fix building the custom-type-assembly assembly from inside a project file. #21347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions tests/monotouch-test/dotnet/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,9 @@
</Target>

<Target Name="BuildTestLibraries" Inputs="@(GeneratedTestInput)" Outputs="@(GeneratedTestOutput)" BeforeTargets="BeforeBuild"
Condition="!Exists('$(TestLibrariesDirectory)/.libs/macos/custom-type-assembly.dll') Or !Exists('$(TestLibrariesDirectory)/.libs/dotnet/macos/custom-type-assembly.dll')" >
<Exec Command="make -j8 -C $(TestLibrariesDirectory)" Condition="'$(BUILD_REVISION)' == ''" />
<Exec Command="make -j8 -C $(TestLibrariesDirectory)/custom-type-assembly build-assembly" Condition="'$(BUILD_REVISION)' == ''" />
Condition="!Exists('$(TestLibrariesDirectory)/.libs/dotnet/macos/custom-type-assembly.dll')" >
<Exec Command="make -j8 -C $(TestLibrariesDirectory) V=1 RUNTIMEIDENTIFIER= RUNTIMEIDENTIFIERS=" Condition="'$(BUILD_REVISION)' == ''" />
<Exec Command="make -j8 -C $(TestLibrariesDirectory)/custom-type-assembly build-assembly V=1 RUNTIMEIDENTIFIER= RUNTIMEIDENTIFIERS=" Condition="'$(BUILD_REVISION)' == ''" />
</Target>

<Target Name="ComputeDefineConstants" BeforeTargets="BeforeBuild">
Expand Down
17 changes: 2 additions & 15 deletions tests/test-libraries/custom-type-assembly/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,19 @@ TOP=../../..

include $(TOP)/Make.config

.libs/macos/custom-type-assembly.dll: custom-type-assembly.cs Makefile | .libs/macos
$(Q_CSC) $(MAC_mobile_CSC) $< -out:$@ -r:$(MAC_DESTDIR)/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/mono/Xamarin.Mac/Xamarin.Mac.dll -target:library /nologo

.libs/dotnet/macos/custom-type-assembly.dll: bin/Debug/$(DOTNET_TFM)-macos/custom-type-assembly.dll | .libs/dotnet/macos
$(Q) $(CP) $< $@

.libs/macos .libs/dotnet/macos:
.libs/dotnet/macos:
$(Q) mkdir -p $@

bin/Debug/$(DOTNET_TFM)-macos/custom-type-assembly.dll: custom-type-assembly.csproj custom-type-assembly.cs
$(Q) unset MSBUILD_EXE_PATH && $(DOTNET) build $< "/bl:$@.binlog" $(MSBUILD_VERBOSITY)
$(Q) unset MSBUILD_EXE_PATH && $(DOTNET) build $< "/bl:$@.binlog" $(DOTNET_BUILD_VERBOSITY)

ifdef INCLUDE_MAC

ifdef INCLUDE_XAMARIN_LEGACY
TARGETS += \
.libs/macos/custom-type-assembly.dll \

endif

ifdef ENABLE_DOTNET
TARGETS += \
.libs/dotnet/macos/custom-type-assembly.dll \

endif

endif # INCLUDE_MAC

build-assembly: $(TARGETS)