Merge pull request #189

DennisDyallo · web-flow · commit e8588b29bff5 · 2025-01-17T18:15:07.000+01:00
Fix failing NativeShims build
diff --git a/Yubico.NativeShims/CMakeLists.txt b/Yubico.NativeShims/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(Yubico.NativeShims VERSION 1.11.0)
+project(Yubico.NativeShims VERSION 1.12)
 include(CheckCCompilerFlag)
 
 if (APPLE OR UNIX)
diff --git a/Yubico.NativeShims/build-macOS.sh b/Yubico.NativeShims/build-macOS.sh
@@ -2,9 +2,7 @@ rm -rf build64 buildarm osx-arm64 osx-x64
 
 pushd $VCPKG_INSTALLATION_ROOT
 git checkout master
-git restore .
-git pull
-vcpkg x-update-baseline
+./bootstrap-vcpkg.sh
 popd
 
 cmake \
diff --git a/Yubico.NativeShims/build-windows.ps1 b/Yubico.NativeShims/build-windows.ps1
@@ -1,9 +1,7 @@
 # Update to latest vcpkg baseline
 Push-Location $env:VCPKG_INSTALLATION_ROOT
 git checkout master
-git restore .
-git pull
-vcpkg x-update-baseline
+.\bootstrap-vcpkg.bat
 Pop-Location
 
 # 32-bit builds
diff --git a/Yubico.NativeShims/vcpkg.json b/Yubico.NativeShims/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "yubico-nativeshims",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "dependencies": [
     "openssl"
   ]

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",`
`3`	`3`	`"name": "yubico-nativeshims",`
`4`		`- "version": "1.11.0",`
	`4`	`+ "version": "1.12.0",`
`5`	`5`	`"dependencies": [`
`6`	`6`	`"openssl"`
`7`	`7`	`]`