solution reorg in anticipation of upcoming additions

CityofSantaMonica · Mar 29, 2018 · 4a0dde0 · 4a0dde0
1 parent 5d60e9c
commit 4a0dde0
Show file tree

Hide file tree

Showing 35 changed files with 12 additions and 6 deletions.
diff --git 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
@@ -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")]
diff --git 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/....Utilities.Tests/DataFileExporterTests.cs → Utilities.Tests/DataFileExporterTests.cs b/....Utilities.Tests/DataFileExporterTests.cs → Utilities.Tests/DataFileExporterTests.cs
diff --git a/...Utilities.Tests/DataRowExtensionsTests.cs → Utilities.Tests/DataRowExtensionsTests.cs b/...Utilities.Tests/DataRowExtensionsTests.cs → Utilities.Tests/DataRowExtensionsTests.cs
diff --git a/...ities.Tests/ExcelDataReaderHelperTests.cs → ...ities.Tests/ExcelDataReaderHelperTests.cs b/...ities.Tests/ExcelDataReaderHelperTests.cs → ...ities.Tests/ExcelDataReaderHelperTests.cs
diff --git a/SODA.Utilities.Tests/FileLoggingTests.cs → Utilities.Tests/FileLoggingTests.cs b/SODA.Utilities.Tests/FileLoggingTests.cs → Utilities.Tests/FileLoggingTests.cs
diff --git a/SODA.Utilities.Tests/Mocks/DataRowMocks.cs → Utilities.Tests/Mocks/DataRowMocks.cs b/SODA.Utilities.Tests/Mocks/DataRowMocks.cs → Utilities.Tests/Mocks/DataRowMocks.cs
diff --git a/SODA.Utilities.Tests/Mocks/EntityMock.cs → Utilities.Tests/Mocks/EntityMock.cs b/SODA.Utilities.Tests/Mocks/EntityMock.cs → Utilities.Tests/Mocks/EntityMock.cs
diff --git a/SODA.Utilities.Tests/Mocks/FileMocks.cs → Utilities.Tests/Mocks/FileMocks.cs b/SODA.Utilities.Tests/Mocks/FileMocks.cs → Utilities.Tests/Mocks/FileMocks.cs
diff --git a/SODA.Utilities.Tests/Mocks/StringMocks.cs → Utilities.Tests/Mocks/StringMocks.cs b/SODA.Utilities.Tests/Mocks/StringMocks.cs → Utilities.Tests/Mocks/StringMocks.cs
diff --git a/SODA.Utilities.Tests/Mocks/mock.xls → Utilities.Tests/Mocks/mock.xls b/SODA.Utilities.Tests/Mocks/mock.xls → Utilities.Tests/Mocks/mock.xls
diff --git a/SODA.Utilities.Tests/Mocks/mock.xlsx → Utilities.Tests/Mocks/mock.xlsx b/SODA.Utilities.Tests/Mocks/mock.xlsx → Utilities.Tests/Mocks/mock.xlsx
diff --git a/SODA.Utilities.Tests/ObjectExtensionTests.cs → Utilities.Tests/ObjectExtensionTests.cs b/SODA.Utilities.Tests/ObjectExtensionTests.cs → Utilities.Tests/ObjectExtensionTests.cs
diff --git a/...tilities.Tests/Properties/AssemblyInfo.cs → Utilities.Tests/Properties/AssemblyInfo.cs b/...tilities.Tests/Properties/AssemblyInfo.cs → Utilities.Tests/Properties/AssemblyInfo.cs
diff --git a/...s.Tests/SeparatedValuesSerializerTests.cs → ...s.Tests/SeparatedValuesSerializerTests.cs b/...s.Tests/SeparatedValuesSerializerTests.cs → ...s.Tests/SeparatedValuesSerializerTests.cs
diff --git a/SODA.Utilities.Tests/StringExtensionTests.cs → Utilities.Tests/StringExtensionTests.cs b/SODA.Utilities.Tests/StringExtensionTests.cs → Utilities.Tests/StringExtensionTests.cs
diff --git a/...ilities.Tests/SODA.Utilities.Tests.csproj → Utilities.Tests/Utilities.Tests.csproj b/...ilities.Tests/SODA.Utilities.Tests.csproj → Utilities.Tests/Utilities.Tests.csproj
@@ -107,9 +107,9 @@
       <Project>{837ebdd7-eb58-44f8-834b-f2903a05a16e}</Project>
       <Name>SODA</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SODA.Utilities\SODA.Utilities.csproj">
