Skip to content

Commit faaeff9

Browse files
SinghRajenMSinghRajenM
committed
Update to VS 2026
1 parent d0a79bc commit faaeff9

File tree

6 files changed

+46
-17
lines changed

6 files changed

+46
-17
lines changed

‎.github/workflows/ci_build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
BUILD_DIR: src\Build\Bin
11-
MSBUILD_TOOLSET: v143
11+
MSBUILD_TOOLSET: v145
1212
ARTIFACT_PREFIX: NppJSONViewer_
1313

1414
jobs:
@@ -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

‎src/NPPJSONViewer.sln‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.3.32804.467
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.0.11217.181 d18.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NPPJSONViewer", "NppJsonViewer\NPPJSONViewer.vcxproj", "{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}"
77
EndProject
88
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UtilityLib", "UtilityLib\UtilityLib.vcxproj", "{171CAFC6-E679-4B81-BF5B-049AC0FAB4F8}"
99
EndProject
1010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "..\tests\UnitTest\UnitTest.vcxproj", "{5A15FD53-E7C1-4F10-85FA-B7C3BB5D4D64}"
1111
EndProject
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{12D1D661-97C4-40DE-AEE7-35A20FBB5F78}"
13+
ProjectSection(SolutionItems) = preProject
14+
..\.github\dependabot.yml = ..\.github\dependabot.yml
15+
EndProjectSection
16+
EndProject
17+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{C781F92F-F279-4B9D-85A5-A08639829C5A}"
18+
ProjectSection(SolutionItems) = preProject
19+
..\.github\workflows\ci_build.yml = ..\.github\workflows\ci_build.yml
20+
..\.github\workflows\codeql.yml = ..\.github\workflows\codeql.yml
21+
EndProjectSection
22+
EndProject
1223
Global
1324
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1425
Debug|ARM64 = Debug|ARM64
@@ -59,6 +70,9 @@ Global
5970
GlobalSection(SolutionProperties) = preSolution
6071
HideSolutionNode = FALSE
6172
EndGlobalSection
73+
GlobalSection(NestedProjects) = preSolution
74+
{C781F92F-F279-4B9D-85A5-A08639829C5A} = {12D1D661-97C4-40DE-AEE7-35A20FBB5F78}
75+
EndGlobalSection
6276
GlobalSection(ExtensibilityGlobals) = postSolution
6377
SolutionGuid = {66FFEF3A-7122-49C7-8CE4-4704DFB30594}
6478
EndGlobalSection

‎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="x64" />
5+
<Platform Name="x86" />
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" Id="5a15fd53-e7c1-4f10-85fa-b7c3bb5d4d64" />
13+
<Project Path="NppJsonViewer/NPPJSONViewer.vcxproj" Id="1590d7cd-7d3a-4ab7-a355-ee02f7fb987d" />
14+
<Project Path="UtilityLib/UtilityLib.vcxproj" Id="171cafc6-e679-4b81-bf5b-049ac0fab4f8" />
15+
</Solution>

‎src/NppJsonViewer/NPPJSONViewer.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,37 +36,37 @@
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3737
<ConfigurationType>DynamicLibrary</ConfigurationType>
3838
<CharacterSet>Unicode</CharacterSet>
39-
<PlatformToolset>v143</PlatformToolset>
39+
<PlatformToolset>v145</PlatformToolset>
4040
<UseDebugLibraries>true</UseDebugLibraries>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<CharacterSet>Unicode</CharacterSet>
45-
<PlatformToolset>v143</PlatformToolset>
45+
<PlatformToolset>v145</PlatformToolset>
4646
<WholeProgramOptimization>true</WholeProgramOptimization>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
5050
<CharacterSet>Unicode</CharacterSet>
51-
<PlatformToolset>v143</PlatformToolset>
51+
<PlatformToolset>v145</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
</PropertyGroup>
5454
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
5555
<ConfigurationType>DynamicLibrary</ConfigurationType>
5656
<CharacterSet>Unicode</CharacterSet>
57-
<PlatformToolset>v143</PlatformToolset>
57+
<PlatformToolset>v145</PlatformToolset>
5858
<WholeProgramOptimization>true</WholeProgramOptimization>
5959
</PropertyGroup>
6060
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
6161
<ConfigurationType>DynamicLibrary</ConfigurationType>
6262
<CharacterSet>Unicode</CharacterSet>
63-
<PlatformToolset>v143</PlatformToolset>
63+
<PlatformToolset>v145</PlatformToolset>
6464
<UseDebugLibraries>true</UseDebugLibraries>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
6767
<ConfigurationType>DynamicLibrary</ConfigurationType>
6868
<CharacterSet>Unicode</CharacterSet>
69-
<PlatformToolset>v143</PlatformToolset>
69+
<PlatformToolset>v145</PlatformToolset>
7070
<UseDebugLibraries>true</UseDebugLibraries>
7171
</PropertyGroup>
7272
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎src/UtilityLib/UtilityLib.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,39 +47,39 @@
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4848
<ConfigurationType>StaticLibrary</ConfigurationType>
4949
<UseDebugLibraries>true</UseDebugLibraries>
50-
<PlatformToolset>v143</PlatformToolset>
50+
<PlatformToolset>v145</PlatformToolset>
5151
<CharacterSet>Unicode</CharacterSet>
5252
</PropertyGroup>
5353
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5454
<ConfigurationType>StaticLibrary</ConfigurationType>
5555
<UseDebugLibraries>false</UseDebugLibraries>
56-
<PlatformToolset>v143</PlatformToolset>
56+
<PlatformToolset>v145</PlatformToolset>
5757
<WholeProgramOptimization>true</WholeProgramOptimization>
5858
<CharacterSet>Unicode</CharacterSet>
5959
</PropertyGroup>
6060
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
6161
<ConfigurationType>StaticLibrary</ConfigurationType>
6262
<UseDebugLibraries>true</UseDebugLibraries>
63-
<PlatformToolset>v143</PlatformToolset>
63+
<PlatformToolset>v145</PlatformToolset>
6464
<CharacterSet>Unicode</CharacterSet>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
6767
<ConfigurationType>StaticLibrary</ConfigurationType>
6868
<UseDebugLibraries>true</UseDebugLibraries>
69-
<PlatformToolset>v143</PlatformToolset>
69+
<PlatformToolset>v145</PlatformToolset>
7070
<CharacterSet>Unicode</CharacterSet>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7373
<ConfigurationType>StaticLibrary</ConfigurationType>
7474
<UseDebugLibraries>false</UseDebugLibraries>
75-
<PlatformToolset>v143</PlatformToolset>
75+
<PlatformToolset>v145</PlatformToolset>
7676
<WholeProgramOptimization>true</WholeProgramOptimization>
7777
<CharacterSet>Unicode</CharacterSet>
7878
</PropertyGroup>
7979
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
8080
<ConfigurationType>StaticLibrary</ConfigurationType>
8181
<UseDebugLibraries>false</UseDebugLibraries>
82-
<PlatformToolset>v143</PlatformToolset>
82+
<PlatformToolset>v145</PlatformToolset>
8383
<WholeProgramOptimization>true</WholeProgramOptimization>
8484
<CharacterSet>Unicode</CharacterSet>
8585
</PropertyGroup>

‎tests/UnitTest/UnitTest.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<Keyword>Win32Proj</Keyword>
3232
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
3333
<ConfigurationType>Application</ConfigurationType>
34-
<PlatformToolset>v143</PlatformToolset>
34+
<PlatformToolset>v145</PlatformToolset>
3535
<CharacterSet>Unicode</CharacterSet>
3636
</PropertyGroup>
3737
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

0 commit comments

Comments
 (0)