.NET6

CnCNet · Apr 18, 2022 · d7e370a · d7e370a
1 parent acfabe4
commit d7e370a
Show file tree

Hide file tree

Showing 69 changed files with 40 additions and 175 deletions.
diff --git a/ClientCore/ClientCore.csproj b/ClientCore/ClientCore.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
+    <TargetPlatformMinVersion>7.0</TargetPlatformMinVersion>
     <UseWindowsForms>true</UseWindowsForms>
     <Title>CnCNet Client</Title>
     <Description>CnCNet Client Core Library</Description>

diff --git a/ClientCore/INIProcessing/IniPreprocessInfoStore.cs b/ClientCore/INIProcessing/IniPreprocessInfoStore.cs
@@ -1,11 +1,7 @@
-using ClientCore;
-using Rampastring.Tools;
+using Rampastring.Tools;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace ClientCore.INIProcessing
 {

diff --git a/ClientCore/INIProcessing/IniPreprocessor.cs b/ClientCore/INIProcessing/IniPreprocessor.cs
@@ -1,11 +1,6 @@
-using ClientCore;
-using Rampastring.Tools;
-using System;
+using Rampastring.Tools;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace ClientCore.INIProcessing
 {

diff --git a/ClientCore/INIProcessing/PreprocessorBackgroundTask.cs b/ClientCore/INIProcessing/PreprocessorBackgroundTask.cs
@@ -1,10 +1,6 @@
-using ClientCore;
-using Rampastring.Tools;
+using Rampastring.Tools;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace ClientCore.INIProcessing

diff --git a/ClientCore/ProgramConstants.cs b/ClientCore/ProgramConstants.cs
@@ -1,8 +1,6 @@
 using Localization;
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 

diff --git a/ClientCore/Settings/IntRangeSetting.cs b/ClientCore/Settings/IntRangeSetting.cs
@@ -1,5 +1,4 @@
-using System;
-using Rampastring.Tools;
+using Rampastring.Tools;
 
 namespace ClientCore.Settings
 {

diff --git a/ClientCore/Statistics/DataWriter.cs b/ClientCore/Statistics/DataWriter.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace ClientCore.Statistics
 {

diff --git a/ClientGUI/ClientGUI.csproj b/ClientGUI/ClientGUI.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
+    <TargetPlatformMinVersion>7.0</TargetPlatformMinVersion>
     <UseWindowsForms>true</UseWindowsForms>
     <Title>CnCNet Client</Title>
     <Description>CnCNet Client UI Library</Description>

diff --git a/ClientGUI/ToolTip.cs b/ClientGUI/ToolTip.cs
@@ -3,9 +3,6 @@
 using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace ClientGUI
 {

diff --git a/ClientGUI/UIDesignConstants.cs b/ClientGUI/UIDesignConstants.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ClientGUI
+namespace ClientGUI
 {
     /// <summary>
     /// Contains constants used in user interface design.

diff --git a/ClientGUI/XNAClientStateButton.cs b/ClientGUI/XNAClientStateButton.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using ClientCore.Extensions;
 using Microsoft.Xna.Framework.Graphics;
 using Rampastring.XNAUI;

diff --git a/ClientGUI/XNAMessageBox.cs b/ClientGUI/XNAMessageBox.cs
@@ -1,9 +1,9 @@
-using System;
+using Localization;
+using System;
 using Microsoft.Xna.Framework;
 using Rampastring.XNAUI.XNAControls;
 using Rampastring.XNAUI;
 using Microsoft.Xna.Framework.Input;
-using Localization;
 
 namespace ClientGUI
 {

diff --git a/ClientGUI/XNAWindow.cs b/ClientGUI/XNAWindow.cs
@@ -1,10 +1,8 @@
 using ClientCore;
-using Rampastring.XNAUI.XNAControls;
 using Rampastring.Tools;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using Rampastring.XNAUI;
 
 namespace ClientGUI

diff --git a/ClientGUI/XNAWindowBase.cs b/ClientGUI/XNAWindowBase.cs
@@ -2,10 +2,7 @@
 using Rampastring.Tools;
 using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace ClientGUI
 {

diff --git a/DTAConfig/DTAConfig.csproj b/DTAConfig/DTAConfig.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
+    <TargetPlatformMinVersion>7.0</TargetPlatformMinVersion>
     <UseWindowsForms>true</UseWindowsForms>
     <Title>CnCNet Client</Title>
     <Description>CnCNet Config Library</Description>

diff --git a/DTAConfig/DirectDrawWrapper.cs b/DTAConfig/DirectDrawWrapper.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 
 namespace DTAConfig
 {

diff --git a/DTAConfig/HotkeyConfigurationWindow.cs b/DTAConfig/HotkeyConfigurationWindow.cs
@@ -1,6 +1,6 @@
-using ClientCore;
+using Localization;
+using ClientCore;
 using ClientGUI;
-using Localization;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
 using Rampastring.Tools;

diff --git a/DTAConfig/OptionPanels/AudioOptionsPanel.cs b/DTAConfig/OptionPanels/AudioOptionsPanel.cs
@@ -1,11 +1,10 @@
-using ClientCore;
+using Localization;
+using ClientCore;
 using ClientGUI;
-using Localization;
 using Microsoft.Xna.Framework;
 using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;
 using System;
-using System.Collections.Generic;
 
 namespace DTAConfig.OptionPanels
 {

diff --git a/DTAConfig/OptionPanels/CnCNetOptionsPanel.cs b/DTAConfig/OptionPanels/CnCNetOptionsPanel.cs
@@ -1,4 +1,5 @@
-using ClientCore;
+using Localization;
+using ClientCore;
 using ClientCore.CnCNet5;
 using ClientGUI;
 using Microsoft.Xna.Framework;
@@ -7,7 +8,6 @@
 using System;
 using System.Collections.Generic;
 using ClientCore.Enums;
-using Localization;
 
 namespace DTAConfig.OptionPanels
 {

diff --git a/DTAConfig/OptionPanels/ComponentsPanel.cs b/DTAConfig/OptionPanels/ComponentsPanel.cs
@@ -1,6 +1,6 @@
-using ClientCore;
+using Localization;
+using ClientCore;
 using ClientGUI;
-using Localization;
 using Microsoft.Xna.Framework;
 using Rampastring.Tools;
 using Rampastring.XNAUI;

diff --git a/DTAConfig/OptionPanels/DisplayOptionsPanel.cs b/DTAConfig/OptionPanels/DisplayOptionsPanel.cs
@@ -1,15 +1,13 @@
+using Localization;
 using ClientCore;
 using ClientGUI;
-using Localization;
-using Microsoft.Win32;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Rampastring.Tools;
 using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
 

diff --git a/DTAConfig/OptionPanels/GameOptionsPanel.cs b/DTAConfig/OptionPanels/GameOptionsPanel.cs
@@ -1,7 +1,7 @@
-using ClientCore;
+using Localization;
+using ClientCore;
 using ClientCore.CnCNet5;
 using ClientGUI;
-using Localization;
 using Microsoft.Xna.Framework;
 using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;

diff --git a/DTAConfig/OptionPanels/UpdaterOptionsPanel.cs b/DTAConfig/OptionPanels/UpdaterOptionsPanel.cs
@@ -1,11 +1,10 @@
-using ClientCore;
+using Localization;
+using ClientCore;
 using ClientGUI;
-using Localization;
 using Microsoft.Xna.Framework;
 using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;
 using System;
-using System.IO;
 using Updater;
 
 namespace DTAConfig.OptionPanels

diff --git a/DTAConfig/OptionsGUICreator.cs b/DTAConfig/OptionsGUICreator.cs
@@ -1,9 +1,5 @@
 using ClientGUI;
 using DTAConfig.CustomSettings;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace DTAConfig
 {

diff --git a/DTAConfig/OptionsWindow.cs b/DTAConfig/OptionsWindow.cs
@@ -1,8 +1,8 @@
-using ClientCore;
+using Localization;
+using ClientCore;
 using ClientCore.CnCNet5;
 using ClientGUI;
 using DTAConfig.OptionPanels;
-using Localization;
 using Microsoft.Xna.Framework;
 using Rampastring.Tools;
 using Rampastring.XNAUI;

diff --git a/DXMainClient/DXGUI/Generic/GameInProgressWindow.cs b/DXMainClient/DXGUI/Generic/GameInProgressWindow.cs
@@ -6,9 +6,6 @@
 using Rampastring.XNAUI;
 using ClientGUI;
 using System.IO;
-using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Linq;
 using Localization;
 
 namespace DTAClient.DXGUI

diff --git a/DXMainClient/DXGUI/Generic/UpdateQueryWindow.cs b/DXMainClient/DXGUI/Generic/UpdateQueryWindow.cs
@@ -1,6 +1,5 @@
 using ClientCore;
 using ClientGUI;
-using DTAClient.Domain;
 using Localization;
 using Microsoft.Xna.Framework;
 using Rampastring.XNAUI;

diff --git a/DXMainClient/DXGUI/Multiplayer/CnCNet/ChoiceNotificationBox.cs b/DXMainClient/DXGUI/Multiplayer/CnCNet/ChoiceNotificationBox.cs
@@ -1,5 +1,4 @@
-using ClientCore;
-using ClientGUI;
+using ClientGUI;
 using Localization;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;

diff --git a/DXMainClient/DXGUI/Multiplayer/CnCNet/GameCreationWindow.cs b/DXMainClient/DXGUI/Multiplayer/CnCNet/GameCreationWindow.cs
@@ -7,7 +7,6 @@
 using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;
 using System;
-using System.Collections.Generic;
 using System.IO;
 
 namespace DTAClient.DXGUI.Multiplayer.CnCNet

diff --git a/DXMainClient/DXGUI/Multiplayer/CnCNet/MapSharingConfirmationPanel.cs b/DXMainClient/DXGUI/Multiplayer/CnCNet/MapSharingConfirmationPanel.cs
@@ -3,10 +3,6 @@
 using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DTAClient.DXGUI.Multiplayer.CnCNet
 {

diff --git a/DXMainClient/DXGUI/Multiplayer/CnCNet/PasswordRequestWindow.cs b/DXMainClient/DXGUI/Multiplayer/CnCNet/PasswordRequestWindow.cs
@@ -2,9 +2,7 @@
 using DTAClient.Domain.Multiplayer.CnCNet;
 using Localization;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Input;
 using Rampastring.XNAUI;
-using Rampastring.XNAUI.Input;
 using Rampastring.XNAUI.XNAControls;
 using System;
 

diff --git a/DXMainClient/DXGUI/Multiplayer/CnCNet/PrivateMessagingWindow.cs b/DXMainClient/DXGUI/Multiplayer/CnCNet/PrivateMessagingWindow.cs
@@ -4,14 +4,12 @@
 using DTAClient.Online;
 using DTAClient.Online.EventArguments;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Audio;
 using Microsoft.Xna.Framework.Graphics;
 using Rampastring.Tools;
 using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using ClientCore.Enums;
 using Localization;

diff --git a/DXMainClient/DXGUI/Multiplayer/CnCNet/TunnelListBox.cs b/DXMainClient/DXGUI/Multiplayer/CnCNet/TunnelListBox.cs
@@ -6,9 +6,6 @@
 using Rampastring.XNAUI.XNAControls;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DTAClient.DXGUI.Multiplayer.CnCNet
 {

diff --git a/DXMainClient/DXGUI/Multiplayer/CnCNet/TunnelSelectionWindow.cs b/DXMainClient/DXGUI/Multiplayer/CnCNet/TunnelSelectionWindow.cs
@@ -4,10 +4,6 @@
 using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DTAClient.DXGUI.Multiplayer.CnCNet
 {

diff --git a/DXMainClient/DXGUI/Multiplayer/GameListBox.cs b/DXMainClient/DXGUI/Multiplayer/GameListBox.cs
@@ -4,7 +4,6 @@
 using ClientCore;
 using ClientCore.Enums;
 using DTAClient.Domain.Multiplayer;
-using DTAClient.Domain.Multiplayer.CnCNet;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Rampastring.XNAUI;

diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/CnCNetGameLobby.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/CnCNetGameLobby.cs
@@ -14,9 +14,7 @@
 using Rampastring.XNAUI.XNAControls;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
 using DTAClient.Domain.Multiplayer.CnCNet;
 using Localization;

diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/CoopBriefingBox.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/CoopBriefingBox.cs
@@ -1,8 +1,6 @@
 using Rampastring.XNAUI.XNAControls;
 using Rampastring.XNAUI;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
 
 namespace DTAClient.DXGUI.Multiplayer.GameLobby
 {

diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs
@@ -13,7 +13,6 @@
 using System.IO;
 using System.Linq;
 using DTAClient.DXGUI.Multiplayer.CnCNet;
-using DTAClient.Online;
 using DTAClient.Online.EventArguments;
 using Localization;