update windows build

nervosys · Feb 20, 2024 · 477db0a · 477db0a
1 parent 9a1d788
commit 477db0a
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 56 deletions.
diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml
@@ -7,26 +7,26 @@ jobs:
     runs-on: ${{ matrix.os }} # windows-latest
     strategy:
       matrix:
-        os: [windows-2019, windows-2022] # versions: [2019: 10, 2022: 11]
+        # NOTE: windows-2019 comes with Visual Studio Build Tools v142, not v143 (required)
+        os: [windows-2022] # versions: [2019: 10, 2022: 11];
         arch:
           - amd64
           # - arm64
 
-    # sequence of tasks that will be executed as part of the job
     steps:
       - uses: actions/checkout@v4
 
+      - name: "Add MSBuild to PATH"
+        uses: microsoft/setup-msbuild@v2
+
       # - name: "Enable Developer Command Prompt for Visual Studio"
       #   uses: ilammy/msvc-dev-cmd@v1
 
-      - name: "Setup MSBuild"
-        uses: microsoft/setup-msbuild@v2
-
       # - name: "Enable Developer Command Prompt for Visual Studio 2019"
       #   if: ${{ matrix.os == 'windows-2019' }}
       #   shell: pwsh
-      #   run: 'C:\Program Files\Microsoft Visual Studio\2019\Community\Common6\Tools\Launch-VsDevShell.ps1'
-      #
+      #   run: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\Launch-VsDevShell.ps1'
+
       # - name: "Enable Developer Command Prompt for Visual Studio 2022"
       #   if: ${{ matrix.os == 'windows-2022' }}
       #   shell: pwsh

diff --git a/.gitignore b/.gitignore
@@ -1,19 +1,16 @@
-### Ignore Visual Studio temporary files, build results, and
-### files generated by popular Visual Studio add-ons.
+# Ignore Visual Studio (VS) temporary files, build results, files generated by VS add-ons.
 
 # Archive (dead code)
 archive/
 
-# User-specific files
+# User files
 *.suo
 *.user
 *.userosscache
 *.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
-# Build results
+# Build files
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
@@ -367,26 +364,6 @@ xcuserdata/
 *.sublime-workspace
 *.sublime-project
 
-# Unity - DEPRECATED
-#/Unity/UnityDemo/Assembly-CSharp.csproj
-#/Unity/UnityDemo/UnityDemo.sln
-#/Unity/linux-build
-#/Unity/UnityDemo/Assets/Plugins/
-#/Unity/UnityDemo/[Ll]ibrary/
-#/Unity/UnityDemo/[Tt]emp/
-#/Unity/UnityDemo/[Oo]bj/
-#/Unity/UnityDemo/[Bb]uild/
-#/Unity/UnityDemo/[Bb]uilds/
-#/Unity/UnityDemo/[Ll]ogs/
-#/Unity/UnityDemo/[Uu]ser[Ss]ettings/
-
-# ROS1 - DEPRECATED
-#ros/.catkin_tools/
-#ros/devel/
-#ros/logs/
-#ros/.catkin_workspace
-#ros/src/CMakeLists.txt
-
 # ROS2
 ros2/install/
 ros2/log/
@@ -412,3 +389,27 @@ python/docs/_build
 
 # clangd generated folder, e.g. from VSCode clangd extension
 .cache/
