diff --git a/.gitignore b/.gitignore index 3c4efe2..8b25aa6 100644 --- a/.gitignore +++ b/.gitignore @@ -258,4 +258,5 @@ paket-files/ # Python Tools for Visual Studio (PTVS) __pycache__/ -*.pyc \ No newline at end of file +*.pyc +/MigrationBackup/3f628632/eJay diff --git a/App.config b/App.config index 8f9544d..fd1aba4 100644 --- a/App.config +++ b/App.config @@ -1,20 +1,20 @@ - -
+ +
- + - + - + diff --git a/FodyWeavers.xml b/FodyWeavers.xml index 29a95df..a5dcf04 100644 --- a/FodyWeavers.xml +++ b/FodyWeavers.xml @@ -1,6 +1,4 @@  - - - - + + \ No newline at end of file diff --git a/FodyWeavers.xsd b/FodyWeavers.xsd new file mode 100644 index 0000000..44a5374 --- /dev/null +++ b/FodyWeavers.xsd @@ -0,0 +1,111 @@ + + + + + + + + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks + + + + + A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. + + + + + A list of unmanaged 32 bit assembly names to include, delimited with line breaks. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with line breaks. + + + + + The order of preloaded assemblies, delimited with line breaks. + + + + + + This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. + + + + + Controls if .pdbs for reference assemblies are also embedded. + + + + + Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. + + + + + As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. + + + + + Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. + + + + + Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | + + + + + A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. + + + + + A list of unmanaged 32 bit assembly names to include, delimited with |. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with |. + + + + + The order of preloaded assemblies, delimited with |. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 96fc286..221219e 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace eJay.Properties { // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/ViewModel/ViewModelLocator.cs b/ViewModel/ViewModelLocator.cs index 30b622d..133c1e0 100644 --- a/ViewModel/ViewModelLocator.cs +++ b/ViewModel/ViewModelLocator.cs @@ -12,9 +12,9 @@ See http://www.galasoft.ch/mvvm */ +using CommonServiceLocator; using eJay.ViewModel.Dialogs; using GalaSoft.MvvmLight.Ioc; -using Microsoft.Practices.ServiceLocation; namespace eJay.ViewModel { diff --git a/eJay.sln b/eJay.sln index 90c2cbf..4a111f3 100644 --- a/eJay.sln +++ b/eJay.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.13 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29806.167 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eJay", "eJay.csproj", "{11FFBAAB-CE28-4B77-8C7A-8B15F0007133}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eJayLegacy", "eJayLegacy.csproj", "{11FFBAAB-CE28-4B77-8C7A-8B15F0007133}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/eJay.csproj b/eJayLegacy.csproj similarity index 58% rename from eJay.csproj rename to eJayLegacy.csproj index 854f1e1..0e66e7f 100644 --- a/eJay.csproj +++ b/eJayLegacy.csproj @@ -7,8 +7,8 @@ {11FFBAAB-CE28-4B77-8C7A-8B15F0007133} WinExe eJay - eJay - v4.6 + eJayLegacy + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -63,80 +63,16 @@ false + + Always + - - packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll - False - .\CurrencyTextBoxControl.dll - - packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll - - - packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll - - - packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll - - - packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll - - - packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Extras.dll - - - packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll - - - packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll - - - packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll - - - packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll - - - packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll - - - packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll - - - packages\squirrel.windows.1.9.0\lib\Net45\NuGet.Squirrel.dll - - - packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll - - - packages\Splat.1.6.2\lib\Net45\Splat.dll - - - packages\SQLite.Net-PCL.3.0.5\lib\net40\SQLite.Net.dll - - - packages\SQLite.Net-PCL.3.0.5\lib\net40\SQLite.Net.Platform.Generic.dll - - - packages\SQLite.Net-PCL.3.0.5\lib\net4\SQLite.Net.Platform.Win32.dll - - - packages\SQLiteNetExtensions.1.3.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll - - - packages\squirrel.windows.1.9.0\lib\Net45\Squirrel.dll - - - packages\MvvmLightLibs.5.3.0.0\lib\net45\System.Windows.Interactivity.dll - @@ -230,9 +166,6 @@ ResXFileCodeGenerator Resources.Designer.cs - - Designer - @@ -303,16 +236,23 @@ false + + + 4.1.0 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 5.4.1.1 + + + 1.3.0 + + + 1.9.1 + + - - - - Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - - - @@ -326,10 +266,13 @@ $(PostBuildEventDependsOn); PostBuildMacros; - set releaseDir="C:\Squirrel\eJay" + set releaseDir="C:\sync\owncloud\dev\Squirrel\eJay" set longVersion=@(VersionNumber) set version=%25longVersion:~0,5%25 -cd ..\..\nuget +cd ..\.. +cd nuget +echo "moep" +echo %25cd%25 nuget pack ..\nuspec\ejay.nuspec Squirrel --releasify eJay.%25version%25.nupkg --releaseDir %25releaseDir%25 echo RELEASED Version %25version%25 IN %25releaseDir%25 diff --git a/packages.config b/packages.config deleted file mode 100644 index 18edb3a..0000000 --- a/packages.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file