Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3 h monkey/net7 #28

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

3 h monkey/net7 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
14d070f
Net7 + dependency update
3HMonkey Mar 19, 2023
9d8ac4d
Cleanup for unused references
3HMonkey Mar 19, 2023
373b970
Removed dependency for Newtonsoft.Json. Using System.Text.Json direct…
3HMonkey Mar 19, 2023
eb542a6
MediaR fix for net7
3HMonkey Mar 19, 2023
01d9175
fix for assets
3HMonkey Mar 19, 2023
8ed00cc
fix port for debugging
3HMonkey Mar 19, 2023
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
10 changes: 9 additions & 1 deletion src/UOStudio.Client.Assets/UOStudio.Client.Assets.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -14,4 +14,12 @@
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2022.3.1" />
<PackageReference Update="SonarAnalyzer.CSharp" Version="8.54.0.64047">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
10 changes: 9 additions & 1 deletion src/UOStudio.Client.Core/UOStudio.Client.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>
Expand All @@ -10,4 +10,12 @@
<ProjectReference Include="..\UOStudio.Common.Core\UOStudio.Common.Core.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2022.3.1" />
<PackageReference Update="SonarAnalyzer.CSharp" Version="8.54.0.64047">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
12 changes: 10 additions & 2 deletions src/UOStudio.Client.Engine.Mathematics/UOStudio.Client.Engine.Mathematics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -14,4 +14,12 @@
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2022.3.1" />
<PackageReference Update="SonarAnalyzer.CSharp" Version="8.54.0.64047">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
10 changes: 9 additions & 1 deletion src/UOStudio.Client.Engine.Native.OpenGL/UOStudio.Client.Engine.Native.OpenGL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\UOStudio.Client.Engine.Native\UOStudio.Client.Engine.Native.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2022.3.1" />
<PackageReference Update="SonarAnalyzer.CSharp" Version="8.54.0.64047">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
9 changes: 8 additions & 1 deletion src/UOStudio.Client.Engine.Native/UOStudio.Client.Engine.Native.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

Expand All @@ -19,5 +19,12 @@
<PropertyGroup Condition="'$(IsLinux)'=='true'">
<DefineConstants>LINUX</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2022.3.1" />
<PackageReference Update="SonarAnalyzer.CSharp" Version="8.54.0.64047">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
3 changes: 2 additions & 1 deletion src/UOStudio.Client.Engine/Graphics/IShader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using UOStudio.Client.Engine.Mathematics;
using UOStudio.Client.Engine.Mathematics;
using Point = UOStudio.Client.Engine.Mathematics.Point;

namespace UOStudio.Client.Engine.Graphics
{
Expand Down
5 changes: 3 additions & 2 deletions src/UOStudio.Client.Engine/Graphics/Shader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using CSharpFunctionalExtensions;
using CSharpFunctionalExtensions;
using UOStudio.Client.Engine.Mathematics;
using UOStudio.Client.Engine.Native.OpenGL;
using Point = UOStudio.Client.Engine.Mathematics.Point;

namespace UOStudio.Client.Engine.Graphics
{
Expand Down Expand Up @@ -344,4 +345,4 @@ private Result ValidateProgram(uint shader)
return Result.Success();
}
}
}
}
7 changes: 7 additions & 0 deletions src/UOStudio.Client.Engine/Graphics/Texture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
using System.Runtime.CompilerServices;
using Assimp;
using Serilog;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing;
using System.Runtime.InteropServices;
using UOStudio.Client.Engine.Extensions;
using UOStudio.Client.Engine.Mathematics;
using UOStudio.Client.Engine.Native.OpenGL;
Expand Down Expand Up @@ -194,6 +197,8 @@ private static bool IsDepthFormat(GL.SizedInternalFormat sizedInternalFormat)
};
}



