Remove the option of disabling the windows-specific part of the .NET build. (#11971)

* Having .NET enabled with the windows-specific parts disabled is not a
  scenario tested on CI (where we've always enabled both). This means it's
  prone to bitrotting.
* It's another configuration to keep track of and make work locally.
* It doesn't work right now anyway.

So just always enable the windows-specific parts of the .NET build, if the
.NET build is enabled.

Makefile

@@ -158,7 +158,7 @@ git-clean-all:
 	@git submodule foreach -q --recursive 'git clean -xffdq && git reset --hard -q'
 	@for dir in $(DEPENDENCY_DIRECTORIES); do if test -d $(CURDIR)/$$dir; then echo "Cleaning $$dir" && cd $(CURDIR)/$$dir && git clean -xffdq && git reset --hard -q && git submodule foreach -q --recursive 'git clean -xffdq'; else echo "Skipped  $$dir (does not exist)"; fi; done
 
-	@if [ -n "$(ENABLE_XAMARIN)" ] || [ -n "$(ENABLE_DOTNET)"] || [ -n "$(ENABLE_DOTNET_WINDOWS)"]; then \
+	@if [ -n "$(ENABLE_XAMARIN)" ] || [ -n "$(ENABLE_DOTNET)"]; then \
 		CONFIGURE_FLAGS=""; \
 		if [ -n "$(ENABLE_XAMARIN)" ]; then \
 			echo "Xamarin-specific build has been re-enabled"; \
@@ -168,10 +168,6 @@ git-clean-all:
 			echo "Dotnet-specific build has been re-enabled"; \
 			CONFIGURE_FLAGS="$$CONFIGURE_FLAGS --enable-dotnet"; \
 		fi; \
-		if [ -n "$(ENABLE_DOTNET_WINDOWS)" ]; then \
-			echo "Dotnet-specific Windows build has been re-enabled"; \
-			CONFIGURE_FLAGS="$$CONFIGURE_FLAGS --enable-dotnet-windows"; \
-		fi; \
 		./configure "$$CONFIGURE_FLAGS"; \
 		$(MAKE) reset; \
 		echo "Done"; \

configure

@@ -34,9 +34,6 @@ Usage: configure [options]
     --enable-dotnet         Enable building .NET 6 bits.
     --disable-dotnet        Disable building .NET 6 bits.
 
-    --enable-dotnet-windows         Enable building Windows .NET 6 bits. Building .NET 6 bits must be also enabled (--enable-dotnet).
-    --disable-dotnet-windows        Disable building Windows .NET 6 bits. 
-
     --enable-documentation  Enable building of API documentation
     --disable-documentation Disable building of API documentation.
 
@@ -134,11 +131,11 @@ while test "x$1" != x; do
         shift
         ;;
     --enable-dotnet-windows)
-        echo "ENABLE_DOTNET_WINDOWS=1" >> "$CONFIGURED_FILE"
+        echo "$1 is ignored. Use --enable-dotnet instead"
         shift
         ;;
     --disable-dotnet-windows)
-        echo "ENABLE_DOTNET_WINDOWS=" >> "$CONFIGURED_FILE"
+        echo "$1 is ignored. Use --disable-dotnet instead"
         shift
         ;;
     --enable-install-source)

dotnet/Makefile

@@ -183,10 +183,8 @@ $(DOTNET_NUPKG_DIR)/%.nupkg: nupkgs/%.nupkg | $(DOTNET_NUPKG_DIR)
 
 ifdef INCLUDE_IOS
 SDK_PACK_IOS_WINDOWS = $(DOTNET_NUPKG_DIR)/$(IOS_WINDOWS_NUGET).Sdk.$(IOS_WINDOWS_NUGET_VERSION_FULL).nupkg
-ifdef ENABLE_DOTNET_WINDOWS
 SDK_PACKS += $(SDK_PACK_IOS_WINDOWS)
 endif
-endif
 
 pack-ios-windows: $(SDK_PACK_IOS_WINDOWS)
 

msbuild/Makefile

@@ -473,7 +473,6 @@ MSBUILD_DIRECTORIES += $(DOTNET_DIRECTORIES)
 ifdef ENABLE_DOTNET
 MSBUILD_PRODUCTS += $(DOTNET_TARGETS)
 
-ifdef ENABLE_DOTNET_WINDOWS
 DOTNET_IOS_WINDOWS_OUTPUT_FILES = $(foreach dll,$(IOS_WINDOWS_TASK_ASSEMBLIES),$(dll).dll $(dll).pdb) Broker.zip Build.zip
 DOTNET_IOS_WINDOWS_FILES = $(IOS_WINDOWS_TARGETS) $(foreach file,$(DOTNET_IOS_WINDOWS_OUTPUT_FILES),Xamarin.iOS.Tasks.Windows/bin/$(CONFIG)/$(TARGETFRAMEWORK)/$(file))
 
@@ -484,7 +483,6 @@ DOTNET_IOS_WINDOWS_FILES = $(IOS_WINDOWS_TARGETS) $(foreach file,$(DOTNET_IOS_WI
 all-local:: .dotnet-windows
 dotnet:: .dotnet-windows
 endif
-endif
 
 ##
 ## Common targets ##

tools/devops/automation/templates/build/build.yml

@@ -280,7 +280,7 @@ steps:
 
     if [[ "$EnableDotNet" == "True" ]]; then
       echo "Enabling dotnet builds."
-      CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-dotnet --enable-dotnet-windows"
+      CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-dotnet"
     fi
 
     CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-install-source"