diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 0f5c99d81..a407fc8c1 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Box Greenshot.Addon.Box - v4.6 + v4.6.1 Properties False False diff --git a/src/Greenshot.Addon.Box/app.config b/src/Greenshot.Addon.Box/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Addon.Box/app.config +++ b/src/Greenshot.Addon.Box/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index c1680700b..de25c86be 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -8,7 +8,7 @@ Library Greenshot.Addon.Confluence Greenshot.Addon.Confluence - v4.6 + v4.6.1 Properties False False diff --git a/src/Greenshot.Addon.Confluence/app.config b/src/Greenshot.Addon.Confluence/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Addon.Confluence/app.config +++ b/src/Greenshot.Addon.Confluence/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 898961315..8c56c3cef 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Dropbox Greenshot.Addon.Dropbox - v4.6 + v4.6.1 Properties False False diff --git a/src/Greenshot.Addon.Dropbox/app.config b/src/Greenshot.Addon.Dropbox/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Addon.Dropbox/app.config +++ b/src/Greenshot.Addon.Dropbox/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index f4a1eb40f..5c2425db1 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.ExternalCommand Greenshot.Addon.ExternalCommand - v4.6 + v4.6.1 Properties False False diff --git a/src/Greenshot.Addon.ExternalCommand/app.config b/src/Greenshot.Addon.ExternalCommand/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Addon.ExternalCommand/app.config +++ b/src/Greenshot.Addon.ExternalCommand/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 572b70fd6..6c1d01b19 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Flickr Greenshot.Addon.Flickr - v4.6 + v4.6.1 Properties False False diff --git a/src/Greenshot.Addon.Flickr/app.config b/src/Greenshot.Addon.Flickr/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Addon.Flickr/app.config +++ b/src/Greenshot.Addon.Flickr/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 536df817a..9a8ac9611 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.GooglePhotos Greenshot.Addon.GooglePhotos - v4.6 + v4.6.1 Properties False False diff --git a/src/Greenshot.Addon.GooglePhotos/app.config b/src/Greenshot.Addon.GooglePhotos/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Addon.GooglePhotos/app.config +++ b/src/Greenshot.Addon.GooglePhotos/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 74b282f05..2e627ddc1 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Imgur Greenshot.Addon.Imgur - v4.6 + v4.6.1 Properties False False diff --git a/src/Greenshot.Addon.Imgur/app.config b/src/Greenshot.Addon.Imgur/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Addon.Imgur/app.config +++ b/src/Greenshot.Addon.Imgur/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index a4358d340..e447d742c 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Jira Greenshot.Addon.Jira - v4.6 + v4.6.1 Properties False False diff --git a/src/Greenshot.Addon.Jira/app.config b/src/Greenshot.Addon.Jira/app.config index 76f62fbe9..e9820709b 100644 --- a/src/Greenshot.Addon.Jira/app.config +++ b/src/Greenshot.Addon.Jira/app.config @@ -16,4 +16,4 @@ - + diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 3d515b992..ca177c865 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -10,7 +10,7 @@ Properties Greenshot.Addon.LegacyEditor Greenshot.Addon.LegacyEditor - v4.6 + v4.6.1 512 true diff --git a/src/Greenshot.Addon.LegacyEditor/app.config b/src/Greenshot.Addon.LegacyEditor/app.config index 17fc57827..6d3837604 100644 --- a/src/Greenshot.Addon.LegacyEditor/app.config +++ b/src/Greenshot.Addon.LegacyEditor/app.config @@ -8,4 +8,4 @@ - + diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index d97010925..277810962 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Lutim Greenshot.Addon.Lutim - v4.6 + v4.6.1 Properties False False diff --git a/src/Greenshot.Addon.Lutim/app.config b/src/Greenshot.Addon.Lutim/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Addon.Lutim/app.config +++ b/src/Greenshot.Addon.Lutim/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index 745f7908d..fd8f0f6e3 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.OCR Greenshot.Addon.OCR - v4.6 + v4.6.1 Properties False False diff --git a/src/Greenshot.Addon.OCR/app.config b/src/Greenshot.Addon.OCR/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Addon.OCR/app.config +++ b/src/Greenshot.Addon.OCR/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Addon.OcrCommand/App.config b/src/Greenshot.Addon.OcrCommand/App.config index bbb531477..45437954e 100644 --- a/src/Greenshot.Addon.OcrCommand/App.config +++ b/src/Greenshot.Addon.OcrCommand/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj b/src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj index 123af6798..ee033be96 100644 --- a/src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj +++ b/src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj @@ -8,9 +8,10 @@ WinExe Greenshot.Addon.OcrCommand GreenshotOCRCommand - v4.6 + v4.6.1 512 true + x86 diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index c089f7150..63250f133 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -9,7 +9,7 @@ Library Greenshot.Addon.Office Greenshot.Addon.Office - v4.6 + v4.6.1 Properties OnBuildSuccess False diff --git a/src/Greenshot.Addon.Office/app.config b/src/Greenshot.Addon.Office/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Addon.Office/app.config +++ b/src/Greenshot.Addon.Office/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index 10db5e4b6..21f1adef3 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.OneDrive Greenshot.Addon.OneDrive - v4.6 + v4.6.1 Properties False False diff --git a/src/Greenshot.Addon.OneDrive/app.config b/src/Greenshot.Addon.OneDrive/app.config index 17fc57827..6d3837604 100644 --- a/src/Greenshot.Addon.OneDrive/app.config +++ b/src/Greenshot.Addon.OneDrive/app.config @@ -8,4 +8,4 @@ - + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index 22c8ec5c2..8d055a57a 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Photobucket Greenshot.Addon.Photobucket - v4.6 + v4.6.1 Properties False False diff --git a/src/Greenshot.Addon.Photobucket/app.config b/src/Greenshot.Addon.Photobucket/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Addon.Photobucket/app.config +++ b/src/Greenshot.Addon.Photobucket/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index 4ddacc78e..68b782daf 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Tfs Greenshot.Addon.Tfs - v4.6 + v4.6.1 Properties False False diff --git a/src/Greenshot.Addon.Tfs/app.config b/src/Greenshot.Addon.Tfs/app.config index 17fc57827..6d3837604 100644 --- a/src/Greenshot.Addon.Tfs/app.config +++ b/src/Greenshot.Addon.Tfs/app.config @@ -8,4 +8,4 @@ - + diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index 4fa23ff9c..675344e0e 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -10,7 +10,7 @@ Properties Greenshot.Addon.Win10 Greenshot.Addon.Win10 - v4.6 + v4.6.1 512 8.1 diff --git a/src/Greenshot.Addon.Win10/app.config b/src/Greenshot.Addon.Win10/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Addon.Win10/app.config +++ b/src/Greenshot.Addon.Win10/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index e86c5701e..2a1b89b3c 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addons Greenshot.Addons - v4.6 + v4.6.1 Properties OnBuildSuccess True diff --git a/src/Greenshot.Addons/app.config b/src/Greenshot.Addons/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Addons/app.config +++ b/src/Greenshot.Addons/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj b/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj index 16c2161be..09c150718 100644 --- a/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj +++ b/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj @@ -9,7 +9,7 @@ Properties Greenshot.Gfx.Experimental Greenshot.Gfx.Experimental - v4.6 + v4.6.1 512 @@ -37,15 +37,19 @@ - ..\packages\System.Buffers.4.5.0\lib\netstandard1.1\System.Buffers.dll + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - ..\packages\System.Memory.4.5.1\lib\netstandard1.1\System.Memory.dll + ..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll diff --git a/src/Greenshot.Gfx.Experimental/app.config b/src/Greenshot.Gfx.Experimental/app.config index 8d6df4cbe..23007dea5 100644 --- a/src/Greenshot.Gfx.Experimental/app.config +++ b/src/Greenshot.Gfx.Experimental/app.config @@ -10,6 +10,10 @@ + + + + - + diff --git a/src/Greenshot.Gfx.Experimental/packages.config b/src/Greenshot.Gfx.Experimental/packages.config index 9116a7aac..bac5c5225 100644 --- a/src/Greenshot.Gfx.Experimental/packages.config +++ b/src/Greenshot.Gfx.Experimental/packages.config @@ -1,6 +1,7 @@  - - - + + + + \ No newline at end of file diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 3a7f5b94b..17ee566de 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -10,7 +10,7 @@ Properties Greenshot.Gfx Greenshot.Gfx - v4.6 + v4.6.1 512 true @@ -106,9 +106,6 @@ ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll - diff --git a/src/Greenshot.Gfx/app.config b/src/Greenshot.Gfx/app.config index 2a87a83e1..17dc2e7c2 100644 --- a/src/Greenshot.Gfx/app.config +++ b/src/Greenshot.Gfx/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index 6770ef423..7fc64a1bb 100644 --- a/src/Greenshot.Gfx/packages.config +++ b/src/Greenshot.Gfx/packages.config @@ -26,5 +26,4 @@ - \ No newline at end of file diff --git a/src/Greenshot.PerformanceTests/App.config b/src/Greenshot.PerformanceTests/App.config index 418f60d26..f1aa07e2b 100644 --- a/src/Greenshot.PerformanceTests/App.config +++ b/src/Greenshot.PerformanceTests/App.config @@ -1,7 +1,7 @@  - + @@ -11,23 +11,23 @@ - + - + - + - + - + @@ -87,7 +87,23 @@ - + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index 74a76c964..7960e5cd5 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -7,9 +7,10 @@ Exe Greenshot.PerformanceTests Greenshot.PerformanceTests - v4.6 + v4.6.1 512 + true @@ -112,8 +113,8 @@ ..\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll - - ..\packages\Microsoft.Win32.Registry.4.5.0\lib\net46\Microsoft.Win32.Registry.dll + + ..\packages\Microsoft.Win32.Registry.4.5.0\lib\net461\Microsoft.Win32.Registry.dll @@ -122,29 +123,41 @@ ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - ..\packages\System.Collections.Immutable.1.5.0\lib\netstandard1.3\System.Collections.Immutable.dll + ..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll + True + True ..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll + True + True ..\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll + True + True ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + True + True ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll + True + True ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + True + True @@ -152,39 +165,57 @@ ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll - ..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + True + True - - ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net46\System.Security.Cryptography.Algorithms.dll + + ..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll + + + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll + True + True ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net46\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True - - ..\packages\System.Text.Encoding.CodePages.4.5.0\lib\net46\System.Text.Encoding.CodePages.dll + + ..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll + + + ..\packages\System.Text.Encoding.CodePages.4.5.0\lib\net461\System.Text.Encoding.CodePages.dll - ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll ..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll + True + True - ..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll @@ -200,15 +231,23 @@ ..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll + True + True ..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll + True + True ..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll + True + True ..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll + True + True diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index d956f1419..b62d35ebe 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -1,82 +1,84 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 193a5925d..2eece3d79 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -11,10 +11,11 @@ Properties Greenshot.Tests Greenshot.Tests - v4.6 + v4.6.1 512 + true @@ -141,8 +142,8 @@ ..\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll - - ..\packages\Microsoft.Win32.Registry.4.5.0\lib\net46\Microsoft.Win32.Registry.dll + + ..\packages\Microsoft.Win32.Registry.4.5.0\lib\net461\Microsoft.Win32.Registry.dll @@ -151,29 +152,41 @@ ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - ..\packages\System.Collections.Immutable.1.5.0\lib\netstandard1.3\System.Collections.Immutable.dll + ..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll + True + True ..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll + True + True ..\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll + True + True ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + True + True ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll + True + True ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + True + True @@ -182,40 +195,61 @@ ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll - ..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll + + + ..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + True + True - - ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net46\System.Security.Cryptography.Algorithms.dll + + ..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll + + + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll + True + True ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net46\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + + + ..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll - - ..\packages\System.Text.Encoding.CodePages.4.5.0\lib\net46\System.Text.Encoding.CodePages.dll + + ..\packages\System.Text.Encoding.CodePages.4.5.0\lib\net461\System.Text.Encoding.CodePages.dll - ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll ..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll + True + True - ..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll @@ -231,15 +265,23 @@ ..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll + True + True ..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll + True + True ..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll + True + True ..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll + True + True @@ -309,17 +351,17 @@ PreserveNewest - - - - - PreserveNewest Designer + + + + + diff --git a/src/Greenshot.Tests/app.config b/src/Greenshot.Tests/app.config index e9b0907c5..0be6426c5 100644 --- a/src/Greenshot.Tests/app.config +++ b/src/Greenshot.Tests/app.config @@ -36,27 +36,27 @@ - + - + - + - + - + - + @@ -74,6 +74,22 @@ + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index 2ceb6d152..bf2b23172 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -1,92 +1,97 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot/App.config b/src/Greenshot/App.config index 9a443e3d8..48da126be 100644 --- a/src/Greenshot/App.config +++ b/src/Greenshot/App.config @@ -2,7 +2,7 @@ - + diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 12018e16f..1ba8208d5 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -13,7 +13,7 @@ False 4 false - v4.6 + v4.6.1 greenshot.manifest 3.5 @@ -34,9 +34,6 @@ ..\packages\Autofac.Mef.4.0.0\lib\net45\Autofac.Integration.Mef.dll - - ..\packages\Ben.Demystifier.0.1.1\lib\net45\Ben.Demystifier.dll - ..\packages\Caliburn.Micro.Core.3.2.0\lib\net45\Caliburn.Micro.dll @@ -183,9 +180,6 @@ ..\packages\Svg.2.3.0\lib\net35\Svg.dll - - ..\packages\System.Collections.Immutable.1.5.0\lib\netstandard1.3\System.Collections.Immutable.dll - @@ -194,9 +188,6 @@ ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll - - ..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - diff --git a/src/Greenshot/Startup.cs b/src/Greenshot/Startup.cs index 04dfb5282..004a342aa 100644 --- a/src/Greenshot/Startup.cs +++ b/src/Greenshot/Startup.cs @@ -63,7 +63,7 @@ namespace Greenshot StringEncryptionTypeConverter.RgbKey = "lsjvkwhvwujkagfauguwcsjgu2wueuff"; // Make sure the exceptions in the log are readable, uses Ben.Demystifier - LogSettings.ExceptionToStacktrace = exception => exception.ToStringDemystified(); + //LogSettings.ExceptionToStacktrace = exception => exception.ToStringDemystified(); #if DEBUG // Initialize a debug logger for Dapplo packages LogSettings.RegisterDefaultLogger(LogLevels.Verbose); diff --git a/src/Greenshot/Ui/Misc/ViewModels/ErrorViewModel.cs b/src/Greenshot/Ui/Misc/ViewModels/ErrorViewModel.cs index 6d7d44d0d..3946c52e3 100644 --- a/src/Greenshot/Ui/Misc/ViewModels/ErrorViewModel.cs +++ b/src/Greenshot/Ui/Misc/ViewModels/ErrorViewModel.cs @@ -24,7 +24,6 @@ #region Usings using System; -using System.Diagnostics; using Caliburn.Micro; using Dapplo.CaliburnMicro; using Greenshot.Addons; @@ -58,7 +57,7 @@ namespace Greenshot.Ui.Misc.ViewModels /// public void SetExceptionToDisplay(Exception exception) { - Stacktrace = exception.ToStringDemystified(); + Stacktrace = exception.ToString(); //ToStringDemystified(); Message = exception.Message; } diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index d53d9f112..dfa13b565 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -4,7 +4,6 @@ - @@ -51,8 +50,6 @@ - - \ No newline at end of file