diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2019-02-15 18:53:49 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-05-11 19:11:19 -0500 |
| commit | dd40005b0cc376410cd931c9790bdd69551e9aa1 (patch) | |
| tree | cd228155d6c4b143d78e15eeb65bb20ee6e79a9b /src/WixToolset.WixBA/UpdateViewModel.cs | |
| parent | 8d92f6d48aa428b1e92a26de53fbf511e780793c (diff) | |
| download | wix-dd40005b0cc376410cd931c9790bdd69551e9aa1.tar.gz wix-dd40005b0cc376410cd931c9790bdd69551e9aa1.tar.bz2 wix-dd40005b0cc376410cd931c9790bdd69551e9aa1.zip | |
Integrate into latest v4 (2019/02/15).
Diffstat (limited to 'src/WixToolset.WixBA/UpdateViewModel.cs')
| -rw-r--r-- | src/WixToolset.WixBA/UpdateViewModel.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/WixToolset.WixBA/UpdateViewModel.cs b/src/WixToolset.WixBA/UpdateViewModel.cs index 6b60112c..cb6c0ad9 100644 --- a/src/WixToolset.WixBA/UpdateViewModel.cs +++ b/src/WixToolset.WixBA/UpdateViewModel.cs | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. |
| 2 | 2 | ||
| 3 | namespace WixToolset.UX | 3 | namespace WixToolset.WixBA |
| 4 | { | 4 | { |
| 5 | using System; | 5 | using System; |
| 6 | using System.ComponentModel; | 6 | using System.ComponentModel; |
| 7 | using System.Windows.Input; | 7 | using System.Windows.Input; |
| 8 | using WixToolset.Bootstrapper; | 8 | using WixToolset.BootstrapperCore; |
| 9 | 9 | ||
| 10 | /// <summary> | 10 | /// <summary> |
| 11 | /// The states of the update view model. | 11 | /// The states of the update view model. |
| @@ -151,7 +151,7 @@ namespace WixToolset.UX | |||
| 151 | } | 151 | } |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | private void DetectUpdateBegin(object sender, Bootstrapper.DetectUpdateBeginEventArgs e) | 154 | private void DetectUpdateBegin(object sender, DetectUpdateBeginEventArgs e) |
| 155 | { | 155 | { |
| 156 | // Don't check for updates if: | 156 | // Don't check for updates if: |
| 157 | // the first check failed (no retry) | 157 | // the first check failed (no retry) |
| @@ -164,7 +164,7 @@ namespace WixToolset.UX | |||
| 164 | } | 164 | } |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | private void DetectUpdate(object sender, Bootstrapper.DetectUpdateEventArgs e) | 167 | private void DetectUpdate(object sender, DetectUpdateEventArgs e) |
| 168 | { | 168 | { |
| 169 | // The list of updates is sorted in descending version, so the first callback should be the largest update available. | 169 | // The list of updates is sorted in descending version, so the first callback should be the largest update available. |
| 170 | // This update should be either larger than ours (so we are out of date), the same as ours (so we are current) | 170 | // This update should be either larger than ours (so we are out of date), the same as ours (so we are current) |
| @@ -186,7 +186,7 @@ namespace WixToolset.UX | |||
| 186 | e.StopProcessingUpdates = true; | 186 | e.StopProcessingUpdates = true; |
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | private void DetectUpdateComplete(object sender, Bootstrapper.DetectUpdateCompleteEventArgs e) | 189 | private void DetectUpdateComplete(object sender, DetectUpdateCompleteEventArgs e) |
| 190 | { | 190 | { |
| 191 | // Failed to process an update, allow the existing bundle to still install. | 191 | // Failed to process an update, allow the existing bundle to still install. |
| 192 | if ((UpdateState.Failed != this.State) && !Hresult.Succeeded(e.Status)) | 192 | if ((UpdateState.Failed != this.State) && !Hresult.Succeeded(e.Status)) |
