Switch to using Visual Studio 2022

musescore · Jun 19, 2022 · db03b7a · db03b7a
1 parent 44e0ff0
commit db03b7a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/ci_windows_mu4.yml b/.github/workflows/ci_windows_mu4.yml
@@ -23,7 +23,7 @@ on:
 
 jobs:
   build_mu4_x64:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - name: Cancel Previous Runs
       uses: styfle/cancel-workflow-action@0.9.1
@@ -151,7 +151,7 @@ jobs:
   # They need to be enabled when we switch to mu4 by default and decide to make a release.      
 
   # build_x32:
-  #   runs-on: windows-2019
+  #   runs-on: windows-2022
   #   steps:
   #   - name: Cancel Previous Runs
   #     uses: styfle/cancel-workflow-action@0.9.1
@@ -227,7 +227,7 @@ jobs:
   #       name: ${{ env.UPLOAD_ARTIFACT_NAME }}
   #       path: build.artifacts\     
   # build_portable:
-  #   runs-on: windows-2019
+  #   runs-on: windows-2022
   #   steps:
   #   - name: Cancel Previous Runs
   #     uses: styfle/cancel-workflow-action@0.9.1

diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -3,7 +3,7 @@
    "configurations": [
       {
          "name": "x64-RelWithDebInfo",
-         "generator": "Visual Studio 16 2019 Win64",
+         "generator": "Visual Studio 17 2022 Win64",
          "configurationType": "RelWithDebInfo",
          "inheritEnvironments": [ "msvc_x64_x64" ],
          "buildRoot": "${projectDir}\\msvc.build_x64", // "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}", 

diff --git a/build.cmake b/build.cmake
@@ -143,7 +143,7 @@ endif()
 
 fn__get_option(GENERATOR -G ${CONFIGURE_ARGS})
 if(WIN32)
-    fn__set_default(GENERATOR "Visual Studio 16 2019")
+    fn__set_default(GENERATOR "Visual Studio 17 2022")
 else()
     fn__set_default(GENERATOR "Unix Makefiles")
 endif()

diff --git a/msvc_build.bat b/msvc_build.bat
@@ -40,7 +40,7 @@ IF "%GENERATOR_NAME%"=="" (
 )
 
 IF "%GENERATOR_NAME%"=="" (
-   ECHO "No supported version of Microsoft Visual Studio (2017 or 2019) found."
+   ECHO "No supported version of Microsoft Visual Studio (2017, 2019 or 2022) found."
    GOTO :END
 )
 
@@ -148,11 +148,11 @@ IF /I "%1"=="clean" (
    SET VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
    IF NOT EXIST %VSWHERE% EXIT /B !ERRORLEVEL!
 
-   REM Try Visual Studio 2019 first.
-   CALL :FIND_GENERATOR_VERSION %VSWHERE% 16 2019
+   REM Try Visual Studio 2022 first.
+   CALL :FIND_GENERATOR_VERSION %VSWHERE% 17 2022
 
-   REM Fall back to Visual Studio 2017.
-   IF "%GENERATOR_NAME%"=="" CALL :FIND_GENERATOR_VERSION %VSWHERE% 15 2017
+   REM Fall back to Visual Studio 2019.
+   IF "%GENERATOR_NAME%"=="" CALL :FIND_GENERATOR_VERSION %VSWHERE% 16 2019
 
    EXIT /B !ERRORLEVEL!