Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow auto upgrade url set #619

Merged
merged 76 commits into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
b470187
Merge pull request #535 from openziti/release-next
dovholuknf Jun 17, 2022
c56d8f2
Merge pull request #543 from openziti/release-next
dovholuknf Jun 28, 2022
ae0140e
Merge pull request #546 from openziti/release-next
dovholuknf Jun 29, 2022
7181922
Merge pull request #553 from openziti/release-next
dovholuknf Jul 19, 2022
8f8ea56
Merge pull request #558 from openziti/release-next
dovholuknf Aug 1, 2022
a020719
Merge pull request #563 from openziti/release-next
dovholuknf Aug 12, 2022
0cf81be
Merge pull request #569 from openziti/release-next
dovholuknf Aug 19, 2022
452ddf8
Merge pull request #570 from openziti/release-next
dovholuknf Aug 19, 2022
d279f13
Merge pull request #572 from openziti/release-next
dovholuknf Aug 22, 2022
b7aead4
quick stab at configuring the url for updates
dovholuknf Oct 25, 2023
8427fac
fix compilation
dovholuknf Oct 25, 2023
9685a61
Use Click instead of Mouse Up
JeremyTellier Oct 25, 2023
790ab77
Switch PCs not working here
JeremyTellier Oct 25, 2023
e960a03
Button Skinned Form Not Yet - Switching Back
JeremyTellier Oct 25, 2023
20b2282
Style Screen
JeremyTellier Oct 26, 2023
cdf73aa
add initial set url impl
dovholuknf Oct 27, 2023
41b6f9c
formatting
dovholuknf Oct 27, 2023
49ec668
formatting
dovholuknf Oct 27, 2023
3317d56
formatting
dovholuknf Oct 27, 2023
88ed3c8
and more... formatting
dovholuknf Oct 27, 2023
b747967
and more... formatting
dovholuknf Oct 27, 2023
3d72171
update version and put comma back
dovholuknf Oct 27, 2023
3ed340f
add a blurb on save. move the testing json to a separate dir
dovholuknf Oct 27, 2023
1878cbe
ignore ZitiDesktopEdgeClient* folders. update readme again
dovholuknf Oct 27, 2023
b010584
another version to test
dovholuknf Oct 27, 2023
cf39317
add c redist
dovholuknf Oct 31, 2023
d14ce07
freshen deps
dovholuknf Oct 31, 2023
9503208
download the vc redist during build and use it
dovholuknf Oct 31, 2023
5457b04
maybe case sensitive
dovholuknf Oct 31, 2023
86a643b
kick thebuild
dovholuknf Oct 31, 2023
7552c77
change VC to vc and verify file
dovholuknf Oct 31, 2023
831e553
use buildPath not scriptPath
dovholuknf Oct 31, 2023
cf93058
initial version check
dovholuknf Oct 31, 2023
5f83023
Merge remote-tracking branch 'origin/release-next' into allow-auto-up…
dovholuknf Oct 31, 2023
8f45749
additional refactoring, test, etc of setting the update url
dovholuknf Nov 1, 2023
d2b6c59
testing resources
dovholuknf Nov 1, 2023
12e8bc8
try triggering an installer build
dovholuknf Nov 1, 2023
8239182
make another version for upgrade testing
dovholuknf Nov 1, 2023
a786833
make another version for upgrade testing
dovholuknf Nov 1, 2023
e84b787
make another version for upgrade testing
dovholuknf Nov 1, 2023
9be9b62
make another version for upgrade testing
dovholuknf Nov 1, 2023
8f19b99
try to emit an update json file as well
dovholuknf Nov 1, 2023
20ff4bc
try putting all three files into one zip
dovholuknf Nov 1, 2023
b0b37c0
keep trying to get github actions to do what i want
dovholuknf Nov 1, 2023
53370f6
build a test 2.1.17
dovholuknf Nov 1, 2023
8e44ff7
update adv installer with new icons
dovholuknf Nov 1, 2023
ce9bd6d
updates to various parts of the puzzle
dovholuknf Nov 1, 2023
0034b7b
last big round of changes before looking to review
dovholuknf Nov 1, 2023
7058bb8
try to fix icon
dovholuknf Nov 2, 2023
416c02a
fix install icon
dovholuknf Nov 2, 2023
a4b8843
update version to 2.2
dovholuknf Nov 2, 2023
d2c0e91
migrate from using github to using cloudfront
dovholuknf Nov 2, 2023
f4f9101
add images
dovholuknf Nov 2, 2023
95e9d58
still working on getting the .ico nice
dovholuknf Nov 2, 2023
7ba62e9
rephrase warning
dovholuknf Nov 2, 2023
adf5018
put the App.xaml back for now
dovholuknf Nov 2, 2023
77ce020
so many formatting issues...
dovholuknf Nov 2, 2023
9529a52
formatting fixes....
dovholuknf Nov 2, 2023
fe5c3b3
revert OnClickEvt to OnClick
dovholuknf Nov 2, 2023
14f62ac
formatting still...
dovholuknf Nov 2, 2023
5c0af0c
icon changes
dovholuknf Nov 2, 2023
9fc3723
revert app.config chnages
dovholuknf Nov 2, 2023
8ce4d29
another format
dovholuknf Nov 2, 2023
fbd90a5
stop building on *url* branches
dovholuknf Nov 2, 2023
3a14bdf
Merge pull request #621 from openziti/additional-set-url-refinements
dovholuknf Nov 2, 2023
97f666c
formatting
dovholuknf Nov 2, 2023
607526f
Merge remote-tracking branch 'origin/main' into allow-auto-upgrade-ur…
dovholuknf Nov 2, 2023
3ad1015
Merge remote-tracking branch 'origin/release-next' into allow-auto-up…
dovholuknf Nov 2, 2023
09756f0
add how to test locally instructions
dovholuknf Nov 2, 2023
a09fd9c
allow either update button to successfully upgrade the app and show b…
dovholuknf Nov 2, 2023
f0180cf
refactoring build scripts a bit to support local upgrade dev
dovholuknf Nov 2, 2023
7a3fc4c
interim commit
dovholuknf Nov 2, 2023
0035c4d
small build updates and ui tweak
dovholuknf Nov 3, 2023
8077639
update all the ui elements when an upgrade is available
dovholuknf Nov 3, 2023
135497b
changes from review, cache wintun due to how often dl'ing fails
dovholuknf Nov 8, 2023
7573674
updates per review
dovholuknf Nov 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/installer.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,15 @@ jobs:
ziti_ci_gpg_key_id: ${{ secrets.ZITI_CI_GPG_KEY_ID }}
run: powershell -File .\Installer\build.ps1
- name: Upload installer onto job
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ZitiDesktopEdgeClient-${{ env.VERSION }}
path: "Installer/Output/Ziti Desktop Edge Client-*"
- name: Upload update json to job
uses: actions/upload-artifact@v2
with:
name: ZitiDesktopEdgeClient-${{ env.VERSION }}
path: ${{ env.VERSION }}.json
- name: Git Status
run: git status
- name: git diff
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -280,5 +280,7 @@ ziti-edge-tunnel/*.dll
ziti-edge-tunnel/*.exe
ziti-edge-tunnel/*.zip
OPENZITI_P12.b64
Installer/wintun.zip
Installer/zet.zip
release-streams/local/*
release-streams/local.json
release-streams/dev.json
5 changes: 2 additions & 3 deletions DesktopEdge/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ protected override void OnStartup(StartupEventArgs e) {

bool createdNew;


_mutex = new Mutex(true, appName, out createdNew);

if (!createdNew) {
Expand All @@ -59,8 +58,8 @@ protected override void OnStartup(StartupEventArgs e) {
#pragma warning disable 4014 //This async method lacks 'await'
StartServer();
#pragma warning restore 4014 //This async method lacks 'await'
}
}
}
}

async public Task StartServer() {
logger.Debug("Starting IPC server to listen for other instances of the app");
Expand Down
Loading
Loading