Merged tools project to main project

hajduakos · Jun 12, 2017 · 38ee04e · 38ee04e
1 parent edc0390
commit 38ee04e
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 144 deletions.
diff --git a/PhotoLapse.sln b/PhotoLapse.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.30501.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotoLapseTools", "PhotolapseTools\PhotoLapseTools.csproj", "{E0CE809C-C028-46DE-95D0-B03A0FFE3465}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotoLapse", "PhotoLapse\PhotoLapse.csproj", "{3ABD00F7-E043-46D4-A542-EF826BC5A24A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotoLapseTests", "PhotoLapseTests\PhotoLapseTests.csproj", "{BFED9CE4-E519-4B37-BF7B-B6B4F0A9294C}"
@@ -15,10 +13,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E0CE809C-C028-46DE-95D0-B03A0FFE3465}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0CE809C-C028-46DE-95D0-B03A0FFE3465}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0CE809C-C028-46DE-95D0-B03A0FFE3465}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0CE809C-C028-46DE-95D0-B03A0FFE3465}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3ABD00F7-E043-46D4-A542-EF826BC5A24A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3ABD00F7-E043-46D4-A542-EF826BC5A24A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3ABD00F7-E043-46D4-A542-EF826BC5A24A}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/...ls/Creators/GradientPhotoLapseCreator .cs → ...se/Creators/GradientPhotoLapseCreator .cs b/...ls/Creators/GradientPhotoLapseCreator .cs → ...se/Creators/GradientPhotoLapseCreator .cs
@@ -4,7 +4,7 @@
 using System.Drawing.Imaging;
 using System.Linq;
 
-namespace PhotoLapseTools.Creators
+namespace PhotoLapse.Creators
 {
     /// <summary>
     /// Gradient PhotoLapse creator

diff --git a/...lapseTools/Creators/IPhotoLapseCreator.cs → PhotoLapse/Creators/IPhotoLapseCreator.cs b/...lapseTools/Creators/IPhotoLapseCreator.cs → PhotoLapse/Creators/IPhotoLapseCreator.cs
@@ -1,8 +1,8 @@
-
-using PhotoLapseTools.Reporters;
+using PhotoLapse.Reporters;
 using System.Collections.Generic;
 using System.Drawing;
-namespace PhotoLapseTools.Creators
+
+namespace PhotoLapse.Creators
 {
     /// <summary>
     /// PhotoLapse creator interface

diff --git a/...Tools/Creators/StripePhotoLapseCreator.cs → ...Lapse/Creators/StripePhotoLapseCreator.cs b/...Tools/Creators/StripePhotoLapseCreator.cs → ...Lapse/Creators/StripePhotoLapseCreator.cs
@@ -4,7 +4,7 @@
 using System.Drawing.Imaging;
 using System.Linq;
 
-namespace PhotoLapseTools.Creators
+namespace PhotoLapse.Creators
 {
     /// <summary>
     /// Stripe PhotoLapse creator

diff --git a/PhotoLapse/Model/BgWorkerReporter.cs b/PhotoLapse/Model/BgWorkerReporter.cs
@@ -1,4 +1,4 @@
-using PhotoLapseTools.Reporters;
+using PhotoLapse.Reporters;
 using System.ComponentModel;
 
 namespace PhotoLapse

diff --git a/PhotoLapse/Model/PhotoLapseManager.cs b/PhotoLapse/Model/PhotoLapseManager.cs
@@ -1,5 +1,5 @@
-using PhotoLapseTools.Creators;
-using PhotoLapseTools.Utils;
+using PhotoLapse.Creators;
+using PhotoLapse.Utils;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

diff --git a/PhotoLapse/PhotoLapse.csproj b/PhotoLapse/PhotoLapse.csproj
@@ -58,6 +58,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Reporters\IReporter.cs" />
+    <Compile Include="Utils\PhotoUtils.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -66,6 +68,9 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Creators\GradientPhotoLapseCreator .cs" />
+    <Compile Include="Creators\IPhotoLapseCreator.cs" />
+    <Compile Include="Creators\StripePhotoLapseCreator.cs" />
     <Compile Include="Model\BgWorkerReporter.cs" />
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
@@ -103,12 +108,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\PhotolapseTools\PhotoLapseTools.csproj">
-      <Project>{e0ce809c-c028-46de-95d0-b03a0ffe3465}</Project>
-      <Name>PhotoLapseTools</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="images\cog.png" />
     <Resource Include="images\disk.png" />

diff --git a/PhotolapseTools/Reporters/IReporter.cs → PhotoLapse/Reporters/IReporter.cs b/PhotolapseTools/Reporters/IReporter.cs → PhotoLapse/Reporters/IReporter.cs
@@ -1,5 +1,5 @@
 
-namespace PhotoLapseTools.Reporters
+namespace PhotoLapse.Reporters
 {
     /// <summary>
     /// Reporter interface

diff --git a/PhotolapseTools/Utils/PhotoUtils.cs → PhotoLapse/Utils/PhotoUtils.cs b/PhotolapseTools/Utils/PhotoUtils.cs → PhotoLapse/Utils/PhotoUtils.cs
@@ -1,7 +1,7 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 
-namespace PhotoLapseTools.Utils
+namespace PhotoLapse.Utils
 {
     /// <summary>
     /// Helper class

diff --git a/PhotoLapseTests/PhotoLapseTests.cs b/PhotoLapseTests/PhotoLapseTests.cs
@@ -1,7 +1,7 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections.Generic;
-using PhotoLapseTools.Creators;
+using PhotoLapse.Creators;
 using System.Linq;
 using System.Drawing;
 using System.Drawing.Imaging;

diff --git a/PhotoLapseTests/PhotoLapseTests.csproj b/PhotoLapseTests/PhotoLapseTests.csproj
@@ -8,14 +8,15 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PhotoLapseTests</RootNamespace>
     <AssemblyName>PhotoLapseTests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -26,6 +27,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -35,6 +37,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -60,9 +63,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PhotolapseTools\PhotoLapseTools.csproj">
-      <Project>{e0ce809c-c028-46de-95d0-b03a0ffe3465}</Project>
-      <Name>PhotoLapseTools</Name>
+    <ProjectReference Include="..\PhotoLapse\PhotoLapse.csproj">
+      <Project>{3abd00f7-e043-46d4-a542-ef826bc5a24a}</Project>
+      <Name>PhotoLapse</Name>
     </ProjectReference>
   </ItemGroup>
   <Choose>

diff --git a/PhotolapseTools/PhotoLapseTools.csproj b/PhotolapseTools/PhotoLapseTools.csproj
diff --git a/PhotolapseTools/Properties/AssemblyInfo.cs b/PhotolapseTools/Properties/AssemblyInfo.cs
diff --git a/PhotolapseTools/Reporters/ConsoleReporter.cs b/PhotolapseTools/Reporters/ConsoleReporter.cs