diff --git a/.appveyor.yml b/.appveyor.yml
index bf93d7a990..c21e7803a4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,28 +1,29 @@
version: '{branch}.{build}'
skip_tags: true
-image: Previous Visual Studio 2019
+image: Visual Studio 2019
configuration: Release
platform: x64
clone_depth: 5
environment:
PATH: 'C:\Python37-x64;C:\Python37-x64\Scripts;%PATH%'
PYTHONUTF8: 1
- QT_DOWNLOAD_URL: 'https://github.com/sipsorcery/qt_win_binary/releases/download/v1.6/Qt5.9.8_x64_static_vs2019.zip'
- QT_DOWNLOAD_HASH: '9a8c6eb20967873785057fdcd329a657c7f922b0af08c5fde105cc597dd37e21'
+ QT_DOWNLOAD_URL: 'https://github.com/sipsorcery/qt_win_binary/releases/download/qt598x64_vs2019_v1681/qt598_x64_vs2019_1681.zip'
+ QT_DOWNLOAD_HASH: '00cf7327818c07d74e0b1a4464ffe987c2728b00d49d4bf333065892af0515c3'
QT_LOCAL_PATH: 'C:\Qt5.9.8_x64_static_vs2019'
- VCPKG_INSTALL_PATH: 'C:\tools\vcpkg\installed'
- VCPKG_COMMIT_ID: '40230b8e3f6368dcb398d649331be878ca1e9007'
+ VCPKG_TAG: '2020.11-1'
install:
# Disable zmq test for now since python zmq library on Windows would cause Access violation sometimes.
# - cmd: pip install zmq
-# Powershell block below is to install the c++ dependencies via vcpkg. The pseudo code is:
+# The powershell block below is to set up vcpkg to install the c++ dependencies. The pseudo code is:
# a. Checkout the vcpkg source (including port files) for the specific checkout and build the vcpkg binary,
-# b. Install the missing packages using the vcpkg manifest.
+# b. Append a setting to the vcpkg cmake config file to only do release builds of dependencies (skipping deubg builds saves ~5 mins).
+# Note originally this block also installed the dependencies using 'vcpkg install'. Dependencies are now installed
+# as part of the msbuild command using vcpkg mainfests.
- ps: |
cd c:\tools\vcpkg
$env:GIT_REDIRECT_STDERR = '2>&1' # git is writing non-errors to STDERR when doing git pull. Send to STDOUT instead.
- git pull origin master > $null
- git -c advice.detachedHead=false checkout $env:VCPKG_COMMIT_ID
+ git -c advice.detachedHead=false checkout $env:VCPKG_TAG
+ git pull origin $env:VCPKG_TAG
.\bootstrap-vcpkg.bat > $null
Add-Content "C:\tools\vcpkg\triplets\$env:PLATFORM-windows-static.cmake" "set(VCPKG_BUILD_TYPE release)"
cd "$env:APPVEYOR_BUILD_FOLDER"
diff --git a/build_msvc/bitcoin-qt/bitcoin-qt.vcxproj b/build_msvc/bitcoin-qt/bitcoin-qt.vcxproj
index 17cd31a52e..65ce1ee9da 100644
--- a/build_msvc/bitcoin-qt/bitcoin-qt.vcxproj
+++ b/build_msvc/bitcoin-qt/bitcoin-qt.vcxproj
@@ -56,7 +56,7 @@
$(QtReleaseLibraries);%(AdditionalDependencies)
- /ignore:4206
+ /ignore:4206 /LTCG:OFF
..\..\src;
diff --git a/build_msvc/common.init.vcxproj b/build_msvc/common.init.vcxproj
index ed227519ae..9c589bccbc 100644
--- a/build_msvc/common.init.vcxproj
+++ b/build_msvc/common.init.vcxproj
@@ -4,8 +4,6 @@
16.0
- x86-windows-static
- x64-windows-static
true
@@ -16,6 +14,8 @@
true
true
$(Configuration)
+ x86-windows-static
+ x64-windows-static
@@ -45,66 +45,46 @@
-
- true
- false
- true
+
+ false
+ false
v142
Unicode
+ No
$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\
$(Platform)\$(Configuration)\$(ProjectName)\
-
- false
- true
- false
+
+
+ true
+ true
v142
Unicode
$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\
$(Platform)\$(Configuration)\$(ProjectName)\
-
-
- MaxSpeed
- true
- true
- true
- MultiThreaded
-
-
- true
- true
-
-
-
-
+
Disabled
- _DEBUG;%(PreprocessorDefinitions)
- true
- MultiThreadedDebug
- /bigobj %(AdditionalOptions)
-
-
-
-
-
- MaxSpeed
+ false
true
true
true
MultiThreaded
+ None
- true
- true
+ false
+ false
+ /LTCG:OFF
-
+
Disabled
+ false
_DEBUG;%(PreprocessorDefinitions)
true
MultiThreadedDebug
@@ -124,7 +104,6 @@
Console
- true
Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
diff --git a/build_msvc/common.vcxproj b/build_msvc/common.vcxproj
index 4bbcc3767f..270c75e8a7 100644
--- a/build_msvc/common.vcxproj
+++ b/build_msvc/common.vcxproj
@@ -4,7 +4,7 @@
-
+
diff --git a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj
index 2095c0c321..1ddd62edf2 100644
--- a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj
+++ b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj
@@ -73,7 +73,7 @@
$(QtLibraryDir)\Qt5Test.lib;$(QtReleaseLibraries);%(AdditionalDependencies)
- /ignore:4206
+ /ignore:4206 /LTCG:OFF
@@ -83,7 +83,7 @@
$(QtDebugLibraries);%(AdditionalDependencies)
- /ignore:4206
+ /ignore:4206