[Shipping] Publish StoreKit bindings as NuGet packages and run device tests

.gitignore

@@ -203,4 +203,3 @@ launchSettings.json
 # Testing artifacts
 testing/
 src/samples/
-GeneratedBindings/

NuGet.config

@@ -9,7 +9,7 @@
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
-    <add key="test-device-runners" value="https://pkgs.dev.azure.com/mattleibow/OpenSource/_packaging/test-device-runners/nuget/v3/index.json" />
+    <add key="dotnet-experimental" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

eng/Version.Details.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24606.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25164.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
+      <Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/pipelines/common/jobs/prepare-signed-artifacts.yml

@@ -2,9 +2,7 @@ parameters:
   PublishRidAgnosticPackagesFromPlatform: ''
   isOfficialBuild: false
   logArtifactName: 'Logs-PrepareSignedArtifacts_Attempt$(System.JobAttempt)'
-  bindings:
-    isBindingsBuild: false
-    scriptArgs: ''
+  scriptArgs: ''
 
 jobs:
 - template: /eng/common/templates-official/job/job.yml
@@ -28,13 +26,16 @@ jobs:
     variables:
       - name: '_SignType'
         value: $[ coalesce(variables.OfficialSignType, 'real') ]
+      - _BuildConfig: Release
+      - _buildScript: ./build.sh
+      - _generateScript: ./generate.sh
 
     steps:
     - script: >-
-        ./build.sh -ci
+        $(_buildScript) -ci
         -publish
         -pack
-        -configuration Release
+        -configuration $(_BuildConfig)
         /p:PublishRidAgnosticPackagesFromPlatform=${{ parameters.PublishRidAgnosticPackagesFromPlatform }}
         /p:OfficialBuildId=$(Build.BuildNumber)
         /p:SignType=$(_SignType)
@@ -43,24 +44,34 @@ jobs:
         /bl:$(Build.SourcesDirectory)\prepare-artifacts.binlog
       displayName: Prepare tooling artifacts and upload to build
 
-    - ${{ if eq(parameters.bindings.isBindingsBuild, true) }}:
-      - script: >-
-          ./generate.sh --configuration Release ${{ parameters.bindings.scriptArgs }}
-        displayName: Generate bindings
+    - script: $(_generateScript) --configuration $(_BuildConfig) --platform MacOSX ${{ parameters.scriptArgs }}
+      displayName: Generate MacOSX bindings
+    - script: $(_generateScript) --configuration $(_BuildConfig) --platform iPhoneOS ${{ parameters.scriptArgs }}
+      displayName: Generate iOS bindings
+    - script: $(_generateScript) --configuration $(_BuildConfig) --platform iPhoneSimulator ${{ parameters.scriptArgs }}
+      displayName: Generate iOSSimulator bindings
+    - script: $(_generateScript) --configuration $(_BuildConfig) --platform AppleTVOS ${{ parameters.scriptArgs }}
+      displayName: Generate tvOS bindings
+    - script: $(_generateScript) --configuration $(_BuildConfig) --platform AppleTVSimulator ${{ parameters.scriptArgs }}
+      displayName: Generate tvOSSimulator bindings
+    - script: $(_generateScript) --configuration $(_BuildConfig) --platform iPhoneOS --maccatalyst ${{ parameters.scriptArgs }}
+      displayName: Generate MacCatalyst bindings
 
