Merge branch 'msix-from-packageexplorer' into msix

.gitignore

@@ -20,6 +20,7 @@ src/managed/OpenLiveWriter.BlogClient/Clients/GoogleBloggerv3Secrets.json
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
+[Rr]eleases[Uu]ap/
 x64/
 x86/
 build/
@@ -204,3 +205,4 @@ FakesAssemblies/
 *.VC.opendb
 *.VC.db
 src/managed/OpenLiveWriter.Package/BundleArtifacts/
+_pkginfo.txt

appveyor.yml

@@ -4,7 +4,7 @@ pull_requests:
 branches:
   only:
   - master
-image: Visual Studio 2017
+image: Visual Studio 2019
 environment:
   OLW_CONFIG: Release
   OlwBloggerClientId: 597389294595-271ukaucs8ghmc6c6cnhrbef2c02g5qa.apps.googleusercontent.com

build.ps1

@@ -28,15 +28,15 @@ if (-Not (Test-Path "$solutionFile" -PathType Leaf))
 Install-Module VSSetup -Scope CurrentUser
 
 $visualStudioLocation = (Get-VSSetupInstance `
-  | Select-VSSetupInstance -Version '[15.0,16.0)' -Latest).InstallationPath
+  | Select-VSSetupInstance -Version '[16.0,17.0)' -Latest).InstallationPath
 
-$msBuildExe = $visualStudioLocation + "\MSBuild\15.0\Bin\msbuild.exe"
+$msBuildExe = $visualStudioLocation + "\MSBuild\Current\Bin\msbuild.exe"
 IF (-Not (Test-Path -LiteralPath "$msBuildExe" -PathType Leaf))
 {
 	"MSBuild not found at '$msBuildExe'"
-	"In order to build OpenLiveWriter either Visual Studio 2017 (any edition) or Build "
-	"Tools for Visual Studio 2017 must be installed."
-	"These can be downloadd from https://visualstudio.microsoft.com/downloads/"
+	"In order to build OpenLiveWriter either Visual Studio 2019 (any edition) or Build "
+	"Tools for Visual Studio 2019 must be installed."
+	"These can be downloaded from https://visualstudio.microsoft.com/downloads/"
 	exit 101
 }
 
@@ -104,6 +104,7 @@ if (-Not (Test-Path env:OLW_CONFIG))
 =======================================================
 "@
 Get-Date
-$buildCommand = "`"$msBuildExe`" $solutionFile /nologo /maxcpucount /verbosity:minimal /p:Configuration=$env:OLW_CONFIG $ARGS"
+New-Item -ItemType Directory -Force -Path ReleasesUap
+$buildCommand = "`"$msBuildExe`" $solutionFile /nologo /maxcpucount /verbosity:minimal /p:Configuration=$env:OLW_CONFIG /p:AppxPackageDir=ReleasesUap /p:UapAppxPackageBuildMode=StoreUpload /p:AppxBundlePlatforms=x86 /p:AppxBundle=Always $ARGS"
 "Running build command '$buildCommand'"
 Invoke-Expression "& $buildCommand"

src/managed/writer.sln

@@ -633,6 +633,7 @@ Global
 		{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|x86.Build.0 = Debug|x86
 		{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|x86.Deploy.0 = Debug|x86
 		{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|Any CPU.ActiveCfg = Release|x86
+		{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|Any CPU.Build.0 = Release|x86
 		{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|x64.ActiveCfg = Release|x64
 		{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|x64.Build.0 = Release|x64
 		{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|x64.Deploy.0 = Release|x64

src/unmanaged/OpenLiveWriter.Ribbon/OpenLiveWriter.Ribbon.vcxproj

@@ -15,19 +15,19 @@
     <ProjectGuid>{195A60BF-7A4D-42E6-B5F4-FEBC679E19F0}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>OpenLiveWriter.Ribbon</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>