From 8954acd4bf954905be7716c54e050c29d136c0fd Mon Sep 17 00:00:00 2001 From: Nick Vella Date: Sun, 22 Sep 2019 17:31:36 +1000 Subject: [PATCH 1/8] msix: switch build.ps1 to target VS 2019 --- build.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.ps1 b/build.ps1 index ea5f334e..334c839d 100644 --- a/build.ps1 +++ b/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 } From 2aa238d0e14f660578d3d3fe1f4229cab48e5113 Mon Sep 17 00:00:00 2001 From: Nick Vella Date: Sun, 22 Sep 2019 17:36:03 +1000 Subject: [PATCH 2/8] msix: add uap build parameters --- build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.ps1 b/build.ps1 index 334c839d..0dc85c26 100644 --- a/build.ps1 +++ b/build.ps1 @@ -104,6 +104,6 @@ if (-Not (Test-Path env:OLW_CONFIG)) ======================================================= "@ Get-Date -$buildCommand = "`"$msBuildExe`" $solutionFile /nologo /maxcpucount /verbosity:minimal /p:Configuration=$env:OLW_CONFIG $ARGS" +$buildCommand = "`"$msBuildExe`" $solutionFile /nologo /maxcpucount /verbosity:minimal /p:Configuration=$env:OLW_CONFIG /p:AppxPackageDir=Packages /p:UapAppxPackageBuildMode=StoreUpload /p:AppxBundlePlatforms=x86 /p:AppxBundle=Always $ARGS" "Running build command '$buildCommand'" Invoke-Expression "& $buildCommand" \ No newline at end of file From 009ab2677d997129465bb39cc8bb15b3de6646d9 Mon Sep 17 00:00:00 2001 From: Nick Vella Date: Wed, 25 Sep 2019 20:06:54 +1000 Subject: [PATCH 3/8] use appveyor vs2019 image --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2473ce9b..c78dbe15 100644 --- a/appveyor.yml +++ b/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 From 5ec613c5bdd93fe669be2441998d03f4f29c49fa Mon Sep 17 00:00:00 2001 From: Nick Vella Date: Wed, 25 Sep 2019 20:56:31 +1000 Subject: [PATCH 4/8] upgrade Ribbon project to 2019 --- .../OpenLiveWriter.Ribbon/OpenLiveWriter.Ribbon.vcxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/unmanaged/OpenLiveWriter.Ribbon/OpenLiveWriter.Ribbon.vcxproj b/src/unmanaged/OpenLiveWriter.Ribbon/OpenLiveWriter.Ribbon.vcxproj index 3b0884c0..f4c712a8 100644 --- a/src/unmanaged/OpenLiveWriter.Ribbon/OpenLiveWriter.Ribbon.vcxproj +++ b/src/unmanaged/OpenLiveWriter.Ribbon/OpenLiveWriter.Ribbon.vcxproj @@ -15,19 +15,19 @@ {195A60BF-7A4D-42E6-B5F4-FEBC679E19F0} Win32Proj OpenLiveWriter.Ribbon - 10.0.17763.0 + 10.0 DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode From eda28a9fa876f87560b236ddea8a09d4a46af399 Mon Sep 17 00:00:00 2001 From: Nick Vella Date: Wed, 25 Sep 2019 22:51:07 +1000 Subject: [PATCH 5/8] msix: build.ps1: place builds into ReleasesUap folder - todo: make folder relative to project root --- build.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.ps1 b/build.ps1 index 0dc85c26..8db2aa0a 100644 --- a/build.ps1 +++ b/build.ps1 @@ -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 /p:AppxPackageDir=Packages /p:UapAppxPackageBuildMode=StoreUpload /p:AppxBundlePlatforms=x86 /p:AppxBundle=Always $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" \ No newline at end of file From f6f3891dc661f43137784554659dfad57bfc7e50 Mon Sep 17 00:00:00 2001 From: Nick Vella Date: Wed, 25 Sep 2019 22:51:21 +1000 Subject: [PATCH 6/8] msix: add releasesuap to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fc587118..e2a27522 100644 --- a/.gitignore +++ b/.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/ From 4ebf97027c75da982d7b17bbb3aa0fdd340129fa Mon Sep 17 00:00:00 2001 From: Nick Vella Date: Wed, 25 Sep 2019 22:51:40 +1000 Subject: [PATCH 7/8] msix: mark Package project for build on release and debug --- src/managed/writer.sln | 1 + 1 file changed, 1 insertion(+) diff --git a/src/managed/writer.sln b/src/managed/writer.sln index 9fee7233..bf8aecf2 100644 --- a/src/managed/writer.sln +++ b/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 From 31a26fd9ec5b7ff8d80c309b92511e73c43f383a Mon Sep 17 00:00:00 2001 From: Nick Vella Date: Wed, 25 Sep 2019 22:52:16 +1000 Subject: [PATCH 8/8] msix: add _pkginfo.txt to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e2a27522..0ada423a 100644 --- a/.gitignore +++ b/.gitignore @@ -205,3 +205,4 @@ FakesAssemblies/ *.VC.opendb *.VC.db src/managed/OpenLiveWriter.Package/BundleArtifacts/ +_pkginfo.txt