[dotnet] Update/fix support for using a custom .NET runtime.

Author: rolfbjarne

Make.config

@@ -336,11 +336,18 @@ ALL_DOTNET_PLATFORMS=iOS macOS tvOS MacCatalyst
 # Set this to 1 if the Microsoft.NETCore.App.Ref dependency in eng/Version.Details.xml does *not* specify a CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal.
 TRACKING_DOTNET_RUNTIME_SEPARATELY=
 
+# If you build dotnet/runtime locally, "*-dev" is the version the built artifacts will use (and which we must reference)
+CUSTOM_DOTNET_VERSION:=$(subst net,,$(DOTNET_TFM)).0-dev
+
 -include $(TOP)/dotnet.config
 $(TOP)/dotnet.config: $(TOP)/eng/Version.Details.props $(TOP)/Build.props
 	$(Q) rm -f [email protected]
 	$(Q) grep '<MicrosoftNETSdkPackageVersion>' $(TOP)/eng/Version.Details.props | sed -e 's/<*\/*MicrosoftNETSdkPackageVersion>//g' -e 's/[ \t]*/DOTNET_VERSION=/' >> [email protected]
+ifdef CUSTOM_DOTNET
+	$(Q) echo "BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION=$(CUSTOM_DOTNET_VERSION)" >> [email protected]
+else
 	$(Q) grep '<MicrosoftNETCoreAppRefPackageVersion>' $(TOP)/eng/Version.Details.props | sed -e 's/<*\/*MicrosoftNETCoreAppRefPackageVersion>//g' -e 's/[ \t]*/BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION=/' >> [email protected]
+endif
 	$(Q) $(foreach platform,$(ALL_DOTNET_PLATFORMS),grep '<Microsoft$(platform)SdkPackageVersion>' $(TOP)/eng/Version.Details.props | sed -e 's/<*\/*Microsoft$(platform)SdkPackageVersion>//g' -e 's/[ \t]*/NET8_$(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_VERSION_NO_METADATA=/' >> [email protected] &&) true
 	$(Q) grep '<MicrosoftDotNetArcadeSdkPackageVersion>' $(TOP)/eng/Version.Details.props | sed -e 's/<*\/*MicrosoftDotNetArcadeSdkPackageVersion>//g' -e 's/[ \t]*/ARCADE_VERSION=/' >> [email protected]
 	$(Q) mv [email protected] $@
@@ -365,14 +372,6 @@ DOTNET_DESTDIR ?= $(TOP)/_build
 DOTNET_NUPKG_DIR ?= $(DOTNET_DESTDIR)/nupkgs
 DOTNET_PKG_DIR ?= $(DOTNET_DESTDIR)/pkgs
 
-# Configuration for .NET 6.
-# We're using preview versions, and there will probably be many of them, so install locally (into builds/downloads) if there's no system version to
-# avoid consuming a lot of disk space (since they're never automatically deleted). The system-dependencies.sh script will install locally as long
-# as there's a TARBALL url.
-
-# If you build dotnet/runtime locally, "*-dev" is the version the built artifacts will use (and which we must reference)
-CUSTOM_DOTNET_VERSION=6.0.0-dev
-
 ifdef CUSTOM_DOTNET
 DOTNET_BCL_VERSION=$(CUSTOM_DOTNET_VERSION)
 export CUSTOM_DOTNET_VERSION

builds/Makefile

@@ -68,6 +68,10 @@ dotnet-install.sh: Makefile
 
 ifdef CUSTOM_DOTNET
 DOWNLOAD_DOTNET_VERSION=$(CUSTOM_DOTNET_VERSION)
+ALL_NUGET_FEEDS:=$(shell grep '^[[:space:]]*<add.*value="https.*' $(TOP)/NuGet.config | sed -e 's/.*value="//' -e 's/".*//')
+CUSTOM_DOTNET_NUGET_FEED=\
+	--source $(DOTNET_RUNTIME_PATH)/artifacts/packages/Debug/Shipping \
+	$(foreach feed,$(ALL_NUGET_FEEDS), --source $(feed))
 else
 ifneq ($(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION),)
 DOWNLOAD_DOTNET_VERSION=$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)
