diff --git a/Eve-O-Preview/packages.config b/Eve-O-Preview/packages.config
deleted file mode 100644
index 7b4d3e0..0000000
--- a/Eve-O-Preview/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/build/Configuration.cs b/build/Configuration.cs
index d948d61..995428f 100644
--- a/build/Configuration.cs
+++ b/build/Configuration.cs
@@ -2,7 +2,7 @@
{
static class Configuration
{
- public const string SolutionName = @"./EVE-O-Preview.sln";
+ public const string SolutionName = @"./src/EVE-O-Preview.sln";
public const string BinFolder = @"./bin";
public const string ToolsFolder = @"./tools";
diff --git a/build/Context.cs b/build/Context.cs
index 7865479..1885b49 100644
--- a/build/Context.cs
+++ b/build/Context.cs
@@ -1,9 +1,13 @@
using Cake.Core;
using Cake.Frosting;
-public class Context : FrostingContext
+
+namespace Build
{
- public Context(ICakeContext context)
- : base(context)
+ public class Context : FrostingContext
{
+ public Context(ICakeContext context)
+ : base(context)
+ {
+ }
}
}
\ No newline at end of file
diff --git a/build/Lifetime.cs b/build/Lifetime.cs
index 197f27a..3bde463 100644
--- a/build/Lifetime.cs
+++ b/build/Lifetime.cs
@@ -5,55 +5,55 @@ using Cake.Core;
using Cake.Core.IO;
using Cake.Frosting;
-public sealed class Lifetime : FrostingLifetime
+namespace Build
{
- private const string NuGetUrl = @"https://dist.nuget.org/win-x86-commandline/latest/nuget.exe";
- private const string ToolsDirectoryName = "./tools";
- private const string BinDirectoryName = "./bin";
- private const string PublishDirectoryName = "./publish";
-
- private void DeleteDirectory(Context context, string directoryName)
+ public sealed class Lifetime : FrostingLifetime
{
- if (!context.DirectoryExists(directoryName))
+ private const string NuGetUrl = @"https://dist.nuget.org/win-x86-commandline/latest/nuget.exe";
+
+ private void DeleteDirectory(Context context, string directoryName)
{
- return;
+ if (!context.DirectoryExists(directoryName))
+ {
+ return;
+ }
+
+ context.DeleteDirectory(directoryName, new DeleteDirectorySettings { Force = true, Recursive = true });
}
- context.DeleteDirectory(directoryName, new DeleteDirectorySettings { Force = true, Recursive = true });
- }
-
- private void DownloadNuGet(Context context)
- {
- if (context.FileExists(ToolsDirectoryName + "/nuget.exe"))
+ private void DownloadNuGet(Context context)
{
- return;
+ if (context.FileExists(Configuration.ToolsFolder + "/nuget.exe"))
+ {
+ return;
+ }
+
+ if (!context.DirectoryExists(Configuration.ToolsFolder))
+ {
+ context.CreateDirectory(Configuration.ToolsFolder);
+ }
+
+ var tempFile = context.DownloadFile(NuGetUrl);
+ context.CopyFile(tempFile, new FilePath(Configuration.ToolsFolder + "/nuget.exe"));
}
- if (!context.DirectoryExists(ToolsDirectoryName))
+ public override void Setup(Context context)
{
- context.CreateDirectory(ToolsDirectoryName);
+ context.Information("Setting things up...");
+
+ context.Information("Delete bin and publish folders");
+ this.DeleteDirectory(context, Configuration.BinFolder);
+ this.DeleteDirectory(context, Configuration.PublishFolder);
+
+ context.Information("Download NuGet");
+ this.DownloadNuGet(context);
+
}
- var tempFile = context.DownloadFile(NuGetUrl);
- context.CopyFile(tempFile, new FilePath(ToolsDirectoryName + "/nuget.exe"));
- }
-
- public override void Setup(Context context)
- {
- context.Information("Setting things up...");
-
- context.Information("Delete bin and publish folders");
- this.DeleteDirectory(context, BinDirectoryName);
- this.DeleteDirectory(context, PublishDirectoryName);
-
- context.Information("Download NuGet");
- this.DownloadNuGet(context);
-
- }
-
- public override void Teardown(Context context, ITeardownContext info)
- {
- context.Information("Tearing things down...");
- //this.DeleteDirectory(context, ToolsDirectoryName);
+ public override void Teardown(Context context, ITeardownContext info)
+ {
+ context.Information("Tearing things down...");
+ //this.DeleteDirectory(context, ToolsDirectoryName);
+ }
}
}
\ No newline at end of file
diff --git a/EVE-O-Preview.sln b/src/EVE-O-Preview.sln
similarity index 91%
rename from EVE-O-Preview.sln
rename to src/EVE-O-Preview.sln
index 7feb2b1..68d36f6 100644
--- a/EVE-O-Preview.sln
+++ b/src/EVE-O-Preview.sln
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eve-O-Preview", "Eve-O-Prev
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eve-O-Mock", "Eve-O-Mock\Eve-O-Mock.csproj", "{BE2C3A13-CC19-4525-895F-381DD71C5833}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "build\Build.csproj", "{68083BCC-92B8-4A73-BFD2-0DE619873F86}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "..\build\Build.csproj", "{68083BCC-92B8-4A73-BFD2-0DE619873F86}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Eve-O-Mock/App.config b/src/Eve-O-Mock/App.config
similarity index 100%
rename from Eve-O-Mock/App.config
rename to src/Eve-O-Mock/App.config
diff --git a/Eve-O-Mock/App.xaml b/src/Eve-O-Mock/App.xaml
similarity index 100%
rename from Eve-O-Mock/App.xaml
rename to src/Eve-O-Mock/App.xaml
diff --git a/Eve-O-Mock/App.xaml.cs b/src/Eve-O-Mock/App.xaml.cs
similarity index 100%
rename from Eve-O-Mock/App.xaml.cs
rename to src/Eve-O-Mock/App.xaml.cs
diff --git a/Eve-O-Mock/Eve-O-Mock.csproj b/src/Eve-O-Mock/Eve-O-Mock.csproj
similarity index 100%
rename from Eve-O-Mock/Eve-O-Mock.csproj
rename to src/Eve-O-Mock/Eve-O-Mock.csproj
diff --git a/Eve-O-Mock/MainWindow.xaml b/src/Eve-O-Mock/MainWindow.xaml
similarity index 100%
rename from Eve-O-Mock/MainWindow.xaml
rename to src/Eve-O-Mock/MainWindow.xaml
diff --git a/Eve-O-Mock/MainWindow.xaml.cs b/src/Eve-O-Mock/MainWindow.xaml.cs
similarity index 100%
rename from Eve-O-Mock/MainWindow.xaml.cs
rename to src/Eve-O-Mock/MainWindow.xaml.cs
diff --git a/Eve-O-Mock/Properties/AssemblyInfo.cs b/src/Eve-O-Mock/Properties/AssemblyInfo.cs
similarity index 100%
rename from Eve-O-Mock/Properties/AssemblyInfo.cs
rename to src/Eve-O-Mock/Properties/AssemblyInfo.cs
diff --git a/Eve-O-Mock/Properties/Resources.Designer.cs b/src/Eve-O-Mock/Properties/Resources.Designer.cs
similarity index 100%
rename from Eve-O-Mock/Properties/Resources.Designer.cs
rename to src/Eve-O-Mock/Properties/Resources.Designer.cs
diff --git a/Eve-O-Mock/Properties/Resources.resx b/src/Eve-O-Mock/Properties/Resources.resx
similarity index 100%
rename from Eve-O-Mock/Properties/Resources.resx
rename to src/Eve-O-Mock/Properties/Resources.resx
diff --git a/Eve-O-Mock/Properties/Settings.Designer.cs b/src/Eve-O-Mock/Properties/Settings.Designer.cs
similarity index 100%
rename from Eve-O-Mock/Properties/Settings.Designer.cs
rename to src/Eve-O-Mock/Properties/Settings.Designer.cs
diff --git a/Eve-O-Mock/Properties/Settings.settings b/src/Eve-O-Mock/Properties/Settings.settings
similarity index 100%
rename from Eve-O-Mock/Properties/Settings.settings
rename to src/Eve-O-Mock/Properties/Settings.settings
diff --git a/Eve-O-Preview/AboutBox.Designer.cs b/src/Eve-O-Preview/AboutBox.Designer.cs
similarity index 100%
rename from Eve-O-Preview/AboutBox.Designer.cs
rename to src/Eve-O-Preview/AboutBox.Designer.cs
diff --git a/Eve-O-Preview/AboutBox.cs b/src/Eve-O-Preview/AboutBox.cs
similarity index 100%
rename from Eve-O-Preview/AboutBox.cs
rename to src/Eve-O-Preview/AboutBox.cs
diff --git a/Eve-O-Preview/AboutBox.resx b/src/Eve-O-Preview/AboutBox.resx
similarity index 100%
rename from Eve-O-Preview/AboutBox.resx
rename to src/Eve-O-Preview/AboutBox.resx
diff --git a/Eve-O-Preview/ApplicationBase/ApplicationController.cs b/src/Eve-O-Preview/ApplicationBase/ApplicationController.cs
similarity index 100%
rename from Eve-O-Preview/ApplicationBase/ApplicationController.cs
rename to src/Eve-O-Preview/ApplicationBase/ApplicationController.cs
diff --git a/Eve-O-Preview/ApplicationBase/ExceptionHandler.cs b/src/Eve-O-Preview/ApplicationBase/ExceptionHandler.cs
similarity index 100%
rename from Eve-O-Preview/ApplicationBase/ExceptionHandler.cs
rename to src/Eve-O-Preview/ApplicationBase/ExceptionHandler.cs
diff --git a/Eve-O-Preview/ApplicationBase/IApplicationController.cs b/src/Eve-O-Preview/ApplicationBase/IApplicationController.cs
similarity index 100%
rename from Eve-O-Preview/ApplicationBase/IApplicationController.cs
rename to src/Eve-O-Preview/ApplicationBase/IApplicationController.cs
diff --git a/Eve-O-Preview/ApplicationBase/IIocContainer.cs b/src/Eve-O-Preview/ApplicationBase/IIocContainer.cs
similarity index 100%
rename from Eve-O-Preview/ApplicationBase/IIocContainer.cs
rename to src/Eve-O-Preview/ApplicationBase/IIocContainer.cs
diff --git a/Eve-O-Preview/ApplicationBase/IPresenter.cs b/src/Eve-O-Preview/ApplicationBase/IPresenter.cs
similarity index 100%
rename from Eve-O-Preview/ApplicationBase/IPresenter.cs
rename to src/Eve-O-Preview/ApplicationBase/IPresenter.cs
diff --git a/Eve-O-Preview/ApplicationBase/IPresenterGeneric.cs b/src/Eve-O-Preview/ApplicationBase/IPresenterGeneric.cs
similarity index 100%
rename from Eve-O-Preview/ApplicationBase/IPresenterGeneric.cs
rename to src/Eve-O-Preview/ApplicationBase/IPresenterGeneric.cs
diff --git a/Eve-O-Preview/ApplicationBase/IView.cs b/src/Eve-O-Preview/ApplicationBase/IView.cs
similarity index 100%
rename from Eve-O-Preview/ApplicationBase/IView.cs
rename to src/Eve-O-Preview/ApplicationBase/IView.cs
diff --git a/Eve-O-Preview/ApplicationBase/LightInjectContainer.cs b/src/Eve-O-Preview/ApplicationBase/LightInjectContainer.cs
similarity index 100%
rename from Eve-O-Preview/ApplicationBase/LightInjectContainer.cs
rename to src/Eve-O-Preview/ApplicationBase/LightInjectContainer.cs
diff --git a/Eve-O-Preview/ApplicationBase/Presenter.cs b/src/Eve-O-Preview/ApplicationBase/Presenter.cs
similarity index 100%
rename from Eve-O-Preview/ApplicationBase/Presenter.cs
rename to src/Eve-O-Preview/ApplicationBase/Presenter.cs
diff --git a/Eve-O-Preview/ApplicationBase/PresenterGeneric.cs b/src/Eve-O-Preview/ApplicationBase/PresenterGeneric.cs
similarity index 100%
rename from Eve-O-Preview/ApplicationBase/PresenterGeneric.cs
rename to src/Eve-O-Preview/ApplicationBase/PresenterGeneric.cs
diff --git a/Eve-O-Preview/Configuration/Implementation/AppConfig.cs b/src/Eve-O-Preview/Configuration/Implementation/AppConfig.cs
similarity index 100%
rename from Eve-O-Preview/Configuration/Implementation/AppConfig.cs
rename to src/Eve-O-Preview/Configuration/Implementation/AppConfig.cs
diff --git a/Eve-O-Preview/Configuration/Implementation/ConfigurationStorage.cs b/src/Eve-O-Preview/Configuration/Implementation/ConfigurationStorage.cs
similarity index 100%
rename from Eve-O-Preview/Configuration/Implementation/ConfigurationStorage.cs
rename to src/Eve-O-Preview/Configuration/Implementation/ConfigurationStorage.cs
diff --git a/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs b/src/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs
similarity index 100%
rename from Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs
rename to src/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs
diff --git a/Eve-O-Preview/Configuration/Interface/ClientLayout.cs b/src/Eve-O-Preview/Configuration/Interface/ClientLayout.cs
similarity index 100%
rename from Eve-O-Preview/Configuration/Interface/ClientLayout.cs
rename to src/Eve-O-Preview/Configuration/Interface/ClientLayout.cs
diff --git a/Eve-O-Preview/Configuration/Interface/IAppConfig.cs b/src/Eve-O-Preview/Configuration/Interface/IAppConfig.cs
similarity index 100%
rename from Eve-O-Preview/Configuration/Interface/IAppConfig.cs
rename to src/Eve-O-Preview/Configuration/Interface/IAppConfig.cs
diff --git a/Eve-O-Preview/Configuration/Interface/IConfigurationStorage.cs b/src/Eve-O-Preview/Configuration/Interface/IConfigurationStorage.cs
similarity index 100%
rename from Eve-O-Preview/Configuration/Interface/IConfigurationStorage.cs
rename to src/Eve-O-Preview/Configuration/Interface/IConfigurationStorage.cs
diff --git a/Eve-O-Preview/Configuration/Interface/IThumbnailConfiguration.cs b/src/Eve-O-Preview/Configuration/Interface/IThumbnailConfiguration.cs
similarity index 100%
rename from Eve-O-Preview/Configuration/Interface/IThumbnailConfiguration.cs
rename to src/Eve-O-Preview/Configuration/Interface/IThumbnailConfiguration.cs
diff --git a/Eve-O-Preview/Configuration/Interface/ZoomAnchor.cs b/src/Eve-O-Preview/Configuration/Interface/ZoomAnchor.cs
similarity index 100%
rename from Eve-O-Preview/Configuration/Interface/ZoomAnchor.cs
rename to src/Eve-O-Preview/Configuration/Interface/ZoomAnchor.cs
diff --git a/Eve-O-Preview/Eve-O-Preview.csproj b/src/Eve-O-Preview/Eve-O-Preview.csproj
similarity index 80%
rename from Eve-O-Preview/Eve-O-Preview.csproj
rename to src/Eve-O-Preview/Eve-O-Preview.csproj
index 375b7a6..9564c26 100644
--- a/Eve-O-Preview/Eve-O-Preview.csproj
+++ b/src/Eve-O-Preview/Eve-O-Preview.csproj
@@ -1,6 +1,5 @@
-
Debug
AnyCPU
@@ -31,7 +30,7 @@
pdbonly
true
- ..\bin
+ ..\..\bin
TRACE
prompt
4
@@ -76,19 +75,7 @@
app.manifest
-
- ..\packages\Costura.Fody.3.3.2\lib\net40\Costura.dll
-
-
- ..\packages\LightInject.5.4.0\lib\net46\LightInject.dll
-
-
- ..\packages\MediatR.6.0.0\lib\net461\MediatR.dll
-
-
- ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
-
@@ -96,9 +83,6 @@
-
- ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll
-
@@ -227,24 +211,31 @@
-
- Designer
-
-
+
+
+ 3.3.2
+
+
+ 4.0.2
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+ 5.4.0
+
+
+ 6.0.0
+
+
+ 12.0.1
+
+
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-