Merge 90147c3092 into 5ff6483ef7

Update README.md to point to .com instead of .org

README.md

@@ -1,12 +1,12 @@
 # Open Live Writer
 Open Live Writer makes it easy to write, preview, and post to your blog.
-For more information see http://www.OpenLiveWriter.org/.
+For more information see http://www.OpenLiveWriter.com/.
 
 [![Build status](https://ci.appveyor.com/api/projects/status/8xpga2y53sgwo24g?svg=true)](https://ci.appveyor.com/project/dotnetfoundation/openlivewriter)
 
 ### Installation
 You can install the latest version of Open Live Writer alongside an [older version of Windows Live Writer](http://windows.microsoft.com/en-us/windows-live/essentials). Visit
-http://www.OpenLiveWriter.org to download and install the latest release.
+http://www.OpenLiveWriter.com to download and install the latest release.
 
 ### Latest News
 The current version of Open Live Writer is our first open source version.
@@ -15,7 +15,7 @@ look at the [roadmap](roadmap.md) to see what the current plans are.
 
 For the latest news and updates about Open Live Writer, you can follow us on Twitter 
 ([@OpenLiveWriter](https://twitter.com/OpenLiveWriter)), by keeping an eye on the website
- http://www.OpenLiveWriter.org or by watching this repo and subscribing to notifications.
+ http://www.OpenLiveWriter.com or by watching this repo and subscribing to notifications.
 
 ### Contributing
 Open Live Writer is an open source project and wouldn't exist without the passionate community of volunteer

src/managed/OpenLiveWriter.PostEditor/PostEditorFile.cs

@@ -1985,7 +1985,7 @@ namespace OpenLiveWriter.PostEditor
 
         private DirectoryInfo _targetDirectory = null;
 
-        internal const string Extension = ".wpost";
+        internal const string Extension = ".olwpost";
         private static readonly Guid Version1FormatCLSID = new Guid("20EBD150-5362-417a-8221-84331F79D41D");
         private static readonly Guid Version2FormatCLSID = new Guid("23F4998B-67EB-450b-A41B-C978F5B4AE25");
 

src/managed/OpenLiveWriter/ApplicationLauncher.cs

@@ -91,7 +91,7 @@ namespace OpenLiveWriter
                 return false;
 
             string autoSaveDir = PostEditorSettings.AutoSaveDirectory;
-            string[] autoSavedPostFiles = Directory.GetFiles(autoSaveDir, "*.wpost");
+            string[] autoSavedPostFiles = Directory.GetFiles(autoSaveDir, "*.olwpost");
             if (autoSavedPostFiles.Length > 0)
             {
                 if (splashScreen != null)

src/managed/PostBuild.CreateInstaller/PostBuild.CreateInstaller.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -49,7 +49,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>"$(ProjectDir)createinstaller.cmd"</PostBuildEvent>
+    <PostBuildEvent>$(ProjectDir)createinstaller.cmd</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

src/managed/PostBuild.CreateInstaller/createinstaller.cmd

@@ -16,15 +16,20 @@ IF EXIST "%LocalAppData%\Nuget\Nuget.exe" (GOTO package) ELSE (
 
 :package
 "%LocalAppData%\Nuget\Nuget.exe" pack .\OpenLiveWriter.nuspec -version %dottedVersion% -basepath src\managed\bin\%OLW_CONFIG%\i386\Writer
+if %errorlevel% neq 0 exit /b %errorlevel%
 ECHO Created Writer NuGet package.
 
 .\src\managed\packages\squirrel.windows.1.4.4\tools\SyncReleases.exe -url=https://olw.blob.core.windows.net/stable/Releases/ -r=.\Releases
+if %errorlevel% neq 0 exit /b %errorlevel%
 .\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 
+if %errorlevel% neq 0 exit /b %errorlevel%
 MOVE .\Releases\Setup.exe .\Releases\OpenLiveWriterSetup.exe
+if %errorlevel% neq 0 exit /b %errorlevel%
 ECHO Created Open Live Writer setup file.
 
 ::Build Chocolatey package. Suppress package analysis since Chocolatey powershell generates verbose warnings.
 "%LocalAppData%\Nuget\Nuget.exe" pack .\OpenLiveWriter.Install.nuspec -version %dottedVersion% -basepath Releases -nopackageanalysis
+if %errorlevel% neq 0 exit /b %errorlevel%
 ECHO Created Writer Chocolatey Package
 
 :end