-      - script: >-
-          ./build.sh -ci
-          -publish
-          -pack
-          -configuration Release
-          --projects $(pwd)/GeneratedBindings/Swift.Bindings.Experimental.csproj
-          /p:PublishRidAgnosticPackagesFromPlatform=${{ parameters.PublishRidAgnosticPackagesFromPlatform }}
-          /p:OfficialBuildId=$(Build.BuildNumber)
-          /p:SignType=$(_SignType)
-          /p:DotNetSignType=$(_SignType)
-          /p:DotNetPublishUsingPipelines=true
+    - script: |
+        for proj in artifacts/MacOSX/*.csproj artifacts/iPhoneOS/*.csproj artifacts/iPhoneSimulator/*.csproj artifacts/AppleTVOS/*.csproj artifacts/AppleTVSimulator/*.csproj artifacts/MacCatalyst/*.csproj; do
+          $(_buildScript) -ci \
+          -publish \
+          -pack \
+          -configuration $(_BuildConfig) \
+          --projects "$(pwd)/$proj" \
+          /p:PublishRidAgnosticPackagesFromPlatform=${{ parameters.PublishRidAgnosticPackagesFromPlatform }} \
+          /p:OfficialBuildId=$(Build.BuildNumber) \
+          /p:SignType=$(_SignType) \
+          /p:DotNetSignType=$(_SignType) \
+          /p:DotNetPublishUsingPipelines=true \
           /bl:$(Build.SourcesDirectory)\prepare-artifacts.binlog
-        displayName: Prepare bindings artifacts and upload to build
+        done
+      displayName: Prepare bindings artifacts and upload to build
 
     - task: CopyFiles@2
       displayName: Copy Files to $(Build.StagingDirectory)\BuildLogs

eng/pipelines/common/templates/build-job.yml

@@ -1,14 +1,13 @@
 parameters:
   variables: {}
   osGroup: ''
+  platform: ''
   archType: ''
   container: ''
   pool: {}
   isOfficialBuild: false
   runTests: true
-  bindings:
-    isBindingsBuild: false
-    scriptArgs: ''
+  scriptArgs: ''
 
 jobs:
 
@@ -38,9 +37,9 @@ jobs:
         testRunTitle: ${{ parameters.osGroup }}_${{ parameters.archType }}_$(_BuildConfig)
 
       variables:
-        - _buildScript: build.cmd
-        - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
-          - _buildScript: ./build.sh
+        - _buildScript: ./build.sh
+        - _generateScript: ./generate.sh
+        - _dotnetScript: ./dotnet.sh
 
         - _testBuildArg: ''
         - ${{ if eq(parameters.runTests, true) }}:
@@ -54,12 +53,37 @@ jobs:
                 /p:TargetPlatform=${{ parameters.archType }}
         displayName: Build and test
 
-      - script: ./dotnet.sh format --exclude artifacts --verify-no-changes --verbosity detailed
+      - script: $(_dotnetScript) format --exclude artifacts --verify-no-changes --verbosity detailed
         displayName: Verify code formatting
 
-      - ${{ if and(eq(parameters.bindings.isBindingsBuild, true), ne(parameters.osGroup, 'Windows_NT')) }}:
-        - script: ./generate.sh --configuration $(_BuildConfig) ${{ parameters.bindings.scriptArgs }}
-          displayName: Generate bindings
+      - ${{ if and(ne(parameters.isOfficialBuild, true), eq(parameters.platform, 'maccatalyst')) }}:
+        - script: |
+            $(_generateScript) --configuration $(_BuildConfig) --platform iPhoneOS --maccatalyst ${{ parameters.scriptArgs }}
+            $(_buildScript) -ci -publish -pack -configuration Release --projects $(pwd)/artifacts/MacCatalyst/Swift.Bindings.MacCatalyst.Experimental.csproj
+          displayName: Generate MacCatalyst bindings
+
+        - script: |
+            $(_dotnetScript) workload install maui maccatalyst mobile-librarybuilder-net9 --version 10.0.100-preview.1.25124.2 --source https://api.nuget.org/v3/index.json
+            $(_dotnetScript) new tool-manifest && $(_dotnetScript) tool install microsoft.dotnet.xharness.cli --version "10.0.0-prerelease*"
+            sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
+          displayName: Install dependencies
+
+        - script: |
+            $(_dotnetScript) build ./src/Swift.Bindings/tests/FrameworkTests/Swift.Bindings.Framework.Tests.csproj \
+            -f net10.0-${{ parameters.platform }} \
+            -c $(_BuildConfig) \
+            -r ${{ parameters.platform }}-${{ parameters.archType }} \
+            /p:UseMaui=true
+          displayName: Build device tests
+
+        - script: |
+            $(_dotnetScript) xharness apple test \
+            --target ${{ parameters.platform }} \
+            --timeout="00:02:00" \
+            --launch-timeout=00:06:00 \
+            --app ./src/Swift.Bindings/tests/FrameworkTests/bin/$(_BuildConfig)/net10.0-${{ parameters.platform }}/${{ parameters.platform }}-${{ parameters.archType }}/Swift.Bindings.Framework.Tests.app \
+            --output-directory artifacts
+          displayName: Run device tests
 
       - ${{ if eq(parameters.isOfficialBuild, true) }}:
         - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml

eng/pipelines/common/templates/publish.yml

@@ -4,9 +4,7 @@ parameters:
   enableSigningValidation: false
   enableNugetValidation: false
   enableSourceLinkValidation: false
-  bindings:
-    isBindingsBuild: false
-    scriptArgs: ''
+  scriptArgs: ''
 
 stages:
 
@@ -19,7 +17,7 @@ stages:
   - template: /eng/pipelines/common/jobs/prepare-signed-artifacts.yml
     parameters:
       PublishRidAgnosticPackagesFromPlatform: ${{ parameters.PublishRidAgnosticPackagesFromPlatform }}
-      bindings: ${{ parameters.bindings }}
+      scriptArgs: ${{ parameters.scriptArgs }}
 
   # Publish to Build Asset Registry in order to generate the ReleaseConfigs artifact.
   - template: /eng/common/templates-official/job/publish-build-assets.yml

eng/pipelines/runtimelab-official.yml

@@ -40,6 +40,4 @@ extends:
         parameters:
           isOfficialBuild: true
           enableSourceLinkValidation: true
-          bindings:
-            isBindingsBuild: true
-            scriptArgs: '--platform MacOSX --arch x86_64-apple-macos --version 16.0 --framework StoreKit --experimental'
+          scriptArgs: '--framework StoreKit'

eng/pipelines/runtimelab.yml

@@ -51,20 +51,11 @@ stages:
   jobs:
   - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
     - template: /eng/pipelines/common/templates/build-job.yml
-      parameters:
-        osGroup: OSX
-        archType: x64
-        runTests: true
-        pool:
-          vmImage: 'macOS-latest'
-        bindings:
-          isBindingsBuild: true
-          scriptArgs: '--platform MacOSX --arch x86_64-apple-macos --version 16.0 --framework StoreKit'
-
-    - template: /eng/pipelines/common/templates/test-job.yml
       parameters:
         osGroup: OSX
         platform: maccatalyst
         archType: x64
+        runTests: true
         pool:
           vmImage: 'macOS-latest'
+        scriptArgs: '--framework StoreKit'