private void CreateTexture(
Image<Rgba32> image,
MinFilter minFilter,
Expand All @@ -204,6 +209,8 @@ private void CreateTexture(
Height = image.Height;

image.Mutate(ipc => ipc.Flip(FlipMode.Vertical));


if (image.TryGetSinglePixelSpan(out var pixelSpan))
{
var mipLevels = (int)MathF.Floor(MathF.Log2(MathF.Max(Width, Height)));
Expand Down
3 changes: 2 additions & 1 deletion src/UOStudio.Client.Engine/UI/ImGuiController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using System.Diagnostics;
using System.Diagnostics;
using System.Runtime.CompilerServices;
using ImGuiNET;
using UOStudio.Client.Engine.Graphics;
using UOStudio.Client.Engine.Input;
using UOStudio.Client.Engine.Mathematics;
using UOStudio.Client.Engine.Native.OpenGL;
using Num = System.Numerics;
using Point = UOStudio.Client.Engine.Mathematics.Point;
using Vector2 = UOStudio.Client.Engine.Mathematics.Vector2;

namespace UOStudio.Client.Engine.UI
Expand Down
28 changes: 18 additions & 10 deletions src/UOStudio.Client.Engine/UOStudio.Client.Engine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand All @@ -14,15 +14,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="CSharpFunctionalExtensions" Version="2.27.1" />
<PackageReference Include="ImGui.NET" Version="1.86.0" />
<PackageReference Include="SeeingSharp2.AssimpImporter" Version="0.8.1" />
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="CSharpFunctionalExtensions" Version="2.38.1" />
<PackageReference Include="ImGui.NET" Version="1.89.4" />
<PackageReference Include="SeeingSharp2.AssimpImporter" Version="0.9.2" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
</ItemGroup>

Expand All @@ -32,4 +32,12 @@
<ProjectReference Include="..\UOStudio.Client.Engine.Native\UOStudio.Client.Engine.Native.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2022.3.1" />
<PackageReference Update="SonarAnalyzer.CSharp" Version="8.54.0.64047">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
10 changes: 9 additions & 1 deletion src/UOStudio.Client.Launcher.Contracts/UOStudio.Client.Launcher.Contracts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2022.3.1" />
<PackageReference Update="SonarAnalyzer.CSharp" Version="8.54.0.64047">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
14 changes: 7 additions & 7 deletions src/UOStudio.Client.Launcher.Data/ProfileDbContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Diagnostics;
using System.Diagnostics;
using Microsoft.EntityFrameworkCore;

namespace UOStudio.Client.Launcher.Data
Expand Down Expand Up @@ -49,8 +49,8 @@ private async Task EnsureCreatedCore()
ServerPort = 9050,
UserName = "admin",
Password = "admin",
AuthBaseUri = "https://localhost:5001",
ApiBaseUri = "https://localhost:5001"
AuthBaseUri = "https://localhost:5000",
ApiBaseUri = "https://localhost:5000"
};
var localhostEditorProfile = await Profiles
.FirstOrDefaultAsync(p => p.Name == "localhost - editor", CancellationToken.None);
Expand All @@ -61,8 +61,8 @@ private async Task EnsureCreatedCore()
ServerName = "localhost",
UserName = "editor",
Password = "editor",
AuthBaseUri = "https://localhost:5001",
ApiBaseUri = "https://localhost:5001"
AuthBaseUri = "https://localhost:5000",
ApiBaseUri = "https://localhost:5000"
};

var localhostInvalidProfile = await Profiles
Expand All @@ -74,8 +74,8 @@ private async Task EnsureCreatedCore()
ServerName = "localhost",
UserName = "invalid",
Password = "invalid",
AuthBaseUri = "https://localhost:5001",
ApiBaseUri = "https://localhost:5001"
AuthBaseUri = "https://localhost:5000",
ApiBaseUri = "https://localhost:5000"
};

await Profiles.AddRangeAsync(localhostAdminProfile, localhostEditorProfile, localhostInvalidProfile);
Expand Down
34 changes: 21 additions & 13 deletions src/UOStudio.Client.Launcher.Data/UOStudio.Client.Launcher.Data.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,36 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="CSharpFunctionalExtensions" Version="2.27.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="6.0.1" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.0.7" />
<PackageReference Include="SQLitePCLRaw.core" Version="2.0.7" />
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="2.0.7" />
<PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.0.7" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="CSharpFunctionalExtensions" Version="2.38.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="7.0.4" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.4" />
<PackageReference Include="SQLitePCLRaw.core" Version="2.1.4" />
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="2.1.4" />
<PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.4" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\UOStudio.Client.Launcher.Contracts\UOStudio.Client.Launcher.Contracts.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2022.3.1" />
<PackageReference Update="SonarAnalyzer.CSharp" Version="8.54.0.64047">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
Loading