From 374ab66c032297ef7535d593c9c7fa106a6c8f25 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Sat, 31 Oct 2020 14:00:01 -0400 Subject: [PATCH 1/5] allow the installer to complete even if the service does not start --- Installer/ZitiDesktopEdge.aip | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index 5d624a2d..4a75f880 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -1,5 +1,5 @@ - - + + @@ -266,7 +266,7 @@ - + From 130a8b55e7b52b113485160d5f8d2d3d508cba64 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Sat, 31 Oct 2020 14:00:45 -0400 Subject: [PATCH 2/5] update to build scripts --- Installer/build.ps1 | 69 ++++++++++++++++++++++----------------------- update-versions.ps1 | 44 +++++++++++++---------------- 2 files changed, 54 insertions(+), 59 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 4504e635..aa77fae7 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -4,48 +4,46 @@ rm .\build -r -fo -ErrorAction Ignore $invocation = (Get-Variable MyInvocation).Value $scriptPath = Split-Path $invocation.MyCommand.Path -${scriptPath} - -$x=[xml] @" -$((Invoke-WebRequest https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/maven-metadata.xml).Content) -"@ - +#${scriptPath} +# +#$x=[xml] @" +#$((Invoke-WebRequest https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/maven-metadata.xml).Content) +#"@ +# echo "the branch is $env:GIT_BRANCH" - -$branch = git rev-parse --abbrev-ref HEAD - -if ("$branch" -ne 'master') { - #if the git command to get the branch fails - this is 'not master' use the 'latest' - else fetch the 'release' - $serviceVersion = $x.metadata.versioning.latest -} -else { - $serviceVersion = $x.metadata.versioning.release -} -echo "service version is: $serviceVersion" -$installerVersion=(Get-Content -Path .\version) - -$zipUrl = "https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/${serviceVersion}/ziti-tunnel-win-${serviceVersion}.zip" - -echo "Downloading zip file " -echo " from: $zipUrl" - -tree ${scriptPath}.. - -$ProgressPreference = 'SilentlyContinue' -$timeTaken = Measure-Command -Expression { - Invoke-WebRequest $zipUrl -OutFile ziti-tunnel-service.zip -} +# +#$branch = git rev-parse --abbrev-ref HEAD +# +#if ("$branch" -ne 'master') { +# #if the git command to get the branch fails - this is 'not master' use the 'latest' - else fetch the 'release' +# $serviceVersion = $x.metadata.versioning.latest +#} +#else { +# $serviceVersion = $x.metadata.versioning.release +#} +#echo "service version is: $serviceVersion" +# +#$zipUrl = "https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/${serviceVersion}/ziti-tunnel-win-${serviceVersion}.zip" +# +#echo "Downloading zip file " +#echo " from: $zipUrl" +# +#tree ${scriptPath}.. +# +#$ProgressPreference = 'SilentlyContinue' +#$timeTaken = Measure-Command -Expression { +# Invoke-WebRequest $zipUrl -OutFile ziti-tunnel-service.zip +#} +#$milliseconds = $timeTaken.TotalMilliseconds +#echo " time to download: $milliseconds" +#$ProgressPreference = 'Continue' $zipLocal = "ziti-tunnel-service.zip" $zipLocal = "${scriptPath}/../service/ziti-tunnel-win.zip" -$milliseconds = $timeTaken.TotalMilliseconds -echo " time to download: $milliseconds" echo "" echo "unzipping $zipLocal to ${scriptPath}\build\service\" -$ProgressPreference = 'Continue' - Expand-Archive -Verbose -Force -LiteralPath $zipLocal "${scriptPath}\build\service\" Push-Location ${scriptPath}\.. @@ -63,8 +61,9 @@ Pop-Location $ADVINST = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.6\bin\x86\AdvancedInstaller.com" $ADVPROJECT = "${scriptPath}\ZitiDesktopEdge.aip" - +$installerVersion=(Get-Content -Path ${scriptPath}\..\version) $action = '/SetVersion' + echo "issuing $ADVINST /edit $ADVPROJECT $action $installerVersion (service version: $serviceVersion) - see https://www.advancedinstaller.com/user-guide/set-version.html" & $ADVINST /edit $ADVPROJECT $action $installerVersion diff --git a/update-versions.ps1 b/update-versions.ps1 index 960c205a..011132a1 100644 --- a/update-versions.ps1 +++ b/update-versions.ps1 @@ -1,25 +1,21 @@ -echo "==================================== update-versions.ps1 begins ====================================" -echo "Obtaining version information from .\version" -$v=(Get-Content -Path .\version) -echo " version: $v" -echo "" - -rm temp.cs -ErrorAction Ignore -rm temp.aip -ErrorAction Ignore - -$assemblyInfo="./DesktopEdge/Properties/AssemblyInfo.cs" -$assemblyInfoReplaced="${assemblyInfo}.replaced" -$installer="./Installer/ZitiDesktopEdge.aip" -$installerReplaced="${installer}.replaced" - -echo "Replacing version in $assemblyInfo into $assemblyInfoReplaced" -(Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace 'Version\("[0-9]*.[0-9]*.[0-9]*.0', "Version(""${v}.0" | Set-Content -Encoding UTF8 -Path "$assemblyInfoReplaced" -NoNewline -rm $assemblyInfo -mv $assemblyInfoReplaced $assemblyInfo - -echo "Replacing version in $installer into $installerReplaced" -(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]*\.[0-9]*\.[0-9]*"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline -rm $installer -mv $installerReplaced $installer - +echo "==================================== update-versions.ps1 begins ====================================" +echo "Obtaining version information from .\version" +$v=(Get-Content -Path .\version) +echo " version: $v" +echo "" + +$assemblyInfo="./DesktopEdge/Properties/AssemblyInfo.cs" +$assemblyInfoReplaced="${assemblyInfo}.replaced" +echo "Replacing version in $assemblyInfo into $assemblyInfoReplaced" +(Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace 'Version\("[0-9]*.[0-9]*.[0-9]*.0', "Version(""${v}.0" | Set-Content -Encoding UTF8 -Path "$assemblyInfoReplaced" -NoNewline +rm $assemblyInfo +mv $assemblyInfoReplaced $assemblyInfo + +#$installer="./Installer/ZitiDesktopEdge.aip" +#$installerReplaced="${installer}.replaced" +#echo "Replacing version in $installer into $installerReplaced" +#(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]*\.[0-9]*\.[0-9]*"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline +#rm $installer +#mv $installerReplaced $installer + echo "==================================== update-versions.ps1 complete ====================================" \ No newline at end of file From 714d9eb6e2a3d001d1d8693cc80e79861c1639c6 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Sat, 31 Oct 2020 14:41:25 -0400 Subject: [PATCH 3/5] rename service name to ziti-monitor for easy use with net start/stop --- Installer/ZitiDesktopEdge.aip | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index 4a75f880..934bb19c 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -265,12 +265,12 @@ - + - - + + From 0e1a09bb11d0b9d0d4818db44e61b154ce17ab2d Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Sat, 31 Oct 2020 14:54:03 -0400 Subject: [PATCH 4/5] update to 1.3.0 to represent auto-update capability --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 0b1f1edf..f0bb29e7 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.2.13 +1.3.0 From db6711fb15a28c66338b713a45138aad9faadd1d Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Sat, 31 Oct 2020 16:00:17 -0400 Subject: [PATCH 5/5] remove cruft from build scripts and update release-notes --- Installer/build.ps1 | 34 +--------------------------------- release-notes.md | 14 ++++++++++++++ update-versions.ps1 | 7 ------- 3 files changed, 15 insertions(+), 40 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index aa77fae7..c323c666 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -4,39 +4,8 @@ rm .\build -r -fo -ErrorAction Ignore $invocation = (Get-Variable MyInvocation).Value $scriptPath = Split-Path $invocation.MyCommand.Path -#${scriptPath} -# -#$x=[xml] @" -#$((Invoke-WebRequest https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/maven-metadata.xml).Content) -#"@ -# + echo "the branch is $env:GIT_BRANCH" -# -#$branch = git rev-parse --abbrev-ref HEAD -# -#if ("$branch" -ne 'master') { -# #if the git command to get the branch fails - this is 'not master' use the 'latest' - else fetch the 'release' -# $serviceVersion = $x.metadata.versioning.latest -#} -#else { -# $serviceVersion = $x.metadata.versioning.release -#} -#echo "service version is: $serviceVersion" -# -#$zipUrl = "https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/${serviceVersion}/ziti-tunnel-win-${serviceVersion}.zip" -# -#echo "Downloading zip file " -#echo " from: $zipUrl" -# -#tree ${scriptPath}.. -# -#$ProgressPreference = 'SilentlyContinue' -#$timeTaken = Measure-Command -Expression { -# Invoke-WebRequest $zipUrl -OutFile ziti-tunnel-service.zip -#} -#$milliseconds = $timeTaken.TotalMilliseconds -#echo " time to download: $milliseconds" -#$ProgressPreference = 'Continue' $zipLocal = "ziti-tunnel-service.zip" $zipLocal = "${scriptPath}/../service/ziti-tunnel-win.zip" @@ -51,7 +20,6 @@ echo "Updating the version for UI and Installer" .\update-versions.ps1 echo "Building the UI" -#msbuild DesktopEdge\ZitiDesktopEdge.csproj /property:Configuration=Release msbuild ZitiDesktopEdge.sln /property:Configuration=Release echo "Building the Wintun installer" diff --git a/release-notes.md b/release-notes.md index 5ef6094a..f985ff55 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,3 +1,17 @@ +# Release 1.3.0 + +* What's New + + * Ziti Desktop Edge for Windows will now montior and install updates + +* Bug Fixes + + * [#000](https://github.com/openziti/desktop-edge-win/issues/000) - Bug fix + +* Dependency Updates + + * None + # Release 1.2.13 * What's New diff --git a/update-versions.ps1 b/update-versions.ps1 index 011132a1..6973e824 100644 --- a/update-versions.ps1 +++ b/update-versions.ps1 @@ -11,11 +11,4 @@ echo "Replacing version in $assemblyInfo into $assemblyInfoReplaced" rm $assemblyInfo mv $assemblyInfoReplaced $assemblyInfo -#$installer="./Installer/ZitiDesktopEdge.aip" -#$installerReplaced="${installer}.replaced" -#echo "Replacing version in $installer into $installerReplaced" -#(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]*\.[0-9]*\.[0-9]*"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline -#rm $installer -#mv $installerReplaced $installer - echo "==================================== update-versions.ps1 complete ====================================" \ No newline at end of file