Merge remote-tracking branch 'origin/main' into support-composer-icons

Author: rolfbjarne

.github/agents/xml-doc-writer.md

@@ -0,0 +1,29 @@
+---
+name: xml-doc-writer
+description: Specialized agent for working with XML docs in C# source code.
+---
+
+## Role
+
+You are a specialized agent for writing XML docs in C# source code. Your job is to validate and improve existing XML docs, and also write XML docs.
+
+## When to Invoke
+
+- When asked to from the Copilot CLI.
+
+## Workflow
+
+Step 1: Gather required information
+
+Before invoking this skill, make sure to know exactly which C# API whose XML docs to work on.
+
+Step 2: Write XML docs
+
+* Add XML docs for public or protected members and types that don't have any docs.
+* Remove any XML docs that are exactly "To be added."
+* If there's an XML doc that is added with an include attribute, replace the include attribute with the contents from the included file instead. Also remove the inlined content from the included file, and if there's nothing left in the included file, remove that file completely.
+* Verify existing XML comments for language, grammar, consistency and correctness.
+* Create 'see cref' attributes whenever suitable.
+* Remove unnecessary whitespace between the triple-slash and the xml comment; but keep/fix correct indentation.
+* Correct indentation: each nesting level adds exactly 2 spaces of indentation.
+* Reorder any top-level XML elements to have the following order: summary, value, param, return, exception, remarks.

.github/workflows/linux-build.yml

@@ -0,0 +1,29 @@
+# yamllint disable rule:line-length rule:document-start rule:truthy
+name: Linux Build Verification
+on:
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  linux-build:
+    name: Verify Linux Build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Check system dependencies
+        run: |
+          set -ex
+          ./system-dependencies.sh
+
+      - name: Build on Linux
+        run: |
+          set -ex
+          make -j$(nproc)

.gitmodules

@@ -1,5 +1,5 @@
 [submodule "external/Xamarin.MacDev"]
     path = external/Xamarin.MacDev
-    url = ../../dotnet/macios-devtools 
+    url = https://github.com/dotnet/macios-devtools
     branch = main
 

Directory.Build.props

@@ -8,7 +8,11 @@
 		<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
 		<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
 		<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
+		<NUnitPackageVersion>4.4.0</NUnitPackageVersion>
+		<NUnitConsoleRunnerPackageVersion>3.22.0</NUnitConsoleRunnerPackageVersion>
+		<NUnit3TestAdapterPackageVersion>6.1.0</NUnit3TestAdapterPackageVersion>
 		<NUnitXmlTestLoggerPackageVersion>3.1.15</NUnitXmlTestLoggerPackageVersion>
+		<MicrosoftNETTestSdkPackageVersion>18.0.1</MicrosoftNETTestSdkPackageVersion>
 		<!-- Fix transient dependency issue found by component governance 4.7.0 -> 4.7.2 brought by Microsoft.Build package -->
 		<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 -->

Make.config

@@ -1,5 +1,11 @@
 include $(TOP)/mk/subdirs.mk
 
+# Detect if we're building on Linux
+UNAME_S:=$(shell uname -s)
+ifeq ($(UNAME_S),Linux)
+IS_LINUX=1
+endif
+
 # Common cURL command:
 # --fail: return an exit code if the connection succeeded, but returned an HTTP error code.
 # --location: follow redirects
@@ -203,6 +209,7 @@ MACCATALYST_NUGET_VERSION_FULL=$(MACCATALYST_NUGET_VERSION_NO_METADATA)$(NUGET_B
 # 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
+ifndef IS_LINUX
 XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.2.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)
 
@@ -224,6 +231,12 @@ endif
 # Tell both Xcode and our build logic which Xcode we're using.
 export DEVELOPER_DIR=$(XCODE_DEVELOPER_ROOT)
 export MD_APPLE_SDK_ROOT=$(abspath $(XCODE_DEVELOPER_ROOT)/../..)
+else
+# On Linux, set placeholder Xcode values
+XCODE_PRODUCT_BUILD_VERSION=
+XCODE_IS_STABLE=true
+XCODE_IS_PREVIEW=false
+endif
 
 # We don't need to be told there are workload updates
 export DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE=true
@@ -350,7 +363,7 @@ endif
 	$(Q) grep '<MicrosoftDotNetArcadeSdkPackageVersion>' $(TOP)/eng/Version.Details.props | sed -e 's/<*\/*MicrosoftDotNetArcadeSdkPackageVersion>//g' -e 's/[ \t]*/ARCADE_VERSION=/' >> [email protected]
 	$(Q) mv [email protected] $@
 
-$(TOP)/Build.props: Make.config
+$(TOP)/Build.props: $(TOP)/Make.config
 	$(Q) rm -f [email protected]
 	$(Q) printf "<Project>\n" >> [email protected]
 	$(Q) printf "\t<PropertyGroup>\n" >> [email protected]

