From aa9a7ef568dcac01f7af2492a73b965e280e5329 Mon Sep 17 00:00:00 2001 From: Chris Kaczor Date: Wed, 25 Feb 2026 11:11:50 -0500 Subject: [PATCH] Update to .NET 10 --- .github/workflows/main.yml | 6 +++--- Data.cs | 2 +- TimeZoneEntry.cs | 6 ++---- WorldClockStatusWindow.csproj | 5 ++--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 54f0b32..5a6e7e2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,14 +23,14 @@ jobs: - name: Install .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - name: Publish Application - run: dotnet publish WorldClockStatusWindow.csproj -c Debug -o publish + run: dotnet publish WorldClockStatusWindow.csproj -c Release -o publish - name: Create Velopack Release run: | dotnet tool install -g vpk vpk download github --repoUrl https://github.com/ckaczor/WorldClockStatusWindow - vpk pack -u WorldClockStatusWindow -v ${{ steps.version.outputs.version }} -p publish --packTitle "World Clock Status Window" --shortcuts StartMenuRoot --framework net8.0-x64-desktop + vpk pack -u WorldClockStatusWindow -v ${{ steps.version.outputs.version }} -p publish --packTitle "World Clock Status Window" --shortcuts StartMenuRoot --framework net10.0-x64-desktop vpk upload github --repoUrl https://github.com/ckaczor/WorldClockStatusWindow --publish --releaseName "${{ steps.version.outputs.version }}" --tag v${{ steps.version.outputs.version }} --token ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/Data.cs b/Data.cs index aa3c7d1..b5d75f0 100644 --- a/Data.cs +++ b/Data.cs @@ -6,7 +6,7 @@ namespace WorldClockStatusWindow; internal static class Data { - internal static ObservableCollection TimeZoneEntries { get; set; } + internal static ObservableCollection TimeZoneEntries { get; private set; } internal static void Load() { diff --git a/TimeZoneEntry.cs b/TimeZoneEntry.cs index 8738050..b0fc457 100644 --- a/TimeZoneEntry.cs +++ b/TimeZoneEntry.cs @@ -16,17 +16,15 @@ public class TimeZoneEntry : INotifyDataErrorInfo _dataErrorDictionary.ErrorsChanged += DataErrorDictionaryErrorsChanged; } - private string _label; - public string Label { - get => _label; + get; set { if (!ValidateLabel(value)) return; - _label = value; + field = value; } } diff --git a/WorldClockStatusWindow.csproj b/WorldClockStatusWindow.csproj index 2c32f31..08918be 100644 --- a/WorldClockStatusWindow.csproj +++ b/WorldClockStatusWindow.csproj @@ -1,6 +1,6 @@  - net8.0-windows7.0 + net10.0-windows7.0 WinExe false true @@ -19,9 +19,8 @@ - + -