Merge branch 'main' of https://github.com/qsharp-community/qsharp-bridge into main

Author: filipw

.github/workflows/ci.yml

@@ -10,12 +10,26 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os: [ ubuntu-latest, windows-latest, macos-latest, windows-11-arm ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      - name: Install Rust on Windows ARM
+        if: matrix.os == 'windows-11-arm'
+        shell: powershell
+        run: |
+          Invoke-WebRequest -Uri https://win.rustup.rs/aarch64 -OutFile rustup-init.exe
+          ./rustup-init.exe -y
+          $env:Path += ";$env:USERPROFILE\.cargo\bin"
+          echo "$env:USERPROFILE\.cargo\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - uses: actions/setup-python@v5
+        if: matrix.os == 'windows-11-arm'
+        with:
+          python-version: '3.13' 
+
       - name: Install uniffi-bindgen-cs
         run: |
           cargo install uniffi-bindgen-cs --git https://github.com/NordSecurity/uniffi-bindgen-cs --tag v0.9.1+v0.28.3

.github/workflows/release.yml

@@ -13,12 +13,26 @@ jobs:
   build-wheels:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, windows-11-arm]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      - name: Install Rust on Windows ARM
+        if: matrix.os == 'windows-11-arm'
+        shell: powershell
+        run: |
+          Invoke-WebRequest -Uri https://win.rustup.rs/aarch64 -OutFile rustup-init.exe
+          ./rustup-init.exe -y
+          $env:Path += ";$env:USERPROFILE\.cargo\bin"
+          echo "$env:USERPROFILE\.cargo\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - uses: actions/setup-python@v5
+        if: matrix.os == 'windows-11-arm'
+        with:
+          python-version: '3.13' 
+
       - name: Set version from tag
         id: get_version
         run: |

.gitignore

@@ -36,3 +36,4 @@ platforms/swift/Qsharp.Bridge/Libs/qsharp_bridge_framework.xcframework
 platforms/swift/Qsharp.Bridge/.swiftpm/xcode/xcuserdata/filipw.xcuserdatad/xcschemes/xcschememanagement.plist
 platforms/swift/Qsharp.Bridge/Sources/Qsharp.Bridge/qsharp_bridge.swift
 qsharp-bridge.sln
+platforms/python/qsharp-bridge/__pycache__/

platforms/python/qsharp-bridge/qsharp_bridge/__init__.py

@@ -10,13 +10,7 @@ def _load_native_lib():
     elif sys.platform.startswith("linux"):
         lib_name = "libqsharp_bridge.so"
     elif sys.platform.startswith("win"):
-        machine = platform.machine().lower()
-        if machine in ("amd64", "x86_64"):
-            lib_name = "qsharp_bridge.dll"
-        elif machine in ("arm64", "aarch64"):
-            lib_name = "qsharp_bridge_arm64.dll"
-        else:
-            lib_name = "qsharp_bridge.dll"
+        lib_name = "qsharp_bridge.dll"
     else:
         raise RuntimeError(f"Unsupported platform: {sys.platform}")
 

platforms/python/qsharp-bridge/setup.py

@@ -19,7 +19,6 @@
 def get_lib_filename():
     """
     Return the platform-specific filename for the shared library.
-    For Windows, select the binary based on the machine architecture.
     """
     machine = platform.machine().lower()
     if sys.platform.startswith("darwin"):
@@ -28,13 +27,7 @@ def get_lib_filename():
     elif sys.platform.startswith("linux"):
         return "libqsharp_bridge.so"
     elif sys.platform.startswith("win"):
-        # what an ambition, arm64 Windows support. maybe it will work?
-        if machine in ("amd64", "x86_64"):
-            return "qsharp_bridge.dll"
-        elif machine in ("arm64", "aarch64"):
-            return "qsharp_bridge_arm64.dll"
-        else:
-            return "qsharp_bridge.dll"
+        return "qsharp_bridge.dll"
     else:
         raise RuntimeError(f"Unsupported platform: {sys.platform}")
 
@@ -68,14 +61,16 @@ def run(self):
     class bdist_wheel(_bdist_wheel):
         def finalize_options(self):
             self.plat_name_supplied = True
-            
-            # Set the platform tag based on the system
             if sys.platform.startswith('linux'):
                 self.plat_name = "py3-none-linux_x86_64"
             elif sys.platform.startswith('darwin'):
                 self.plat_name = "py3-none-macosx_11_0_universal2"
             elif sys.platform.startswith('win'):
-                self.plat_name = "py3-none-win_amd64"
+                machine = platform.machine().lower()
+                if machine in ("arm64", "aarch64"):
+                    self.plat_name = "py3-none-win_arm64"
+                else:
+                    self.plat_name = "py3-none-win_amd64"
             else:
                 # Fall back to default behavior for unknown platforms
                 self.plat_name_supplied = False