From 80ca771ae602412ebc79f03f5fa3d2d93cfd3f55 Mon Sep 17 00:00:00 2001
From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>
Date: Thu, 11 Jan 2018 14:33:39 +0100
Subject: [PATCH] Rename ATXSerializables project to ATXCommon.
Since we have more to share between the applications than just the XML
wrappers, this is the location to keep common classes and methods.
---
ATXConfigTest/ATXConfigTest.csproj | 4 ++--
ATXConfigTest/AutoTxConfigTest.cs | 2 +-
.../{ATXSerializables.csproj => ATXCommon.csproj} | 10 +++++-----
ATXSerializables/{ => Serializables}/DriveToCheck.cs | 2 +-
ATXSerializables/{ => Serializables}/ServiceConfig.cs | 2 +-
ATXSerializables/{ => Serializables}/ServiceStatus.cs | 2 +-
ATXService.sln | 2 +-
ATXTray/ATXTray.csproj | 4 ++--
ATXTray/AutoTxTray.cs | 2 +-
AutoTx/ATXProject.csproj | 4 ++--
AutoTx/AutoTx.cs | 2 +-
11 files changed, 18 insertions(+), 18 deletions(-)
rename ATXSerializables/{ATXSerializables.csproj => ATXCommon.csproj} (89%)
rename ATXSerializables/{ => Serializables}/DriveToCheck.cs (93%)
rename ATXSerializables/{ => Serializables}/ServiceConfig.cs (99%)
rename ATXSerializables/{ => Serializables}/ServiceStatus.cs (99%)
diff --git a/ATXConfigTest/ATXConfigTest.csproj b/ATXConfigTest/ATXConfigTest.csproj
index df442c4..f5d0375 100644
--- a/ATXConfigTest/ATXConfigTest.csproj
+++ b/ATXConfigTest/ATXConfigTest.csproj
@@ -48,9 +48,9 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ATXSerializables\ATXSerializables.csproj">
+ <ProjectReference Include="..\ATXSerializables\ATXCommon.csproj">
<Project>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</Project>
- <Name>ATXSerializables</Name>
+ <Name>ATXCommon</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/ATXConfigTest/AutoTxConfigTest.cs b/ATXConfigTest/AutoTxConfigTest.cs
index a649bc0..100291f 100644
--- a/ATXConfigTest/AutoTxConfigTest.cs
+++ b/ATXConfigTest/AutoTxConfigTest.cs
@@ -1,6 +1,6 @@
using System;
using System.IO;
-using ATXSerializables;
+using ATXCommon.Serializables;
namespace ATXConfigTest
{
diff --git a/ATXSerializables/ATXSerializables.csproj b/ATXSerializables/ATXCommon.csproj
similarity index 89%
rename from ATXSerializables/ATXSerializables.csproj
rename to ATXSerializables/ATXCommon.csproj
index 0b6ec7c..d6477bd 100644
--- a/ATXSerializables/ATXSerializables.csproj
+++ b/ATXSerializables/ATXCommon.csproj
@@ -7,8 +7,8 @@
<ProjectGuid>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>ATXSerializables</RootNamespace>
- <AssemblyName>ATXSerializables</AssemblyName>
+ <RootNamespace>ATXCommon</RootNamespace>
+ <AssemblyName>ATXCommon</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
@@ -40,10 +40,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="DriveToCheck.cs" />
- <Compile Include="ServiceConfig.cs" />
+ <Compile Include="Serializables\DriveToCheck.cs" />
+ <Compile Include="Serializables\ServiceConfig.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ServiceStatus.cs" />
+ <Compile Include="Serializables\ServiceStatus.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/ATXSerializables/DriveToCheck.cs b/ATXSerializables/Serializables/DriveToCheck.cs
similarity index 93%
rename from ATXSerializables/DriveToCheck.cs
rename to ATXSerializables/Serializables/DriveToCheck.cs
index 7d52e74..35a0242 100644
--- a/ATXSerializables/DriveToCheck.cs
+++ b/ATXSerializables/Serializables/DriveToCheck.cs
@@ -1,6 +1,6 @@
using System.Xml.Serialization;
-namespace ATXSerializables
+namespace ATXCommon.Serializables
{
/// <summary>
/// Helper class for the nested SpaceMonitoring sections.
diff --git a/ATXSerializables/ServiceConfig.cs b/ATXSerializables/Serializables/ServiceConfig.cs
similarity index 99%
rename from ATXSerializables/ServiceConfig.cs
rename to ATXSerializables/Serializables/ServiceConfig.cs
index 512e426..9f5e635 100644
--- a/ATXSerializables/ServiceConfig.cs
+++ b/ATXSerializables/Serializables/ServiceConfig.cs
@@ -4,7 +4,7 @@ using System.Configuration;
using System.IO;
using System.Xml.Serialization;
-namespace ATXSerializables
+namespace ATXCommon.Serializables
{
/// <summary>
/// configuration class based on xml
diff --git a/ATXSerializables/ServiceStatus.cs b/ATXSerializables/Serializables/ServiceStatus.cs
similarity index 99%
rename from ATXSerializables/ServiceStatus.cs
rename to ATXSerializables/Serializables/ServiceStatus.cs
index 5bdc52f..9d88b50 100644
--- a/ATXSerializables/ServiceStatus.cs
+++ b/ATXSerializables/Serializables/ServiceStatus.cs
@@ -2,7 +2,7 @@
using System.IO;
using System.Xml.Serialization;
-namespace ATXSerializables
+namespace ATXCommon.Serializables
{
[Serializable]
public class ServiceStatus
diff --git a/ATXService.sln b/ATXService.sln
index 82264d7..7ce63be 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}") = "ATXSerializables", "ATXSerializables\ATXSerializables.csproj", "{166D65D5-EE10-4364-8AA3-4D86BA5CE244}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATXCommon", "ATXSerializables\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 3fcf8f0..667121e 100644
--- a/ATXTray/ATXTray.csproj
+++ b/ATXTray/ATXTray.csproj
@@ -89,9 +89,9 @@
<Content Include="AutoTx.ico" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ATXSerializables\ATXSerializables.csproj">
+ <ProjectReference Include="..\ATXSerializables\ATXCommon.csproj">
<Project>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</Project>
- <Name>ATXSerializables</Name>
+ <Name>ATXCommon</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/ATXTray/AutoTxTray.cs b/ATXTray/AutoTxTray.cs
index d149a15..5f13a9e 100644
--- a/ATXTray/AutoTxTray.cs
+++ b/ATXTray/AutoTxTray.cs
@@ -4,8 +4,8 @@ using System.Timers;
using System.Drawing;
using System.IO;
using System.Windows.Forms;
+using ATXCommon.Serializables;
using Microsoft.WindowsAPICodePack.Dialogs;
-using ATXSerializables;
using Timer = System.Timers.Timer;
namespace ATXTray
diff --git a/AutoTx/ATXProject.csproj b/AutoTx/ATXProject.csproj
index 5d3ca82..15cfffa 100644
--- a/AutoTx/ATXProject.csproj
+++ b/AutoTx/ATXProject.csproj
@@ -148,9 +148,9 @@
<None Include="Resources\BuildCommit.txt" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ATXSerializables\ATXSerializables.csproj">
+ <ProjectReference Include="..\ATXSerializables\ATXCommon.csproj">
<Project>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</Project>
- <Name>ATXSerializables</Name>
+ <Name>ATXCommon</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/AutoTx/AutoTx.cs b/AutoTx/AutoTx.cs
index e2cacbc..4a9426e 100644
--- a/AutoTx/AutoTx.cs
+++ b/AutoTx/AutoTx.cs
@@ -9,7 +9,7 @@ using System.Timers;
using System.DirectoryServices.AccountManagement;
using System.Globalization;
using System.Management;
-using ATXSerializables;
+using ATXCommon.Serializables;
using RoboSharp;
namespace AutoTx
--
GitLab