Publish new release 2.8.0.47

Author: lovettchris

publish.cmd

@@ -1,13 +1,13 @@
 @echo off
 cd %~dp0
-
+SET ROOT=%~dp0
+set DRIVE=%~dd0
+set WINGET_SRC=%ROOT%..\winget-pkgs
 for /f "usebackq" %%i in (`xsl -e -s src\Version\version.xsl src\Version\version.props`) do (
     set VERSION=%%i
 )
 
 set WINGET=1
-set APPX_DROPS=D:\XmlNotepadReleases
-if not exist %APPX_DROPS% mkdir %APPX_DROPS%
 
 echo ### Publishing version %VERSION%...
 where sed > nul 2>&1
@@ -36,20 +36,18 @@ if exist publish\XmlNotepadSetup.zip del publish\XmlNotepadSetup.zip
 pwsh -command "Compress-Archive -Path src\XmlNotepadSetup\bin\Release\* -DestinationPath publish\XmlNotepadSetup.zip"
 
 if not EXIST src\XmlNotepadPackage\AppPackages\%VERSION%\XmlNotepadPackage_%VERSION%_Test\XmlNotepadPackage_%VERSION%_AnyCPU.msixbundle goto :noappx
-xcopy /y /s src\XmlNotepadPackage\AppPackages\%VERSION%\ %APPX_DROPS%\%VERSION%\
-if ERRORLEVEL 1 goto :eof
-copy /y src\XmlNotepadPackage\AppPackages\%VERSION%\index.html %APPX_DROPS%
-if ERRORLEVEL 1 goto :eof
 
 echo Uploading ClickOnce installer to XmlNotepad
 AzurePublishClickOnce %~dp0publish downloads/XmlNotepad "%LOVETTSOFTWARE_STORAGE_CONNECTION_STRING%"
 if ERRORLEVEL 1 goto :eof
 
 if "%WINGET%"=="0" goto :eof
 
+if not exist %WINGET_SRC% goto :nowinget
+
 :winget
 echo Syncing winget master branch
-pushd d:\git\lovettchris\winget-pkgs\manifests\m\Microsoft\XMLNotepad
+pushd %WINGET_SRC%\manifests\m\Microsoft\XMLNotepad
 git checkout master
 git pull
 git fetch upstream master
@@ -58,10 +56,10 @@ git push
 popd
 
 echo Preparing winget package
-set TARGET=d:\git\lovettchris\winget-pkgs\manifests\m\Microsoft\XMLNotepad\%VERSION%\
+set TARGET=%WINGET_SRC%\manifests\m\Microsoft\XMLNotepad\%VERSION%\
 if not exist %TARGET% mkdir %TARGET%
 copy /y tools\Microsoft.XMLNotepad*.yaml  %TARGET%
-wingetcreate update Microsoft.XMLNotepad --version %VERSION% -o d:\git\lovettchris\winget-pkgs -u https://github.com/microsoft/XmlNotepad/releases/download/%VERSION%/XmlNotepadPackage_%VERSION%_AnyCPU.msixbundle
+wingetcreate update Microsoft.XMLNotepad --version %VERSION% -o %WINGET_SRC% -u https://github.com/microsoft/XmlNotepad/releases/download/%VERSION%/XmlNotepadPackage_%VERSION%_AnyCPU.msixbundle
 if ERRORLEVEL 1 goto :eof
 
 pushd %TARGET%
@@ -103,4 +101,8 @@ exit /b 1
 
 :installfailed
 echo winget install failed
-exit /b 1
+exit /b 1
+
+:nowinget
+echo Please clone [email protected]:lovettchris/winget-pkgs.git into %WINGET_SRC%
+ecit /b 1

src/Application/Application.csproj

@@ -23,7 +23,7 @@
     <TargetFrameworkProfile />
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <NuGetPackageImportStamp></NuGetPackageImportStamp>
-    <PublishUrl>d:\git\lovettchris\XmlNotepad\publish\</PublishUrl>
+    <PublishUrl>$(MSBuildProjectDirectory)\..\..\publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>

src/Version/Version.cs

@@ -15,5 +15,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.8.0.46")]
-[assembly: AssemblyFileVersion("2.8.0.46")]
+[assembly: AssemblyVersion("2.8.0.47")]
+[assembly: AssemblyFileVersion("2.8.0.47")]

src/Version/Version.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ApplicationRevision>46</ApplicationRevision>
-    <ApplicationVersion>2.8.0.46</ApplicationVersion>
+    <ApplicationRevision>47</ApplicationRevision>
+    <ApplicationVersion>2.8.0.47</ApplicationVersion>
   </PropertyGroup>
 </Project>

src/XmlNotepadPackage/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap">
-  <Identity Name="5632ff08-aa93-439a-b09f-677eb3664250" Publisher="CN=Chris Lovett, O=Chris Lovett, STREET=18606 201st Ave NE, L=Woodinville, S=WA, PostalCode=98077, C=US" Version="2.8.0.46" />
+  <Identity Name="5632ff08-aa93-439a-b09f-677eb3664250" Publisher="CN=Chris Lovett, O=Chris Lovett, STREET=18606 201st Ave NE, L=Woodinville, S=WA, PostalCode=98077, C=US" Version="2.8.0.47" />
   <Properties>
     <DisplayName>XML Notepad</DisplayName>
     <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>

src/XmlNotepadSetup/Product.wxs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="XmlNotepad" Language="1033" Version="2.8.0.46" Manufacturer="Lovett Software" UpgradeCode="14C1B5E8-3198-4AF2-B4BC-351017A109D3">
+  <Product Id="*" Name="XmlNotepad" Language="1033" Version="2.8.0.47" Manufacturer="Lovett Software" UpgradeCode="14C1B5E8-3198-4AF2-B4BC-351017A109D3">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade Schedule="afterInstallFinalize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" />
     <MediaTemplate />