Merge branch 'main' of github.com:dotnet/xharness into copilot/fix-1425

Author: kotlarmilos

.github/copilot-instructions.md

@@ -64,7 +64,7 @@ xharness [platform] [command] [options]
 
 ### Build System
 - Use `./build.sh` (Linux/macOS) or `Build.cmd` (Windows) for proper SDK setup
-- Alternative: `dotnet build XHarness.sln` (requires correct .NET version)
+- Alternative: `dotnet build XHarness.slnx` (requires correct .NET version)
 - Integration with Arcade SDK for .NET Foundation build standards
 - Azure DevOps pipelines for CI/CD
 
@@ -157,7 +157,7 @@ XHarness uses standardized exit codes (see `src/Microsoft.DotNet.XHarness.Common
 ├── eng/                          # Build and engineering files
 ├── tools/                        # Development tools and scripts
 ├── azure-pipelines*.yml         # CI/CD pipeline definitions
-├── XHarness.sln                 # Main solution file
+├── XHarness.slnx                # Main solution file
 ├── build.sh / Build.cmd         # Build scripts
 └── README.md                    # Main documentation
 ```

.github/workflows/backport.yml

@@ -0,0 +1,17 @@
+name: Backport PR to branch
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    # once a day at 13:00 UTC to cleanup old runs
+    - cron: '0 13 * * *'
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+  actions: write
+
+jobs:
+  backport:
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@main

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

@@ -12,10 +12,6 @@ on:
 permissions:
   contents: read
 
-env:
-  # Allow Copilot to access Visual Studio assets URLs needed for NuGet restore
-  COPILOT_AGENT_FIREWALL_ALLOW_LIST_ADDITIONS: "vsblob.vsassets.io"
-
 jobs:
 
   copilot-setup-steps:

Directory.Packages.props

@@ -18,7 +18,7 @@
     <PackageVersion Include="Mono.Options" Version="6.12.0.148" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Selenium.WebDriver" Version="4.0.0-alpha05" />
-    <PackageVersion Include="Microsoft.Tools.Mlaunch" Version="1.1.14" />
+    <PackageVersion Include="Microsoft.Tools.Mlaunch" Version="1.1.72" />
     <PackageVersion Include="NUnit" Version="3.13.0" />
     <PackageVersion Include="NUnit.Engine" Version="3.13.0" />
     <PackageVersion Include="xunit.extensibility.execution" Version="$(XUnitVersion)" />

README.md

@@ -152,12 +152,12 @@ Currently we support **xunit v2**, **xunit v3**, and **NUnit** test assemblies b
 When working on XHarness, there are couple of neat hacks that can improve the inner loop.
 The repository can either be built using regular .NET, assuming you have new enough version:
 ```
-dotnet build XHarness.sln
+dotnet build XHarness.slnx
 ```
 or you can use the build scripts `build.sh` or `Build.cmd` in repository root which will install the correct .NET SDK into the `.dotnet` folder.
 You can then use
 ```
-./.dotnet/dotnet build XHarness.sln
+./.dotnet/dotnet build XHarness.slnx
 ```
 
 You can also use Visual Studio 2019+ and just F5 the `Microsoft.DotNet.XHarness.CLI` project.

XHarness.sln

@@ -0,0 +1,25 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path="global.json" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/Microsoft.DotNet.XHarness.Android/Microsoft.DotNet.XHarness.Android.csproj" />
+    <Project Path="src/Microsoft.DotNet.XHarness.Apple/Microsoft.DotNet.XHarness.Apple.csproj" />
+    <Project Path="src/Microsoft.DotNet.XHarness.CLI/Microsoft.DotNet.XHarness.CLI.csproj" />
+    <Project Path="src/Microsoft.DotNet.XHarness.Common/Microsoft.DotNet.XHarness.Common.csproj" />
+    <Project Path="src/Microsoft.DotNet.XHarness.InstrumentationBase.Xunit/Microsoft.DotNet.XHarness.DefaultAndroidEntryPoint.Xunit.csproj" />
+    <Project Path="src/Microsoft.DotNet.XHarness.iOS.Shared/Microsoft.DotNet.XHarness.iOS.Shared.csproj" />
+    <Project Path="src/Microsoft.DotNet.XHarness.TestRunners.Common/Microsoft.DotNet.XHarness.TestRunners.Common.csproj" />
+    <Project Path="src/Microsoft.DotNet.XHarness.TestRunners.NUnit/Microsoft.DotNet.XHarness.TestRunners.NUnit.csproj" />
+    <Project Path="src/Microsoft.DotNet.XHarness.TestRunners.Xunit/Microsoft.DotNet.XHarness.TestRunners.Xunit.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/Microsoft.DotNet.XHarness.Android.Tests/Microsoft.DotNet.XHarness.Android.Tests.csproj" />
+    <Project Path="tests/Microsoft.DotNet.XHarness.Apple.Tests/Microsoft.DotNet.XHarness.Apple.Tests.csproj" />
+    <Project Path="tests/Microsoft.DotNet.XHarness.CLI.Tests/Microsoft.DotNet.XHarness.CLI.Tests.csproj" />
+    <Project Path="tests/Microsoft.DotNet.XHarness.Common.Tests/Microsoft.DotNet.XHarness.Common.Tests.csproj" />
+    <Project Path="tests/Microsoft.DotNet.XHarness.iOS.Shared.Tests/Microsoft.DotNet.XHarness.iOS.Shared.Tests.csproj" />
+    <Project Path="tests/Microsoft.DotNet.XHarness.TestRunners.Tests/Microsoft.DotNet.XHarness.TestRunners.Tests.csproj" />
+  </Folder>
+</Solution>

XHarness.slnx

@@ -48,19 +48,21 @@ extends:
           jobs:
           - job: Windows_NT
             displayName: Build Windows
+            timeoutInMinutes: 120
             steps:
               - script: eng\common\CIBuild.cmd -configuration $(_BuildConfig) -prepareMachine $(_InternalBuildArgs) /p:Test=false
                 name: Build
                 displayName: Build
                 condition: succeeded()
+
+              - template: /eng/pipelines/apiscan-steps.yml
             templateContext:
               outputs:
               - output: pipelineArtifact
                 artifact: Artifacts_Windows_NT
                 path: '$(Build.SourcesDirectory)\artifacts\bin\Microsoft.DotNet.XHarness.CLI'
                 displayName: 'Publish Windows_NT Artifacts'
                 condition: succeeded()
-
     - template: /eng/common/templates-official/post-build/post-build.yml@self
       parameters:
         enableSymbolValidation: true

azure-pipelines.yml

@@ -4,7 +4,6 @@
     <FileSignInfo Include="mlaunch.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="WebDriver.dll" CertificateName="3PartySHA2" />
-    <FileSignInfo Include="Xamarin.Hosting.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Xamarin.Localization.Mlaunch.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Xamarin.Localization.Mlaunch.resources.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Microsoft.macOS.dll" CertificateName="3PartySHA2" />

eng/Signing.props

@@ -3,13 +3,13 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25320.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25374.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>066f0d1e5e1a59ce611e82f4a1146239d6253bd7</Sha>
+      <Sha>e2fed65f9c524d12c64876194ae4ce177b935bb3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25320.5">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25374.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>066f0d1e5e1a59ce611e82f4a1146239d6253bd7</Sha>
+      <Sha>e2fed65f9c524d12c64876194ae4ce177b935bb3</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>