diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 6518b9f3b..66b545c08 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,13 +3,13 @@
"isRoot": true,
"tools": {
"jetbrains.resharper.globaltools": {
- "version": "2022.3.2",
+ "version": "2025.3.3",
"commands": [
"jb"
]
},
"nvika": {
- "version": "3.0.0",
+ "version": "4.0.0",
"commands": [
"nvika"
]
diff --git a/.github/workflows/pull-request-ui.yml b/.github/workflows/pull-request-ui.yml
index 94db206a1..964e05f3b 100644
--- a/.github/workflows/pull-request-ui.yml
+++ b/.github/workflows/pull-request-ui.yml
@@ -11,7 +11,7 @@ env:
jobs:
get_version_code:
name: Get Version Code
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-24.04
outputs:
version: ${{ steps.get_version_code.outputs.version }}
build_number: ${{ steps.get_version_code.outputs.build_number }}
@@ -43,7 +43,7 @@ jobs:
source: ${{ steps.filter.outputs.source }}
steps:
# For pull requests it's not necessary to checkout the code
- - uses: dorny/paths-filter@v2
+ - uses: dorny/paths-filter@v3
id: filter
with:
filters: |
@@ -69,11 +69,11 @@ jobs:
name: ["macOS", "windows-os"]
include:
- name: macOS
- os: macOS-13
- version: "14.2"
+ os: macos-26
+ version: "26.2"
osFolder: "maccatalyst"
- name: windows-os
- os: windows-2022
+ os: windows-2025-vs2026
version: "latest"
osFolder: "windows"
@@ -113,7 +113,7 @@ jobs:
if: (runner.os == 'macOS' && steps.filter.outputs.any == 'true')
run: |
ls -ls /Applications/
- ls -ls $ANDROID_SDK_ROOT/ndk
+ # ANDROID_SDK_ROOT may not be set on all runners
sudo xcode-select -switch /Applications/Xcode_${{ matrix.version }}.app
- name: Configure Environment
@@ -132,20 +132,19 @@ jobs:
- name: Clean UI
if: (steps.filter.outputs.bindings == 'true' || steps.filter.outputs.source == 'true')
run: make clean-ui
-
- - name: Publish UI
- if: (steps.filter.outputs.bindings == 'true' || steps.filter.outputs.source == 'true')
- env:
- BUILD_NUMBER: ${{ needs.get_version_code.outputs.build_number }}
- BUILD_VERSION: "${{needs.get_version_code.outputs.version}}"
- APPCENTER_SECRET_MACOS: ${{ secrets.APPCENTER_SECRET_MACOS }}
- APPCENTER_SECRET_UWP: ${{ secrets.APPCENTER_SECRET_UWP }}
- run: make publish-ui
-
- - name: save build artifacts
- if: (steps.filter.outputs.bindings == 'true' || steps.filter.outputs.source == 'true')
- uses: actions/upload-artifact@v4
- with:
- name: electionguard-admin
- retention-days: 7
- path: ./publish/*
+# - name: Publish UI
+# if: (steps.filter.outputs.bindings == 'true' || steps.filter.outputs.source == 'true')
+# env:
+# BUILD_NUMBER: ${{ needs.get_version_code.outputs.build_number }}
+# BUILD_VERSION: "${{needs.get_version_code.outputs.version}}"
+# APPCENTER_SECRET_MACOS: ${{ secrets.APPCENTER_SECRET_MACOS }}
+# APPCENTER_SECRET_UWP: ${{ secrets.APPCENTER_SECRET_UWP }}
+# run: make publish-ui
+#
+# - name: save build artifacts
+# if: (steps.filter.outputs.bindings == 'true' || steps.filter.outputs.source == 'true')
+# uses: actions/upload-artifact@v4
+# with:
+# name: electionguard-admin
+# retention-days: 7
+# path: ./publish/*
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 46180e449..e44024297 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -26,7 +26,7 @@ jobs:
typescript: ${{ steps.filter.outputs.typescript }}
steps:
# For pull requests it's not necessary to checkout the code
- - uses: dorny/paths-filter@v2
+ - uses: dorny/paths-filter@v3
id: filter
with:
filters: |
@@ -65,19 +65,19 @@ jobs:
matrix:
name:
[
- "ubuntu-22.04-clang-14.0.0",
- "ubuntu-22.04-emscripten-3.1",
- "ubuntu-22.04-gcc-12.1.0",
- "macos-13-xcode-14.2",
- "macos-13-xcode-14.2-arm64",
- "windows-2022-gcc-11",
- "windows-2022-msvc-latest-x86",
- "windows-2022-msvc-latest-x64",
- "ubuntu-22.04-linter",
+ "ubuntu-24.04-clang-14.0.0",
+ "ubuntu-24.04-emscripten-3.1",
+ "ubuntu-24.04-gcc-12.1.0",
+ "macos-15-intel-xcode-16.4",
+ "macos-15-xcode-16.4-arm64",
+ "windows-2025-msys2-clang-14",
+ "windows-2025-msvc-latest-x86",
+ "windows-2025-msvc-latest-x64",
+ "ubuntu-24.04-linter",
]
include:
- - name: ubuntu-22.04-clang-14.0.0
- os: ubuntu-22.04
+ - name: ubuntu-24.04-clang-14.0.0
+ os: ubuntu-24.04
processor: x64
compiler: clang
version: "14"
@@ -85,8 +85,8 @@ jobs:
lint: false
runCsTests: false
runTsTests: false
- - name: ubuntu-22.04-emscripten-3.1
- os: ubuntu-22.04
+ - name: ubuntu-24.04-emscripten-3.1
+ os: ubuntu-24.04
processor: x64
compiler: emscripten
version: "3.1.35"
@@ -94,8 +94,8 @@ jobs:
lint: false
runCsTests: false
runTsTests: true
- - name: ubuntu-22.04-gcc-12.1.0
- os: ubuntu-22.04
+ - name: ubuntu-24.04-gcc-12.1.0
+ os: ubuntu-24.04
processor: x64
compiler: gcc
version: "12"
@@ -103,35 +103,35 @@ jobs:
lint: false
runCsTests: false
runTsTests: false
- - name: macOS-13-xcode-14.2
- os: macOS-13
+ - name: macos-15-intel-xcode-16.4
+ os: macos-15-intel
processor: x64
compiler: xcode
- version: "14.2"
+ version: "16.4"
makeReleaseBuild: false
lint: false
runCsTests: true
runTsTests: false
- - name: macOS-13-xcode-14.2-arm64
- os: macOS-13
+ - name: macos-15-xcode-16.4-arm64
+ os: macos-15
processor: arm64
compiler: xcode
- version: "14.2"
+ version: "16.4"
makeReleaseBuild: false
lint: false
runCsTests: false
runTsTests: false
- - name: windows-2022-gcc-11
- os: windows-2022
+ - name: windows-2025-msys2-clang-14
+ os: windows-2025-vs2026
processor: x64
- compiler: gcc
- version: "11"
+ compiler: clang
+ version: "14"
makeReleaseBuild: false
lint: false
runCsTests: false
runTsTests: false
- - name: windows-2022-msvc-latest-x86
- os: windows-2022
+ - name: windows-2025-msvc-latest-x86
+ os: windows-2025-vs2026
processor: x86
compiler: msvc
version: "latest"
@@ -139,8 +139,8 @@ jobs:
lint: false
runCsTests: false
runTsTests: false
- - name: windows-2022-msvc-latest-x64
- os: windows-2022
+ - name: windows-2025-msvc-latest-x64
+ os: windows-2025-vs2026
processor: x64
compiler: msvc
version: "latest"
@@ -148,8 +148,8 @@ jobs:
lint: false
runCsTests: true
runTsTests: false
- - name: ubuntu-22.04-linter
- os: ubuntu-22.04
+ - name: ubuntu-24.04-linter
+ os: ubuntu-24.04
processor: x64
compiler: clang
version: "14"
@@ -246,7 +246,7 @@ jobs:
if: (runner.os == 'macOS' && steps.filter.outputs.any == 'true')
run: |
ls -ls /Applications/
- ls -ls $ANDROID_SDK_ROOT/ndk
+ # ANDROID_SDK_ROOT may not be set on all runners
sudo xcode-select -switch /Applications/Xcode_${{ matrix.version }}.app
- name: Update Environment (Windows MSYS2)
@@ -259,9 +259,9 @@ jobs:
base-devel
mingw-w64-clang-x86_64-gcc
mingw-w64-clang-x86_64-toolchain
- mingw-w64-clang-x86_64-clang-14
+ mingw-w64-clang-x86_64-clang
mingw-w64-clang-x86_64-cmake
- mingw-w64-clang-x86_64-llvm-14
+ mingw-w64-clang-x86_64-llvm
make
git
@@ -320,6 +320,13 @@ jobs:
if: (runner.os == 'Windows' && matrix.compiler == 'msvc' && steps.filter.outputs.cpp == 'true')
run: make test
+ - name: Run Tests (Windows MSYS2)
+ env:
+ PROCESSOR: ${{ matrix.processor }}
+ if: (runner.os == 'Windows' && matrix.compiler == 'clang' && steps.filter.outputs.cpp == 'true')
+ shell: msys2 {0}
+ run: make test-msys2
+
- name: Run Tests (Windows-x86)
env:
PROCESSOR: ${{ matrix.processor }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 459dab65e..ab7a925ab 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ env:
jobs:
get_version_code:
name: Get Version Code
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-24.04
outputs:
version: ${{ steps.get_version_code.outputs.version }}
build_number: ${{ steps.get_version_code.outputs.build_number }}
@@ -32,7 +32,7 @@ jobs:
linux_build_x64:
name: Linux Build (x64)
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-24.04
env:
compiler: clang
compiler_version: 14
@@ -59,9 +59,9 @@ jobs:
maccatalyst_build_arm64:
name: MacCatalyst Build (arm64)
- runs-on: macos-13
+ runs-on: macos-15
env:
- compiler_version: 14.2
+ compiler_version: 16.4
steps:
- name: Checkout Code
uses: actions/checkout@v4
@@ -82,9 +82,9 @@ jobs:
macos_build_arm64:
name: MacOS Build (arm64)
- runs-on: macos-13
+ runs-on: macos-15
env:
- compiler_version: 14.2
+ compiler_version: 16.4
steps:
- name: Checkout Code
uses: actions/checkout@v4
@@ -105,9 +105,9 @@ jobs:
macos_build_x64:
name: MacOS Build (x64)
- runs-on: macos-13
+ runs-on: macos-15-intel
env:
- compiler_version: 14.2
+ compiler_version: 16.4
steps:
- name: Checkout Code
uses: actions/checkout@v4
@@ -128,7 +128,7 @@ jobs:
wasm_build:
name: WASM Build
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-24.04
env:
compiler: clang
compiler_version: 14
@@ -154,7 +154,7 @@ jobs:
windows_build_x86:
name: Windows Build (x86)
- runs-on: windows-2022
+ runs-on: windows-2025-vs2026
steps:
- name: Checkout Code
uses: actions/checkout@v4
@@ -180,7 +180,7 @@ jobs:
windows_build_x64:
name: Windows Build (x64)
- runs-on: windows-2022
+ runs-on: windows-2025-vs2026
steps:
- name: Checkout Code
uses: actions/checkout@v4
@@ -216,7 +216,7 @@ jobs:
windows_build_x64,
windows_build_x86,
]
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-24.04
steps:
- name: Checkout Code
uses: actions/checkout@v4
@@ -275,7 +275,7 @@ jobs:
publish_npm:
name: Publish NPM
needs: [get_version_code, wasm_build]
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-24.04
steps:
- name: Checkout Code
uses: actions/checkout@v4
@@ -313,11 +313,11 @@ jobs:
name: ["windows-os"]
include:
# - name: macOS
- # os: macOS-13
- # version: "14.2"
+ # os: macos-26
+ # version: "26.2"
# osFolder: "maccatalyst"
- name: windows-os
- os: windows-2022
+ os: windows-2025-vs2026
version: "latest"
osFolder: "windows"
@@ -382,10 +382,10 @@ jobs:
publish_release:
name: Publish Release
needs: [get_version_code, publish_nuget, publish_npm, publish_admin]
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-24.04
steps:
- name: Create Github Release
- uses: softprops/action-gh-release@v1
+ uses: softprops/action-gh-release@v2
with:
name: Release ${{needs.get_version_code.outputs.version}}
tag_name: ${{needs.get_version_code.outputs.version}}
diff --git a/.github/workflows/sanitizer.yml b/.github/workflows/sanitizer.yml
index 809bc7d4e..b67877c2f 100644
--- a/.github/workflows/sanitizer.yml
+++ b/.github/workflows/sanitizer.yml
@@ -20,7 +20,7 @@ env:
jobs:
Test:
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-24.04
steps:
- name: Fail if non Linux OS
diff --git a/Makefile b/Makefile
index 32fd19ef3..aa16cd2cb 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ EMSDK?=$(ELECTIONGUARD_CACHE)/emscripten
# not all platforms can compile all targets.
# valid values:
# OPERATING_SYSTEM: Android, Ios, Linux, Darwin, Windows
+# OS_VARIANT: Debian, Alpine
# PROCESSOR: arm64, x64, x86
ifeq ($(OS),Windows_NT)
OPERATING_SYSTEM ?= Windows
@@ -114,18 +115,34 @@ ifeq ($(OPERATING_SYSTEM),Darwin)
endif
ifeq ($(OPERATING_SYSTEM),Linux)
@echo 🐧 LINUX INSTALL
- sudo apt install -y build-essential
- sudo apt install -y iwyu
- sudo apt install -y llvm
- sudo apt install -y clang-12
- sudo apt install -y cmake
- sudo apt install -y lcov
- sudo apt install -y cppcheck
- sudo apt install -y clang-format
- sudo apt install -y clang-tidy
- sudo apt install -y ninja-build
- sudo apt install -y valgrind
- sudo apt install -y unzip
+ if [ -f /etc/os-release ] && grep -qi "alpine" /etc/os-release; then \
+ echo "🏔️ Alpine Linux detected"; \
+ sudo apk update; \
+ echo "Installing CXX dependencies"; \
+ sudo apk add make musl-dev g++ cmake; \
+ echo "Installing DotNet dependencies"; \
+ sudo apk add dotnet10-sdk dotnetcore10-runtime; \
+ else \
+ echo "🐧 Debian-based Linux detected"; \
+ wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb; \
+ sudo dpkg -i packages-microsoft-prod.deb; \
+ rm packages-microsoft-prod.deb; \
+ sudo apt update; \
+ sudo apt install -y build-essential; \
+ sudo apt install -y iwyu; \
+ sudo apt install -y llvm; \
+ sudo apt install -y clang-14; \
+ sudo apt install -y cmake; \
+ sudo apt install -y lcov; \
+ sudo apt install -y cppcheck; \
+ sudo apt install -y clang-format; \
+ sudo apt install -y clang-tidy; \
+ sudo apt install -y ninja-build; \
+ sudo apt install -y valgrind; \
+ sudo apt install -y unzip; \
+ sudo apt install -y dotnet-sdk-10.0; \
+ sudo apt install -y npm; \
+ fi
endif
ifeq ($(OPERATING_SYSTEM),Windows)
@echo 🏁 WINDOWS INSTALL
@@ -134,11 +151,20 @@ ifeq ($(OPERATING_SYSTEM),Windows)
choco upgrade cmake -y
choco upgrade ninja -y
choco upgrade vswhere -y
+ choco upgrade llvm -y
+ choco install dotnet-sdk
endif
wget -O cmake/CPM.cmake https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.38.2/CPM.cmake
make fetch-sample-data
dotnet tool restore
+# environment-dotnet:
+# ifeq ($(OPERATING_SYSTEM),Linux)
+# # Ubuntu 22.04 and later?
+# sudo add-apt-repository ppa:dotnet/backports
+# apt-get update && sudo apt-get install -y dotnet-sdk-10.0
+# endif
+
environment-msys2:
ifeq ($(OPERATING_SYSTEM),Windows)
@echo 🏁 MSYS2 INSTALL
@@ -187,6 +213,7 @@ ifeq ($(OPERATING_SYSTEM),Windows)
cmake -S . -B $(ELECTIONGUARD_BUILD_LIBS_DIR)/$(OPERATING_SYSTEM)/$(PROCESSOR)/$(TARGET) \
-G "Visual Studio 18" -A $(VSPLATFORM) \
-DCMAKE_BUILD_TYPE=$(TARGET) \
+ -DCMAKE_OBJECT_PATH_MAX=200 \
-DBUILD_SHARED_LIBS=ON \
-DDISABLE_VALE=$(TEMP_DISABLE_VALE) \
-DUSE_MSVC=ON \
@@ -307,7 +334,12 @@ build-cli:
build-ui:
@echo 🖥️ BUILD UI $(OPERATING_SYSTEM) $(PROCESSOR) $(TARGET)
cd ./src/electionguard-ui && dotnet restore
+ifeq ($(OPERATING_SYSTEM),Darwin)
+ dotnet build -f net10.0-maccatalyst -c $(TARGET) ./$(ELECTIONGUARD_APP_ADMIN_DIR)/ElectionGuard.UI/ElectionGuard.UI.csproj /p:APPCENTER_SECRET_MACOS=$(APPCENTER_SECRET_MACOS)
+endif
+ifeq ($(OPERATING_SYSTEM),Windows)
dotnet build -c $(TARGET) ./src/electionguard-ui/ElectionGuard.UI.sln /p:Platform=$(PROCESSOR) /p:APPCENTER_SECRET_UWP=$(APPCENTER_SECRET_UWP) /p:APPCENTER_SECRET_MACOS=$(APPCENTER_SECRET_MACOS)
+endif
build-wasm:
@echo 🌐 BUILD WASM $(OPERATING_SYSTEM) $(PROCESSOR) $(TARGET)
@@ -388,7 +420,7 @@ generate-interop:
# Lint / Format
format: build
- cd $(ELECTIONGUARD_BUILD_LIBS_DIR)/$(PROCESSOR) && $(MAKE) format
+ cd $(ELECTIONGUARD_BUILD_LIBS_DIR)/$(OPERATING_SYSTEM)/$(PROCESSOR) && $(MAKE) format
lint:
dotnet jb inspectcode -o="lint-results.xml" -f="Xml" --build --verbosity="WARN" --severity="Warning" bindings/netstandard/ElectionGuard/ElectionGuard.sln
@@ -419,6 +451,7 @@ endif
ifeq ($(OPERATING_SYSTEM),Darwin)
dotnet publish -f net10.0-maccatalyst -c $(TARGET) /p:CreatePackage=true /p:ApplicationVersion=$(BUILD_NUMBER) /p:APPCENTER_SECRET_MACOS=$(APPCENTER_SECRET_MACOS) ./$(ELECTIONGUARD_APP_ADMIN_DIR)/ElectionGuard.UI/ElectionGuard.UI.csproj -o ./publish
endif
+# add error for running on Linuxx!
publish-ui-appcenter:
@echo 🧱 PUBLISH UI APPCENTER
@@ -440,7 +473,7 @@ else
@echo "APPCENTER_SECRET_MACOS not set. Skipping AppCenter publish"
exit 1
endif
-
+# add linux check
publish-wasm: build-npm
@echo 🌐 PUBLISH WASM
ifeq ($(OPERATING_SYSTEM),Windows)
@@ -728,7 +761,7 @@ fetch-sample-data:
@echo ⬇️ FETCH Sample Data
wget -O $(TEMPFILE) https://github.com/microsoft/electionguard/releases/download/v1.0/sample-data.zip
unzip -o $(TEMPFILE)
- rm -f $(TEMPFILE)
+# rm -f $(TEMPFILE)
generate-sample-data: build-netstandard
@echo Generate Sample Data
diff --git a/cmake/tools.cmake b/cmake/tools.cmake
index 81543159d..988e98e4a 100644
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -5,7 +5,7 @@
option(CODE_COVERAGE "Enable code coverage" OFF)
option(USE_STATIC_ANALYSIS "use static analysis tools" OFF)
option(USE_DYNAMIC_ANALYSIS "use dynamic analysis tools" OFF)
-option(USE_FORMATTING "use formatting tools" OFF)
+option(USE_FORMATTING "use formatting tools" ON)
function(use_valgrind TARGET_NAME)
set(VALGRIND_LOG ${PROJECT_BINARY_DIR}/valgrind.log)
@@ -20,7 +20,7 @@ function(use_valgrind TARGET_NAME)
endfunction()
# ---- Dependencies ----
-include(cmake/CPM_0.31.0.cmake)
+include(cmake/CPM.cmake)
CPMAddPackage(
NAME StableCoder-cmake-scripts
@@ -111,7 +111,7 @@ if(USE_DYNAMIC_ANALYSIS)
endif()
endif()
-#if(USE_FORMATTING)
-# message("++ Running with formatting")
-# include(${StableCoder-cmake-scripts_SOURCE_DIR}/formatting.cmake)
-#endif()
+## if(USE_FORMATTING)
+## message("++ Running with formatting")
+## include(${StableCoder-cmake-scripts_SOURCE_DIR}/formatting.cmake)
+## endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f257921c2..f6739ade8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.14...3.16 FATAL_ERROR)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
# ---- Dependencies ----
-include(../cmake/CPM_0.31.0.cmake)
+include(../cmake/CPM.cmake)
CPMAddPackage(
NAME date
@@ -14,9 +14,9 @@ CPMAddPackage(
CPMAddPackage(
NAME nlohmann_json
- VERSION 3.11.2
- URL https://github.com/nlohmann/json/releases/download/v3.11.2/include.zip
- URL_HASH SHA256=e5c7a9f49a16814be27e4ed0ee900ecd0092bfb7dbfca65b5a421b774dccaaed
+ VERSION 3.11.3
+ URL https://github.com/nlohmann/json/releases/download/v3.11.3/include.zip
+ URL_HASH SHA256=a22461d13119ac5c78f205d3df1db13403e58ce1bb1794edc9313677313f4a9d
)
CPMAddPackage(
@@ -266,7 +266,7 @@ if(CODE_COVERAGE)
target_code_coverage(${META_PROJECT_TARGET} AUTO)
endif()
-#if(USE_FORMATTING)
-# message("++ Building with formatting")
-# clang_format(format ${PROJECT_SOURCE_FILES})
-#endif()
+## if(USE_FORMATTING)
+## message("++ Building with formatting")
+## clang_format(format ${PROJECT_SOURCE_FILES})
+## endif()
diff --git a/src/electionguard-ui/Directory.Packages.props b/src/electionguard-ui/Directory.Packages.props
index e641f943a..1168729c3 100644
--- a/src/electionguard-ui/Directory.Packages.props
+++ b/src/electionguard-ui/Directory.Packages.props
@@ -8,8 +8,9 @@
-
-
+
+
+
diff --git a/src/electionguard-ui/ElectionGuard.UI.Lib/Models/ElectionPartialKeyBackup.cs b/src/electionguard-ui/ElectionGuard.UI.Lib/Models/ElectionPartialKeyBackup.cs
index 40b442532..3d9c3655b 100644
--- a/src/electionguard-ui/ElectionGuard.UI.Lib/Models/ElectionPartialKeyBackup.cs
+++ b/src/electionguard-ui/ElectionGuard.UI.Lib/Models/ElectionPartialKeyBackup.cs
@@ -54,7 +54,7 @@ public ElectionPartialKeyBackup(ElectionPartialKeyBackupRecord contract)
OwnerSequenceOrder = contract.OwnerSequenceOrder;
DesignatedId = contract.DesignatedId;
DesignatedSequenceOrder = contract.DesignatedSequenceOrder;
- EncryptedCoordinate = contract.EncryptedCoordinate;
+ EncryptedCoordinate = new(contract.EncryptedCoordinate);
}
public ElectionPartialKeyBackupRecord ToRecord()
diff --git a/src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj b/src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj
index 61b5ff481..015d43ce0 100644
--- a/src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj
+++ b/src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj
@@ -1,7 +1,7 @@
-
+ net10.0-maccatalyst
net10.0-windows10.0.19041.0
Exe
true
@@ -20,15 +20,18 @@
1.92.0
19
-
+
15.3
+ maccatalyst-arm64
+
+ None
10.0.19041.0
10.0.19041.0
enable
true
PackageReference
- arm64;x64
+ arm64
AnyCPU
efb177b9-29c3-4df1-adaa-be7e64bdc8ce
@@ -37,24 +40,15 @@
$(DefineConstants);APPCENTER_SECRET_MACOS=$(APPCENTER_SECRET_MACOS);APPCENTER_SECRET_UWP=$(APPCENTER_SECRET_UWP)
+
false
- maccatalyst-arm64;maccatalyst-x64
+ maccatalyst-arm64
true
- maccatalyst-arm64;maccatalyst-x64
-
-
-
- false
- maccatalyst-x64
-
-
-
- false
- maccatalyst-x64
+ maccatalyst-arm64
@@ -68,8 +62,8 @@
-
- False
+ portable
+
@@ -95,8 +89,8 @@
-
- False
+ portable
+
@@ -149,11 +143,12 @@
-
+
+
diff --git a/src/electionguard-ui/ElectionGuard.UI/Services/TallyManager.cs b/src/electionguard-ui/ElectionGuard.UI/Services/TallyManager.cs
index ab8937d81..273e13bee 100644
--- a/src/electionguard-ui/ElectionGuard.UI/Services/TallyManager.cs
+++ b/src/electionguard-ui/ElectionGuard.UI/Services/TallyManager.cs
@@ -5,12 +5,12 @@
using ElectionGuard.Decryption.Extensions;
using ElectionGuard.Decryption.Shares;
using ElectionGuard.Decryption.Tally;
+using ElectionGuard.ElectionSetup;
using ElectionGuard.Converters;
using ElectionGuard.Extensions;
using ElectionGuard.Guardians;
using MongoDB.Driver;
using Newtonsoft.Json;
-using ElectionGuard.ElectionSetup;
namespace ElectionGuard.UI.Services
{
diff --git a/src/electionguard/lookup_table.hpp b/src/electionguard/lookup_table.hpp
index fab37ccdc..5e0ed20e3 100644
--- a/src/electionguard/lookup_table.hpp
+++ b/src/electionguard/lookup_table.hpp
@@ -5,6 +5,7 @@
#include "facades/bignum4096.hpp"
#include "utils.hpp"
+#include
#include
#include
#include