From 7781d4205d3384b48c0844fc5357e247f1677738 Mon Sep 17 00:00:00 2001 From: Will Duff Date: Mon, 19 Sep 2016 23:34:55 -0700 Subject: [PATCH] Upgrade Writer to .NET Framework 4.6.1, upgrade NuGet packages Upgrades Squirrel installer to 1.4.4 which includes fix so that /silent option works correctly. --- OpenLiveWriter.SDK.nuspec | 6 +- src/managed/BlogRunner.Core/app.config | 8 +++ src/managed/BlogRunner/app.config | 8 +++ src/managed/BlogRunnerGui/app.config | 8 +++ src/managed/MarketXmlGenerator/app.config | 2 +- .../OpenLiveWriter.BlogClient.csproj | 36 ++++++----- .../OpenLiveWriter.BlogClient/app.config | 8 +++ .../OpenLiveWriter.BlogClient/packages.config | 23 +++---- .../OpenLiveWriter.PostEditor.csproj | 64 ++++++++++--------- .../OpenLiveWriter.PostEditor/app.config | 8 +++ .../OpenLiveWriter.PostEditor/packages.config | 31 ++++----- .../packages.config | 2 +- .../OpenLiveWriter.Tests.csproj | 52 +++++++++------ .../OpenLiveWriter.Tests/packages.config | 8 +-- .../OpenLiveWriter.UnitTest/app.config | 8 +++ .../OpenLiveWriter/OpenLiveWriter.csproj | 28 ++++---- src/managed/OpenLiveWriter/app.config | 12 ++++ src/managed/OpenLiveWriter/packages.config | 8 +-- .../PostBuild.CreateInstaller.csproj | 2 +- .../createinstaller.cmd | 2 +- writer.build.settings | 2 +- 21 files changed, 204 insertions(+), 122 deletions(-) diff --git a/OpenLiveWriter.SDK.nuspec b/OpenLiveWriter.SDK.nuspec index f7f1609e..274b2de0 100644 --- a/OpenLiveWriter.SDK.nuspec +++ b/OpenLiveWriter.SDK.nuspec @@ -12,11 +12,11 @@ The SDK required to create plug-ins for Open Live Writer. (c) .NET Foundation - - + + - + \ No newline at end of file diff --git a/src/managed/BlogRunner.Core/app.config b/src/managed/BlogRunner.Core/app.config index 940d25ca..10e19414 100644 --- a/src/managed/BlogRunner.Core/app.config +++ b/src/managed/BlogRunner.Core/app.config @@ -6,6 +6,14 @@ + + + + + + + + \ No newline at end of file diff --git a/src/managed/BlogRunner/app.config b/src/managed/BlogRunner/app.config index 940d25ca..10e19414 100644 --- a/src/managed/BlogRunner/app.config +++ b/src/managed/BlogRunner/app.config @@ -6,6 +6,14 @@ + + + + + + + + \ No newline at end of file diff --git a/src/managed/BlogRunnerGui/app.config b/src/managed/BlogRunnerGui/app.config index 940d25ca..10e19414 100644 --- a/src/managed/BlogRunnerGui/app.config +++ b/src/managed/BlogRunnerGui/app.config @@ -6,6 +6,14 @@ + + + + + + + + \ No newline at end of file diff --git a/src/managed/MarketXmlGenerator/app.config b/src/managed/MarketXmlGenerator/app.config index ff995010..3dbff35f 100644 --- a/src/managed/MarketXmlGenerator/app.config +++ b/src/managed/MarketXmlGenerator/app.config @@ -1,3 +1,3 @@ - + diff --git a/src/managed/OpenLiveWriter.BlogClient/OpenLiveWriter.BlogClient.csproj b/src/managed/OpenLiveWriter.BlogClient/OpenLiveWriter.BlogClient.csproj index 2d52a4cc..19b07481 100644 --- a/src/managed/OpenLiveWriter.BlogClient/OpenLiveWriter.BlogClient.csproj +++ b/src/managed/OpenLiveWriter.BlogClient/OpenLiveWriter.BlogClient.csproj @@ -10,32 +10,36 @@ - - ..\packages\Google.Apis.1.9.2\lib\net40\Google.Apis.dll + + ..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll True - - ..\packages\Google.Apis.Auth.1.9.2\lib\net40\Google.Apis.Auth.dll + + ..\packages\Google.Apis.1.16.0\lib\net45\Google.Apis.dll True - - ..\packages\Google.Apis.Auth.1.9.2\lib\net40\Google.Apis.Auth.PlatformServices.dll + + ..\packages\Google.Apis.Auth.1.16.0\lib\net45\Google.Apis.Auth.dll True - - ..\packages\Google.Apis.Blogger.v3.1.9.2.480\lib\portable-net40+sl50+win+wpa81+wp80\Google.Apis.Blogger.v3.dll + + ..\packages\Google.Apis.Auth.1.16.0\lib\net45\Google.Apis.Auth.PlatformServices.dll True - - ..\packages\Google.Apis.Core.1.9.2\lib\portable-net40+sl50+win+wpa81+wp80\Google.Apis.Core.dll + + ..\packages\Google.Apis.Blogger.v3.1.16.0.111\lib\portable-net45+netcore45+wpa81+wp8\Google.Apis.Blogger.v3.dll True - - ..\packages\Google.Apis.1.9.2\lib\net40\Google.Apis.PlatformServices.dll + + ..\packages\Google.Apis.Core.1.16.0\lib\net45\Google.Apis.Core.dll True - - ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + + ..\packages\Google.Apis.1.16.0\lib\net45\Google.Apis.PlatformServices.dll + True + + + ..\packages\log4net.2.0.5\lib\net45-full\log4net.dll True @@ -50,8 +54,8 @@ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll True - - ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True diff --git a/src/managed/OpenLiveWriter.BlogClient/app.config b/src/managed/OpenLiveWriter.BlogClient/app.config index 940d25ca..10e19414 100644 --- a/src/managed/OpenLiveWriter.BlogClient/app.config +++ b/src/managed/OpenLiveWriter.BlogClient/app.config @@ -6,6 +6,14 @@ + + + + + + + + \ No newline at end of file diff --git a/src/managed/OpenLiveWriter.BlogClient/packages.config b/src/managed/OpenLiveWriter.BlogClient/packages.config index 1f5059b7..e76044d0 100644 --- a/src/managed/OpenLiveWriter.BlogClient/packages.config +++ b/src/managed/OpenLiveWriter.BlogClient/packages.config @@ -1,14 +1,15 @@  - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/managed/OpenLiveWriter.PostEditor/OpenLiveWriter.PostEditor.csproj b/src/managed/OpenLiveWriter.PostEditor/OpenLiveWriter.PostEditor.csproj index 40421a39..cc58dc8a 100644 --- a/src/managed/OpenLiveWriter.PostEditor/OpenLiveWriter.PostEditor.csproj +++ b/src/managed/OpenLiveWriter.PostEditor/OpenLiveWriter.PostEditor.csproj @@ -16,48 +16,52 @@ OpenLiveWriter.SpellChecker - - ..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.dll + + ..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll True - - ..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.MsDelta.dll + + ..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll True - - ..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.PatchApi.dll + + ..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll True - - ..\packages\Google.Apis.1.9.2\lib\net40\Google.Apis.dll + + ..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll True - - ..\packages\Google.Apis.Auth.1.9.2\lib\net40\Google.Apis.Auth.dll + + ..\packages\Google.Apis.1.16.0\lib\net45\Google.Apis.dll True - - ..\packages\Google.Apis.Auth.1.9.2\lib\net40\Google.Apis.Auth.PlatformServices.dll + + ..\packages\Google.Apis.Auth.1.16.0\lib\net45\Google.Apis.Auth.dll True - - ..\packages\Google.Apis.Blogger.v3.1.9.2.480\lib\portable-net40+sl50+win+wpa81+wp80\Google.Apis.Blogger.v3.dll + + ..\packages\Google.Apis.Auth.1.16.0\lib\net45\Google.Apis.Auth.PlatformServices.dll True - - ..\packages\Google.Apis.Core.1.9.2\lib\portable-net40+sl50+win+wpa81+wp80\Google.Apis.Core.dll + + ..\packages\Google.Apis.Blogger.v3.1.16.0.111\lib\portable-net45+netcore45+wpa81+wp8\Google.Apis.Blogger.v3.dll True - - ..\packages\Google.Apis.1.9.2\lib\net40\Google.Apis.PlatformServices.dll + + ..\packages\Google.Apis.Core.1.16.0\lib\net45\Google.Apis.Core.dll + True + + + ..\packages\Google.Apis.1.16.0\lib\net45\Google.Apis.PlatformServices.dll True - ..\packages\squirrel.windows.1.2.1\lib\Net45\ICSharpCode.SharpZipLib.dll + ..\packages\squirrel.windows.1.4.4\lib\Net45\ICSharpCode.SharpZipLib.dll True - - ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.5\lib\net45-full\log4net.dll True @@ -73,35 +77,35 @@ True - ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll True - ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll True - ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll True - ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll True - - ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True - ..\packages\squirrel.windows.1.2.1\lib\Net45\NuGet.Squirrel.dll + ..\packages\squirrel.windows.1.4.4\lib\Net45\NuGet.Squirrel.dll True ..\packages\Splat.1.6.2\lib\Net45\Splat.dll True - - ..\packages\squirrel.windows.1.2.1\lib\Net45\Squirrel.dll + + ..\packages\squirrel.windows.1.4.4\lib\Net45\Squirrel.dll True diff --git a/src/managed/OpenLiveWriter.PostEditor/app.config b/src/managed/OpenLiveWriter.PostEditor/app.config index 940d25ca..10e19414 100644 --- a/src/managed/OpenLiveWriter.PostEditor/app.config +++ b/src/managed/OpenLiveWriter.PostEditor/app.config @@ -6,6 +6,14 @@ + + + + + + + + \ No newline at end of file diff --git a/src/managed/OpenLiveWriter.PostEditor/packages.config b/src/managed/OpenLiveWriter.PostEditor/packages.config index fab1fa0e..75b666eb 100644 --- a/src/managed/OpenLiveWriter.PostEditor/packages.config +++ b/src/managed/OpenLiveWriter.PostEditor/packages.config @@ -1,18 +1,19 @@  - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/managed/OpenLiveWriter.SpellChecker/packages.config b/src/managed/OpenLiveWriter.SpellChecker/packages.config index dbb8145c..1ae43d24 100644 --- a/src/managed/OpenLiveWriter.SpellChecker/packages.config +++ b/src/managed/OpenLiveWriter.SpellChecker/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/managed/OpenLiveWriter.Tests/OpenLiveWriter.Tests.csproj b/src/managed/OpenLiveWriter.Tests/OpenLiveWriter.Tests.csproj index aec7c6c7..a22179ee 100644 --- a/src/managed/OpenLiveWriter.Tests/OpenLiveWriter.Tests.csproj +++ b/src/managed/OpenLiveWriter.Tests/OpenLiveWriter.Tests.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -8,7 +9,6 @@ Properties OpenLiveWriter.Tests OpenLiveWriter.Tests - v4.5.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 @@ -40,36 +40,48 @@ - ..\packages\ApprovalTests.3.0.10\lib\net40\ApprovalTests.dll + ..\packages\ApprovalTests.3.0.11\lib\net40\ApprovalTests.dll True - ..\packages\ApprovalUtilities.3.0.10\lib\net45\ApprovalUtilities.dll + ..\packages\ApprovalUtilities.3.0.11\lib\net45\ApprovalUtilities.dll True - ..\packages\ApprovalUtilities.3.0.10\lib\net45\ApprovalUtilities.Net45.dll + ..\packages\ApprovalUtilities.3.0.11\lib\net45\ApprovalUtilities.Net45.dll True - ..\packages\NUnit3TestAdapter.3.0.8-ctp-8\lib\Mono.Cecil.dll - False - - - ..\packages\NUnit3TestAdapter.3.0.8-ctp-8\lib\nunit.engine.dll - False - - - ..\packages\NUnit3TestAdapter.3.0.8-ctp-8\lib\nunit.engine.api.dll - False - - - ..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll + ..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.dll True - - ..\packages\NUnit3TestAdapter.3.0.8-ctp-8\lib\NUnit3.TestAdapter.dll - False + + ..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Mdb.dll + True + + + ..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Pdb.dll + True + + + ..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Rocks.dll + True + + + ..\packages\NUnit3TestAdapter.3.4.1\lib\nunit.engine.dll + True + + + ..\packages\NUnit3TestAdapter.3.4.1\lib\nunit.engine.api.dll + True + + + ..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll + True + + + ..\packages\NUnit3TestAdapter.3.4.1\lib\NUnit3.TestAdapter.dll + True diff --git a/src/managed/OpenLiveWriter.Tests/packages.config b/src/managed/OpenLiveWriter.Tests/packages.config index ac85d7b2..fb0e3253 100644 --- a/src/managed/OpenLiveWriter.Tests/packages.config +++ b/src/managed/OpenLiveWriter.Tests/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/src/managed/OpenLiveWriter.UnitTest/app.config b/src/managed/OpenLiveWriter.UnitTest/app.config index 940d25ca..10e19414 100644 --- a/src/managed/OpenLiveWriter.UnitTest/app.config +++ b/src/managed/OpenLiveWriter.UnitTest/app.config @@ -6,6 +6,14 @@ + + + + + + + + \ No newline at end of file diff --git a/src/managed/OpenLiveWriter/OpenLiveWriter.csproj b/src/managed/OpenLiveWriter/OpenLiveWriter.csproj index 0f73d54c..ba741d9d 100644 --- a/src/managed/OpenLiveWriter/OpenLiveWriter.csproj +++ b/src/managed/OpenLiveWriter/OpenLiveWriter.csproj @@ -15,48 +15,48 @@ false - - ..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.dll + + ..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll True - - ..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.MsDelta.dll + + ..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll True - - ..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.PatchApi.dll + + ..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll True - ..\packages\squirrel.windows.1.2.1\lib\Net45\ICSharpCode.SharpZipLib.dll + ..\packages\squirrel.windows.1.4.4\lib\Net45\ICSharpCode.SharpZipLib.dll True - ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll True - ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll True - ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll True - ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll True - ..\packages\squirrel.windows.1.2.1\lib\Net45\NuGet.Squirrel.dll + ..\packages\squirrel.windows.1.4.4\lib\Net45\NuGet.Squirrel.dll True ..\packages\Splat.1.6.2\lib\Net45\Splat.dll True - - ..\packages\squirrel.windows.1.2.1\lib\Net45\Squirrel.dll + + ..\packages\squirrel.windows.1.4.4\lib\Net45\Squirrel.dll True diff --git a/src/managed/OpenLiveWriter/app.config b/src/managed/OpenLiveWriter/app.config index 940d25ca..8d818fb5 100644 --- a/src/managed/OpenLiveWriter/app.config +++ b/src/managed/OpenLiveWriter/app.config @@ -6,6 +6,18 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/managed/OpenLiveWriter/packages.config b/src/managed/OpenLiveWriter/packages.config index a31960ee..7ab65e82 100644 --- a/src/managed/OpenLiveWriter/packages.config +++ b/src/managed/OpenLiveWriter/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/src/managed/PostBuild.CreateInstaller/PostBuild.CreateInstaller.csproj b/src/managed/PostBuild.CreateInstaller/PostBuild.CreateInstaller.csproj index 9310d962..7a80821f 100644 --- a/src/managed/PostBuild.CreateInstaller/PostBuild.CreateInstaller.csproj +++ b/src/managed/PostBuild.CreateInstaller/PostBuild.CreateInstaller.csproj @@ -1,5 +1,6 @@ + Debug @@ -9,7 +10,6 @@ Properties PostBuild.CreateInstaller PostBuild.CreateInstaller - v4.5.2 512 true diff --git a/src/managed/PostBuild.CreateInstaller/createinstaller.cmd b/src/managed/PostBuild.CreateInstaller/createinstaller.cmd index fa11a8c9..f40dbbf4 100644 --- a/src/managed/PostBuild.CreateInstaller/createinstaller.cmd +++ b/src/managed/PostBuild.CreateInstaller/createinstaller.cmd @@ -18,7 +18,7 @@ IF EXIST "%LocalAppData%\Nuget\Nuget.exe" (GOTO package) ELSE ( "%LocalAppData%\Nuget\Nuget.exe" pack .\OpenLiveWriter.nuspec -version %dottedVersion% -basepath src\managed\bin\%OLW_CONFIG%\i386\Writer ECHO Created Writer NuGet package. -.\src\managed\packages\squirrel.windows.1.2.1\tools\Squirrel.exe -i .\src\managed\OpenLiveWriter.PostEditor\Images\Writer.ico %OLW_SIGN% --no-msi --releasify .\OpenLiveWriter.%dottedVersion%.nupkg +.\src\managed\packages\squirrel.windows.1.4.4\tools\Squirrel.exe -i .\src\managed\OpenLiveWriter.PostEditor\Images\Writer.ico %OLW_SIGN% --no-msi --releasify .\OpenLiveWriter.%dottedVersion%.nupkg MOVE .\Releases\Setup.exe .\Releases\OpenLiveWriterSetup.exe ECHO Created Open Live Writer setup file. diff --git a/writer.build.settings b/writer.build.settings index 1eb45ef1..d9df49ac 100644 --- a/writer.build.settings +++ b/writer.build.settings @@ -2,7 +2,7 @@ Writer - v4.5.2 + v4.6.1 $(MSBuildThisFileDirectory) $(RepoRoot)\src\managed $(SrcManagedRoot)