Modified msbuild working directory

BuzzteeBear · Jul 26, 2024 · 1847502 · 1847502
1 parent 62572db
commit 1847502
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -9,6 +9,9 @@ on:
   workflow_dispatch:
 
 env:
+  # Path to the solution file relative to the root of the project.
+  SOLUTION_FILE_PATH: .
+
   # name of the project to build
   PROJECT_NAME: XR_APILAYER_NOVENDOR_motion_compensation
 
@@ -17,6 +20,8 @@ env:
   # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
   BUILD_CONFIGURATION: Release
 
+  BUILD_PLATFORM: x64
+
 permissions:
   contents: read
 
@@ -26,15 +31,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-
-    - name: Setup Python
-      uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
-
-    - name: Write out Python version
-      run: python -c "import sys; print(sys.version)"
-
+        lfs: true
+        submodules: true
+
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v2
       with:
@@ -48,4 +48,10 @@ jobs:
       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 /t:rebuild /p:Configuration=${{env.BUILD_CONFIGURATION}} /v:diag .\${{env.PROJECT_NAME}}\${{env.PROJECT_NAME}}.vcxproj
+      run: msbuild /t:rebuild /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{env.BUILD_PLATFORM}} /v:diag  ${{env.SOLUTION_FILE_PATH}}
+
+    - name: Archive dll
+      uses: actions/upload-artifact@v4
+      with:
+        name: binary_x64
+        path: OpenXR-MotionCompensation\bin\${{env.BUILD_PLATFORM}}\Release\${{env.PROJECT_NAME}}.dll"
diff --git a/OpenXR-MotionCompensation.sln b/OpenXR-MotionCompensation.sln
@@ -46,11 +46,9 @@ Global
 		{A772D93D-0E95-4A88-8FE8-A67AB6C57E2B}.Release|x64.ActiveCfg = Release|x64
 		{A772D93D-0E95-4A88-8FE8-A67AB6C57E2B}.Release|x64.Build.0 = Release|x64
 		{54A184FF-D0F6-44E8-90C9-4097561C5EB9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{54A184FF-D0F6-44E8-90C9-4097561C5EB9}.Debug|Win32.Build.0 = Debug|Win32
 		{54A184FF-D0F6-44E8-90C9-4097561C5EB9}.Debug|x64.ActiveCfg = Debug|x64
 		{54A184FF-D0F6-44E8-90C9-4097561C5EB9}.Debug|x64.Build.0 = Debug|x64
 		{54A184FF-D0F6-44E8-90C9-4097561C5EB9}.Release|Win32.ActiveCfg = Release|Win32
-		{54A184FF-D0F6-44E8-90C9-4097561C5EB9}.Release|Win32.Build.0 = Release|Win32
 		{54A184FF-D0F6-44E8-90C9-4097561C5EB9}.Release|x64.ActiveCfg = Release|x64
 		{54A184FF-D0F6-44E8-90C9-4097561C5EB9}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection

diff --git a/XR_APILAYER_NOVENDOR_motion_compensation/XR_APILAYER_NOVENDOR_motion_compensation.vcxproj b/XR_APILAYER_NOVENDOR_motion_compensation/XR_APILAYER_NOVENDOR_motion_compensation.vcxproj
@@ -415,8 +415,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\fmt.7.0.1\build\fmt.targets" Condition="Exists('..\packages\fmt.7.0.1\build\fmt.targets')" />
-    <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\packages\directxtex_desktop_win10.2023.1.31.1\build\native\directxtex_desktop_win10.targets" Condition="Exists('..\packages\directxtex_desktop_win10.2023.1.31.1\build\native\directxtex_desktop_win10.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="..\packages\directxtex_desktop_win10.2023.10.31.1\build\native\directxtex_desktop_win10.targets" Condition="Exists('..\packages\directxtex_desktop_win10.2023.10.31.1\build\native\directxtex_desktop_win10.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>