Skip to content

Commit 24791a5

Browse files
YJammakYJammak
committed
升级依赖库，适配.NET 10
1 parent c0e21e8 commit 24791a5

File tree

83 files changed

+1510
-1347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1510
-1347
lines changed

‎.github/workflows/dotnet-desktop.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: [ "master" ]
88

99
env:
10-
VERSION: "0.4.5.${{github.run_number}}"
10+
VERSION: "0.4.6.${{github.run_number}}"
1111

1212
jobs:
1313
build:
@@ -18,13 +18,13 @@ jobs:
1818
- name: Setup .NET SDK
1919
uses: actions/setup-dotnet@v1.9.0
2020
with:
21-
dotnet-version: '9.0.x'
21+
dotnet-version: '10.0.x'
2222

2323
- name: Checkout
2424
uses: actions/checkout@v3
2525

2626
- name: Install dependencies
27-
run: dotnet restore src/Weather.sln
27+
run: dotnet restore src/Weather.slnx
2828

2929
# Build applications
3030
- name: Build win-x64

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021 Y.J.K
3+
Copyright (c) 2025 Y.J.K
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Weather
22
用WPF写的日历天气桌面小程序
33

4-
- .NET 8.0
5-
- Visual Studio 2022
4+
- .NET 10.0
5+
- Visual Studio 2026
66
- MVVM（ReactiveUI）
77

88
### 软件截图

‎src/Directory.Packages.props‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<PackageVersion Include="Anotar.NLog.Fody" Version="6.0.0" />
8+
<PackageVersion Include="DynamicData" Version="9.4.1" />
9+
<PackageVersion Include="Enums.NET" Version="5.0.0" />
10+
<PackageVersion Include="Fody" Version="6.9.3" />
11+
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.2" />
12+
<PackageVersion Include="MaterialDesignThemes" Version="5.3.0" />
13+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
14+
<PackageVersion Include="NLog" Version="6.0.6" />
15+
<PackageVersion Include="NPinyin.Core" Version="3.0.0" />
16+
<PackageVersion Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" />
17+
<PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
18+
<PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.5.1" />
19+
<PackageVersion Include="ReactiveUI.Validation" Version="6.0.5" />
20+
<PackageVersion Include="ReactiveUI.WPF" Version="22.2.1" />
21+
<PackageVersion Include="RestSharp" Version="112.1.0" />
22+
<PackageVersion Include="RestSharp.Serializers.NewtonsoftJson" Version="112.1.0" />
23+
<PackageVersion Include="Splat.NLog" Version="17.1.1" />
24+
<PackageVersion Include="System.Management" Version="10.0.0" />
25+
<PackageVersion Include="System.Reactive.Linq" Version="6.1.0" />
26+
<PackageVersion Include="System.Text.Json" Version="10.0.0" />
27+
<PackageVersion Include="Ymiot.Core" Version="0.1.0" />
28+
</ItemGroup>
29+
</Project>

‎src/SharpSxwnl/SharpSxwnl.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Copyright>Copyright © 2021 Y.J.K. All rights reserved.</Copyright>
6-
<AssemblyVersion>0.2.1.0</AssemblyVersion>
7-
<FileVersion>0.2.1.0</FileVersion>
8-
<Version>0.2.1.0</Version>
6+
<AssemblyVersion>0.2.2.0</AssemblyVersion>
7+
<FileVersion>0.2.2.0</FileVersion>
8+
<Version>0.2.2.0</Version>
99
<Authors>Y.J.K</Authors>
1010
<Product>天气日历</Product>
1111
<PackageProjectUrl>https://github.com/YJammak/Weather</PackageProjectUrl>

‎src/Weather.sln‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎src/Weather.slnx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Solution>
2+
<Project Path="SharpSxwnl/SharpSxwnl.csproj" />
3+
<Project Path="Weather/Weather.csproj" />
4+
<Project Path="WeatherCalendar/WeatherCalendar.csproj" />
5+
</Solution>

‎src/Weather/Weather.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Copyright>Copyright © 2021 Y.J.K. All rights reserved.</Copyright>
6-
<AssemblyVersion>0.2.1.0</AssemblyVersion>
7-
<FileVersion>0.2.1.0</FileVersion>
8-
<Version>0.2.1.0</Version>
6+
<AssemblyVersion>0.2.2.0</AssemblyVersion>
7+
<FileVersion>0.2.2.0</FileVersion>
8+
<Version>0.2.2.0</Version>
99
<Authors>Y.J.K</Authors>
1010
<Product>天气日历</Product>
1111
<PackageProjectUrl>https://github.com/YJammak/Weather</PackageProjectUrl>
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
16-
<PackageReference Include="RestSharp" Version="112.1.0" />
17-
<PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="112.1.0" />
15+
<PackageReference Include="Newtonsoft.Json" />
16+
<PackageReference Include="RestSharp" />
17+
<PackageReference Include="RestSharp.Serializers.NewtonsoftJson" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/WeatherCalendar/App.xaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Application
1+
<Application
22
x:Class="WeatherCalendar.App"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -11,10 +11,8 @@
1111
BaseTheme="Dark"
1212
PrimaryColor="DeepOrange"
1313
SecondaryColor="Red" />
14-
<ResourceDictionary
15-
Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.defaults.xaml" />
16-
<ResourceDictionary
17-
Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ObsoleteBrushes.xaml" />
14+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.defaults.xaml" />
15+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ObsoleteBrushes.xaml" />
1816
</ResourceDictionary.MergedDictionaries>
1917

2018
<FontFamily x:Key="ChineseZodiacFontFamily">pack://application:,,,/WeatherCalendar;component/Resources/Fonts/#ChineseZodiac</FontFamily>

‎src/WeatherCalendar/App.xaml.cs‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
1-
using Splat;
21
using System.Windows;
2+
using ReactiveUI.Builder;
3+
using Splat;
4+
using Splat.NLog;
35
using WeatherCalendar.Services;
46

57
namespace WeatherCalendar;
68

79
/// <summary>
8-
/// Interaction logic for App.xaml
10+
/// Interaction logic for App.xaml
911
/// </summary>
1012
public partial class App
1113
{
1214
protected override void OnStartup(StartupEventArgs e)
1315
{
1416
base.OnStartup(e);
1517

18+
RxAppBuilder.CreateReactiveUIBuilder()
19+
.WithWpf()
20+
.WithViewsFromAssembly(typeof(App).Assembly)
21+
.Build();
22+
23+
Locator.CurrentMutable.UseNLogWithWrappingFullLogger();
24+
1625
var appService = new AppService();
1726
Locator.CurrentMutable.RegisterConstant(appService);
1827

1928
appService.Initial();
2029
}
21-
}
30+
}

0 commit comments

Comments
 (0)