From c7daf37c1c6ad4244520343d7dfacd3117ea5e28 Mon Sep 17 00:00:00 2001 From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch> Date: Thu, 1 Feb 2018 00:33:10 +0100 Subject: [PATCH] Start cleaning the project / solution structure. All projects (and namespaces) should start with an "ATx" prefix, having a capital "AT" and a lowercase "x". --- ATXConfigTest/ATXConfigTest.csproj | 4 ++-- ATXConfigTest/AutoTxConfigTest.cs | 2 +- ATXService.sln | 2 +- ATXTray/ATXTray.csproj | 4 ++-- ATXTray/AutoTxTray.cs | 2 +- ATXCommon/ATXCommon.csproj => ATxCommon/ATxCommon.csproj | 4 ++-- {ATXCommon => ATxCommon}/ActiveDirectory.cs | 2 +- {ATXCommon => ATxCommon}/Conv.cs | 2 +- {ATXCommon => ATxCommon}/FsUtils.cs | 2 +- {ATXCommon => ATxCommon}/NLog/RateLimitWrapper.cs | 2 +- {ATXCommon => ATxCommon}/Properties/AssemblyInfo.cs | 2 +- {ATXCommon => ATxCommon}/Serializables/DriveToCheck.cs | 2 +- {ATXCommon => ATxCommon}/Serializables/ServiceConfig.cs | 2 +- {ATXCommon => ATxCommon}/Serializables/ServiceStatus.cs | 2 +- {ATXCommon => ATxCommon}/SystemChecks.cs | 2 +- {ATXCommon => ATxCommon}/TimeUtils.cs | 2 +- AutoTx/ATXProject.csproj | 4 ++-- AutoTx/AutoTx.cs | 6 +++--- AutoTx/Email.cs | 2 +- AutoTx/RoboCommand.cs | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) rename ATXCommon/ATXCommon.csproj => ATxCommon/ATxCommon.csproj (97%) rename {ATXCommon => ATxCommon}/ActiveDirectory.cs (98%) rename {ATXCommon => ATxCommon}/Conv.cs (97%) rename {ATXCommon => ATxCommon}/FsUtils.cs (99%) rename {ATXCommon => ATxCommon}/NLog/RateLimitWrapper.cs (97%) rename {ATXCommon => ATxCommon}/Properties/AssemblyInfo.cs (97%) rename {ATXCommon => ATxCommon}/Serializables/DriveToCheck.cs (95%) rename {ATXCommon => ATxCommon}/Serializables/ServiceConfig.cs (99%) rename {ATXCommon => ATxCommon}/Serializables/ServiceStatus.cs (99%) rename {ATXCommon => ATxCommon}/SystemChecks.cs (99%) rename {ATXCommon => ATxCommon}/TimeUtils.cs (99%) diff --git a/ATXConfigTest/ATXConfigTest.csproj b/ATXConfigTest/ATXConfigTest.csproj index 08f32fb..30fd874 100644 --- a/ATXConfigTest/ATXConfigTest.csproj +++ b/ATXConfigTest/ATXConfigTest.csproj @@ -53,9 +53,9 @@ <None Include="packages.config" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\ATXCommon\ATXCommon.csproj"> + <ProjectReference Include="..\ATxCommon\ATxCommon.csproj"> <Project>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</Project> - <Name>ATXCommon</Name> + <Name>ATxCommon</Name> </ProjectReference> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> diff --git a/ATXConfigTest/AutoTxConfigTest.cs b/ATXConfigTest/AutoTxConfigTest.cs index 47af5d8..135cad8 100644 --- a/ATXConfigTest/AutoTxConfigTest.cs +++ b/ATXConfigTest/AutoTxConfigTest.cs @@ -1,8 +1,8 @@ using System; using System.IO; +using ATxCommon.Serializables; using NLog; using NLog.Config; -using ATXCommon.Serializables; namespace ATXConfigTest { diff --git a/ATXService.sln b/ATXService.sln index 626d823..f02ed06 100644 --- a/ATXService.sln +++ b/ATXService.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATXProject", "AutoTx\ATXProject.csproj", "{5CB67E3A-E63A-4791-B90B-8CEF0027AEAD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATXCommon", "ATXCommon\ATXCommon.csproj", "{166D65D5-EE10-4364-8AA3-4D86BA5CE244}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATxCommon", "ATxCommon\ATxCommon.csproj", "{166D65D5-EE10-4364-8AA3-4D86BA5CE244}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATXConfigTest", "ATXConfigTest\ATXConfigTest.csproj", "{81E0A5AC-0E0D-4F98-B399-41A58612EF33}" EndProject diff --git a/ATXTray/ATXTray.csproj b/ATXTray/ATXTray.csproj index e64ce31..d3f0902 100644 --- a/ATXTray/ATXTray.csproj +++ b/ATXTray/ATXTray.csproj @@ -93,9 +93,9 @@ <Content Include="AutoTx.ico" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\ATXCommon\ATXCommon.csproj"> + <ProjectReference Include="..\ATxCommon\ATxCommon.csproj"> <Project>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</Project> - <Name>ATXCommon</Name> + <Name>ATxCommon</Name> </ProjectReference> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> diff --git a/ATXTray/AutoTxTray.cs b/ATXTray/AutoTxTray.cs index 0f2a971..311fa6c 100644 --- a/ATXTray/AutoTxTray.cs +++ b/ATXTray/AutoTxTray.cs @@ -4,7 +4,7 @@ using System.Timers; using System.Drawing; using System.IO; using System.Windows.Forms; -using ATXCommon.Serializables; +using ATxCommon.Serializables; using Microsoft.WindowsAPICodePack.Dialogs; using NLog; using NLog.Config; diff --git a/ATXCommon/ATXCommon.csproj b/ATxCommon/ATxCommon.csproj similarity index 97% rename from ATXCommon/ATXCommon.csproj rename to ATxCommon/ATxCommon.csproj index a2297d0..aee0a69 100644 --- a/ATXCommon/ATXCommon.csproj +++ b/ATxCommon/ATxCommon.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</ProjectGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>ATXCommon</RootNamespace> - <AssemblyName>ATXCommon</AssemblyName> + <RootNamespace>ATxCommon</RootNamespace> + <AssemblyName>ATxCommon</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> </PropertyGroup> diff --git a/ATXCommon/ActiveDirectory.cs b/ATxCommon/ActiveDirectory.cs similarity index 98% rename from ATXCommon/ActiveDirectory.cs rename to ATxCommon/ActiveDirectory.cs index 6fd6335..063f9eb 100644 --- a/ATXCommon/ActiveDirectory.cs +++ b/ATxCommon/ActiveDirectory.cs @@ -2,7 +2,7 @@ using System.DirectoryServices.AccountManagement; using NLog; -namespace ATXCommon +namespace ATxCommon { public static class ActiveDirectory { diff --git a/ATXCommon/Conv.cs b/ATxCommon/Conv.cs similarity index 97% rename from ATXCommon/Conv.cs rename to ATxCommon/Conv.cs index b0516aa..004e59d 100644 --- a/ATXCommon/Conv.cs +++ b/ATxCommon/Conv.cs @@ -1,4 +1,4 @@ -namespace ATXCommon +namespace ATxCommon { public static class Conv { diff --git a/ATXCommon/FsUtils.cs b/ATxCommon/FsUtils.cs similarity index 99% rename from ATXCommon/FsUtils.cs rename to ATxCommon/FsUtils.cs index a9eb50b..446bb35 100644 --- a/ATXCommon/FsUtils.cs +++ b/ATxCommon/FsUtils.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using NLog; -namespace ATXCommon +namespace ATxCommon { public static class FsUtils { diff --git a/ATXCommon/NLog/RateLimitWrapper.cs b/ATxCommon/NLog/RateLimitWrapper.cs similarity index 97% rename from ATXCommon/NLog/RateLimitWrapper.cs rename to ATxCommon/NLog/RateLimitWrapper.cs index b86dded..2170a48 100644 --- a/ATXCommon/NLog/RateLimitWrapper.cs +++ b/ATxCommon/NLog/RateLimitWrapper.cs @@ -4,7 +4,7 @@ using NLog.Common; using NLog.Targets; using NLog.Targets.Wrappers; -namespace ATXCommon.NLog +namespace ATxCommon.NLog { /// <summary> /// A wrapper target for NLog, limiting the rate of messages being logged. diff --git a/ATXCommon/Properties/AssemblyInfo.cs b/ATxCommon/Properties/AssemblyInfo.cs similarity index 97% rename from ATXCommon/Properties/AssemblyInfo.cs rename to ATxCommon/Properties/AssemblyInfo.cs index 6018b41..940f654 100644 --- a/ATXCommon/Properties/AssemblyInfo.cs +++ b/ATxCommon/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ATXCommon")] +[assembly: AssemblyTitle("ATxCommon")] [assembly: AssemblyDescription("AutoTx Common Runtime Libraries")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Universitaet Basel")] diff --git a/ATXCommon/Serializables/DriveToCheck.cs b/ATxCommon/Serializables/DriveToCheck.cs similarity index 95% rename from ATXCommon/Serializables/DriveToCheck.cs rename to ATxCommon/Serializables/DriveToCheck.cs index 553f475..2c43e0c 100644 --- a/ATXCommon/Serializables/DriveToCheck.cs +++ b/ATxCommon/Serializables/DriveToCheck.cs @@ -1,6 +1,6 @@ using System.Xml.Serialization; -namespace ATXCommon.Serializables +namespace ATxCommon.Serializables { /// <summary> /// Helper class for the nested SpaceMonitoring sections. diff --git a/ATXCommon/Serializables/ServiceConfig.cs b/ATxCommon/Serializables/ServiceConfig.cs similarity index 99% rename from ATXCommon/Serializables/ServiceConfig.cs rename to ATxCommon/Serializables/ServiceConfig.cs index bb2a066..7eb183f 100644 --- a/ATXCommon/Serializables/ServiceConfig.cs +++ b/ATxCommon/Serializables/ServiceConfig.cs @@ -5,7 +5,7 @@ using System.IO; using System.Xml.Serialization; using NLog; -namespace ATXCommon.Serializables +namespace ATxCommon.Serializables { /// <summary> /// AutoTx service configuration class. diff --git a/ATXCommon/Serializables/ServiceStatus.cs b/ATxCommon/Serializables/ServiceStatus.cs similarity index 99% rename from ATXCommon/Serializables/ServiceStatus.cs rename to ATxCommon/Serializables/ServiceStatus.cs index cda77de..3d5f9c1 100644 --- a/ATXCommon/Serializables/ServiceStatus.cs +++ b/ATxCommon/Serializables/ServiceStatus.cs @@ -3,7 +3,7 @@ using System.IO; using System.Xml.Serialization; using NLog; -namespace ATXCommon.Serializables +namespace ATxCommon.Serializables { /// <summary> /// AutoTx service status class. diff --git a/ATXCommon/SystemChecks.cs b/ATxCommon/SystemChecks.cs similarity index 99% rename from ATXCommon/SystemChecks.cs rename to ATxCommon/SystemChecks.cs index b3832f5..e65c8f1 100644 --- a/ATXCommon/SystemChecks.cs +++ b/ATxCommon/SystemChecks.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Management; using NLog; -namespace ATXCommon +namespace ATxCommon { public static class SystemChecks { diff --git a/ATXCommon/TimeUtils.cs b/ATxCommon/TimeUtils.cs similarity index 99% rename from ATXCommon/TimeUtils.cs rename to ATxCommon/TimeUtils.cs index e334161..a499a16 100644 --- a/ATXCommon/TimeUtils.cs +++ b/ATxCommon/TimeUtils.cs @@ -1,6 +1,6 @@ using System; -namespace ATXCommon +namespace ATxCommon { public static class TimeUtils { diff --git a/AutoTx/ATXProject.csproj b/AutoTx/ATXProject.csproj index aa53c59..6099401 100644 --- a/AutoTx/ATXProject.csproj +++ b/AutoTx/ATXProject.csproj @@ -147,9 +147,9 @@ <None Include="Resources\BuildCommit.txt" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\ATXCommon\ATXCommon.csproj"> + <ProjectReference Include="..\ATxCommon\ATxCommon.csproj"> <Project>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</Project> - <Name>ATXCommon</Name> + <Name>ATxCommon</Name> </ProjectReference> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> diff --git a/AutoTx/AutoTx.cs b/AutoTx/AutoTx.cs index ee781dd..1a14cbc 100644 --- a/AutoTx/AutoTx.cs +++ b/AutoTx/AutoTx.cs @@ -6,12 +6,12 @@ using System.Linq; using System.ServiceProcess; using System.IO; using System.Timers; +using ATxCommon; +using ATxCommon.NLog; +using ATxCommon.Serializables; using NLog; using NLog.Config; using NLog.Targets; -using ATXCommon; -using ATXCommon.NLog; -using ATXCommon.Serializables; using RoboSharp; namespace AutoTx diff --git a/AutoTx/Email.cs b/AutoTx/Email.cs index c22fc3b..2b03b78 100644 --- a/AutoTx/Email.cs +++ b/AutoTx/Email.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Net.Mail; using System.Text; -using ATXCommon; +using ATxCommon; namespace AutoTx { diff --git a/AutoTx/RoboCommand.cs b/AutoTx/RoboCommand.cs index 9fa02ed..bd1ad19 100644 --- a/AutoTx/RoboCommand.cs +++ b/AutoTx/RoboCommand.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Management; -using ATXCommon; +using ATxCommon; using RoboSharp; namespace AutoTx -- GitLab