Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,12 @@ jobs:
uses: actions/setup-dotnet@v5
with:
dotnet-version: '9.0.x'


- name: Setup Dotnet SDK (10.0)
uses: actions/setup-dotnet@v5
with:
dotnet-version: '10.0.x'

- name: Get Dotnet Info
run: dotnet --info

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reloaded-utils-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ jobs:
with:
dotnet-version: 5.0.x

- name: Setup .NET Core SDK (9.0)
- name: Setup Dotnet SDK (10.0)
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.0.x
dotnet-version: '10.0.x'

- name: Setup Node.js
uses: actions/setup-node@v6
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<LangVersion>12.0</LangVersion>
Expand Down Expand Up @@ -52,7 +52,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.11" />
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion source/Publish.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ dotnet publish "$communityProjectPath" -c Release -r win-x64 --self-contained fa
dotnet publish "$installerProjectPath" -f net472 -o "$installerPublishDirectory"

# Build Installer (Static/Linux)
dotnet publish "$installerCliProjectPath" -f net9.0-windows -r win-x64 -o "$installerStaticPublishDirectory"
dotnet publish "$installerCliProjectPath" -f net10.0-windows -r win-x64 -o "$installerStaticPublishDirectory"

# Build Templates
dotnet pack "$templateProjectPath" -o "$templatePublishDirectory"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>NET472;net9.0-windows</TargetFrameworks>
<TargetFrameworks>NET472;net10.0-windows</TargetFrameworks>
<LangVersion>preview</LangVersion>
<ApplicationManifest>app.manifest</ApplicationManifest>
<AssemblyName>Setup-Linux</AssemblyName>
Expand All @@ -11,7 +11,7 @@
<DebugType>portable</DebugType>
</PropertyGroup>

<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0-windows'))">
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0-windows'))">
<PublishAot>true</PublishAot>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>NET472;net9.0-windows</TargetFrameworks>
<TargetFrameworks>NET472;net10.0-windows</TargetFrameworks>
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0-windows'))">
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0-windows'))">
<PublishAot>true</PublishAot>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions source/Reloaded.Mod.Installer/Reloaded.Mod.Installer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>NET472;net9.0-windows</TargetFrameworks>
<TargetFrameworks>NET472;net10.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<LangVersion>preview</LangVersion>
<ApplicationManifest>app.manifest</ApplicationManifest>
Expand All @@ -15,7 +15,7 @@
<_SuppressWpfTrimError>true</_SuppressWpfTrimError>
</PropertyGroup>

<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0-windows'))">
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0-windows'))">
<PublishAot>true</PublishAot>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<LangVersion>preview</LangVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>CS0067</NoWarn>
Expand All @@ -15,7 +15,7 @@
<PackageReference Include="dll_syringe.Net.Sys" Version="0.16.0" />
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.39" PrivateAssets="All" />
<PackageReference Include="IoC.Container" Version="1.3.8" />
<PackageReference Include="McMaster.NETCore.Plugins" Version="2.0.0-beta.0" />
<PackageReference Include="McMaster.NETCore.Plugins" Version="2.0.0" />
<PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
<PackageReference Include="PhotoSauce.NativeCodecs.Libjxl" Version="0.6.1-ci222723" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0">
Expand Down
2 changes: 1 addition & 1 deletion source/Reloaded.Mod.Launcher/Reloaded.Mod.Launcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<LangVersion>preview</LangVersion>
<UseWPF>true</UseWPF>
<AssemblyName>Reloaded-II</AssemblyName>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;net9.0</TargetFrameworks>
<TargetFrameworks>net5.0;net10.0</TargetFrameworks>
<LangVersion>12.0</LangVersion>
<NoWarn>1701;1702;CS1591;NU5104;CS0067</NoWarn>
<Nullable>enable</Nullable>
Expand Down Expand Up @@ -29,7 +29,7 @@
<PackageReference Include="Equals.Fody" Version="4.0.2">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.11" />
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="10.0.0" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<IsPackable>false</IsPackable>
<LangVersion>preview</LangVersion>
Expand Down
14 changes: 6 additions & 8 deletions source/Reloaded.Mod.Loader/Reloaded.Mod.Loader.csproj
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-windows</TargetFramework>
<RuntimeFrameworkVersion>9.0.8</RuntimeFrameworkVersion>
<RollForward>Minor</RollForward> <!-- Allow 9.X greater than 9.0.8 -->

<LangVersion>preview</LangVersion>
<TargetFramework>net10.0-windows</TargetFramework>
<RollForward>Minor</RollForward>
<LangVersion>preview</LangVersion>
<AssemblyTitle>Reloaded.Mod.Loader</AssemblyTitle>
<UseWindowsForms>true</UseWindowsForms>
<UseWindowsForms>true</UseWindowsForms>
<Product>Reloaded.Mod.Loader</Product>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<EnableDynamicLoading>true</EnableDynamicLoading>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);NU1605;NU1701</NoWarn>
<Version>1.29.5</Version>
<Version>1.29.5</Version>
<CETCompat>false</CETCompat>
<Platforms>x86;x64</Platforms>
<GenerateDepsJson>false</GenerateDepsJson>
Expand Down Expand Up @@ -98,7 +96,7 @@
<PackageReference Include="Colorful.Console" Version="1.2.2-reloaded" />
<PackageReference Include="Indieteur.SteamAppsManAndVDFAPI" Version="1.0.5" />
<PackageReference Include="McMaster.NETCore.Plugins" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.11" />
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="10.0.0" />
<PackageReference Include="Reloaded.SharedLib.Hooks" Version="1.9.0" ExcludeAssets="runtime" />
</ItemGroup>
<ItemGroup>
Expand Down
Loading