Commit Graph

868 Commits

Author SHA1 Message Date
dovholuknf d85af48711 Merge branch 'release-1.2.11' of github.com:openziti/desktop-edge-win into release-1.2.11 2020-10-20 12:30:39 -04:00
dovholuknf e1ff140981 _sigh_ - this all needs to get unified into github - can't run the script from travis... 2020-10-20 12:30:32 -04:00
ziti-ci bafd8ba704 [ci skip] committing updated version information 2020-10-20 16:28:00 +00:00
dovholuknf d621b0e6ff Merge branch 'release-1.2.11' of github.com:openziti/desktop-edge-win into release-1.2.11 2020-10-20 12:11:47 -04:00
dovholuknf 01ef0c3bf8 use advanced installer to update versions 2020-10-20 12:10:56 -04:00
ziti-ci 6e93894c7a [ci skip] committing updated version information 2020-10-20 15:59:24 +00:00
dovholuknf 402993e209 use a wildcard to find the exe 2020-10-20 11:39:54 -04:00
Jeremy Tellier - ROG f899bc2917 Merge branch 'release-0.0.30' into release-1.2.11 2020-10-20 16:39:08 +01:00
Jeremy Tellier - ROG f71564172d Fix the hide on deactivation when not attached. 2020-10-20 16:25:07 +01:00
ziti-ci 21063f8ae0 [ci skip] committing updated version information 2020-10-20 15:07:50 +00:00
dovholuknf 089cdb2730 fix string replacement for AssemblyInfo.cs and fix the version in the file 2020-10-20 10:58:27 -04:00
ziti-ci ef1dcb5065 [ci skip] committing updated version information 2020-10-20 14:55:57 +00:00
dovholuknf d610413505 Merge branch 'release-1.2.11' of github.com:openziti/desktop-edge-win into release-1.2.11 2020-10-20 10:47:50 -04:00
dovholuknf b738dc3aeb closing in on getting version information updating on push 2020-10-20 10:46:18 -04:00
ziti-ci 4262c98710 [ci skip] committing updated version information 2020-10-20 14:30:31 +00:00
dovholuknf 59f5e08e34 update travis to get versions updated automatically if needed 2020-10-20 10:28:43 -04:00
dovholuknf 258e4b5c6f update travis to get versions updated automatically if needed 2020-10-20 10:24:01 -04:00
ziti-ci ef082935d7 [ci skip] committing updated version information 2020-10-20 13:35:51 +00:00
dovholuknf 1ef83bba62 Merge branch 'release-1.2.11' of github.com:openziti/desktop-edge-win into release-1.2.11 2020-10-20 09:29:40 -04:00
dovholuknf a3d774a5d0 call set-ExecutionPolicy from install and try again 2020-10-20 09:29:35 -04:00
ziti-ci 7860cc1755 [ci skip] committing updated version information 2020-10-20 13:21:47 +00:00
dovholuknf 46f54fa133 update travis to get versions updated automatically if needed 2020-10-20 09:15:22 -04:00
ziti-ci f42b5fbea8 [ci skip] committing updated version information 2020-10-20 13:09:21 +00:00
dovholuknf 3e5ad176d8 Merge branch 'release-1.2.11' of github.com:openziti/desktop-edge-win into release-1.2.11 2020-10-20 09:03:19 -04:00
dovholuknf 57f9c02ea5 wheeeeee travis 2020-10-20 09:03:13 -04:00
ziti-ci dae85bcef2 [ci skip] committing updated version information 2020-10-20 13:01:34 +00:00
dovholuknf 8a85a4ce65 Merge branch 'release-1.2.11' of github.com:openziti/desktop-edge-win into release-1.2.11 2020-10-20 08:55:22 -04:00
dovholuknf 3e2c67cf76 powershell won't run from bat - try calling it from .travis 2020-10-20 08:50:09 -04:00
ziti-ci 3ed5926bd0 [ci skip] committing updated version information 2020-10-20 12:42:08 +00:00
dovholuknf d12524b7a6 stray d pressed and saved 2020-10-20 08:36:36 -04:00
dovholuknf 9fe80deeab Merge branch 'release-1.2.11' of github.com:openziti/desktop-edge-win into release-1.2.11 2020-10-20 08:35:21 -04:00
dovholuknf cceaa87c7f add some 2>&1 and --no-progress 2020-10-20 08:35:08 -04:00
ziti-ci c64f68c265 [ci skip] committing updated version information 2020-10-20 12:08:38 +00:00
dovholuknf 5a04e8fefe Merge branch 'release-1.2.11' of github.com:openziti/desktop-edge-win into release-1.2.11 2020-10-20 08:02:06 -04:00
dovholuknf 77983c3b95 forgot to call the update script 2020-10-20 08:01:58 -04:00
ziti-ci 1a5b39100b [ci skip] committing updated version information 2020-10-20 12:01:31 +00:00
dovholuknf 72a37a0bb9 update travis file - should build on anything that isn't the 'installer' branch 2020-10-20 07:55:21 -04:00
dovholuknf d096cda0de update version update information 2020-10-20 07:49:59 -04:00
dovholuknf a3d5654a27 remove trailing lines from AssemblyInfo.cs 2020-10-20 07:44:37 -04:00
dovholuknf f93b55d436 replacing content in a file should not be this hard with powershell... 2020-10-20 07:44:12 -04:00
dovholuknf 164a00e35e update version line by line to see if it will stop adding newlines 2020-10-20 00:04:07 -04:00
dovholuknf 56ec6eccee don't append newlines over and over 2020-10-19 23:35:48 -04:00
dovholuknf a4a60bc0ab build pre-releases for testing 2020-10-19 23:16:55 -04:00
dovholuknf c7914ac210 bump to 1.2.11 2020-10-19 23:15:37 -04:00
dovholuknf 925b005ce2 Merge branch 'release-1.2.10' of github.com:openziti/desktop-edge-win into release-1.2.10 2020-10-19 23:13:36 -04:00
dovholuknf 144c074e15 truing all the branches to the pre-release branch 2020-10-19 23:13:28 -04:00
ziti-ci ae27dfc8ca [ci skip] committing updated version information 2020-10-20 03:11:42 +00:00
dovholuknf aa0474a469 Merge pull request #141 from openziti/issue-130-upgrade-detection
Issue 130 upgrade version detection
2020-10-19 23:06:06 -04:00
dovholuknf 2d7dc9e062 Merge pull request #139 from openziti/fix-ips-treated-as-dns
change dns timeout to debug not warning
2020-10-19 23:05:31 -04:00
dovholuknf f035917ca7 good enough without the version baked in automatically for now... 2020-10-19 14:49:35 -04:00