mirror of
https://github.com/ckaczor/WorldClockStatusWindow.git
synced 2026-01-13 17:23:18 -05:00
Fix version number?
This commit is contained in:
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
@@ -25,4 +25,4 @@ jobs:
|
|||||||
dotnet tool install -g vpk
|
dotnet tool install -g vpk
|
||||||
vpk download github --repoUrl https://github.com/ckaczor/WorldClockStatusWindow
|
vpk download github --repoUrl https://github.com/ckaczor/WorldClockStatusWindow
|
||||||
vpk pack -u MyUniqueIdentifier -v ${{ steps.get-version.outputs.version }} -p publish
|
vpk pack -u MyUniqueIdentifier -v ${{ steps.get-version.outputs.version }} -p publish
|
||||||
vpk upload github --repoUrl https://github.com/ckaczor/WorldClockStatusWindow --publish --releaseName "WorldClockStatusWindow ${{ steps.get-version.outputs.version }}" --tag v${{ steps.get-version.outputs.version }}
|
vpk upload github --repoUrl https://github.com/ckaczor/WorldClockStatusWindow --publish --releaseName "WorldClockStatusWindow 1.0.${{ github.event.release.tag_name }}" --tag v1.0.${{ github.event.release.tag_name }}
|
||||||
@@ -45,18 +45,18 @@ internal class WindowSource : IWindowSource, IDisposable
|
|||||||
if (!updateManager.IsInstalled)
|
if (!updateManager.IsInstalled)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
_dispatcher.InvokeAsync(() => _floatingStatusWindow.SetText("Checking for update..."));
|
_dispatcher.Invoke(() => _floatingStatusWindow.SetText("Checking for update..."));
|
||||||
|
|
||||||
var newVersion = await updateManager.CheckForUpdatesAsync();
|
var newVersion = await updateManager.CheckForUpdatesAsync();
|
||||||
|
|
||||||
if (newVersion == null)
|
if (newVersion == null)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
_dispatcher.InvokeAsync(() => _floatingStatusWindow.SetText("Downloading update..."));
|
_dispatcher.Invoke(() => _floatingStatusWindow.SetText("Downloading update..."));
|
||||||
|
|
||||||
await updateManager.DownloadUpdatesAsync(newVersion);
|
await updateManager.DownloadUpdatesAsync(newVersion);
|
||||||
|
|
||||||
_dispatcher.InvokeAsync(() => _floatingStatusWindow.SetText("Installing update..."));
|
_dispatcher.Invoke(() => _floatingStatusWindow.SetText("Installing update..."));
|
||||||
|
|
||||||
updateManager.ApplyUpdatesAndRestart(newVersion);
|
updateManager.ApplyUpdatesAndRestart(newVersion);
|
||||||
}
|
}
|
||||||
@@ -119,7 +119,7 @@ internal class WindowSource : IWindowSource, IDisposable
|
|||||||
text.AppendLine();
|
text.AppendLine();
|
||||||
text.Append($"Version: {Assembly.GetEntryAssembly()!.GetName().Version!.ToString()}");
|
text.Append($"Version: {Assembly.GetEntryAssembly()!.GetName().Version!.ToString()}");
|
||||||
|
|
||||||
_dispatcher.InvokeAsync(() => _floatingStatusWindow.SetText(text.ToString()));
|
_dispatcher.Invoke(() => _floatingStatusWindow.SetText(text.ToString()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
|
|||||||
Reference in New Issue
Block a user