mirror of
https://github.com/ckaczor/WorldClockStatusWindow.git
synced 2026-03-09 12:11:37 -04:00
Compare commits
2 Commits
v2024.10.3
...
v2026.3.1
| Author | SHA1 | Date | |
|---|---|---|---|
| 4ab9994897 | |||
| aa9a7ef568 |
6
.github/workflows/main.yml
vendored
6
.github/workflows/main.yml
vendored
@@ -23,14 +23,14 @@ jobs:
|
|||||||
- name: Install .NET
|
- name: Install .NET
|
||||||
uses: actions/setup-dotnet@v4
|
uses: actions/setup-dotnet@v4
|
||||||
with:
|
with:
|
||||||
dotnet-version: 8.0.x
|
dotnet-version: 10.0.x
|
||||||
|
|
||||||
- name: Publish Application
|
- 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
|
- name: Create Velopack Release
|
||||||
run: |
|
run: |
|
||||||
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 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 }}
|
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
2
Data.cs
@@ -6,7 +6,7 @@ namespace WorldClockStatusWindow;
|
|||||||
|
|
||||||
internal static class Data
|
internal static class Data
|
||||||
{
|
{
|
||||||
internal static ObservableCollection<TimeZoneEntry> TimeZoneEntries { get; set; }
|
internal static ObservableCollection<TimeZoneEntry> TimeZoneEntries { get; private set; }
|
||||||
|
|
||||||
internal static void Load()
|
internal static void Load()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -16,17 +16,15 @@ public class TimeZoneEntry : INotifyDataErrorInfo
|
|||||||
_dataErrorDictionary.ErrorsChanged += DataErrorDictionaryErrorsChanged;
|
_dataErrorDictionary.ErrorsChanged += DataErrorDictionaryErrorsChanged;
|
||||||
}
|
}
|
||||||
|
|
||||||
private string _label;
|
|
||||||
|
|
||||||
public string Label
|
public string Label
|
||||||
{
|
{
|
||||||
get => _label;
|
get;
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if (!ValidateLabel(value))
|
if (!ValidateLabel(value))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
_label = value;
|
field = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0-windows7.0</TargetFramework>
|
<TargetFramework>net10.0-windows7.0</TargetFramework>
|
||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||||
<UseWPF>true</UseWPF>
|
<UseWPF>true</UseWPF>
|
||||||
@@ -19,9 +19,8 @@
|
|||||||
<PackageReference Include="ChrisKaczor.Wpf.Controls.Link" Version="1.0.4" />
|
<PackageReference Include="ChrisKaczor.Wpf.Controls.Link" Version="1.0.4" />
|
||||||
<PackageReference Include="ChrisKaczor.Wpf.Validation" 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.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.9" />
|
||||||
<PackageReference Include="gong-wpf-dragdrop" Version="3.2.1" />
|
<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" Version="4.0.2" />
|
||||||
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
|
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
|
||||||
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
|
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
|
||||||
|
|||||||
Reference in New Issue
Block a user