dotnet · rolfbjarne · Mar 3, 2026 · Feb 13, 2026 · Feb 13, 2026 · Feb 13, 2026
diff --git a/.github/workflows/inter-branch-merge-flow.yml b/.github/workflows/inter-branch-merge-flow.yml
@@ -0,0 +1,33 @@
+# Inter-branch merge workflow
+# Uses the shared dotnet/arcade merge flow infrastructure to automatically
+# create PRs when changes are pushed to source branches.
+#
+# Configuration is in /github-merge-flow.jsonc at the repository root.
+# Currently configured merge paths:
+#   main → net11.0
+#
+# Key features (from arcade):
+#   - ResetToTargetPaths: auto-resets version files (global.json, eng/*, etc.)
+#     to target branch versions, avoiding common merge conflicts
+#   - QuietComments: reduces GitHub notification noise
+#   - Skips PRs when only Maestro bot commits exist
+#   - Detailed PR body with merge/conflict resolution instructions
+
+name: Inter-branch merge workflow
+
+on:
+  push:
+    branches:
+      - main
+
+  # Run every day at 3:00 AM UTC
+  schedule:
+    - cron: '0 3 * * *'
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  Merge:
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: 'Checkout'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -17,6 +17,15 @@
 		<SystemDrawingCommonPackageVersion>4.7.2</SystemDrawingCommonPackageVersion>
 		<!-- Fix transient dependency issue found by component governance 4.7.0 -> 4.7.1 brought by Microsoft.Build.Tasks.Core package -->
 		<SystemSecurityCryptographyXmlPackageVersion>8.0.0</SystemSecurityCryptographyXmlPackageVersion>
+
+		<ClangSharpPackageVersion>21.1.8.2</ClangSharpPackageVersion>
+		<ICSharpCodeNRefactoryPackageVersion>5.5.1</ICSharpCodeNRefactoryPackageVersion>
+		<libclangPackageVersion>21.1.8</libclangPackageVersion>
+		<MicrosoftNETTestSdkPackageVersion>17.14.0</MicrosoftNETTestSdkPackageVersion>
+		<MonoCecilPackageVersion>0.11.6</MonoCecilPackageVersion>
+		<NUnit3TestAdapterPackageVersion>5.0.0</NUnit3TestAdapterPackageVersion>
+		<NUnitAnalyzersPackageVersion>4.7.0</NUnitAnalyzersPackageVersion>
+		<NUnitPackageVersion>4.3.2</NUnitPackageVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>

@@ -37,7 +37,7 @@ NUGET_VERSION_COMMIT_DISTANCE_START=$(DOTNET_MAJOR_VERSION)000
 NUGET_VERSION_STABLE_COMMIT_DISTANCE_START=$(DOTNET_MAJOR_VERSION)000
 
 -include $(TOP)/Make.config.inc
-$(TOP)/Make.config.inc: $(TOP)/Make.config $(TOP)/mk/mono.mk
+$(TOP)/Make.config.inc: $(TOP)/Make.config
 	$(Q) cd $(TOP) && \
 		ALL_DOTNET_PLATFORMS="$(ALL_DOTNET_PLATFORMS)" \
 		NUGET_VERSION_COMMIT_DISTANCE_START=$(NUGET_VERSION_COMMIT_DISTANCE_START) \
@@ -207,10 +207,10 @@ MACCATALYST_NUGET_VERSION_NO_METADATA=$(MACCATALYST_NUGET_VERSION)$(NUGET_PREREL
 MACCATALYST_NUGET_VERSION_FULL=$(MACCATALYST_NUGET_VERSION_NO_METADATA)$(NUGET_BUILD_METADATA)
 
 # Xcode version should have both a major and a minor version (even if the minor version is 0)
-XCODE_VERSION=26.2
-XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.2.xip
+XCODE_VERSION=26.3
+XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.3.xip
 ifndef IS_LINUX
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.2.0.app/Contents/Developer
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.3.0.app/Contents/Developer
 XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist 2>/dev/null || echo "    $(shell tput setaf 1 2>/dev/null)The required Xcode ($(XCODE_VERSION)) is not installed in $(basename $(basename $(XCODE_DEVELOPER_ROOT)))$(shell tput sgr0 2>/dev/null)" >&2)
 
 # We define stable Xcode as the Xcode app being named like "Xcode_#.#[.#].app"
@@ -232,31 +232,22 @@ endif
 export DEVELOPER_DIR=$(XCODE_DEVELOPER_ROOT)
 export MD_APPLE_SDK_ROOT=$(abspath $(XCODE_DEVELOPER_ROOT)/../..)
 else
-# On Linux, set placeholder Xcode values
+# On Linux, set placeholder Xcode values but honor XCODE_CHANNEL so we configure bots correctly
 XCODE_PRODUCT_BUILD_VERSION=
+ifeq ($(XCODE_CHANNEL),Beta)
+XCODE_IS_STABLE=false
+XCODE_IS_PREVIEW=true
+else
 XCODE_IS_STABLE=true
 XCODE_IS_PREVIEW=false
 endif
+endif
 
 # We don't need to be told there are workload updates
 export DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE=true
 # We don't need to be told we're using preview packages (we pretty much always are).
 export SuppressNETCoreSdkPreviewMessage=true
 
-# Mono version embedded in XI/XM (NEEDED_MONO_VERSION/BRANCH) are specified in mk/mono.mk
-include $(TOP)/mk/mono.mk
-MONO_HASH := $(NEEDED_MONO_VERSION)
-
-# Minimum Mono version for building XI/XM
-MIN_MONO_VERSION=6.12.0.179
-MAX_MONO_VERSION=6.12.99
-MIN_MONO_URL=https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-6.12.0.179.macos10.xamarin.universal.pkg
-
-# ObjectiveSharpie min/max versions
-MIN_SHARPIE_VERSION=3.5.126
-MAX_SHARPIE_VERSION=3.5.999
-MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/0f25c412-fde2-408f-a3e6-13facf6d1484/33033e7ce78cbea9f876dd4e75eabc60/objectivesharpie-3.5.126.pkg
-
 # Minimum OSX versions for building XI/XM
 MIN_OSX_BUILD_VERSION=15.3
 
@@ -304,15 +295,7 @@ RANLIB=$(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranli
 
 # paths to the modules we depend on, as variables, so people can put
 # things in other places if they absolutely must.
-MONO_PATH=$(TOP)/external/mono
 XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
-API_TOOLS_PATH=$(TOP)/external/api-tools
-
-MONO_PREFIX ?= /Library/Frameworks/Mono.framework/Versions/Current
-SYSTEM_MONO=$(MONO_PREFIX)/bin/mono
-SYSTEM_MSBUILD=unset MSBuildExtensionsPath && $(MONO_PREFIX)/bin/msbuild /p:Features=strict /m
-
-PKG_CONFIG=$(MONO_PREFIX)/bin/pkg-config
 
 MACOS_NUGET=Microsoft.macOS
 MACOS_NUGET_VERSION=$(MACOS_NUGET_OS_VERSION).$(MACOS_NUGET_COMMIT_DISTANCE)
@@ -333,8 +316,6 @@ JENKINS_RESULTS_DIRECTORY ?= $(abspath $(TOP)/jenkins-results)
 # Clone files instead of copying them on APFS file systems. Much faster.
 CP:=$(shell df -t apfs / >/dev/null 2>&1 && echo "cp -c" || echo "cp")
 
-MONO_IOS_SDK_DESTDIR:=$(abspath $(TOP)/builds/downloads/mono-ios-sdk-destdir)
-
 # This variable includes all the platforms we support, even those that might be disabled in this build.
 ALL_DOTNET_PLATFORMS=iOS macOS tvOS MacCatalyst
 

@@ -64,19 +64,6 @@ install-hook::
 all-hook install-hook::
 	$(Q) $(MAKE) -C dotnet shutdown-build-server
 
-.PHONY: package release
-package release:
-	$(Q) $(MAKE) -C $(TOP)/release release
-	# copy .pkg, .zip and *updateinfo to the packages directory to be uploaded to storage
-	$(Q) mkdir -p ../package
-	$(Q) echo "Output from 'make release':"
-	$(Q) ls -la $(TOP)/release | sed 's/^/    /'
-	$(Q) if test -n "$$(shopt -s nullglob; echo $(TOP)/release/*.pkg)"; then $(CP) $(TOP)/release/*.pkg ../package; fi
-	$(Q) if test -n "$$(shopt -s nullglob; echo $(TOP)/release/*.zip)"; then $(CP) $(TOP)/release/*.zip ../package; fi
-	$(Q) if test -n "$$(shopt -s nullglob; echo $(TOP)/release/*updateinfo)"; then $(CP) $(TOP)/release/*updateinfo ../package; fi
-	$(Q) echo "Packages:"
-	$(Q) ls -la ../package | sed 's/^/    /'
-
 dotnet-install-system:
 	$(Q) $(MAKE) -C dotnet install-system