chore:调整构建

GengGode · Dec 16, 2022 · 811cc4b · 811cc4b
1 parent 3eb38a4
commit 811cc4b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: windows-latest
     env:
       Qt_Dir_Static : D:/a/GenshinTianLiBattleClient/GenshinTianLiBattleClient/deps_qt/5.15.7/
-
+      ProjectName: GenshinImpact_TianLi
     steps:
     - uses: actions/checkout@v3
     - name: Add Deps_Qt
@@ -34,20 +34,15 @@ jobs:
         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
+        copy deps_qt/QtMsBuild.7z $(ProjectName)/
+        copy deps_qt/7z.exe $(ProjectName)/
+        copy deps_qt/7z.dll $(ProjectName)/
+        cd $(ProjectName)
         7z.exe x QtMsBuild.7z   
+        
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2
-
-    - name: Restore NuGet packages
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: nuget restore ${{env.SOLUTION_FILE_PATH}}
+      uses: microsoft/setup-msbuild@v1.1.3
 
     - 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}}
diff --git a/GenshinImpactNaturalLaw.sln b/GenshinImpactNaturalLaw.sln
@@ -11,6 +11,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{9A489CD8-0696-4D05-9351-F2011B1D95F1}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\windows.yml = .github\workflows\windows.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64

diff --git a/GenshinImpactNaturalLaw/GenshinImpactNaturalLaw.vcxproj b/GenshinImpactNaturalLaw/GenshinImpactNaturalLaw.vcxproj
@@ -45,7 +45,7 @@
     <QtBuildConfig>debug</QtBuildConfig>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="QtSettings">
-    <QtInstall>5.14.2_msvc2017_64</QtInstall>
+    <QtInstall>$(Qt_Dir_Static)</QtInstall>
     <QtModules>core;gui;multimedia;network;widgets</QtModules>
     <QtBuildConfig>release</QtBuildConfig>
   </PropertyGroup>