@@ -88,6 +92,7 @@ package-download/all-package-references.csproj: $(GIT_DIRECTORY)/HEAD $(GIT_DIRE
 		/p:PackageRuntimeIdentifiersCoreCLR="$(DOTNET_CORECLR_RUNTIME_IDENTIFIERS)" \
 		/p:CustomDotNetVersion="$(DOWNLOAD_DOTNET_VERSION)" \
 		/p:TrackingDotNetRuntimeSeparately="$(TRACKING_DOTNET_RUNTIME_SEPARATELY)" \
+		$(CUSTOM_DOTNET_NUGET_FEED) \
 		/bl \
 		$(DOTNET_BUILD_VERBOSITY)
 	$(Q) touch $@

configure

@@ -25,7 +25,7 @@ Usage: configure [options]
     --enable-xamarin
     --disable-xamarin       Enable/disable additional Xamarin-specific parts of the build.
 
-    --custom-dotnet=[artifacts] Use a locally built version of dotnet/runtime. See docs/CORECLR.md for detailed instructions about how to build dotnet/runtime from source.
+    --custom-dotnet=[dotnet/runtime] Use a locally built version of dotnet/runtime. Pass the path to an already build checkout of dotnet/runtime. See docs/CORECLR.md for detailed instructions about how to build dotnet/runtime from source.
 
     --ignore-unknown-params  alters the default behavior to not return an non-zero exit code when an unknown parameter is provided.
 EOL

docs/CORECLR.md

@@ -5,36 +5,36 @@
 1. Clone dotnet/runtime somewhere:
 
     ```shell
-    cd ~/work
+    cd ~/work/dotnet
     git clone [email protected]:dotnet/runtime
     # Checkout any specific branch you want to test
     ```
 
-2. Configure xamarin-macios to use the cloned dotnet/runtime:
+2. Configure dotnet/macios to use the cloned dotnet/runtime:
 
     ```shell
-    cd ~/work/xamarin-macios
+    cd ~/work/dotnet/macios
     make git-clean-all # Must start from a clean state when switching between downloaded and custom built dotnet/runtime.
-    ./configure --custom-dotnet=$HOME/work/runtime
+    ./configure --custom-dotnet=$HOME/work/dotnet/runtime
     ```
 
 3. Build dotnet/runtime using our script that builds everything we need:
 
     ```shell
-    cd ~/work/xamarin-macios/dotnet
+    cd ~/work/dotnet/macios/dotnet
     ./build-custom-runtime.sh
     ```
 
-4. Finally build xamarin-macios:
+4. Finally build dotnet/macios:
 
     ```shell
-    cd ~/work/xamarin-macios
+    cd ~/work/dotnet/macios
     make all -j8
     make install -j8
     ```
 
 ### Caveats
 
-You must clean your xamarin-macios working copy every time you switch between
+You must clean your dotnet/macios working copy every time you switch between
 using a locally built dotnet/runtime and a downloaded version. Not all parts
 of the build will pick up any configure changes for an incremental rebuild.

dotnet/build-custom-runtime.sh

@@ -7,7 +7,7 @@ COLOR_RED=$(tput setaf 1 2>/dev/null)
 COLOR_CLEAR=$(tput sgr0 2>/dev/null)
 
 if test -z "$TOP"; then
-	echo "${COLOR_RED}Could not find the top-level xamarin-macios directory.${COLOR_CLEAR}"
+	echo "${COLOR_RED}Could not find the top-level dotnet/macios directory.${COLOR_CLEAR}"
 	exit 1
 fi
 
@@ -29,8 +29,7 @@ fi
 
 cd "$DOTNET_RUNTIME_PATH"
 
-# use 'arch -x86_64' because the build doesn't work on Apple Silicon with ARM64.
-use_installed_dotnet_cli=false arch -x86_64 ./build.sh clr+libs+host+packs+mono -configuration release -arch arm64  -cross /p:UseCrossGen2=false
-use_installed_dotnet_cli=false arch -x86_64 ./build.sh libs+host+packs+mono     -configuration release -arch arm64  -cross /p:UseCrossGen2=false
-use_installed_dotnet_cli=false arch -x86_64 ./build.sh clr+libs+host+packs+mono -configuration release -arch x86_64 -cross /p:UseCrossGen2=false
-use_installed_dotnet_cli=false arch -x86_64 ./build.sh libs+host+packs+mono     -configuration release -arch x86_64 -cross /p:UseCrossGen2=false
+use_installed_dotnet_cli=false ./build.sh clr+libs+host+packs+mono -configuration release -arch arm64  -cross /p:UseCrossGen2=false
+use_installed_dotnet_cli=false ./build.sh libs+host+packs+mono     -configuration release -arch arm64  -cross /p:UseCrossGen2=false
+use_installed_dotnet_cli=false ./build.sh clr+libs+host+packs+mono -configuration release -arch x86_64 -cross /p:UseCrossGen2=false
+use_installed_dotnet_cli=false ./build.sh libs+host+packs+mono     -configuration release -arch x86_64 -cross /p:UseCrossGen2=false