Merge branch 'main' into mbuck/passkeys

Author: MackinnonBuck

.github/policies/resourceManagement.yml

@@ -239,8 +239,6 @@ configuration:
         - titleContains:
             pattern: Source code updates
             isRegex: False
-      - targetsBranch:
-          branch: main
       then:
       - addLabel:
           label: area-infrastructure

.github/workflows/backport.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@080e393ba794356ef2b743cc89481774c4a26656 # 2025-01-13
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@fdcda9b4919dd16bd2388b5421cc5d55afac0e88 # 2025-01-13
     with:
       pr_description_template: |
         Backport of #%source_pr_number% to %target_branch%

.github/workflows/copilot-setup-steps.yml

@@ -6,7 +6,7 @@ on: workflow_dispatch
 jobs:
   # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
   copilot-setup-steps:
-    runs-on: ubuntu-latest
+    runs-on: 8-core-ubuntu-latest
 
     permissions:
       contents: read

.github/workflows/inter-branch-merge-flow.yml

@@ -10,4 +10,4 @@ permissions:
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@080e393ba794356ef2b743cc89481774c4a26656 # 2024-06-24
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@fdcda9b4919dd16bd2388b5421cc5d55afac0e88 # 2024-06-24

eng/Common.props

@@ -44,8 +44,8 @@
       - If we're building outside of the VMR, publish these assets from the Windows job.
       - If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
     -->
-    <PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
-                                                or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
+    <PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildFromVMR)' != 'true')
+                                                or ('$(DotNetBuildFromVMR)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
                                                     and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
     <PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == ''">$(PublishAllBuildsAssetsInThisJob)</PublishInstallerBaseVersion>
   </PropertyGroup>

eng/Version.Details.xml

@@ -102,6 +102,9 @@ Key for feed that can be used when downloading .NET runtimes and SDKs
 .PARAMETER ProductBuild
 Build the repository in product mode (short: -pb).
 
+.PARAMETER fromVMR
+Set when building from within the VMR.
+
 .EXAMPLE
 Building both native and managed projects.
 
@@ -203,6 +206,9 @@ param(
     [Alias('pb')]
     [switch]$ProductBuild,
 
+    # Intentionally lowercase as tools.ps1 depends on it
+    [switch]$fromVMR,
+
     # Capture the rest
     [Parameter(ValueFromRemainingArguments = $true)]
     [string[]]$MSBuildArguments
@@ -283,6 +289,7 @@ $MSBuildArguments += "/p:TargetArchitecture=$Architecture"
 $MSBuildArguments += "/p:TargetOsName=win"
 
 if ($ProductBuild) { $MSBuildArguments += "/p:DotNetBuild=$ProductBuild" }
+if ($fromVMR) { $MSBuildArguments += "/p:DotNetBuildFromVMR=$fromVMR" }
 
 if (-not $Configuration) {
     $Configuration = if ($CI) { 'Release' } else { 'Debug' }
@@ -299,6 +306,7 @@ if ($RuntimeSourceFeed -or $RuntimeSourceFeedKey) {
     $ToolsetBuildArguments += $runtimeFeedKeyArg
 }
 if ($ProductBuild) { $ToolsetBuildArguments += "/p:DotNetBuild=$ProductBuild" }
+if ($fromVMR) { $ToolsetBuildArguments += "/p:DotNetBuildFromVMR=$fromVMR" }
 
 # Split build categories between dotnet msbuild and desktop msbuild. Use desktop msbuild as little as possible.
 [string[]]$dotnetBuildArguments = ''

eng/Versions.props

@@ -37,7 +37,9 @@ runtime_source_feed=''
 runtime_source_feed_key=''
 source_build=''
 product_build=''
+from_vmr=''
 warn_as_error=true
+from_vmr=''
 
 if [ "$(uname)" = "Darwin" ]; then
     target_os_name='osx'
@@ -94,6 +96,7 @@ Options:
 
     --sourceBuild|-sb                 Build the repository in source-only mode.
     --productBuild|-pb                Build the repository in product-build mode.
+    --fromVMR                         Set when building from within the VMR.
 
 Description:
     This build script installs required tools and runs an MSBuild command on this repository
@@ -261,6 +264,9 @@ while [[ $# -gt 0 ]]; do
         -productbuild|-product-build|-pb)
             product_build=true
             ;;
+        -fromvmr|-from-vmr)
+            from_vmr=true
+            ;;
         -warnaserror)
             shift
             [ -z "${1:-}" ] && __error "Missing value for parameter --warnaserror" && __usage
@@ -325,6 +331,7 @@ fi
 [ ! -z "$build_installers" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildInstallers=$build_installers"
 [ ! -z "$product_build" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuild=$product_build"
 [ ! -z "$source_build" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuildSourceOnly=$source_build"
+[ ! -z "$from_vmr" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuildFromVMR=$from_vmr"
 
 # Run restore by default unless --no-restore or --no-build was specified.
 [ -z "$run_restore" ] && run_restore=true
@@ -363,6 +370,7 @@ if [ ! -z "$runtime_source_feed$runtime_source_feed_key" ]; then
 fi
 [ ! -z "$product_build" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuild=$product_build"
 [ ! -z "$source_build" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuildSourceOnly=$source_build"
+[ ! -z "$from_vmr" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuildFromVMR=$from_vmr"
 
 # Initialize global variables need to be set before the import of Arcade is imported
 restore=$run_restore

eng/build.ps1

@@ -21,6 +21,7 @@ Param(
   [switch] $publish,
   [switch] $clean,
   [switch][Alias('pb')]$productBuild,
+  [switch]$fromVMR,
   [switch][Alias('bl')]$binaryLog,
   [switch][Alias('nobl')]$excludeCIBinarylog,
   [switch] $ci,
@@ -74,6 +75,7 @@ function Print-Usage() {
   Write-Host "  -nativeToolsOnMachine   Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
   Write-Host "  -nodeReuse <value>      Sets nodereuse msbuild parameter ('true' or 'false')"
   Write-Host "  -buildCheck             Sets /check msbuild parameter"
+  Write-Host "  -fromVMR                Set when building from within the VMR"
   Write-Host ""
 
   Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -128,6 +130,7 @@ function Build {
     /p:Test=$test `
     /p:Pack=$pack `
     /p:DotNetBuild=$productBuild `
+    /p:DotNetBuildFromVMR=$fromVMR `
     /p:IntegrationTest=$integrationTest `
     /p:PerformanceTest=$performanceTest `
     /p:Sign=$sign `