Makefile

@@ -1,9 +1,18 @@
 TOP=.
-SUBDIRS=builds runtime src msbuild tools
+SUBDIRS=builds
 include $(TOP)/Make.config
 include $(TOP)/mk/versions.mk
 
+# On Linux, skip directories that require native compilation or macOS platform
+ifndef IS_LINUX
+SUBDIRS += runtime
+endif
+
+SUBDIRS += src msbuild tools
+
+ifndef IS_LINUX
 SUBDIRS += dotnet
+endif
 
 #
 # Common

NuGet.config

@@ -10,10 +10,10 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-dotnet -->
-    <add key="darc-pub-dotnet-dotnet-9441e5b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-9441e5bb/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-dotnet-455f135" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-455f1358/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from dotnet-macios -->
-    <add key="darc-pub-dotnet-macios-e6a0fb7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-e6a0fb79/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-macios-45f29c7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-45f29c7b/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-macios -->
     <!--  Begin: Package sources from xamarin-xamarin-macios -->
     <!--  End: Package sources from xamarin-xamarin-macios -->
@@ -38,10 +38,14 @@
     <add key="darc-pub-dotnet-runtime-ad2d4fbc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ad2d4fbc/nuget/v3/index.json" />
     <!-- Add a 8.0.23 feed -->
     <add key="darc-pub-dotnet-runtime-891f8976" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-891f8976/nuget/v3/index.json" />
+    <!-- Add a 8.0.24 feed -->
+    <add key="darc-pub-dotnet-runtime-b43df221" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b43df221/nuget/v3/index.json" />
     <!-- Add a 9.0.11 feed -->
     <add key="darc-pub-dotnet-runtime-35fe9c61" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-35fe9c61/nuget/v3/index.json" />
     <!-- Add a 9.0.12 feed -->
     <add key="darc-pub-dotnet-runtime-9c2fb4b7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-9c2fb4b7/nuget/v3/index.json" />
+    <!-- Add a 9.0.13 feed -->
+    <add key="darc-pub-dotnet-runtime-7dd1559a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-7dd1559a/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

builds/Makefile

@@ -12,56 +12,73 @@ else
 DOTNET_ARCH=x64
 endif
 
+ifeq ($(OS),Windows_NT)
+DOTNET_INSTALL_SCRIPT=dotnet-install.ps1
+else
+DOTNET_INSTALL_SCRIPT=dotnet-install.sh
+endif
+
 include $(TOP)/mk/colors.mk
 
 DOTNET_FILENAME=$(DOTNET_VERSION).tar.gz
 DOTNET_CACHE_FILENAME=$(HOME)/Library/Caches/xamarin-macios/$(DOTNET_FILENAME)
 
-downloads/$(DOTNET_INSTALL_NAME): dotnet-install.sh
+downloads/$(DOTNET_INSTALL_NAME): $(DOTNET_INSTALL_SCRIPT)
 	$(Q) echo "Downloading and installing .NET $(DOTNET_VERSION) ($(DOTNET_ARCH)) into $@..."
+ifeq ($(OS),Windows_NT)
+	rm -Rf "$@"
+	pwsh -ExecutionPolicy ByPass -NoProfile -Command '& ./$(DOTNET_INSTALL_SCRIPT) -Version "$(DOTNET_VERSION)" -InstallDir "[email protected]" -Verbose'
+	mv "[email protected]" "$@"
+else
 	$(Q) if test -f $(DOTNET_CACHE_FILENAME); then \
 			echo "Found a cached version of .NET $(DOTNET_VERSION) in $(DOTNET_CACHE_FILENAME)."; \
 			mkdir -p "[email protected]"; \
 			tar -xzf $(DOTNET_CACHE_FILENAME) -C "[email protected]"; \
 		else \
-			./dotnet-install.sh --install-dir "$@.tmp" --version "$(DOTNET_VERSION)" --architecture $(DOTNET_ARCH) --no-path --keep-zip --zip-path "downloads/$(DOTNET_FILENAME)" $$DOTNET_INSTALL_EXTRA_ARGS; \
-			cp -c downloads/$(DOTNET_FILENAME) $(DOTNET_CACHE_FILENAME); \
+			./$(DOTNET_INSTALL_SCRIPT) --install-dir "[email protected]" --version "$(DOTNET_VERSION)" --architecture $(DOTNET_ARCH) --no-path --keep-zip --zip-path "downloads/$(DOTNET_FILENAME)" $$DOTNET_INSTALL_EXTRA_ARGS; \
+			mkdir -p $$(dirname $(DOTNET_CACHE_FILENAME)); \
+			$(CP) downloads/$(DOTNET_FILENAME) $(DOTNET_CACHE_FILENAME); \
 			echo "Cached the download of $(DOTNET_FILENAME) in ~/Library/Caches/xamarin-macios"; \
 		fi
 	$(Q) rm -Rf "$@"
 	$(Q) mv "[email protected]" "$@"
