Skip to content

Commit 8bc1e97

Browse files
YJammakYJammak
committed
升级dotnet7.0
1 parent 1e52130 commit 8bc1e97

File tree

4 files changed

+62
-62
lines changed

4 files changed

+62
-62
lines changed

‎src/SharpSxwnl/SharpSxwnl.csproj‎

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

3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
5-
<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>
9-
<Authors>Y.J.K</Authors>
10-
<Product>天气日历</Product>
11-
<PackageProjectUrl>https://github.com/yjk282/Weather</PackageProjectUrl>
12-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net7.0</TargetFramework>
5+
<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>
9+
<Authors>Y.J.K</Authors>
10+
<Product>天气日历</Product>
11+
<PackageProjectUrl>https://github.com/YJammak/Weather</PackageProjectUrl>
12+
</PropertyGroup>
1313

14-
<ItemGroup>
15-
<Compile Update="Resource.Designer.cs">
16-
<DesignTime>True</DesignTime>
17-
<AutoGen>True</AutoGen>
18-
<DependentUpon>Resource.resx</DependentUpon>
19-
</Compile>
20-
</ItemGroup>
14+
<ItemGroup>
15+
<Compile Update="Resource.Designer.cs">
16+
<DesignTime>True</DesignTime>
17+
<AutoGen>True</AutoGen>
18+
<DependentUpon>Resource.resx</DependentUpon>
19+
</Compile>
20+
</ItemGroup>
2121

22-
<ItemGroup>
23-
<EmbeddedResource Update="Resource.resx">
24-
<Generator>ResXFileCodeGenerator</Generator>
25-
<LastGenOutput>Resource.Designer.cs</LastGenOutput>
26-
</EmbeddedResource>
27-
</ItemGroup>
22+
<ItemGroup>
23+
<EmbeddedResource Update="Resource.resx">
24+
<Generator>ResXFileCodeGenerator</Generator>
25+
<LastGenOutput>Resource.Designer.cs</LastGenOutput>
26+
</EmbeddedResource>
27+
</ItemGroup>
2828

2929
</Project>

‎src/Weather.sln‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30804.86
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.4.33103.184
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WeatherCalendar", "WeatherCalendar\WeatherCalendar.csproj", "{FD42C9D1-76B5-4381-B3A5-573BC7E9F23A}"
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Weather", "Weather\Weather.csproj", "{661F15FA-86FF-4780-B07B-F49F415FA306}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSxwnl", "SharpSxwnl\SharpSxwnl.csproj", "{72FF6302-45FB-4AE4-B519-FA09806381D5}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpSxwnl", "SharpSxwnl\SharpSxwnl.csproj", "{72FF6302-45FB-4AE4-B519-FA09806381D5}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎src/Weather/Weather.csproj‎

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

3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
5-
<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>
9-
<Authors>Y.J.K</Authors>
10-
<Product>天气日历</Product>
11-
<PackageProjectUrl>https://github.com/yjk282/Weather</PackageProjectUrl>
12-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net7.0</TargetFramework>
5+
<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>
9+
<Authors>Y.J.K</Authors>
10+
<Product>天气日历</Product>
11+
<PackageProjectUrl>https://github.com/YJammak/Weather</PackageProjectUrl>
12+
</PropertyGroup>
1313

14-
<ItemGroup>
15-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
16-
<PackageReference Include="RestSharp" Version="108.0.2" />
17-
<PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="108.0.2" />
18-
</ItemGroup>
14+
<ItemGroup>
15+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
16+
<PackageReference Include="RestSharp" Version="108.0.2" />
17+
<PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="108.0.2" />
18+
</ItemGroup>
1919

20-
<ItemGroup>
21-
<Compile Update="Resource.Designer.cs">
22-
<DesignTime>True</DesignTime>
23-
<AutoGen>True</AutoGen>
24-
<DependentUpon>Resource.resx</DependentUpon>
25-
</Compile>
26-
</ItemGroup>
20+
<ItemGroup>
21+
<Compile Update="Resource.Designer.cs">
22+
<DesignTime>True</DesignTime>
23+
<AutoGen>True</AutoGen>
24+
<DependentUpon>Resource.resx</DependentUpon>
25+
</Compile>
26+
</ItemGroup>
2727

28-
<ItemGroup>
29-
<EmbeddedResource Update="Resource.resx">
30-
<Generator>ResXFileCodeGenerator</Generator>
31-
<LastGenOutput>Resource.Designer.cs</LastGenOutput>
32-
</EmbeddedResource>
33-
</ItemGroup>
28+
<ItemGroup>
29+
<EmbeddedResource Update="Resource.resx">
30+
<Generator>ResXFileCodeGenerator</Generator>
31+
<LastGenOutput>Resource.Designer.cs</LastGenOutput>
32+
</EmbeddedResource>
33+
</ItemGroup>
3434

3535
</Project>

‎src/WeatherCalendar/WeatherCalendar.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net6.0-windows</TargetFramework>
5+
<TargetFramework>net7.0-windows</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<ApplicationIcon>Icon.ico</ApplicationIcon>
88
<Copyright>Copyright © 2021-2022 Y.J.K. All rights reserved.</Copyright>
9-
<AssemblyVersion>0.3.0.0</AssemblyVersion>
10-
<FileVersion>0.4.0.0</FileVersion>
11-
<Version>0.4.0.0</Version>
9+
<AssemblyVersion>0.4.2.0</AssemblyVersion>
10+
<FileVersion>0.4.2.0</FileVersion>
11+
<Version>0.4.2.0</Version>
1212
<Authors>Y.J.K</Authors>
1313
<Product>天气日历</Product>
14-
<PackageProjectUrl>https://github.com/yjk282/Weather</PackageProjectUrl>
14+
<PackageProjectUrl>https://github.com/YJammak/Weather</PackageProjectUrl>
1515
</PropertyGroup>
1616

1717
<ItemGroup>
@@ -30,16 +30,16 @@
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>
33-
<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.73" />
33+
<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.74" />
3434
<PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
3535
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
36-
<PackageReference Include="NLog" Version="5.0.4" />
36+
<PackageReference Include="NLog" Version="5.0.5" />
3737
<PackageReference Include="NPinyin.Core" Version="3.0.0" />
3838
<PackageReference Include="ReactiveUI.Events.WPF" Version="15.1.1" />
3939
<PackageReference Include="ReactiveUI.Fody" Version="18.3.1" />
4040
<PackageReference Include="ReactiveUI.Validation" Version="3.0.1" />
4141
<PackageReference Include="ReactiveUI.WPF" Version="18.3.1" />
42-
<PackageReference Include="System.Management" Version="6.0.0" />
42+
<PackageReference Include="System.Management" Version="7.0.0" />
4343
<PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
4444
<PackageReference Include="Ymiot.Core" Version="0.1.0" />
4545
</ItemGroup>

0 commit comments

Comments
 (0)