+    <ProjectReference Include="..\Utilities\Utilities.csproj">
       <Project>{63b7fad7-5927-417c-ad2a-608d777ad1a7}</Project>
-      <Name>SODA.Utilities</Name>
+      <Name>Utilities</Name>
     </ProjectReference>
   </ItemGroup>
   <Choose>

diff --git a/SODA.Utilities.Tests/packages.config → Utilities.Tests/packages.config b/SODA.Utilities.Tests/packages.config → Utilities.Tests/packages.config
diff --git a/SODA.Utilities/DataFileExporter.cs → Utilities/DataFileExporter.cs b/SODA.Utilities/DataFileExporter.cs → Utilities/DataFileExporter.cs
diff --git a/SODA.Utilities/Ews2007Sp1Client.cs → Utilities/Ews2007Sp1Client.cs b/SODA.Utilities/Ews2007Sp1Client.cs → Utilities/Ews2007Sp1Client.cs
diff --git a/SODA.Utilities/Ews2010Sp2Client.cs → Utilities/Ews2010Sp2Client.cs b/SODA.Utilities/Ews2010Sp2Client.cs → Utilities/Ews2010Sp2Client.cs
diff --git a/SODA.Utilities/EwsClient.cs → Utilities/EwsClient.cs b/SODA.Utilities/EwsClient.cs → Utilities/EwsClient.cs
diff --git a/SODA.Utilities/ExcelDataReaderHelper.cs → Utilities/ExcelDataReaderHelper.cs b/SODA.Utilities/ExcelDataReaderHelper.cs → Utilities/ExcelDataReaderHelper.cs
diff --git a/SODA.Utilities/Extensions.cs → Utilities/Extensions.cs b/SODA.Utilities/Extensions.cs → Utilities/Extensions.cs
diff --git a/SODA.Utilities/IEwsClient.cs → Utilities/IEwsClient.cs b/SODA.Utilities/IEwsClient.cs → Utilities/IEwsClient.cs
diff --git a/SODA.Utilities/Office365EwsClient.cs → Utilities/Office365EwsClient.cs b/SODA.Utilities/Office365EwsClient.cs → Utilities/Office365EwsClient.cs
diff --git a/SODA.Utilities/Properties/AssemblyInfo.cs → Utilities/Properties/AssemblyInfo.cs b/SODA.Utilities/Properties/AssemblyInfo.cs → Utilities/Properties/AssemblyInfo.cs
diff --git a/SODA.Utilities/README.md → Utilities/README.md b/SODA.Utilities/README.md → Utilities/README.md
diff --git a/SODA.Utilities/SODA.Utilities.nuspec → Utilities/SODA.Utilities.nuspec b/SODA.Utilities/SODA.Utilities.nuspec → Utilities/SODA.Utilities.nuspec
diff --git a/SODA.Utilities/SeparatedValuesDelimiter.cs → Utilities/SeparatedValuesDelimiter.cs b/SODA.Utilities/SeparatedValuesDelimiter.cs → Utilities/SeparatedValuesDelimiter.cs
diff --git a/SODA.Utilities/SeparatedValuesSerializer.cs → Utilities/SeparatedValuesSerializer.cs b/SODA.Utilities/SeparatedValuesSerializer.cs → Utilities/SeparatedValuesSerializer.cs
diff --git a/SODA.Utilities/SimpleFileLogger.cs → Utilities/SimpleFileLogger.cs b/SODA.Utilities/SimpleFileLogger.cs → Utilities/SimpleFileLogger.cs
diff --git a/SODA.Utilities/SODA.Utilities.csproj → Utilities/Utilities.csproj b/SODA.Utilities/SODA.Utilities.csproj → Utilities/Utilities.csproj
diff --git a/SODA.Utilities/packages.config → Utilities/packages.config b/SODA.Utilities/packages.config → Utilities/packages.config