Merge branch 'master' of https://github.com/GengGode/GenshinImpactNat…

…uralLaw

.github/workflows/windows.yml

@@ -0,0 +1,53 @@
+name: MSBuild
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+env:
+  # Path to the solution file relative to the root of the project.
+  SOLUTION_FILE_PATH: .
+
+  # Configuration type to build.
+  # You can convert this to a build matrix if you need coverage of multiple configuration types.
+  # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+  BUILD_CONFIGURATION: Release
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-latest
+    env:
+      Qt_Dir_Static : D:/a/GenshinTianLiBattleClient/GenshinTianLiBattleClient/deps_qt/5.15.7/
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Add Deps_Qt
+      run: |
+        git clone http://github.com/GenshinTianLiBattle/deps_qt.git
+        cd deps_qt
+        .\unzip.bat
+        Copy-Item -Path "openssl" -Destination "C:\" -Recurse
+        cd ..
+        dir
+        copy deps_qt/QtMsBuild.7z GenshinImpact_TianLi/
+        copy deps_qt/7z.exe GenshinImpact_TianLi/
+        copy deps_qt/7z.dll GenshinImpact_TianLi/
+        cd GenshinImpact_TianLi
+        7z.exe x QtMsBuild.7z   
+    - name: Add MSBuild to PATH
+      uses: microsoft/[email protected]
+
+    - name: Restore NuGet packages
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: nuget restore ${{env.SOLUTION_FILE_PATH}}
+
+    - name: Build
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      # Add additional options to the MSBuild command line here (like platform or verbosity level).
+      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}

appveyor.yml

@@ -1,5 +1,5 @@
 version: '1.0.{build}'
-image: Visual Studio 2019
+image: Visual Studio 2017
 configuration: Release
 platform:
     - x64
@@ -8,10 +8,10 @@ branches:
     - master
 
 environment:
-    qt: 5.14
+    qt: 5.13
     msvc: msvc2017
-    vs: C:\"Program Files (x86)"\"Microsoft Visual Studio"\2019\Community\VC\Auxiliary\Build
-    QTDIR: C:\Qt\5.14.2\msvc2017_64
+    vs: C:\"Program Files (x86)"\"Microsoft Visual Studio"\2017\Community\VC\Auxiliary\Build
+    QTDIR: C:\Qt\5.13.2\msvc2017_64
     ProjectName: GenshinImpactNaturalLaw
     ProJectExeName: TianLi_Launcher
     MyProjectDir: C:\projects\%ProjectName%
@@ -20,6 +20,7 @@ environment:
 skip_tags: true
 
 before_build: 
+    #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
     #- set PATH=%PATH%;%QTDIR%\bin;
     #- set vcvarsall=%vs%\vcvarsall.bat
     #- call "%vcvarsall%" x64
@@ -49,7 +50,7 @@ after_build:
     - cd %MyProjectDir%\x64\build\
     - windeployqt %ProJectExeName%.exe 
 
-    #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
 
     - echo %APPVEYOR_BUILD_VERSION% >version.tag
     - 7z a source.7z %MyProjectDir%\x64\build\*