Update Nuget package and VS projects to build and package ARM64

.github/workflows/nuget-publish.yml

@@ -17,8 +17,12 @@ env:
 jobs:
   build:
     runs-on: windows-latest
-    permissions:
-      packages: write
+    strategy:
+      matrix:
+        # Add additional configurations if needed.
+        configuration: [Release, Debug]
+        # If you need to build for multiple platforms, you can add them here.
+        platform: [x64, x86, ARM64]
 
     steps:
     - uses: actions/checkout@v3
@@ -27,13 +31,74 @@ jobs:
       uses: microsoft/setup-msbuild@v1.0.2
 
     - name: Build
-      working-directory: ${{env.GITHUB_WORKSPACE}}
       # Add additional options to the MSBuild command line here (like platform or verbosity level).
       # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
-      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
+      run: msbuild /m /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} ${{env.SOLUTION_FILE_PATH}}
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: build-artifacts-${{ matrix.configuration }}-${{ matrix.platform }}
+        path: |
+          ${{ matrix.platform == 'x86' && 'Win32' || matrix.platform }}/${{ matrix.configuration }}/api/pict.lib
+          ${{ matrix.platform == 'x86' && 'Win32' || matrix.platform }}/${{ matrix.configuration }}/cli/*.exe
+          ${{ matrix.platform == 'x86' && 'Win32' || matrix.platform }}/${{ matrix.configuration }}/cli/*.pdb
+          ${{ matrix.platform == 'x86' && 'Win32' || matrix.platform }}/${{ matrix.configuration }}/clidll/*.dll
+          ${{ matrix.platform == 'x86' && 'Win32' || matrix.platform }}/${{ matrix.configuration }}/clidll/*.pdb
+        retention-days: 1
+
+  package:
+    runs-on: windows-latest
+    needs: build
+    permissions:
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Download all build artifacts
+      uses: actions/download-artifact@v4
+      with:
+        path: artifacts/
+
+    - name: Verify source files exist
+      run: |
+        # Verify all required source files exist
+        Write-Host "Checking for required files..."
+        if (Test-Path "api/pictapi.h") { Write-Host "✓ api/pictapi.h found" } else { Write-Host "✗ api/pictapi.h missing"; exit 1 }
+        if (Test-Path "doc/pict.md") { Write-Host "✓ doc/pict.md found" } else { Write-Host "✗ doc/pict.md missing"; exit 1 }
+        if (Test-Path "LICENSE.TXT") { Write-Host "✓ LICENSE.TXT found" } else { Write-Host "✗ LICENSE.TXT missing"; exit 1 }
+        if (Test-Path "Microsoft.Test.Pict.targets") { Write-Host "✓ Microsoft.Test.Pict.targets found" } else { Write-Host "✗ Microsoft.Test.Pict.targets missing"; exit 1 }
+        if (Test-Path "Microsoft.Test.Pict.nuspec") { Write-Host "✓ Microsoft.Test.Pict.nuspec found" } else { Write-Host "✗ Microsoft.Test.Pict.nuspec missing"; exit 1 }
+
+    - name: Restore build structure
+      run: |
+        # Copy artifacts back to original build structure
+        Get-ChildItem -Path "artifacts" -Directory | ForEach-Object {
+          $artifactName = $_.Name
+          if ($artifactName -match "build-artifacts-(.+)-(.+)") {
+            $config = $matches[1]
+            $platform = $matches[2]
+
+            # Map platform names to match directory structure
+            $platformDir = $platform
+            if ($platform -eq "x86") {
+              $platformDir = "Win32"
+            }
+
+            # Create the target directory structure (platform/configuration)
+            $targetDir = "$platformDir/$config"
+            if (!(Test-Path $targetDir)) {
+              New-Item -ItemType Directory -Path $targetDir -Force
+            }
+
+            # Copy contents preserving structure
+            Copy-Item -Path "$($_.FullName)/*" -Destination $targetDir -Recurse -Force
+          }
+        }
 
     - name: Add NUGET to PATH
-      uses: NuGet/setup-nuget@v1.0.5
+      uses: NuGet/setup-nuget@v2
 
     - name: Create a package
       run: nuget pack

.gitignore

@@ -20,4 +20,7 @@
 pict
 *.o
 .DS_Store
-build
+build
+/*/ARM64/*
+/*/Win32/*
+/*/x64/*

Microsoft.Test.Pict.nuspec

@@ -1,25 +1,47 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-    <metadata>
-        <id>Microsoft.Test.Pict</id>
-        <version>3.7.5</version>
-        <authors>Jacek Czerwonka</authors>
-        <license type="file">contents/LICENSE.TXT</license>
-        <projectUrl>http://github.com/microsoft/pict</projectUrl>
-        <repository type="git" url="https://github.com/microsoft/pict.git" />
-        <description>PICT - Combinatorial Testing Tool</description>
-    </metadata>
-    <files>
-        <file src="Release/cli/pict.exe" target="contents/win-x64/exe" />
-        <file src="Release/cli/pict.pdb" target="contents/win-x64/exe" />
+	<metadata>
+		<id>Microsoft.Test.Pict</id>
+		<version>4.0.0</version>
+		<authors>Jacek Czerwonka</authors>
+		<license type="file">contents/LICENSE.TXT</license>
+		<projectUrl>http://github.com/microsoft/pict</projectUrl>
+		<repository type="git" url="https://github.com/microsoft/pict.git" />
+		<description>PICT - Combinatorial Testing Tool</description>
+	</metadata>
+	<files>
+		<!-- x64 files -->
+		<file src="x64/Release/cli/pict.exe" target="contents/win-x64/exe" />
+		<file src="x64/Release/cli/pict.pdb" target="contents/win-x64/exe" />
+		<file src="x64/Debug/api/pict.lib" target="contents/win-x64/api/Debug" />
+		<file src="x64/Release/api/pict.lib" target="contents/win-x64/api/Release" />
+		<file src="x64/Release/clidll/pict.dll" target="contents/win-x64/dll" />
+		<file src="x64/Release/clidll/pict.pdb" target="contents/win-x64/dll" />
 
-        <file src="Release/api/pict.lib" target="contents/win-x64/api" />
-        <file src="api/pictapi.h" target="contents/win-x64/api" />
+		<!-- x86 (Win32) files -->
+		<file src="Win32/Release/cli/pict.exe" target="contents/win-x86/exe" />
+		<file src="Win32/Release/cli/pict.pdb" target="contents/win-x86/exe" />
+		<file src="Win32/Debug/api/pict.lib" target="contents/win-x86/api/Debug" />
+		<file src="Win32/Release/api/pict.lib" target="contents/win-x86/api/Release" />
+		<file src="Win32/Release/clidll/pict.dll" target="contents/win-x86/dll" />
+		<file src="Win32/Release/clidll/pict.pdb" target="contents/win-x86/dll" />
 
-        <file src="Release/clidll/pict.dll" target="contents/win-x64/dll" />
-        <file src="Release/clidll/pict.pdb" target="contents/win-x64/dll" />
+		<!-- ARM64 files -->
+		<file src="ARM64/Release/cli/pict.exe" target="contents/win-arm64/exe" />
+		<file src="ARM64/Release/cli/pict.pdb" target="contents/win-arm64/exe" />
+		<file src="ARM64/Debug/api/pict.lib" target="contents/win-arm64/api/Debug" />
+		<file src="ARM64/Release/api/pict.lib" target="contents/win-arm64/api/Release" />
+		<file src="ARM64/Release/clidll/pict.dll" target="contents/win-arm64/dll" />
+		<file src="ARM64/Release/clidll/pict.pdb" target="contents/win-arm64/dll" />
 
-        <file src="doc/pict.md" target="contents" />
-        <file src="LICENSE.txt" target="contents" />
-    </files>
-</package>
+		<!-- Common header file - shared across architectures -->
+		<file src="api/pictapi.h" target="contents/api" />
+
+		<!-- MSBuild targets file for native C++ projects -->
+		<file src="Microsoft.Test.Pict.targets" target="build/Microsoft.Test.Pict.targets" />
+
+		<!-- Documentation and license - common for all architectures -->
+		<file src="doc/pict.md" target="contents" />
+		<file src="LICENSE.TXT" target="contents" />
+	</files>
+</package>

Microsoft.Test.Pict.targets

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\contents\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <!-- Win32 Debug -->
+      <AdditionalLibraryDirectories Condition="'$(Platform)' == 'Win32' And '$(Configuration)' == 'Debug'">$(MSBuildThisFileDirectory)..\contents\win-x86\api\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <!-- Win32 Release -->
+      <AdditionalLibraryDirectories Condition="'$(Platform)' == 'Win32' And '$(Configuration)' == 'Release'">$(MSBuildThisFileDirectory)..\contents\win-x86\api\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <!-- x64 Debug -->
+      <AdditionalLibraryDirectories Condition="'$(Platform)' == 'x64' And '$(Configuration)' == 'Debug'">$(MSBuildThisFileDirectory)..\contents\win-x64\api\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <!-- x64 Release -->
+      <AdditionalLibraryDirectories Condition="'$(Platform)' == 'x64' And '$(Configuration)' == 'Release'">$(MSBuildThisFileDirectory)..\contents\win-x64\api\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <!-- ARM64 Debug -->
+      <AdditionalLibraryDirectories Condition="'$(Platform)' == 'ARM64' And '$(Configuration)' == 'Debug'">$(MSBuildThisFileDirectory)..\contents\win-arm64\api\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <!-- ARM64 Release -->
+      <AdditionalLibraryDirectories Condition="'$(Platform)' == 'ARM64' And '$(Configuration)' == 'Release'">$(MSBuildThisFileDirectory)..\contents\win-arm64\api\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+
+      <!-- Link the PICT API library -->
+      <AdditionalDependencies>pict.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <!-- Copy DLLs to output directory -->
+  <ItemGroup Condition="'$(Platform)' == 'Win32'">
+    <Content Include="$(MSBuildThisFileDirectory)contents\win-x86\dll\*.dll">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup Condition="'$(Platform)' == 'x64'">
+    <Content Include="$(MSBuildThisFileDirectory)contents\win-x64\dll\*.dll">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup Condition="'$(Platform)' == 'ARM64'">
+    <Content Include="$(MSBuildThisFileDirectory)contents\win-arm64\dll\*.dll">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+</Project>