[Code] Moved to .NET 6.0 build only

also cleaned up solution and project
BAndysc · Nov 22, 2021 · bb2ff46 · bb2ff46
2 parents 3c26991 + 73ea12b
commit bb2ff46
Show file tree

Hide file tree

Showing 266 changed files with 62 additions and 13,929 deletions.
diff --git a/AvaloniaStyles/AvaloniaStyles.csproj b/AvaloniaStyles/AvaloniaStyles.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+        <TargetFramework>net6.0</TargetFramework>
         <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
         <Nullable>enable</Nullable>

diff --git a/LoaderAvalonia/LoaderAvalonia.csproj b/LoaderAvalonia/LoaderAvalonia.csproj
@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
         <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
     </PropertyGroup>
-
+    <PropertyGroup>
+        <OutputPath>..\bin\$(Configuration)\</OutputPath>
+    </PropertyGroup>
     <ItemGroup>
       <ProjectReference Include="..\Updater\Updater.csproj" SkipGetTargetFrameworkProperties="true" />
       <ProjectReference Include="..\AvaloniaStyles\AvaloniaStyles.csproj" />
@@ -57,7 +59,7 @@
       <ProjectReference Include="..\WowPacketParser\WowPacketParserModule.V7_0_3_22248\WowPacketParserModule.V7_0_3_22248.csproj" />
       <ProjectReference Include="..\WowPacketParser\WowPacketParserModule.V8_0_1_27101\WowPacketParserModule.V8_0_1_27101.csproj" />
       <ProjectReference Include="..\WowPacketParser\WowPacketParserModule.V9_0_1_36216\WowPacketParserModule.V9_0_1_36216.csproj" />
-      <ProjectReference Include="..\WowPacketParser\WowPacketParser\WowPacketParser.csproj" SkipGetTargetFrameworkProperties="true" />
+      <ProjectReference Include="..\WowPacketParser\WowPacketParser\WowPacketParser.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/LoaderAvalonia/Program.cs b/LoaderAvalonia/Program.cs
@@ -4,6 +4,7 @@ public class Program
     {
         public static void Main(string[] args)
         {
+            WoWDatabaseEditorCore.Avalonia.Program.Main(args);
         }
     }
 }
diff --git a/LoaderWPF/LoaderWPF.csproj b/LoaderWPF/LoaderWPF.csproj
diff --git a/LoaderWPF/Program.cs b/LoaderWPF/Program.cs
diff --git a/README.md b/README.md
@@ -24,9 +24,7 @@ Application has a built-in auto updater, so you do **not** have to redownload a
 
 ## Mac OS / Linux / Windows version
 
-**To run the editor, you need [.NET 5 Runtime](https://dotnet.microsoft.com/download/dotnet/5.0) for your OS**.
-
-**Future versions will require [.NET 6 Runtime](https://dotnet.microsoft.com/download/dotnet/6.0), we recommend to install it now already**.
+**To run the editor, you need [.NET 6 Runtime](https://dotnet.microsoft.com/download/dotnet/6.0) for your OS**.
 
 WoW Database Editor is compatibile with both MacOS, Linux and Windows.
 
@@ -50,19 +48,19 @@ WoW Database Editor is using [git submodules](https://git-scm.com/book/en/v2/Git
 git submodule update --init --recursive
 ```
 
-Now you can open the solution in Visual Studio or other C#/.NET IDE and build. Start "WoWDatabaseCore.Avalonia" project
+Now you can open the solution in Visual Studio or other C#/.NET IDE and build. Start **LoaderAvalonia** project (this part is important!)
 
 **To build a version to distribute:**
 
 ```
 -- Windows version
-dotnet publish -c Release --self-contained false -f net5.0 -o bin/wowdatabaseeditor-avalonia-win/ LoaderAvalonia/LoaderAvalonia.csproj -r win7-x64
+dotnet publish -c Release --self-contained false -f net6.0 -o bin/wowdatabaseeditor-avalonia-win/ LoaderAvalonia/LoaderAvalonia.csproj -r win7-x64
 
 -- MacOS version
-dotnet publish -c Release --self-contained false -f net5.0 -o bin/wowdatabaseeditor-avalonia-mac/ LoaderAvalonia/LoaderAvalonia.csproj -r osx-x64
+dotnet publish -c Release --self-contained false -f net6.0 -o bin/wowdatabaseeditor-avalonia-mac/ LoaderAvalonia/LoaderAvalonia.csproj -r osx-x64
 
 -- Linux version
-dotnet publish -c Release --self-contained false -f net5.0 -o bin/wowdatabaseeditor-avalonia-linux/ LoaderAvalonia/LoaderAvalonia.csproj -r linux-x64
+dotnet publish -c Release --self-contained false -f net6.0 -o bin/wowdatabaseeditor-avalonia-linux/ LoaderAvalonia/LoaderAvalonia.csproj -r linux-x64
 ```
 
 

diff --git a/Rendering/OpenGLBindings/OpenGLBindings.csproj b/Rendering/OpenGLBindings/OpenGLBindings.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/Rendering/TheAvaloniaOpenGL/TheAvaloniaOpenGL.csproj b/Rendering/TheAvaloniaOpenGL/TheAvaloniaOpenGL.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/Rendering/TheEngine/TheEngine.csproj b/Rendering/TheEngine/TheEngine.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/Rendering/TheMaths/TheMaths.csproj b/Rendering/TheMaths/TheMaths.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/Updater/Updater.csproj b/Updater/Updater.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+        <TargetFramework>net6.0</TargetFramework>
         <OutputType>Exe</OutputType>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <Nullable>enable</Nullable>

diff --git a/WDE.AzerothCore/WDE.AzerothCore.csproj b/WDE.AzerothCore/WDE.AzerothCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <OutputType>Library</OutputType>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>nullable</WarningsAsErrors>

diff --git a/WDE.Common.Avalonia/WDE.Common.Avalonia.csproj b/WDE.Common.Avalonia/WDE.Common.Avalonia.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Library</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
         <Nullable>enable</Nullable>

diff --git a/WDE.Common.WPF/AssemblyInfo.cs b/WDE.Common.WPF/AssemblyInfo.cs
diff --git a/WDE.Common.WPF/Attached/GongDragAndDrop.cs b/WDE.Common.WPF/Attached/GongDragAndDrop.cs
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ public class Program @@
         {
             public static void Main(string[] args)
             {
+                WoWDatabaseEditorCore.Avalonia.Program.Main(args);
             }
         }
     }