ckaczor/WorldClockStatusWindow
1
0
Fork 0
mirror of https://github.com/ckaczor/WorldClockStatusWindow.git synced 2026-03-06 18:52:02 -05:00
Code Issues Packages Projects Releases 12 Wiki Activity

Update to .NET 10

Browse Source
This commit is contained in:
Chris Kaczor
2026-02-25 11:11:50 -05:00
parent a73a583ed7
commit aa9a7ef568
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/main.yml vendored
View File

@@ -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 }}

2
Data.cs
View File

@@ -6,7 +6,7 @@ namespace WorldClockStatusWindow;
internal static class Data
{
internal static ObservableCollection<TimeZoneEntry> TimeZoneEntries { get; set; }
internal static ObservableCollection<TimeZoneEntry> TimeZoneEntries { get; private set; }
internal static void Load()
{

6
TimeZoneEntry.cs
View File

@@ -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;
}
}

5
WorldClockStatusWindow.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<TargetFramework>net10.0-windows7.0</TargetFramework>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWPF>true</UseWPF>
@@ -19,9 +19,8 @@
<PackageReference Include="ChrisKaczor.Wpf.Controls.Link" Version="1.0.4" />
<PackageReference Include="ChrisKaczor.Wpf.Validation" Version="1.0.4" />
<PackageReference Include="ChrisKaczor.Wpf.Windows.CategoryWindow" Version="1.0.2" />
<PackageReference Include="ChrisKaczor.Wpf.Windows.FloatingStatusWindow" Version="2.0.0.5" />
<PackageReference Include="ChrisKaczor.Wpf.Windows.FloatingStatusWindow" Version="2.0.0.8" />
<PackageReference Include="gong-wpf-dragdrop" Version="3.2.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Serilog" Version="4.0.2" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />