Skip to content

Commit aecc62c

Browse files
jeffu231jeffu231
authored
Merge pull request #791 from jeffu231/VIX-3781
VIX-3781 NET 10 upgrade
2 parents 1beb67e + 800482f commit aecc62c

File tree

48 files changed

+106
-89
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+106
-89
lines changed

‎.github/workflows/compile_test.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,20 @@ jobs:
3030

3131
compile_test:
3232

33-
runs-on: windows-2022
33+
runs-on: windows-2025-vs2026
3434

3535
steps:
3636

37-
- uses: actions/checkout@v4
37+
- name: Checkout
38+
uses: actions/checkout@v4
3839

39-
- uses: nuget/setup-nuget@v2
40-
40+
- name: Display dotnet version
41+
run: dotnet --version
42+
4143
- uses: microsoft/setup-msbuild@v2
4244

43-
- name: NuGet Restore
44-
run: nuget restore Vixen.sln
45-
4645
- name: Build Release
47-
run: msbuild Vixen.sln -m -t:Rebuild -p:Configuration=Release
46+
run: msbuild Vixen.sln -m -t:restore -t:Rebuild -p:Configuration=Release
4847

4948
- run: dir
5049
shell: cmd

‎.github/workflows/release_build.yml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
if: github.repository == 'VixenLights/Vixen' || ${{ vars.CAN_RUN_RELEASE_ACTION }} == 'true'
2727

28-
runs-on: windows-2022
28+
runs-on: windows-2025-vs2026
2929
environment:
3030
name: delayed-build
3131

@@ -42,8 +42,12 @@ jobs:
4242

4343
steps:
4444

45-
- uses: actions/checkout@v4
46-
45+
- name: Checkout
46+
uses: actions/checkout@v4
47+
48+
- name: Display dotnet version
49+
run: dotnet --version
50+
4751
- name: create a custom version using run number offset by 968
4852
shell: bash
4953
working-directory: ${{env.GITHUB_WORKSPACE}}
@@ -100,7 +104,7 @@ jobs:
100104
outputs:
101105
setup_64: ${{ env.SETUP_64 }}
102106

103-
runs-on: windows-2022
107+
runs-on: windows-2025-vs2026
104108

105109
steps:
106110

@@ -110,18 +114,13 @@ jobs:
110114
uses: actions/download-artifact@v4
111115
with:
112116
name: _releaseNotes
113-
114-
- uses: nuget/setup-nuget@v2
115117

116118
- uses: microsoft/setup-msbuild@v2
117119
with:
118120
msbuild-architecture: x64
119121

120-
- name: NuGet Restore
121-
run: nuget restore Vixen.sln
122-
123122
- name: Build x64
124-
run: msbuild Vixen.sln -m -t:Rebuild -p:Configuration=Deploy -p:Platform=x64 -p:PlatformTarget=x64 -p:Environment=${{ needs.setup.outputs.environment }} -p:App_Version=${{ needs.setup.outputs.app_version }} -p:Assembly_Version=${{ needs.setup.outputs.version }}
123+
run: msbuild Vixen.sln -m -t:restore -t:Rebuild -p:Configuration=Deploy -p:Platform=x64 -p:PlatformTarget=x64 -p:Environment=${{ needs.setup.outputs.environment }} -p:App_Version=${{ needs.setup.outputs.app_version }} -p:Assembly_Version=${{ needs.setup.outputs.version }}
125124

126125
- name: Set installer name in environment
127126
working-directory: Release\Setup\${{ needs.setup.outputs.environment }}
@@ -142,7 +141,7 @@ jobs:
142141
- setup
143142
- build_x64
144143

145-
runs-on: windows-2022
144+
runs-on: windows-2025-vs2026
146145

147146
steps:
148147

‎Directory.Packages.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageVersion Include="LiteDB" Version="4.1.4" />
1818
<PackageVersion Include="LoadAssembliesOnStartup.Fody" Version="4.6.0" />
1919
<PackageVersion Include="MessagePack" Version="2.5.192" />
20-
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
20+
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="10.0.1" />
2121
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.122" />
2222
<PackageVersion Include="ModuleInit.Fody" Version="2.1.1" />
2323
<PackageVersion Include="NAudio.Core" Version="2.2.1" />
@@ -36,14 +36,14 @@
3636
<PackageVersion Include="Orchestra.Core" Version="7.0.1" />
3737
<PackageVersion Include="Svg" Version="3.4.7" />
3838
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
39-
<PackageVersion Include="System.Drawing.Common" Version="8.0.6" />
40-
<PackageVersion Include="System.IO.Ports" Version="8.0.0" />
39+
<PackageVersion Include="System.Drawing.Common" Version="10.0.1" />
40+
<PackageVersion Include="System.IO.Ports" Version="10.0.1" />
4141
<PackageVersion Include="System.Reactive" Version="5.0.0" />
4242
<PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
4343
<PackageVersion Include="Zstandard.Net" Version="1.1.7" />
44-
<PackageVersion Include="WixToolset.Heat" Version="5.0.0" />
44+
<PackageVersion Include="WixToolset.Heat" Version="5.0.0" />
4545
<PackageVersion Include="WixToolset.Bal.wixext" Version="5.0.0" />
4646
<PackageVersion Include="WixToolset.Netfx.wixext" Version="5.0.0" />
4747
<PackageVersion Include="WixToolset.Util.wixext" Version="5.0.0" />
4848
</ItemGroup>
49-
</Project>
49+
</Project>

‎Installer/Redist/VC_redist.x64.exe‎

-6.52 MB
Binary file not shown.

‎Installer/Redist/VC_redist.x86.exe‎

-6.67 MB
Binary file not shown.

‎sandbox/scripts/startup.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
REM Download windowsdesktop-runtime
2-
curl -L "https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/8.0.21/windowsdesktop-runtime-8.0.21-win-x64.exe" --output C:\users\WDAGUtilityAccount\Downloads\windowsdesktop-runtime.exe
2+
curl -L "https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/10.0.3/windowsdesktop-runtime-10.0.3-win-x64.exe" --output C:\users\WDAGUtilityAccount\Downloads\windowsdesktop-runtime.exe
33

44
REM Install windowsdesktop-runtime
55
C:\users\WDAGUtilityAccount\Downloads\windowsdesktop-runtime.exe /norestart /quiet
66

77
REM Download aspcore-runtime
8-
curl -L "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.21/dotnet-hosting-8.0.21-win.exe" --output C:\users\WDAGUtilityAccount\Downloads\aspcore-runtime.exe
8+
curl -L "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.3/aspnetcore-runtime-10.0.3-win-x64.exe" --output C:\users\WDAGUtilityAccount\Downloads\aspcore-runtime.exe
99

1010
REM Install aspcore-runtime
1111
C:\users\WDAGUtilityAccount\Downloads\aspcore-runtime.exe /norestart /quiet

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Version>$(Assembly_Version)</Version>
1313
<RepositoryType>git</RepositoryType>
1414
<RepositoryUrl>https://github.com/VixenLights/Vixen</RepositoryUrl>
15-
<TargetFramework>net8.0-windows</TargetFramework>
15+
<TargetFramework>net10.0-windows</TargetFramework>
1616
<ImplicitUsings>enable</ImplicitUsings>
1717
<Nullable>enable</Nullable>
1818
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

‎src/Vixen.Application/Vixen.Application.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
88
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
99
<ApplicationIcon>Vixen3.ico</ApplicationIcon>
10+
<NoWarn>$(NoWarn);WFO1000</NoWarn>
1011
</PropertyGroup>
1112

1213
<!--Required to allow the webserver module to work.-->

‎src/Vixen.Common/Box2D/Box2D.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,25 @@
3030
<ConfigurationType>StaticLibrary</ConfigurationType>
3131
<UseOfMfc>false</UseOfMfc>
3232
<CharacterSet>MultiByte</CharacterSet>
33-
<PlatformToolset>v143</PlatformToolset>
33+
<PlatformToolset>v145</PlatformToolset>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3636
<ConfigurationType>StaticLibrary</ConfigurationType>
3737
<UseOfMfc>false</UseOfMfc>
3838
<CharacterSet>MultiByte</CharacterSet>
39-
<PlatformToolset>v143</PlatformToolset>
39+
<PlatformToolset>v145</PlatformToolset>
4040
</PropertyGroup>
4141
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4242
<ConfigurationType>StaticLibrary</ConfigurationType>
4343
<UseOfMfc>false</UseOfMfc>
4444
<CharacterSet>MultiByte</CharacterSet>
45-
<PlatformToolset>v143</PlatformToolset>
45+
<PlatformToolset>v145</PlatformToolset>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4848
<ConfigurationType>StaticLibrary</ConfigurationType>
4949
<UseOfMfc>false</UseOfMfc>
5050
<CharacterSet>MultiByte</CharacterSet>
51-
<PlatformToolset>v143</PlatformToolset>
51+
<PlatformToolset>v145</PlatformToolset>
5252
</PropertyGroup>
5353
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5454
<ImportGroup Label="ExtensionSettings">

‎src/Vixen.Common/Broadcast/Broadcast.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0-windows</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
64
<Nullable>disable</Nullable>
75
<Copyright>2025 Vixen Team</Copyright>
86
<RootNamespace>$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>

0 commit comments

Comments
 (0)