Skip to content

Commit 64a7d2b

Browse files
Update to slnx (#705)
* Update to slnx This upgrades all the solution files to the new Solution Format .slnx * Use .slnx in the builds * Update README.md and CodeQL * Address PR feedback Removed FileIO as BuildDependency for KscViewer Added sync-submodule dependency to fetch-argparse.vcxproj * Delete old .sln files --------- Co-authored-by: twostars <i.am.twostars@gmail.com>
1 parent 4a9013b commit 64a7d2b

24 files changed

+692
-2551
lines changed

.github/workflows/build_msbuild_all.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ on:
2020
- '**/*.hpp'
2121
- '**/*.vcxproj'
2222
- 'deps/**'
23-
- 'All.sln'
24-
- 'ThirdParty.sln'
23+
- 'All.slnx'
24+
- 'ThirdParty.slnx'
2525

2626
pull_request:
2727
branches:
@@ -37,8 +37,8 @@ on:
3737
- '**/*.hpp'
3838
- '**/*.vcxproj'
3939
- 'deps/**'
40-
- 'All.sln'
41-
- 'ThirdParty.sln'
40+
- 'All.slnx'
41+
- 'ThirdParty.slnx'
4242

4343
merge_group:
4444
workflow_dispatch:
@@ -70,22 +70,22 @@ jobs:
7070

7171
# NOTE: We could simply run All.sln, but it makes it far more obvious in the Github output when it's broken up across its solutions.
7272
- name: Build third party dependencies
73-
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" ThirdParty.sln
73+
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" ThirdParty.slnx
7474

7575
- name: Build client
76-
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Client.sln
76+
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Client.slnx
7777

7878
- name: Build server
79-
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Server.sln
79+
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Server.slnx
8080

8181
- name: Build tools
82-
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Tools.sln
82+
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Tools.slnx
8383

8484
- name: Build client tools
85-
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" ClientTools.sln
85+
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" ClientTools.slnx
8686

8787
- name: Build tests
88-
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Tests.sln
88+
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Tests.slnx
8989

9090
- name: Run tests - MathUtils
9191
shell: cmd

.github/workflows/build_msbuild_client.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ jobs:
4343

4444
- name: Build client
4545
working-directory: ${{env.GITHUB_WORKSPACE}}
46-
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Client.sln
46+
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Client.slnx

.github/workflows/build_msbuild_client_tools.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ jobs:
4343
uses: microsoft/setup-msbuild@v2
4444

4545
- name: Build tools
46-
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" ClientTools.sln
46+
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" ClientTools.slnx

.github/workflows/build_msbuild_server.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ jobs:
4242
uses: microsoft/setup-msbuild@v2
4343

4444
- name: Build server
45-
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" Server.sln
45+
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" Server.slnx

.github/workflows/build_msbuild_tools.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ jobs:
4242
uses: microsoft/setup-msbuild@v2
4343

4444
- name: Build tools
45-
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" Tools.sln
45+
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" Tools.slnx

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# as needed from within All.sln; this ensures they're built first so they won't build again during
4343
# CodeQL monitoring.
4444
- name: Build third party dependencies
45-
run: msbuild /p:Configuration="${{env.BUILD_CONFIGURATION}}" /p:Platform="${{env.BUILD_PLATFORM}}" ThirdParty.sln
45+
run: msbuild /p:Configuration="${{env.BUILD_CONFIGURATION}}" /p:Platform="${{env.BUILD_PLATFORM}}" ThirdParty.slnx
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
@@ -52,7 +52,7 @@ jobs:
5252
build-mode: manual
5353

5454
- name: Build all
55-
run: msbuild /p:Configuration="${{env.BUILD_CONFIGURATION}}" /p:Platform="${{env.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" All.sln
55+
run: msbuild /p:Configuration="${{env.BUILD_CONFIGURATION}}" /p:Platform="${{env.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" All.slnx
5656

5757
- name: Perform CodeQL Analysis
5858
uses: github/codeql-action/analyze@v3

0 commit comments

Comments
 (0)