+
+###
+### DEPRECATED
+###
+
+# Unity - DEPRECATED
+#/Unity/UnityDemo/Assembly-CSharp.csproj
+#/Unity/UnityDemo/UnityDemo.sln
+#/Unity/linux-build
+#/Unity/UnityDemo/Assets/Plugins/
+#/Unity/UnityDemo/[Ll]ibrary/
+#/Unity/UnityDemo/[Tt]emp/
+#/Unity/UnityDemo/[Oo]bj/
+#/Unity/UnityDemo/[Bb]uild/
+#/Unity/UnityDemo/[Bb]uilds/
+#/Unity/UnityDemo/[Ll]ogs/
+#/Unity/UnityDemo/[Uu]ser[Ss]ettings/
+
+# ROS1 - DEPRECATED
+#ros/.catkin_tools/
+#ros/devel/
+#ros/logs/
+#ros/.catkin_workspace
+#ros/src/CMakeLists.txt
diff --git a/AutonomySim.sln b/AutonomySim.sln
@@ -3,22 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34316.72
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DroneShell", "DroneShell\DroneShell.vcxproj", "{9FE9234B-373A-4D5A-AD6B-FB0B593312DD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutonomyLib", "AutonomyLib\AutonomyLib.vcxproj", "{4BFB7231-077A-4671-BD21-D3ADE3EA36E7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloDrone", "HelloDrone\HelloDrone.vcxproj", "{98BB426F-6FB5-4754-81BC-BB481900E135}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MavLinkCom", "MavLinkCom\MavLinkCom.vcxproj", "{8510C7A4-BF63-41D2-94F6-D8731D137A5A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DroneServer", "DroneServer\DroneServer.vcxproj", "{A050F015-87E2-498F-866A-2E5AF65AF7AC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MavLinkTest", "MavLinkCom\MavLinkTest\MavLinkTest.vcxproj", "{25EB67BE-468A-4AA5-910F-07EFD58C5516}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Examples", "Examples\Examples.vcxproj", "{C679466F-9D35-4AFC-B9AE-F9FB5448FB99}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutonomyLibUnitTests", "AutonomyLibUnitTests\AutonomyLibUnitTests.vcxproj", "{2A61ED54-2B66-4B9B-99FA-299DD0EF57CD}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{11C1B3C5-35A0-46EA-B532-100A14FDAAC6}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
@@ -38,18 +22,34 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		scripts\test_visualstudio.psm1 = scripts\test_visualstudio.psm1
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCar", "HelloCar\HelloCar.vcxproj", "{4358ED90-CCA1-47A8-8D68-A260F212931E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutonomyLib", "AutonomyLib\AutonomyLib.vcxproj", "{4BFB7231-077A-4671-BD21-D3ADE3EA36E7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnrealPluginFiles", "Unreal\UnrealPluginFiles.vcxproj", "{39683523-C864-4D47-8350-33FC3EC0F00F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutonomyLibUnitTests", "AutonomyLibUnitTests\AutonomyLibUnitTests.vcxproj", "{2A61ED54-2B66-4B9B-99FA-299DD0EF57CD}"
 EndProject
-Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "PythonClient", "Python\PythonClient.pyproj", "{E2049E20-B6DD-474E-8BCA-1C8DC54725AA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DroneServer", "DroneServer\DroneServer.vcxproj", "{A050F015-87E2-498F-866A-2E5AF65AF7AC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sgmstereo", "SemiGlobalMatching\src\sgmstereo\sgmstereo.vcxproj", "{A01E543F-EF34-46BB-8F3F-29AB84E7A5D4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DroneShell", "DroneShell\DroneShell.vcxproj", "{9FE9234B-373A-4D5A-AD6B-FB0B593312DD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stereoPipeline", "SemiGlobalMatching\src\stereoPipeline\stereoPipeline.vcxproj", "{E512EB59-4EAB-49D1-9174-0CAF1B40CED0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Examples", "Examples\Examples.vcxproj", "{C679466F-9D35-4AFC-B9AE-F9FB5448FB99}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCar", "HelloCar\HelloCar.vcxproj", "{4358ED90-CCA1-47A8-8D68-A260F212931E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloDrone", "HelloDrone\HelloDrone.vcxproj", "{98BB426F-6FB5-4754-81BC-BB481900E135}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloSpawnedDrones", "HelloSpawnedDrones\HelloSpawnedDrones.vcxproj", "{99CBF376-5EBA-4164-A657-E7D708C9D685}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MavLinkCom", "MavLinkCom\MavLinkCom.vcxproj", "{8510C7A4-BF63-41D2-94F6-D8731D137A5A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MavLinkTest", "MavLinkCom\MavLinkTest\MavLinkTest.vcxproj", "{25EB67BE-468A-4AA5-910F-07EFD58C5516}"
+EndProject
+Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Python", "python\PythonClient.pyproj", "{E2049E20-B6DD-474E-8BCA-1C8DC54725AA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SGMStereo", "SemiGlobalMatching\src\sgmstereo\sgmstereo.vcxproj", "{A01E543F-EF34-46BB-8F3F-29AB84E7A5D4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SGMStereoPipeline", "SemiGlobalMatching\src\stereoPipeline\stereoPipeline.vcxproj", "{E512EB59-4EAB-49D1-9174-0CAF1B40CED0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Unreal", "Unreal\UnrealPluginFiles.vcxproj", "{39683523-C864-4D47-8350-33FC3EC0F00F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/scripts/test_visualstudio.psm1 b/scripts/test_visualstudio.psm1
@@ -36,9 +36,9 @@ Import-Module "${PWD}\scripts\utils.psm1"
 function Get-VsInstance {
     [OutputType([PSCustomObject])]
     param(
-        [Parameter(Mandatory)]
+        [Parameter()]
         [System.Object]
-        $VsWhereArgs
+        $VsWhereArgs = "-all -sort"
     )
     $VsWherePath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
     $Expression = "& `"$VsWherePath`" $VsWhereArgs -format json"