+endif
 	$(Q) echo "Downloaded and installed .NET $(DOTNET_VERSION) into $@."
 
 # Create a symlink with a persistent (non-version-dependent) name
 # The dependency on the stamp file is to ensure the symlink is re-created
 # when the .NET version changes.
 all-local:: downloads/dotnet
 dotnet:: downloads/dotnet
+
+ifeq ($(OS),Windows_NT)
+# On Windows, for simplicity just copy the entire directory (creating symbolic links on Windows requires admin rights).
+downloads/dotnet: downloads/$(DOTNET_INSTALL_NAME)
+	$(Q) rm -f $@
+	$(Q) $(CP) -r downloads/$(DOTNET_INSTALL_NAME) $@
+else
 downloads/dotnet: .stamp-dotnet-symlink-$(DOTNET_VERSION)
 	$(Q) mkdir -p downloads
 	$(Q) rm -f $@
 	$(Q) ln -s $(abspath downloads/$(DOTNET_INSTALL_NAME)) $@
+endif
 
 .stamp-dotnet-symlink-$(DOTNET_VERSION): Makefile
 	$(Q) touch $@
 
 # This is just a helpful target to print the url to the .pkg to download and install the current .NET version into the system.
-print-dotnet-pkg-urls: dotnet-install.sh
+print-dotnet-pkg-urls: $(DOTNET_INSTALL_SCRIPT)
 	$(Q) rm -f $@-found-it.stamp
-	$(Q) for url in $$(./dotnet-install.sh --version "$(DOTNET_VERSION)" --architecture $(DOTNET_ARCH) --no-path $$DOTNET_INSTALL_EXTRA_ARGS --dry-run | grep URL.*primary: | sed 's/.*primary: //'); do \
+	$(Q) for url in $$(./$(DOTNET_INSTALL_SCRIPT) --version "$(DOTNET_VERSION)" --architecture $(DOTNET_ARCH) --no-path $$DOTNET_INSTALL_EXTRA_ARGS --dry-run | grep URL.*primary: | sed 's/.*primary: //'); do \
 		pkg=$${url/tar.gz/pkg}; \
 		if $(CURL) -I "$$pkg" >/dev/null 2>&1; then echo "$$pkg"; touch $@-found-it.stamp; break; fi; \
 	done
 	$(Q) if ! test -f $@-found-it.stamp; then echo "No working urls were found."; exit 1; fi
 	$(Q) rm -f $@-found-it.stamp
 
-# We need https://github.com/dotnet/install-scripts/pull/555, which hasn't been released yet.
-# Revert to using https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh whenever https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh has been updated.
-# DOTNET_DOWNLOAD_URL?=https://raw.githubusercontent.com/dotnet/install-scripts/d48e000adad7243861d799ec86c0bf7210a8fc7a/src/dotnet-install.sh
-
-DOTNET_DOWNLOAD_URL?=https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
+DOTNET_DOWNLOAD_URL?=https://builds.dotnet.microsoft.com/dotnet/scripts/v1/$(DOTNET_INSTALL_SCRIPT)
 
-dotnet-install.sh: Makefile
+$(DOTNET_INSTALL_SCRIPT): Makefile
 	$(Q) $(CURL_RETRY) $(DOTNET_DOWNLOAD_URL) --output $@.tmp
 	$(Q) chmod +x $@.tmp
 	$(Q) mv $@.tmp $@
@@ -112,6 +129,7 @@ DOTNET_DOWNLOADS = \
 	.stamp-download-dotnet-packages \
 	.stamp-install-t4 \
 
+download: downloads/dotnet
 dotnet:: $(DOTNET_DOWNLOADS)
 all-local:: $(DOTNET_DOWNLOADS)
 

builds/Versions-MacCatalyst.plist.in

@@ -149,8 +149,6 @@
 	<key>Optimizations</key>
 	<dict>
 		<!-- The key is the value to be passed to mtouch. The string is a very short description. Any IDE UI should also point to the documentation for the optimizations. -->
-		<key>inline-intptr-size</key>
-		<string>Inline IntPtr.Size</string>
 		<key>inline-runtime-arch</key>
 		<string>Inline NSObject.IsDirectBinding</string>
 		<key>dead-code-elimination</key>

builds/Versions-iOS.plist.in

@@ -173,8 +173,6 @@
 	<key>Optimizations</key>
 	<dict>
 		<!-- The key is the value to be passed to mtouch. The string is a very short description. Any IDE UI should also point to the documentation for the optimizations. -->
-		<key>inline-intptr-size</key>
-		<string>Inline IntPtr.Size</string>
 		<key>inline-runtime-arch</key>
 		<string>Inline NSObject.IsDirectBinding</string>
 		<key>dead-code-elimination</key>