[src] Use different variables for source files for .NET and legacy. (#14120)

This allows us to have different sets of source files between .NET and legacy.

There should be no change in this PR, it's just preparatory work for removing
OpenTK files from the .NET build.
This commit is contained in:
Rolf Bjarne Kvinge 2022-02-11 07:43:35 +01:00 коммит произвёл GitHub
Родитель 478c1d2c8f
Коммит 25cfcaad10
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 137 добавлений и 57 удалений

Просмотреть файл

@ -117,21 +117,35 @@ $(SHARED_DESIGNER_CS): $(SHARED_RESX)
# Add new bindings + source files in frameworks.sources, not here.
IOS_DOTNET_EXTRA_SOURCES = \
$(IOS_OPENTK_1_0_CORE_SOURCES) \
$(IOS_BUILD_DIR)/Constants.cs \
$(DOTNET_BUILD_DIR)/Constants.ios.generated.cs \
$(IOS_BUILD_DIR)/AssemblyInfo.cs \
$(SHARED_DESIGNER_CS) \
IOS_EXTRA_SOURCES = \
$(IOS_OPENTK_1_0_CORE_SOURCES) \
$(IOS_BUILD_DIR)/Constants.cs \
$(BUILD_DIR)/Constants.ios.generated.cs \
$(DOTNET_BUILD_DIR)/Constants.ios.generated.cs \
$(IOS_BUILD_DIR)/AssemblyInfo.cs \
$(SHARED_DESIGNER_CS) \
$(SHARED_SYSTEM_DRAWING_SOURCES) \
IOS_DOTNET_HTTP_SOURCES = \
Foundation/NSUrlSessionHandler.cs \
System.Net.Http/CFContentStream.cs \
System.Net.Http/CFNetworkHandler.cs \
IOS_HTTP_SOURCES = \
Foundation/NSUrlSessionHandler.cs \
System.Net.Http/CFContentStream.cs \
System.Net.Http/CFNetworkHandler.cs \
IOS_DOTNET_CORE_SOURCES += $(IOS_DOTNET_EXTRA_SOURCES)
IOS_CORE_SOURCES += $(IOS_EXTRA_SOURCES)
IOS_DOTNET_SOURCES += $(IOS_DOTNET_EXTRA_SOURCES) $(IOS_DOTNET_HTTP_SOURCES)
IOS_SOURCES += $(IOS_EXTRA_SOURCES) $(IOS_HTTP_SOURCES)
IOS_GENERATOR_FLAGS = -inline-selectors -d:IOS -process-enums -warnaserror:$(IOS_GENERATOR_WARNASERROR)
@ -190,16 +204,16 @@ $(IOS_BUILD_DIR)/native/generated_sources: $(IOS_GENERATOR) $(IOS_APIS) $(IOS_BU
### .NET ###
$(IOS_DOTNET_BUILD_DIR)/core-ios.dll: $(IOS_CORE_SOURCES) frameworks.sources $(DOTNET_BUILD_DIR)/ios-defines-dotnet.rsp | $(IOS_DOTNET_BUILD_DIR)
$(IOS_DOTNET_BUILD_DIR)/core-ios.dll: $(IOS_DOTNET_CORE_SOURCES) frameworks.sources $(DOTNET_BUILD_DIR)/ios-defines-dotnet.rsp | $(IOS_DOTNET_BUILD_DIR)
$(Q_DOTNET_GEN) \
$(DOTNET6_CSC) $(DOTNET_FLAGS) \
$(IOS_CORE_WARNINGS_TO_FIX) \
@$(DOTNET_BUILD_DIR)/ios-defines-dotnet.rsp \
$(IOS_CORE_DEFINES) \
$(IOS_CORE_SOURCES) \
$(IOS_DOTNET_CORE_SOURCES) \
-out:$@
$(IOS_DOTNET_BUILD_DIR)/ios-generated-sources: $(DOTNET_GENERATOR) $(IOS_APIS) $(IOS_DOTNET_BUILD_DIR)/core-ios.dll $(DOTNET_BINDING_ATTRIBUTES) $(IOS_DOTNET_BUILD_DIR)/ios.rsp | $(IOS_DOTNET_BUILD_DIR)/generated-sources
$(IOS_DOTNET_BUILD_DIR)/ios-generated-sources: $(DOTNET_GENERATOR) $(IOS_DOTNET_APIS) $(IOS_DOTNET_BUILD_DIR)/core-ios.dll $(DOTNET_BINDING_ATTRIBUTES) $(IOS_DOTNET_BUILD_DIR)/ios.rsp | $(IOS_DOTNET_BUILD_DIR)/generated-sources
$(Q_DOTNET_GEN) $< @$(IOS_DOTNET_BUILD_DIR)/ios.rsp
$(BUILD_DIR)/ios.rsp: Makefile Makefile.generator frameworks.sources
@ -247,7 +261,7 @@ $(IOS_BUILD_DIR)/native-$(1)%Xamarin.iOS.dll $(IOS_BUILD_DIR)/native-$(1)%Xamari
@$(BUILD_DIR)/ios-defines.rsp \
$$(IOS_SOURCES) @$(IOS_BUILD_DIR)/native/generated_sources
$(IOS_DOTNET_BUILD_DIR)/$(1)/Xamarin.iOS%dll $(IOS_DOTNET_BUILD_DIR)/$(1)/Xamarin.iOS%pdb $(2): $$(IOS_SOURCES) $$(IOS_DOTNET_BUILD_DIR)/ios-generated-sources $$(IOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $$(IOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml $(PRODUCT_KEY_PATH) | $(IOS_DOTNET_BUILD_DIR)/$(1) $(IOS_DOTNET_BUILD_DIR)/ref
$(IOS_DOTNET_BUILD_DIR)/$(1)/Xamarin.iOS%dll $(IOS_DOTNET_BUILD_DIR)/$(1)/Xamarin.iOS%pdb $(2): $$(IOS_DOTNET_SOURCES) $$(IOS_DOTNET_BUILD_DIR)/ios-generated-sources $$(IOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $$(IOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml $(PRODUCT_KEY_PATH) | $(IOS_DOTNET_BUILD_DIR)/$(1) $(IOS_DOTNET_BUILD_DIR)/ref
$$(call Q_PROF_CSC,dotnet/$(1)-bit) $(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(IOS_DOTNET_BUILD_DIR)/$(1)/Xamarin.iOS.dll -unsafe -optimize \
$$(ARGS_$(1)) \
-publicsign -keyfile:$(PRODUCT_KEY_PATH) \
@ -258,7 +272,7 @@ $(IOS_DOTNET_BUILD_DIR)/$(1)/Xamarin.iOS%dll $(IOS_DOTNET_BUILD_DIR)/$(1)/Xamari
@$(DOTNET_BUILD_DIR)/ios-defines-dotnet.rsp \
-res:$(IOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml \
-res:$(IOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml \
$$(IOS_SOURCES) @$(IOS_DOTNET_BUILD_DIR)/ios-generated-sources
$$(IOS_DOTNET_SOURCES) @$(IOS_DOTNET_BUILD_DIR)/ios-generated-sources
endef
@ -457,16 +471,29 @@ $(MAC_BUILD_DIR)/$(1)/$(3).pdb: $(MAC_BUILD_DIR)/$(1)/$(3).dll
SN_KEY = $(PRODUCT_KEY_PATH)
MAC_DOTNET_EXTRA_CORE_SOURCES += \
$(MAC_BUILD_DIR)/Constants.cs \
$(DOTNET_BUILD_DIR)/Constants.macos.generated.cs \
MAC_EXTRA_CORE_SOURCES += \
$(MAC_BUILD_DIR)/Constants.cs \
$(BUILD_DIR)/Constants.macos.generated.cs \
$(DOTNET_BUILD_DIR)/Constants.macos.generated.cs \
# Add new bindings + source files in frameworks.sources, not here.
MACOS_DOTNET_CORE_SOURCES += \
$(MAC_DOTNET_EXTRA_CORE_SOURCES) \
MACOS_CORE_SOURCES += \
$(MAC_EXTRA_CORE_SOURCES) \
MACOS_DOTNET_SOURCES += \
$(MAC_DOTNET_EXTRA_CORE_SOURCES) \
$(MAC_BUILD_DIR)/AssemblyInfo.cs \
Darwin/KernelNotification.cs \
Darwin/SystemLog.cs \
$(SHARED_DESIGNER_CS) \
MACOS_SOURCES += \
$(MAC_EXTRA_CORE_SOURCES) \
$(MAC_BUILD_DIR)/AssemblyInfo.cs \
@ -491,6 +518,10 @@ MAC_HTTP_SOURCES = \
System.Net.Http/CFContentStream.cs \
System.Net.Http/CFNetworkHandler.cs \
MACOS_DOTNET_SOURCES += \
$(MAC_CFNETWORK_SOURCES) \
$(MAC_HTTP_SOURCES) \
$(MAC_BUILD_DIR)/Constants.cs: Constants.mac.cs.in Makefile $(TOP)/Make.config.inc | $(MAC_BUILD_DIR)
$(Q) sed \
-e "s/@VERSION@/$(MAC_PACKAGE_VERSION_MAJOR).$(MAC_PACKAGE_VERSION_MINOR).$(MAC_PACKAGE_VERSION_REV)/g" \
@ -612,16 +643,16 @@ $(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net6.0/Xamarin.Mac.dll: $(MACOS_DOTNET_
### .NET ###
$(MACOS_DOTNET_BUILD_DIR)/core-macos.dll: $(MACOS_CORE_SOURCES) frameworks.sources $(DOTNET_BUILD_DIR)/macos-defines-dotnet.rsp | $(MACOS_DOTNET_BUILD_DIR)
$(MACOS_DOTNET_BUILD_DIR)/core-macos.dll: $(MACOS_DOTNET_CORE_SOURCES) frameworks.sources $(DOTNET_BUILD_DIR)/macos-defines-dotnet.rsp | $(MACOS_DOTNET_BUILD_DIR)
$(Q_DOTNET_GEN) \
$(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$@ \
$(MAC_CORE_WARNINGS_TO_FIX) \
@$(DOTNET_BUILD_DIR)/macos-defines-dotnet.rsp \
$(MAC_CORE_DEFINES) \
$(MACOS_CORE_SOURCES) \
$(MACOS_DOTNET_CORE_SOURCES) \
-out:$@ \
$(MACOS_DOTNET_BUILD_DIR)/macos-generated-sources: $(DOTNET_GENERATOR) $(MACOS_APIS) $(MACOS_DOTNET_BUILD_DIR)/core-macos.dll $(DOTNET_BINDING_ATTRIBUTES) $(MACOS_DOTNET_BUILD_DIR)/macos.rsp | $(MACOS_DOTNET_BUILD_DIR)/generated-sources
$(MACOS_DOTNET_BUILD_DIR)/macos-generated-sources: $(DOTNET_GENERATOR) $(MACOS_DOTNET_APIS) $(MACOS_DOTNET_BUILD_DIR)/core-macos.dll $(DOTNET_BINDING_ATTRIBUTES) $(MACOS_DOTNET_BUILD_DIR)/macos.rsp | $(MACOS_DOTNET_BUILD_DIR)/generated-sources
$(Q_DOTNET_GEN) $< @$(MACOS_DOTNET_BUILD_DIR)/macos.rsp
$(MACOS_DOTNET_BUILD_DIR)/macos.rsp: Makefile Makefile.generator frameworks.sources $(DOTNET_COMPILER) | $(MACOS_DOTNET_BUILD_DIR)
@ -633,11 +664,11 @@ $(MACOS_DOTNET_BUILD_DIR)/macos.rsp: Makefile Makefile.generator frameworks.sour
-tmpdir:$(MACOS_DOTNET_BUILD_DIR)/generated-sources \
-baselib:$(MACOS_DOTNET_BUILD_DIR)/core-macos.dll \
--target-framework=.NETCoreApp,Version=6.0,Profile=macos \
$(MACOS_APIS) \
$(MACOS_DOTNET_APIS) \
@$(DOTNET_BUILD_DIR)/macos-defines-dotnet.rsp \
> $@
$(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac%dll $(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac%pdb $(MACOS_DOTNET_BUILD_DIR)/ref/Xamarin.Mac%dll: $(MACOS_DOTNET_BUILD_DIR)/macos-generated-sources $(MACOS_SOURCES) $(MAC_CFNETWORK_SOURCES) $(SN_KEY) $(MACOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(MACOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(MACOS_DOTNET_BUILD_DIR)/64 $(MACOS_DOTNET_BUILD_DIR)/ref
$(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac%dll $(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac%pdb $(MACOS_DOTNET_BUILD_DIR)/ref/Xamarin.Mac%dll: $(MACOS_DOTNET_BUILD_DIR)/macos-generated-sources $(MACOS_DOTNET_SOURCES) $(SN_KEY) $(MACOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(MACOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(MACOS_DOTNET_BUILD_DIR)/64 $(MACOS_DOTNET_BUILD_DIR)/ref
$(Q_DOTNET_BUILD) \
$(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac.dll -optimize \
-publicsign -keyfile:$(SN_KEY) \
@ -646,8 +677,8 @@ $(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac%dll $(MACOS_DOTNET_BUILD_DIR)/64/Xamari
$(ARGS_64) \
-nowarn:3021,1635,612,618,0219,0414,$(MAC_WARNINGS_TO_FIX),$(WARNINGS_TO_IGNORE) \
$(MAC_CSC_FLAGS_XM) \
$(MAC_CFNETWORK_SOURCES) $(MAC_HTTP_SOURCES) $(SHARED_SYSTEM_DRAWING_SOURCES) $(APPLETLS_DEFINES) -D:XAMARIN_MODERN \
$(MACOS_SOURCES) \
$(APPLETLS_DEFINES) -D:XAMARIN_MODERN \
$(MACOS_DOTNET_SOURCES) \
@$(DOTNET_BUILD_DIR)/macos-defines-dotnet.rsp \
-res:$(MACOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml \
-res:$(MACOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml \
@ -1070,23 +1101,41 @@ TVOS_CORE_DEFINES=$(TVOS_DEFINES) -d:COREBUILD
TVOS_GENERATOR_DEFINES = $(TVOS_GENERATED_DEFINES)
TVOS_WARNINGS_TO_FIX=-nowarn:219,618,114,414,1635,3021,$(IOS_WARNINGS_THAT_YOU_SHOULD_FIX),$(WARNINGS_TO_IGNORE)
TVOS_DOTNET_EXTRA_CORE_SOURCES = \
$(TVOS_BUILD_DIR)/Constants.cs \
$(DOTNET_BUILD_DIR)/Constants.tvos.generated.cs \
$(TVOS_BUILD_DIR)/AssemblyInfo.cs \
$(IOS_OPENTK_1_0_CORE_SOURCES) \
TVOS_EXTRA_CORE_SOURCES = \
$(TVOS_BUILD_DIR)/Constants.cs \
$(BUILD_DIR)/Constants.tvos.generated.cs \
$(DOTNET_BUILD_DIR)/Constants.tvos.generated.cs \
$(TVOS_BUILD_DIR)/AssemblyInfo.cs \
$(IOS_OPENTK_1_0_CORE_SOURCES) \
$(SHARED_SYSTEM_DRAWING_SOURCES) \
TVOS_DOTNET_CORE_SOURCES += \
$(TVOS_DOTNET_EXTRA_CORE_SOURCES) \
TVOS_CORE_SOURCES += \
$(TVOS_EXTRA_CORE_SOURCES) \
TVOS_DOTNET_HTTP_SOURCES = \
Foundation/NSUrlSessionHandler.cs \
System.Net.Http/CFContentStream.cs \
System.Net.Http/CFNetworkHandler.cs \
$(SHARED_DESIGNER_CS) \
TVOS_HTTP_SOURCES = \
Foundation/NSUrlSessionHandler.cs \
System.Net.Http/CFContentStream.cs \
System.Net.Http/CFNetworkHandler.cs \
$(SHARED_DESIGNER_CS) \
TVOS_DOTNET_SOURCES += \
$(TVOS_DOTNET_EXTRA_CORE_SOURCES) \
$(TVOS_HTTP_SOURCES) \
TVOS_SOURCES += \
$(TVOS_EXTRA_CORE_SOURCES) \
$(TVOS_HTTP_SOURCES) \
@ -1158,16 +1207,16 @@ $(BUILD_DIR)/tvos.rsp: Makefile Makefile.generator frameworks.sources
### .NET ###
$(TVOS_DOTNET_BUILD_DIR)/core-tvos.dll: $(TVOS_CORE_SOURCES) frameworks.sources Makefile $(DOTNET_BUILD_DIR)/tvos-defines-dotnet.rsp | $(TVOS_DOTNET_BUILD_DIR)
$(TVOS_DOTNET_BUILD_DIR)/core-tvos.dll: $(TVOS_DOTNET_CORE_SOURCES) frameworks.sources Makefile $(DOTNET_BUILD_DIR)/tvos-defines-dotnet.rsp | $(TVOS_DOTNET_BUILD_DIR)
$(Q_DOTNET_GEN) \
$(DOTNET6_CSC) $(DOTNET_FLAGS) \
$(TVOS_CORE_WARNINGS_TO_FIX) \
@$(DOTNET_BUILD_DIR)/tvos-defines-dotnet.rsp \
$(TVOS_CORE_DEFINES) \
$(TVOS_CORE_SOURCES) \
$(TVOS_DOTNET_CORE_SOURCES) \
-out:$@ \
$(TVOS_DOTNET_BUILD_DIR)/tvos-generated-sources: $(DOTNET_GENERATOR) $(TVOS_APIS) $(TVOS_DOTNET_BUILD_DIR)/core-tvos.dll $(DOTNET_BINDING_ATTRIBUTES) $(TVOS_DOTNET_BUILD_DIR)/tvos.rsp | $(TVOS_DOTNET_BUILD_DIR)/generated-sources
$(TVOS_DOTNET_BUILD_DIR)/tvos-generated-sources: $(DOTNET_GENERATOR) $(TVOS_DOTNET_APIS) $(TVOS_DOTNET_BUILD_DIR)/core-tvos.dll $(DOTNET_BINDING_ATTRIBUTES) $(TVOS_DOTNET_BUILD_DIR)/tvos.rsp | $(TVOS_DOTNET_BUILD_DIR)/generated-sources
$(Q_DOTNET_GEN) $< @$(TVOS_DOTNET_BUILD_DIR)/tvos.rsp
$(TVOS_DOTNET_BUILD_DIR)/tvos.rsp: Makefile Makefile.generator frameworks.sources $(DOTNET_COMPILER) | $(TVOS_DOTNET_BUILD_DIR)
@ -1179,11 +1228,11 @@ $(TVOS_DOTNET_BUILD_DIR)/tvos.rsp: Makefile Makefile.generator frameworks.source
-tmpdir=$(TVOS_DOTNET_BUILD_DIR)/generated-sources \
-baselib=$(TVOS_DOTNET_BUILD_DIR)/core-tvos.dll \
--target-framework=.NETCoreApp,Version=6.0,Profile=tvos \
$(TVOS_APIS) \
$(TVOS_DOTNET_APIS) \
@$(DOTNET_BUILD_DIR)/tvos-defines-dotnet.rsp \
> $@
$(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS%dll $(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS%pdb $(TVOS_DOTNET_BUILD_DIR)/ref/Xamarin.TVOS%dll: $(TVOS_DOTNET_BUILD_DIR)/tvos-generated-sources $(TVOS_SOURCES) $(PRODUCT_KEY_PATH) $(TVOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(TVOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(TVOS_DOTNET_BUILD_DIR)/64 $(TVOS_DOTNET_BUILD_DIR)/ref
$(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS%dll $(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS%pdb $(TVOS_DOTNET_BUILD_DIR)/ref/Xamarin.TVOS%dll: $(TVOS_DOTNET_BUILD_DIR)/tvos-generated-sources $(TVOS_DOTNET_SOURCES) $(PRODUCT_KEY_PATH) $(TVOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(TVOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(TVOS_DOTNET_BUILD_DIR)/64 $(TVOS_DOTNET_BUILD_DIR)/ref
$(Q_DOTNET_GEN) \
$(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS.dll -optimize \
-publicsign -keyfile:$(PRODUCT_KEY_PATH) \
@ -1193,7 +1242,7 @@ $(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS%dll $(TVOS_DOTNET_BUILD_DIR)/64/Xamarin
$(TVOS_WARNINGS_TO_FIX) \
-warnaserror:$(NULLABILITY_WARNINGS) \
$(IOS_CSC_FLAGS_XI) \
$(TVOS_SOURCES) \
$(TVOS_DOTNET_SOURCES) \
@$(DOTNET_BUILD_DIR)/tvos-defines-dotnet.rsp \
-res:$(TVOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml \
-res:$(TVOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml \
@ -1280,15 +1329,20 @@ MACCATALYST_CORE_DEFINES=$(MACCATALYST_DEFINES) -d:COREBUILD
MACCATALYST_GENERATOR_DEFINES = $(MACCATALYST_GENERATED_DEFINES)
MACCATALYST_WARNINGS_TO_FIX=-nowarn:219,618,114,414,1635,3021,$(IOS_WARNINGS_THAT_YOU_SHOULD_FIX),$(WARNINGS_TO_IGNORE)
MACCATALYST_EXTRA_CORE_SOURCES = \
MACCATALYST_DOTNET_EXTRA_CORE_SOURCES = \
$(MACCATALYST_BUILD_DIR)/Constants.cs \
$(DOTNET_BUILD_DIR)/Constants.maccatalyst.generated.cs \
$(MACCATALYST_BUILD_DIR)/AssemblyInfo.cs \
$(IOS_OPENTK_1_0_CORE_SOURCES) \
$(SHARED_SYSTEM_DRAWING_SOURCES) \
MACCATALYST_CORE_SOURCES += \
$(MACCATALYST_EXTRA_CORE_SOURCES) \
MACCATALYST_DOTNET_CORE_SOURCES += \
$(MACCATALYST_DOTNET_EXTRA_CORE_SOURCES) \
MACCATALYST_DOTNET_HTTP_SOURCES = \
Foundation/NSUrlSessionHandler.cs \
System.Net.Http/CFContentStream.cs \
System.Net.Http/CFNetworkHandler.cs \
$(SHARED_DESIGNER_CS) \
MACCATALYST_HTTP_SOURCES = \
Foundation/NSUrlSessionHandler.cs \
@ -1296,6 +1350,10 @@ MACCATALYST_HTTP_SOURCES = \
System.Net.Http/CFNetworkHandler.cs \
$(SHARED_DESIGNER_CS) \
MACCATALYST_DOTNET_SOURCES += \
$(MACCATALYST_DOTNET_EXTRA_CORE_SOURCES) \
$(MACCATALYST_DOTNET_HTTP_SOURCES) \
MACCATALYST_SOURCES += \
$(MACCATALYST_EXTRA_CORE_SOURCES) \
$(MACCATALYST_HTTP_SOURCES) \
@ -1335,16 +1393,16 @@ $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml: $(TOP)/src/ILLink.Subs
### .NET ###
$(MACCATALYST_DOTNET_BUILD_DIR)/core-maccatalyst.dll: $(MACCATALYST_CORE_SOURCES) frameworks.sources Makefile $(DOTNET_BUILD_DIR)/maccatalyst-defines-dotnet.rsp | $(MACCATALYST_DOTNET_BUILD_DIR)
$(MACCATALYST_DOTNET_BUILD_DIR)/core-maccatalyst.dll: $(MACCATALYST_DOTNET_CORE_SOURCES) frameworks.sources Makefile $(DOTNET_BUILD_DIR)/maccatalyst-defines-dotnet.rsp | $(MACCATALYST_DOTNET_BUILD_DIR)
$(Q_DOTNET_GEN) \
$(DOTNET6_CSC) $(DOTNET_FLAGS) \
$(MACCATALYST_WARNINGS_TO_FIX) \
@$(DOTNET_BUILD_DIR)/maccatalyst-defines-dotnet.rsp \
$(MACCATALYST_CORE_DEFINES) \
$(MACCATALYST_CORE_SOURCES) \
$(MACCATALYST_DOTNET_CORE_SOURCES) \
-out:$@ \
$(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst-generated-sources: $(DOTNET_GENERATOR) $(TVOS_APIS) $(MACCATALYST_DOTNET_BUILD_DIR)/core-maccatalyst.dll $(DOTNET_BINDING_ATTRIBUTES) $(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst.rsp | $(MACCATALYST_DOTNET_BUILD_DIR)/generated-sources
$(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst-generated-sources: $(DOTNET_GENERATOR) $(MACCATALYST_DOTNET_APIS) $(MACCATALYST_DOTNET_BUILD_DIR)/core-maccatalyst.dll $(DOTNET_BINDING_ATTRIBUTES) $(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst.rsp | $(MACCATALYST_DOTNET_BUILD_DIR)/generated-sources
$(Q_DOTNET_GEN) $< @$(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst.rsp
$(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst.rsp: Makefile Makefile.generator frameworks.sources $(DOTNET_COMPILER) | $(MACCATALYST_DOTNET_BUILD_DIR)
@ -1356,11 +1414,11 @@ $(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst.rsp: Makefile Makefile.generator fra
-tmpdir=$(MACCATALYST_DOTNET_BUILD_DIR)/generated-sources \
-baselib=$(MACCATALYST_DOTNET_BUILD_DIR)/core-maccatalyst.dll \
--target-framework=.NETCoreApp,Version=6.0,Profile=maccatalyst \
$(MACCATALYST_APIS) \
$(MACCATALYST_DOTNET_APIS) \
@$(DOTNET_BUILD_DIR)/maccatalyst-defines-dotnet.rsp \
> $@
$(MACCATALYST_DOTNET_BUILD_DIR)/64/Xamarin.MacCatalyst%dll $(MACCATALYST_DOTNET_BUILD_DIR)/64/Xamarin.MacCatalyst%pdb $(MACCATALYST_DOTNET_BUILD_DIR)/ref/Xamarin.MacCatalyst%dll: $(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst-generated-sources $(MACCATALYST_SOURCES) $(PRODUCT_KEY_PATH) $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(MACCATALYST_DOTNET_BUILD_DIR)/64 $(MACCATALYST_DOTNET_BUILD_DIR)/ref
$(MACCATALYST_DOTNET_BUILD_DIR)/64/Xamarin.MacCatalyst%dll $(MACCATALYST_DOTNET_BUILD_DIR)/64/Xamarin.MacCatalyst%pdb $(MACCATALYST_DOTNET_BUILD_DIR)/ref/Xamarin.MacCatalyst%dll: $(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst-generated-sources $(MACCATALYST_DOTNET_SOURCES) $(PRODUCT_KEY_PATH) $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(MACCATALYST_DOTNET_BUILD_DIR)/64 $(MACCATALYST_DOTNET_BUILD_DIR)/ref
$(Q_DOTNET_GEN) \
$(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(MACCATALYST_DOTNET_BUILD_DIR)/64/Xamarin.MacCatalyst.dll -optimize \
-publicsign -keyfile:$(PRODUCT_KEY_PATH) \
@ -1370,7 +1428,7 @@ $(MACCATALYST_DOTNET_BUILD_DIR)/64/Xamarin.MacCatalyst%dll $(MACCATALYST_DOTNET_
$(MACCATALYST_WARNINGS_TO_FIX) \
-warnaserror:$(NULLABILITY_WARNINGS) \
$(IOS_CSC_FLAGS_XI) \
$(MACCATALYST_SOURCES) \
$(MACCATALYST_DOTNET_SOURCES) \
@$(DOTNET_BUILD_DIR)/maccatalyst-defines-dotnet.rsp \
-res:$(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml \
-res:$(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml \
@ -1525,21 +1583,18 @@ all-local:: $(ALL_TARGETS)
$(DOTNET_TARGETS_DIRS):
$(Q) mkdir -p $@
DOTNET_macOS_SOURCES+=$(MAC_CFNETWORK_SOURCES) $(MAC_HTTP_SOURCES) $(SHARED_SYSTEM_DRAWING_SOURCES)
ifdef ENABLE_DOTNET
define DotNetProjectFiles
DOTNET_$(1)_SOURCES+=$$($$(shell echo $(1) | tr '[:lower:]' '[:upper:]')_SOURCES)
DOTNET_$(1)_APIS=$$($$(shell echo $(1) | tr '[:lower:]' '[:upper:]')_APIS)
$(DOTNET_BUILD_DIR)/projects/$(1)/$(1).csproj: dotnet.tmpl.csproj Makefile $$(wildcard $(CURDIR)/*.sources)
@mkdir -p $$(dir $$@)
@sed \
-e 's*%PLATFORM%*$(1)*' \
-e 's*<!--%FILES%-->*$$(foreach file,$$(DOTNET_$(1)_SOURCES),<Compile Include="../../../../$$(file)" Link="sources/$$(file)" />)*' \
-e 's*<!--%APIS%-->*$$(foreach file,$$(DOTNET_$(1)_APIS),<None Include="../../../../$$(file)" Link="apis/$$(file)" />)*' \
-e 's*<!--%FILES%-->*$$(foreach file,$$($(2)_DOTNET_SOURCES),<Compile Include="../../../../$$(file)" Link="sources/$$(file)" />)*' \
-e 's*<!--%APIS%-->*$$(foreach file,$$($(2)_DOTNET_APIS),<None Include="../../../../$$(file)" Link="apis/$$(file)" />)*' \
$$< | xmllint --format - > $$@
PROJECT_FILES += $(DOTNET_BUILD_DIR)/projects/$(1)/$(1).csproj
endef
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call DotNetProjectFiles,$(platform))))
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call DotNetProjectFiles,$(platform),$(shell echo $(platform) | tr '[:lower:]' '[:upper:]'))))
endif
dotnet: $(DOTNET_TARGETS)

Просмотреть файл

@ -2339,27 +2339,52 @@ DOTNET_REMOVED_MACCATALYST_FRAMEWORKS = \
# Compute the SOURCES variables.
#
IOS_CORE_SOURCES := $(sort $(foreach framework,$(shell echo $(IOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_CORE_SOURCES)) $(SHARED_CORE_SOURCES))
IOS_API_SOURCES := $(sort $(foreach framework,$(shell echo $(IOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_API_SOURCES)) $(SHARED_API_SOURCES))
IOS_APIS := $(sort $(foreach framework,$(shell echo $(IOS_FRAMEWORKS) | tr '[:upper:]' '[:lower:]'),$(framework).cs) $(IOS_API_SOURCES))
IOS_SOURCES := $(sort $(foreach framework,$(shell echo $(IOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_SOURCES)) $(SHARED_SOURCES) $(IOS_CORE_SOURCES))
IOS_DOTNET_CORE_SOURCES := $(sort $(foreach framework,$(shell echo $(IOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_CORE_SOURCES)) $(SHARED_CORE_SOURCES))
IOS_DOTNET_API_SOURCES := $(sort $(foreach framework,$(shell echo $(IOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_API_SOURCES)) $(SHARED_API_SOURCES))
IOS_DOTNET_APIS := $(sort $(foreach framework,$(shell echo $(IOS_FRAMEWORKS) | tr '[:upper:]' '[:lower:]'),$(framework).cs) $(IOS_DOTNET_API_SOURCES))
IOS_DOTNET_SOURCES := $(sort $(foreach framework,$(shell echo $(IOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_SOURCES)) $(SHARED_SOURCES) $(IOS_DOTNET_CORE_SOURCES))
MACOS_CORE_SOURCES := $(sort $(foreach framework,$(shell echo $(MACOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_CORE_SOURCES)) $(SHARED_CORE_SOURCES))
MACOS_API_SOURCES := $(sort $(foreach framework,$(shell echo $(MACOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_API_SOURCES)) $(SHARED_API_SOURCES))
MACOS_APIS := $(sort $(foreach framework,$(shell echo $(MACOS_FRAMEWORKS) | tr '[:upper:]' '[:lower:]'),$(framework).cs) $(MACOS_API_SOURCES))
MACOS_SOURCES := $(sort $(foreach framework,$(shell echo $(MACOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_SOURCES)) $(SHARED_SOURCES) $(MACOS_CORE_SOURCES))
MACOS_DOTNET_CORE_SOURCES := $(sort $(foreach framework,$(shell echo $(MACOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_CORE_SOURCES)) $(SHARED_CORE_SOURCES))
MACOS_DOTNET_API_SOURCES := $(sort $(foreach framework,$(shell echo $(MACOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_API_SOURCES)) $(SHARED_API_SOURCES))
MACOS_DOTNET_APIS := $(sort $(foreach framework,$(shell echo $(MACOS_FRAMEWORKS) | tr '[:upper:]' '[:lower:]'),$(framework).cs) $(MACOS_DOTNET_API_SOURCES))
MACOS_DOTNET_SOURCES := $(sort $(foreach framework,$(shell echo $(MACOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_SOURCES)) $(SHARED_SOURCES) $(MACOS_DOTNET_CORE_SOURCES))
WATCHOS_CORE_SOURCES := $(sort $(foreach framework,$(shell echo $(WATCHOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_CORE_SOURCES)) $(SHARED_CORE_SOURCES))
WATCHOS_API_SOURCES := $(sort $(foreach framework,$(shell echo $(WATCHOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_API_SOURCES)) $(SHARED_API_SOURCES))
WATCHOS_APIS := $(sort $(foreach framework,$(shell echo $(WATCHOS_FRAMEWORKS) | tr '[:upper:]' '[:lower:]'),$(framework).cs) $(WATCHOS_API_SOURCES))
WATCHOS_SOURCES := $(sort $(foreach framework,$(shell echo $(WATCHOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_SOURCES)) $(SHARED_SOURCES) $(WATCHOS_CORE_SOURCES))
WATCHOS_DOTNET_CORE_SOURCES := $(sort $(foreach framework,$(shell echo $(WATCHOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_CORE_SOURCES)) $(SHARED_CORE_SOURCES))
WATCHOS_DOTNET_API_SOURCES := $(sort $(foreach framework,$(shell echo $(WATCHOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_API_SOURCES)) $(SHARED_API_SOURCES))
WATCHOS_DOTNET_APIS := $(sort $(foreach framework,$(shell echo $(WATCHOS_FRAMEWORKS) | tr '[:upper:]' '[:lower:]'),$(framework).cs) $(WATCHOS_DOTNET_API_SOURCES))
WATCHOS_DOTNET_SOURCES := $(sort $(foreach framework,$(shell echo $(WATCHOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_SOURCES)) $(SHARED_SOURCES) $(WATCHOS_DOTNET_CORE_SOURCES))
TVOS_CORE_SOURCES := $(sort $(foreach framework,$(shell echo $(TVOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_CORE_SOURCES)) $(SHARED_CORE_SOURCES))
TVOS_API_SOURCES := $(sort $(foreach framework,$(shell echo $(TVOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_API_SOURCES)) $(SHARED_API_SOURCES))
TVOS_APIS := $(sort $(foreach framework,$(shell echo $(TVOS_FRAMEWORKS) | tr '[:upper:]' '[:lower:]'),$(framework).cs) $(TVOS_API_SOURCES))
TVOS_SOURCES := $(sort $(foreach framework,$(shell echo $(TVOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_SOURCES)) $(SHARED_SOURCES) $(TVOS_CORE_SOURCES))
TVOS_DOTNET_CORE_SOURCES := $(sort $(foreach framework,$(shell echo $(TVOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_CORE_SOURCES)) $(SHARED_CORE_SOURCES))
TVOS_DOTNET_API_SOURCES := $(sort $(foreach framework,$(shell echo $(TVOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_API_SOURCES)) $(SHARED_API_SOURCES))
TVOS_DOTNET_APIS := $(sort $(foreach framework,$(shell echo $(TVOS_FRAMEWORKS) | tr '[:upper:]' '[:lower:]'),$(framework).cs) $(TVOS_DOTNET_API_SOURCES))
TVOS_DOTNET_SOURCES := $(sort $(foreach framework,$(shell echo $(TVOS_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_SOURCES)) $(SHARED_SOURCES) $(TVOS_DOTNET_CORE_SOURCES))
MACCATALYST_CORE_SOURCES := $(sort $(foreach framework,$(shell echo $(MACCATALYST_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_CORE_SOURCES)) $(SHARED_CORE_SOURCES))
MACCATALYST_API_SOURCES := $(sort $(foreach framework,$(shell echo $(MACCATALYST_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_API_SOURCES)) $(SHARED_API_SOURCES))
MACCATALYST_APIS := $(sort $(foreach framework,$(shell echo $(MACCATALYST_FRAMEWORKS) | tr '[:upper:]' '[:lower:]'),$(framework).cs) $(MACCATALYST_API_SOURCES))
MACCATALYST_SOURCES := $(sort $(foreach framework,$(shell echo $(MACCATALYST_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_SOURCES)) $(SHARED_SOURCES) $(MACCATALYST_CORE_SOURCES))
MACCATALYST_DOTNET_CORE_SOURCES := $(sort $(foreach framework,$(shell echo $(MACCATALYST_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_CORE_SOURCES)) $(SHARED_CORE_SOURCES))
MACCATALYST_DOTNET_API_SOURCES := $(sort $(foreach framework,$(shell echo $(MACCATALYST_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_API_SOURCES)) $(SHARED_API_SOURCES))
MACCATALYST_DOTNET_APIS := $(sort $(foreach framework,$(shell echo $(MACCATALYST_FRAMEWORKS) | tr '[:upper:]' '[:lower:]'),$(framework).cs) $(MACCATALYST_DOTNET_API_SOURCES))
MACCATALYST_DOTNET_SOURCES := $(sort $(foreach framework,$(shell echo $(MACCATALYST_FRAMEWORKS) | tr '[:lower:]' '[:upper:]'),$($(framework)_SOURCES)) $(SHARED_SOURCES) $(MACCATALYST_DOTNET_CORE_SOURCES))
IOS_CORE_SOURCES := $(IOS_DOTNET_CORE_SOURCES)
IOS_API_SOURCES := $(IOS_DOTNET_API_SOURCES)
IOS_APIS := $(IOS_DOTNET_APIS)
IOS_SOURCES := $(IOS_DOTNET_SOURCES)
MACOS_CORE_SOURCES := $(MACOS_DOTNET_CORE_SOURCES)
MACOS_API_SOURCES := $(MACOS_DOTNET_API_SOURCES)
MACOS_APIS := $(MACOS_DOTNET_APIS)
MACOS_SOURCES := $(MACOS_DOTNET_SOURCES)
WATCHOS_CORE_SOURCES := $(WATCHOS_DOTNET_CORE_SOURCES)
WATCHOS_API_SOURCES := $(WATCHOS_DOTNET_API_SOURCES)
WATCHOS_APIS := $(WATCHOS_DOTNET_APIS)
WATCHOS_SOURCES := $(WATCHOS_DOTNET_SOURCES)
TVOS_CORE_SOURCES := $(TVOS_DOTNET_CORE_SOURCES)
TVOS_API_SOURCES := $(TVOS_DOTNET_API_SOURCES)
TVOS_APIS := $(TVOS_DOTNET_APIS)
TVOS_SOURCES := $(TVOS_DOTNET_SOURCES)
MACCATALYST_CORE_SOURCES := $(MACCATALYST_DOTNET_CORE_SOURCES)
MACCATALYST_API_SOURCES := $(MACCATALYST_DOTNET_API_SOURCES)
MACCATALYST_APIS := $(MACCATALYST_DOTNET_APIS)
MACCATALYST_SOURCES := $(MACCATALYST_DOTNET_SOURCES)