Merge remote-tracking branch 'origin/main' into dev/rolf/fix-building-extensions-on-remote-windows

Author: rolfbjarne

.azuredevops/policies/branchClassification.yml

@@ -0,0 +1,19 @@
+name: branch_classification
+resource: repository
+disabled: false
+where:
+configuration:
+  branchClassificationSettings:
+    defaultClassification: nonproduction
+    ruleset:
+      - name: prod-branches
+        branchNames:
+          - main
+          - release-test/*
+          - release/*
+          - net7.0
+          - net8.0
+          - net9.0
+          - net10.0
+          - xcode*
+        classification: production

.github/workflows/bump-global-json.yml

@@ -13,7 +13,7 @@ jobs:
     if: contains(github.event.pull_request.title, 'Update dependencies from dotnet/') && github.actor == 'dotnet-maestro[bot]'
     steps:
     - name: 'Checkout repo'
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
         repository: ${{ github.event.pull_request.head.repo.full_name }}

.github/workflows/localization-update.yml

@@ -15,7 +15,7 @@ jobs:
     name: '[Localization PR to main]'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       name: checkout
 
     - uses: repo-sync/pull-request@v2

.github/workflows/maestro-changelog.yml

@@ -15,7 +15,7 @@ jobs:
     if: github.actor == 'dotnet-maestro[bot]'
 
     steps:
-    - uses: actions/setup-dotnet@v4
+    - uses: actions/setup-dotnet@v5
       with:
         dotnet-version: '9'
 
@@ -28,7 +28,7 @@ jobs:
         ./bin/Debug/net9.0/changelog https://github.com/$GITHUB_REPOSITORY/pull/${GITHUB_REF_NAME/\/*/} > /tmp/changelog.txt 2>&1
 
     - name: 'Add changelog'
-      uses: actions/github-script@v7.0.1
+      uses: actions/github-script@v8.0.0
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |

.github/workflows/pwsh-ci.yml

@@ -10,7 +10,7 @@ jobs:
   test-pwsh:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Run Pester tests
       run: |
         Set-PSRepository psgallery -InstallationPolicy trusted

.github/workflows/update-single-platform-branches.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.github/workflows/yamllint.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: 'Checkout'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0

Make.config

@@ -239,19 +239,13 @@ 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
 
-# Minimum Mono version for Xamarin.Mac apps using the system mono
-MIN_XM_MONO_VERSION=6.4.0.94
-
 # ObjectiveSharpie min/max versions
 MIN_SHARPIE_VERSION=3.5.116
 MAX_SHARPIE_VERSION=3.5.999
 MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/3a748cc2-780d-403c-88ba-700aa9a2d299/88cbfd86e85f56b4c61e092d0f0b9ad9/objectivesharpie-3.5.116.pkg
 
 # Minimum OSX versions for building XI/XM
-MIN_OSX_BUILD_VERSION=13.0
-# Minimum OSX version for executing XI/XM tooling.
-MIN_OSX_VERSION_FOR_IOS=10.15
-MIN_OSX_VERSION_FOR_MAC=10.15
+MIN_OSX_BUILD_VERSION=15.3
 
 # Bump the *_NUGET_VERSION variables in Make.versions instead, because that makes sure the computed commit distance for the version is correct.
 IOS_SDK_VERSION=$(word 1, $(subst ., ,$(IOS_NUGET_VERSION))).$(word 2, $(subst ., ,$(IOS_NUGET_VERSION)))
@@ -341,13 +335,12 @@ ALL_DOTNET_PLATFORMS=iOS macOS tvOS MacCatalyst
 TRACKING_DOTNET_RUNTIME_SEPARATELY=
 
 -include $(TOP)/dotnet.config
-$(TOP)/dotnet.config: $(TOP)/eng/Versions.props $(TOP)/Build.props
+$(TOP)/dotnet.config: $(TOP)/eng/Version.Details.props $(TOP)/Build.props
 	$(Q) rm -f [email protected]
-	$(Q) grep '<MicrosoftNETSdkPackageVersion>' $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETSdkPackageVersion>//g' -e 's/[ \t]*/DOTNET_VERSION=/' >> [email protected]
-	$(Q) grep MicrosoftNETCoreAppRefPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETCoreAppRefPackageVersion>//g' -e 's/[ \t]*/BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION=/' >> [email protected]
-	$(Q) grep "<$$(grep EmscriptenWorkloadVersion $(TOP)/eng/Versions.props | sed -e 's_.*>$$[\(]\(.*\)[\)]<.*_\1_')>" $(TOP)/eng/Versions.props | sed -e 's/.*>\(.*\)<.*/EMSCRIPTEN_MANIFEST_PACKAGE_VERSION=\1/' >> [email protected]
-	$(Q) $(foreach platform,$(ALL_DOTNET_PLATFORMS),grep '<Microsoft$(platform)SdkPackageVersion>' $(TOP)/eng/Versions.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/Versions.props | sed -e 's/<*\/*MicrosoftDotNetArcadeSdkPackageVersion>//g' -e 's/[ \t]*/ARCADE_VERSION=/' >> [email protected]
+	$(Q) grep '<MicrosoftNETSdkPackageVersion>' $(TOP)/eng/Version.Details.props | sed -e 's/<*\/*MicrosoftNETSdkPackageVersion>//g' -e 's/[ \t]*/DOTNET_VERSION=/' >> [email protected]
+	$(Q) grep '<MicrosoftNETCoreAppRefPackageVersion>' $(TOP)/eng/Version.Details.props | sed -e 's/<*\/*MicrosoftNETCoreAppRefPackageVersion>//g' -e 's/[ \t]*/BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION=/' >> [email protected]
+	$(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] $@
 
 $(TOP)/Build.props: Make.config

Make.versions

@@ -98,7 +98,7 @@ MACCATALYST_TARGET_PLATFORM_VERSION_LIBRARY=18.0
 #     <NoWarn>XCODE_16_0_PREVIEW;$(NoWarn)</NoWarn>
 #
 # Note that any SUPPORTED_API_VERSIONS entry below for older OS versions need a corresponding entry in
-# the eng/Version.Details.xml and eng/Versions.props files.
+# the eng/Version.Details.xml file.
 #
 
 # First add the versions for the current branch. DO NOT TOUCH THIS. Add older branches below.

NuGet.config

@@ -27,10 +27,10 @@
     <add key="macios-dependencies" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/macios-dependencies/nuget/v3/index.json" />
     <add key="xamarin-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
     <add key="local-tests-feed" value="tests/.nuget/packages" />
-    <!-- Add a 8.0.18 feed -->
-    <add key="darc-pub-dotnet-runtime-c0390586" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-c0390586/nuget/v3/index.json" />
     <!-- Add a 8.0.19 feed -->
     <add key="darc-pub-dotnet-runtime-be973c08" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-be973c08/nuget/v3/index.json" />
+    <!-- Add a 8.0.20 feed -->
+    <add key="darc-pub-dotnet-runtime-e6c1b037" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-e6c1b037/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />