Skip to content

Commit 07489a3

Browse files
SinghRajenMSinghRajenM
authored
Move to slnx (#231)
1 parent c3db249 commit 07489a3

File tree

4 files changed

+92
-130
lines changed

4 files changed

+92
-130
lines changed

‎.github/workflows/ci_build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
# Step 1: Check out the code from the repo
25-
- name: Checkout repo
25+
- name: Checkout repository
2626
uses: actions/checkout@v6
2727
with:
2828
submodules: recursive
@@ -34,7 +34,7 @@ jobs:
3434
# Step 3: Build projects and unit test
3535
- name: Build code
3636
working-directory: src
37-
run: msbuild NppJSONViewer.sln /m /p:configuration="${{matrix.build_configuration}}" /p:platform="${{matrix.build_platform}}" /p:PlatformToolset=${{env.MSBUILD_TOOLSET}}
37+
run: msbuild NppJSONViewer.slnx /m /p:configuration="${{matrix.build_configuration}}" /p:platform="${{matrix.build_platform}}" /p:PlatformToolset=${{env.MSBUILD_TOOLSET}}
3838

3939
# Step 4: Upload build binary artifacts for deployment
4040
- name: Archive binaries artifacts

‎.github/workflows/codeql.yml‎

Lines changed: 75 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,75 @@
1-
# For most projects, this workflow file will not need changing; you simply need
2-
# to commit it to your repository.
3-
#
4-
# You may wish to alter this file to override the set of languages analyzed,
5-
# or to provide custom queries or build logic.
6-
#
7-
# ******** NOTE ********
8-
# We have attempted to detect the languages in your repository. Please check
9-
# the `language` matrix defined below to confirm you have the correct set of
10-
# supported CodeQL languages.
11-
#
12-
name: "Code Scanning"
13-
14-
on:
15-
push:
16-
branches: [ "master" ]
17-
pull_request:
18-
branches: [ "master" ]
19-
schedule:
20-
- cron: '34 11 * * 1'
21-
22-
permissions:
23-
contents: read
24-
25-
concurrency:
26-
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
27-
cancel-in-progress: true
28-
29-
jobs:
30-
analyze:
31-
name: Analyze
32-
runs-on: windows-latest
33-
timeout-minutes: 20
34-
permissions:
35-
actions: read
36-
contents: read
37-
security-events: write
38-
39-
strategy:
40-
fail-fast: false
41-
matrix:
42-
language: [ 'c-cpp' ]
43-
44-
steps:
45-
- name: Checkout repository
46-
uses: actions/checkout@v6
47-
with:
48-
submodules: recursive
49-
50-
# Initializes the CodeQL tools for scanning.
51-
- name: Initialize CodeQL
52-
uses: github/codeql-action/init@v4
53-
with:
54-
languages: ${{ matrix.language }}
55-
56-
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
57-
# If this step fails, then you should remove it and run the build manually (see below)
58-
- name: Autobuild
59-
uses: github/codeql-action/autobuild@v4
60-
61-
- name: Perform CodeQL Analysis
62-
uses: github/codeql-action/analyze@v4
63-
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "Code Scanning"
13+
14+
on:
15+
push:
16+
branches: [ "master" ]
17+
pull_request:
18+
branches: [ "master" ]
19+
schedule:
20+
- cron: '34 11 * * 1'
21+
22+
permissions:
23+
contents: read
24+
25+
env:
26+
MSBUILD_TOOLSET: v143
27+
28+
concurrency:
29+
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
30+
cancel-in-progress: true
31+
32+
jobs:
33+
analyze:
34+
name: Analyze
35+
runs-on: windows-latest
36+
timeout-minutes: 20
37+
permissions:
38+
actions: read
39+
contents: read
40+
security-events: write
41+
42+
strategy:
43+
fail-fast: false
44+
matrix:
45+
language: [ 'c-cpp' ]
46+
47+
steps:
48+
- name: Checkout repository
49+
uses: actions/checkout@v6
50+
with:
51+
submodules: recursive
52+
53+
- name: Initialize CodeQL
54+
uses: github/codeql-action/init@v4
55+
with:
56+
languages: ${{ matrix.language }}
57+
58+
# Ensure MSBuild is available
59+
- name: Setup MSBuild
60+
uses: microsoft/setup-msbuild@v2
61+
62+
# Build explicitly as Autobuild is not working with .slnx
63+
# This makes sure include paths from submodules (external/*) are found.
64+
- name: Build solution for CodeQL analysis
65+
working-directory: src
66+
run: |
67+
msbuild NppJSONViewer.slnx /m /p:configuration=Debug /p:platform=Win32 /p:PlatformToolset=${{ env.MSBUILD_TOOLSET }}
68+
69+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
70+
# If this step fails, then you should remove it and run the build manually (see below)
71+
# - name: Autobuild
72+
# uses: github/codeql-action/autobuild@v4
73+
74+
- name: Perform CodeQL Analysis
75+
uses: github/codeql-action/analyze@v4

‎src/NPPJSONViewer.sln‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎src/NPPJSONViewer.slnx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Solution>
2+
<Configurations>
3+
<Platform Name="ARM64" />
4+
<Platform Name="Win32" />
5+
<Platform Name="x64" />
6+
</Configurations>
7+
<Folder Name="/.github/" />
8+
<Folder Name="/.github/workflows/">
9+
<File Path="../.github/workflows/ci_build.yml" />
10+
<File Path="../.github/workflows/codeql.yml" />
11+
</Folder>
12+
<Project Path="../tests/UnitTest/UnitTest.vcxproj" />
13+
<Project Path="NppJsonViewer/NPPJSONViewer.vcxproj" />
14+
<Project Path="UtilityLib/UtilityLib.vcxproj" />
15+
</Solution>

0 commit comments

Comments
 (0)