Upgraded to dotnet 9. Fixed smaller issues
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using MoonCore.Extended.SingleDb;
|
using MoonCore.Extended.SingleDb;
|
||||||
using Moonlight.ApiServer.Configuration;
|
using Moonlight.ApiServer.Configuration;
|
||||||
using Moonlight.ApiServer.Helpers;
|
|
||||||
using MoonlightServers.ApiServer.Database.Entities;
|
using MoonlightServers.ApiServer.Database.Entities;
|
||||||
|
|
||||||
namespace MoonlightServers.ApiServer.Database;
|
namespace MoonlightServers.ApiServer.Database;
|
||||||
|
|||||||
@@ -1,19 +1,23 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net9.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
||||||
<IsPackable>true</IsPackable>
|
</PropertyGroup>
|
||||||
<Version>2.1.0</Version>
|
|
||||||
|
<PropertyGroup Label="Nuget Settings">
|
||||||
|
<PackageId>MoonlightServers.ApiServer</PackageId>
|
||||||
<Title>MoonlightServers.ApiServer</Title>
|
<Title>MoonlightServers.ApiServer</Title>
|
||||||
|
<Version>2.1.0</Version>
|
||||||
<PackageTags>apiserver</PackageTags>
|
<PackageTags>apiserver</PackageTags>
|
||||||
|
<IsPackable>true</IsPackable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Moonlight.ApiServer" Version="2.1.0"/>
|
<PackageReference Include="Moonlight.ApiServer" Version="2.1.0"/>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15"/>
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.5"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -13,22 +13,6 @@ using MoonlightServers.ApiServer.Startup;
|
|||||||
|
|
||||||
var startup = new Startup();
|
var startup = new Startup();
|
||||||
|
|
||||||
#region Creating virtual plugin manifest from plugin.json file
|
|
||||||
|
|
||||||
// Read out content
|
|
||||||
var pluginManifestJson = await File.ReadAllTextAsync("../plugin.json");
|
|
||||||
|
|
||||||
// Parse to model
|
|
||||||
var pluginManifest = JsonSerializer.Deserialize<PluginManifest>(pluginManifestJson, new JsonSerializerOptions()
|
|
||||||
{
|
|
||||||
PropertyNameCaseInsensitive = true
|
|
||||||
})!;
|
|
||||||
|
|
||||||
// Clear assemblies as we are loading them using the additional assembly parameter
|
|
||||||
pluginManifest.Assemblies.Clear();
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
await startup.Run(args, [
|
await startup.Run(args, [
|
||||||
new PluginStartup()
|
new PluginStartup()
|
||||||
]);
|
]);
|
||||||
@@ -1,20 +1,20 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net9.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Docker.DotNet" Version="3.125.15" />
|
<PackageReference Include="Docker.DotNet" Version="3.125.15" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
|
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.2.0" />
|
||||||
<PackageReference Include="MoonCore" Version="1.8.5" />
|
<PackageReference Include="MoonCore" Version="1.8.6" />
|
||||||
<PackageReference Include="MoonCore.Extended" Version="1.3.2" />
|
<PackageReference Include="MoonCore.Extended" Version="1.3.3" />
|
||||||
<PackageReference Include="MoonCore.Unix" Version="1.0.6" />
|
<PackageReference Include="MoonCore.Unix" Version="1.0.7" />
|
||||||
<PackageReference Include="SharpZipLib" Version="1.4.2" />
|
<PackageReference Include="SharpZipLib" Version="1.4.2" />
|
||||||
<PackageReference Include="Stateless" Version="5.17.0" />
|
<PackageReference Include="Stateless" Version="5.17.0" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2"/>
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,19 +1,22 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net9.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup Label="Nuget Settings">
|
||||||
|
<Title>MoonlightServers.DaemonShared</Title>
|
||||||
<PackageId>MoonlightServers.DaemonShared</PackageId>
|
<PackageId>MoonlightServers.DaemonShared</PackageId>
|
||||||
|
<Version>2.1.0</Version>
|
||||||
<PackageTags>shared</PackageTags>
|
<PackageTags>shared</PackageTags>
|
||||||
<IsPackable>true</IsPackable>
|
<IsPackable>true</IsPackable>
|
||||||
<Version>2.1.0</Version>
|
|
||||||
<Title>MoonlightServers.DaemonShared</Title>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="DaemonSide\" />
|
<Folder Include="DaemonSide\"/>
|
||||||
<Folder Include="DaemonSide\Http\Responses\Servers\Files\" />
|
<Folder Include="DaemonSide\Http\Responses\Servers\Files\"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,19 +1,23 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
|
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net9.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<IsPackable>true</IsPackable>
|
</PropertyGroup>
|
||||||
<Version>2.1.0</Version>
|
|
||||||
|
<PropertyGroup Label="Nuget Settings">
|
||||||
|
<PackageId>MoonlightServers.Frontend</PackageId>
|
||||||
<Title>MoonlightServers.Frontend</Title>
|
<Title>MoonlightServers.Frontend</Title>
|
||||||
|
<Version>2.1.0</Version>
|
||||||
<PackageTags>frontend</PackageTags>
|
<PackageTags>frontend</PackageTags>
|
||||||
|
<IsPackable>true</IsPackable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.15"/>
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.5"/>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.15" PrivateAssets="all"/>
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.5" PrivateAssets="all"/>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.15" />
|
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.5" />
|
||||||
<PackageReference Include="Moonlight.Client" Version="2.1.0"/>
|
<PackageReference Include="Moonlight.Client" Version="2.1.0"/>
|
||||||
<PackageReference Include="XtermBlazor" Version="2.1.2" />
|
<PackageReference Include="XtermBlazor" Version="2.1.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -1,13 +1,17 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net9.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<IsPackable>true</IsPackable>
|
</PropertyGroup>
|
||||||
<Version>2.1.0</Version>
|
|
||||||
|
<PropertyGroup Label="Nuget Settings">
|
||||||
|
<PackageId>MoonlightServers.Shared</PackageId>
|
||||||
<Title>MoonlightServers.Shared</Title>
|
<Title>MoonlightServers.Shared</Title>
|
||||||
|
<Version>2.1.0</Version>
|
||||||
<PackageTags>shared</PackageTags>
|
<PackageTags>shared</PackageTags>
|
||||||
|
<IsPackable>true</IsPackable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
Reference in New Issue
Block a user