From 4a0dde091b098bc7cc4a4139b1c66c6d6f67b89d Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Wed, 28 Mar 2018 23:47:31 -0700 Subject: [PATCH] solution reorg in anticipation of upcoming additions --- SODA.sln | 10 ++++++++-- SODA/Properties/AssemblyInfo.cs | 2 +- SolutionInfo.cs | 2 +- .../DataFileExporterTests.cs | 0 .../DataRowExtensionsTests.cs | 0 .../ExcelDataReaderHelperTests.cs | 0 .../FileLoggingTests.cs | 0 .../Mocks/DataRowMocks.cs | 0 .../Mocks/EntityMock.cs | 0 .../Mocks/FileMocks.cs | 0 .../Mocks/StringMocks.cs | 0 .../Mocks/mock.xls | Bin .../Mocks/mock.xlsx | Bin .../ObjectExtensionTests.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../SeparatedValuesSerializerTests.cs | 0 .../StringExtensionTests.cs | 0 .../Utilities.Tests.csproj | 4 ++-- .../packages.config | 0 {SODA.Utilities => Utilities}/DataFileExporter.cs | 0 {SODA.Utilities => Utilities}/Ews2007Sp1Client.cs | 0 {SODA.Utilities => Utilities}/Ews2010Sp2Client.cs | 0 {SODA.Utilities => Utilities}/EwsClient.cs | 0 .../ExcelDataReaderHelper.cs | 0 {SODA.Utilities => Utilities}/Extensions.cs | 0 {SODA.Utilities => Utilities}/IEwsClient.cs | 0 {SODA.Utilities => Utilities}/Office365EwsClient.cs | 0 .../Properties/AssemblyInfo.cs | 0 {SODA.Utilities => Utilities}/README.md | 0 {SODA.Utilities => Utilities}/SODA.Utilities.nuspec | 0 .../SeparatedValuesDelimiter.cs | 0 .../SeparatedValuesSerializer.cs | 0 {SODA.Utilities => Utilities}/SimpleFileLogger.cs | 0 .../Utilities.csproj | 0 {SODA.Utilities => Utilities}/packages.config | 0 35 files changed, 12 insertions(+), 6 deletions(-) rename {SODA.Utilities.Tests => Utilities.Tests}/DataFileExporterTests.cs (100%) rename {SODA.Utilities.Tests => Utilities.Tests}/DataRowExtensionsTests.cs (100%) rename {SODA.Utilities.Tests => Utilities.Tests}/ExcelDataReaderHelperTests.cs (100%) rename {SODA.Utilities.Tests => Utilities.Tests}/FileLoggingTests.cs (100%) rename {SODA.Utilities.Tests => Utilities.Tests}/Mocks/DataRowMocks.cs (100%) rename {SODA.Utilities.Tests => Utilities.Tests}/Mocks/EntityMock.cs (100%) rename {SODA.Utilities.Tests => Utilities.Tests}/Mocks/FileMocks.cs (100%) rename {SODA.Utilities.Tests => Utilities.Tests}/Mocks/StringMocks.cs (100%) rename {SODA.Utilities.Tests => Utilities.Tests}/Mocks/mock.xls (100%) rename {SODA.Utilities.Tests => Utilities.Tests}/Mocks/mock.xlsx (100%) rename {SODA.Utilities.Tests => Utilities.Tests}/ObjectExtensionTests.cs (100%) rename {SODA.Utilities.Tests => Utilities.Tests}/Properties/AssemblyInfo.cs (100%) rename {SODA.Utilities.Tests => Utilities.Tests}/SeparatedValuesSerializerTests.cs (100%) rename {SODA.Utilities.Tests => Utilities.Tests}/StringExtensionTests.cs (100%) rename SODA.Utilities.Tests/SODA.Utilities.Tests.csproj => Utilities.Tests/Utilities.Tests.csproj (98%) rename {SODA.Utilities.Tests => Utilities.Tests}/packages.config (100%) rename {SODA.Utilities => Utilities}/DataFileExporter.cs (100%) rename {SODA.Utilities => Utilities}/Ews2007Sp1Client.cs (100%) rename {SODA.Utilities => Utilities}/Ews2010Sp2Client.cs (100%) rename {SODA.Utilities => Utilities}/EwsClient.cs (100%) rename {SODA.Utilities => Utilities}/ExcelDataReaderHelper.cs (100%) rename {SODA.Utilities => Utilities}/Extensions.cs (100%) rename {SODA.Utilities => Utilities}/IEwsClient.cs (100%) rename {SODA.Utilities => Utilities}/Office365EwsClient.cs (100%) rename {SODA.Utilities => Utilities}/Properties/AssemblyInfo.cs (100%) rename {SODA.Utilities => Utilities}/README.md (100%) rename {SODA.Utilities => Utilities}/SODA.Utilities.nuspec (100%) rename {SODA.Utilities => Utilities}/SeparatedValuesDelimiter.cs (100%) rename {SODA.Utilities => Utilities}/SeparatedValuesSerializer.cs (100%) rename {SODA.Utilities => Utilities}/SimpleFileLogger.cs (100%) rename SODA.Utilities/SODA.Utilities.csproj => Utilities/Utilities.csproj (100%) rename {SODA.Utilities => Utilities}/packages.config (100%) diff --git a/SODA.sln b/SODA.sln index a9649ba..da01369 100644 --- a/SODA.sln +++ b/SODA.sln @@ -21,9 +21,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution SolutionInfo.cs = SolutionInfo.cs EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SODA.Utilities", "SODA.Utilities\SODA.Utilities.csproj", "{63B7FAD7-5927-417C-AD2A-608D777AD1A7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utilities", "Utilities\Utilities.csproj", "{63B7FAD7-5927-417C-AD2A-608D777AD1A7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SODA.Utilities.Tests", "SODA.Utilities.Tests\SODA.Utilities.Tests.csproj", "{6AAB405A-D32F-4D8B-B491-BDD5088561A7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utilities.Tests", "Utilities.Tests\Utilities.Tests.csproj", "{6AAB405A-D32F-4D8B-B491-BDD5088561A7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{C2E27366-ABDF-4FE3-A399-A6792C33D437}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -51,6 +53,10 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {63B7FAD7-5927-417C-AD2A-608D777AD1A7} = {C2E27366-ABDF-4FE3-A399-A6792C33D437} + {6AAB405A-D32F-4D8B-B491-BDD5088561A7} = {C2E27366-ABDF-4FE3-A399-A6792C33D437} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {17A9746D-4584-4AD5-B2FA-2A9EDFC6ED09} EndGlobalSection diff --git a/SODA/Properties/AssemblyInfo.cs b/SODA/Properties/AssemblyInfo.cs index d0a3212..fb4dca9 100644 --- a/SODA/Properties/AssemblyInfo.cs +++ b/SODA/Properties/AssemblyInfo.cs @@ -2,5 +2,5 @@ using System.Runtime.CompilerServices; [assembly: AssemblyTitle("SODA")] -[assembly: AssemblyDescription("Socrata Open Data API client library target .NET 4.5 and above.")] +[assembly: AssemblyDescription("Socrata Open Data API client library targeting .NET 4.5 and above.")] [assembly: InternalsVisibleTo("SODA.Tests")] \ No newline at end of file diff --git a/SolutionInfo.cs b/SolutionInfo.cs index 52f673b..06084bc 100644 --- a/SolutionInfo.cs +++ b/SolutionInfo.cs @@ -3,7 +3,7 @@ [assembly: AssemblyCompany("City of Santa Monica, CA")] [assembly: AssemblyProduct("SODA")] -[assembly: AssemblyCopyright("Copyright © 2017 City of Santa Monica, CA")] +[assembly: AssemblyCopyright("Copyright © 2018 City of Santa Monica, CA")] [assembly: AssemblyVersion("0.8.0")] [assembly: AssemblyFileVersion("0.8.0")] [assembly: AssemblyInformationalVersion("0.8.0")] diff --git a/SODA.Utilities.Tests/DataFileExporterTests.cs b/Utilities.Tests/DataFileExporterTests.cs similarity index 100% rename from SODA.Utilities.Tests/DataFileExporterTests.cs rename to Utilities.Tests/DataFileExporterTests.cs diff --git a/SODA.Utilities.Tests/DataRowExtensionsTests.cs b/Utilities.Tests/DataRowExtensionsTests.cs similarity index 100% rename from SODA.Utilities.Tests/DataRowExtensionsTests.cs rename to Utilities.Tests/DataRowExtensionsTests.cs diff --git a/SODA.Utilities.Tests/ExcelDataReaderHelperTests.cs b/Utilities.Tests/ExcelDataReaderHelperTests.cs similarity index 100% rename from SODA.Utilities.Tests/ExcelDataReaderHelperTests.cs rename to Utilities.Tests/ExcelDataReaderHelperTests.cs diff --git a/SODA.Utilities.Tests/FileLoggingTests.cs b/Utilities.Tests/FileLoggingTests.cs similarity index 100% rename from SODA.Utilities.Tests/FileLoggingTests.cs rename to Utilities.Tests/FileLoggingTests.cs diff --git a/SODA.Utilities.Tests/Mocks/DataRowMocks.cs b/Utilities.Tests/Mocks/DataRowMocks.cs similarity index 100% rename from SODA.Utilities.Tests/Mocks/DataRowMocks.cs rename to Utilities.Tests/Mocks/DataRowMocks.cs diff --git a/SODA.Utilities.Tests/Mocks/EntityMock.cs b/Utilities.Tests/Mocks/EntityMock.cs similarity index 100% rename from SODA.Utilities.Tests/Mocks/EntityMock.cs rename to Utilities.Tests/Mocks/EntityMock.cs diff --git a/SODA.Utilities.Tests/Mocks/FileMocks.cs b/Utilities.Tests/Mocks/FileMocks.cs similarity index 100% rename from SODA.Utilities.Tests/Mocks/FileMocks.cs rename to Utilities.Tests/Mocks/FileMocks.cs diff --git a/SODA.Utilities.Tests/Mocks/StringMocks.cs b/Utilities.Tests/Mocks/StringMocks.cs similarity index 100% rename from SODA.Utilities.Tests/Mocks/StringMocks.cs rename to Utilities.Tests/Mocks/StringMocks.cs diff --git a/SODA.Utilities.Tests/Mocks/mock.xls b/Utilities.Tests/Mocks/mock.xls similarity index 100% rename from SODA.Utilities.Tests/Mocks/mock.xls rename to Utilities.Tests/Mocks/mock.xls diff --git a/SODA.Utilities.Tests/Mocks/mock.xlsx b/Utilities.Tests/Mocks/mock.xlsx similarity index 100% rename from SODA.Utilities.Tests/Mocks/mock.xlsx rename to Utilities.Tests/Mocks/mock.xlsx diff --git a/SODA.Utilities.Tests/ObjectExtensionTests.cs b/Utilities.Tests/ObjectExtensionTests.cs similarity index 100% rename from SODA.Utilities.Tests/ObjectExtensionTests.cs rename to Utilities.Tests/ObjectExtensionTests.cs diff --git a/SODA.Utilities.Tests/Properties/AssemblyInfo.cs b/Utilities.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from SODA.Utilities.Tests/Properties/AssemblyInfo.cs rename to Utilities.Tests/Properties/AssemblyInfo.cs diff --git a/SODA.Utilities.Tests/SeparatedValuesSerializerTests.cs b/Utilities.Tests/SeparatedValuesSerializerTests.cs similarity index 100% rename from SODA.Utilities.Tests/SeparatedValuesSerializerTests.cs rename to Utilities.Tests/SeparatedValuesSerializerTests.cs diff --git a/SODA.Utilities.Tests/StringExtensionTests.cs b/Utilities.Tests/StringExtensionTests.cs similarity index 100% rename from SODA.Utilities.Tests/StringExtensionTests.cs rename to Utilities.Tests/StringExtensionTests.cs diff --git a/SODA.Utilities.Tests/SODA.Utilities.Tests.csproj b/Utilities.Tests/Utilities.Tests.csproj similarity index 98% rename from SODA.Utilities.Tests/SODA.Utilities.Tests.csproj rename to Utilities.Tests/Utilities.Tests.csproj index f8c001c..1db3721 100644 --- a/SODA.Utilities.Tests/SODA.Utilities.Tests.csproj +++ b/Utilities.Tests/Utilities.Tests.csproj @@ -107,9 +107,9 @@ {837ebdd7-eb58-44f8-834b-f2903a05a16e} SODA - + {63b7fad7-5927-417c-ad2a-608d777ad1a7} - SODA.Utilities + Utilities diff --git a/SODA.Utilities.Tests/packages.config b/Utilities.Tests/packages.config similarity index 100% rename from SODA.Utilities.Tests/packages.config rename to Utilities.Tests/packages.config diff --git a/SODA.Utilities/DataFileExporter.cs b/Utilities/DataFileExporter.cs similarity index 100% rename from SODA.Utilities/DataFileExporter.cs rename to Utilities/DataFileExporter.cs diff --git a/SODA.Utilities/Ews2007Sp1Client.cs b/Utilities/Ews2007Sp1Client.cs similarity index 100% rename from SODA.Utilities/Ews2007Sp1Client.cs rename to Utilities/Ews2007Sp1Client.cs diff --git a/SODA.Utilities/Ews2010Sp2Client.cs b/Utilities/Ews2010Sp2Client.cs similarity index 100% rename from SODA.Utilities/Ews2010Sp2Client.cs rename to Utilities/Ews2010Sp2Client.cs diff --git a/SODA.Utilities/EwsClient.cs b/Utilities/EwsClient.cs similarity index 100% rename from SODA.Utilities/EwsClient.cs rename to Utilities/EwsClient.cs diff --git a/SODA.Utilities/ExcelDataReaderHelper.cs b/Utilities/ExcelDataReaderHelper.cs similarity index 100% rename from SODA.Utilities/ExcelDataReaderHelper.cs rename to Utilities/ExcelDataReaderHelper.cs diff --git a/SODA.Utilities/Extensions.cs b/Utilities/Extensions.cs similarity index 100% rename from SODA.Utilities/Extensions.cs rename to Utilities/Extensions.cs diff --git a/SODA.Utilities/IEwsClient.cs b/Utilities/IEwsClient.cs similarity index 100% rename from SODA.Utilities/IEwsClient.cs rename to Utilities/IEwsClient.cs diff --git a/SODA.Utilities/Office365EwsClient.cs b/Utilities/Office365EwsClient.cs similarity index 100% rename from SODA.Utilities/Office365EwsClient.cs rename to Utilities/Office365EwsClient.cs diff --git a/SODA.Utilities/Properties/AssemblyInfo.cs b/Utilities/Properties/AssemblyInfo.cs similarity index 100% rename from SODA.Utilities/Properties/AssemblyInfo.cs rename to Utilities/Properties/AssemblyInfo.cs diff --git a/SODA.Utilities/README.md b/Utilities/README.md similarity index 100% rename from SODA.Utilities/README.md rename to Utilities/README.md diff --git a/SODA.Utilities/SODA.Utilities.nuspec b/Utilities/SODA.Utilities.nuspec similarity index 100% rename from SODA.Utilities/SODA.Utilities.nuspec rename to Utilities/SODA.Utilities.nuspec diff --git a/SODA.Utilities/SeparatedValuesDelimiter.cs b/Utilities/SeparatedValuesDelimiter.cs similarity index 100% rename from SODA.Utilities/SeparatedValuesDelimiter.cs rename to Utilities/SeparatedValuesDelimiter.cs diff --git a/SODA.Utilities/SeparatedValuesSerializer.cs b/Utilities/SeparatedValuesSerializer.cs similarity index 100% rename from SODA.Utilities/SeparatedValuesSerializer.cs rename to Utilities/SeparatedValuesSerializer.cs diff --git a/SODA.Utilities/SimpleFileLogger.cs b/Utilities/SimpleFileLogger.cs similarity index 100% rename from SODA.Utilities/SimpleFileLogger.cs rename to Utilities/SimpleFileLogger.cs diff --git a/SODA.Utilities/SODA.Utilities.csproj b/Utilities/Utilities.csproj similarity index 100% rename from SODA.Utilities/SODA.Utilities.csproj rename to Utilities/Utilities.csproj diff --git a/SODA.Utilities/packages.config b/Utilities/packages.config similarity index 100% rename from SODA.Utilities/packages.config rename to Utilities/packages.config