升级dotnet7.0

YJammak · Nov 9, 2022 · 8bc1e97 · 8bc1e97
1 parent 1e52130
commit 8bc1e97
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 62 deletions.
diff --git a/src/SharpSxwnl/SharpSxwnl.csproj b/src/SharpSxwnl/SharpSxwnl.csproj
@@ -1,29 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <Copyright>Copyright © 2021 Y.J.K. All rights reserved.</Copyright>
-    <AssemblyVersion>0.2.1.0</AssemblyVersion>
-    <FileVersion>0.2.1.0</FileVersion>
-    <Version>0.2.1.0</Version>
-    <Authors>Y.J.K</Authors>
-    <Product>天气日历</Product>
-    <PackageProjectUrl>https://github.com/yjk282/Weather</PackageProjectUrl>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net7.0</TargetFramework>
+        <Copyright>Copyright © 2021 Y.J.K. All rights reserved.</Copyright>
+        <AssemblyVersion>0.2.1.0</AssemblyVersion>
+        <FileVersion>0.2.1.0</FileVersion>
+        <Version>0.2.1.0</Version>
+        <Authors>Y.J.K</Authors>
+        <Product>天气日历</Product>
+        <PackageProjectUrl>https://github.com/YJammak/Weather</PackageProjectUrl>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Update="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Update="Resource.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Resource.resx</DependentUpon>
+        </Compile>
+    </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="Resource.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Update="Resource.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+    </ItemGroup>
 
 </Project>
diff --git a/src/Weather.sln b/src/Weather.sln
@@ -1,13 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30804.86
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33103.184
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WeatherCalendar", "WeatherCalendar\WeatherCalendar.csproj", "{FD42C9D1-76B5-4381-B3A5-573BC7E9F23A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Weather", "Weather\Weather.csproj", "{661F15FA-86FF-4780-B07B-F49F415FA306}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSxwnl", "SharpSxwnl\SharpSxwnl.csproj", "{72FF6302-45FB-4AE4-B519-FA09806381D5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpSxwnl", "SharpSxwnl\SharpSxwnl.csproj", "{72FF6302-45FB-4AE4-B519-FA09806381D5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/Weather/Weather.csproj b/src/Weather/Weather.csproj
@@ -1,35 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <Copyright>Copyright © 2021 Y.J.K. All rights reserved.</Copyright>
-    <AssemblyVersion>0.2.1.0</AssemblyVersion>
-    <FileVersion>0.2.1.0</FileVersion>
-    <Version>0.2.1.0</Version>
-    <Authors>Y.J.K</Authors>
-    <Product>天气日历</Product>
-    <PackageProjectUrl>https://github.com/yjk282/Weather</PackageProjectUrl>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net7.0</TargetFramework>
+        <Copyright>Copyright © 2021 Y.J.K. All rights reserved.</Copyright>
+        <AssemblyVersion>0.2.1.0</AssemblyVersion>
+        <FileVersion>0.2.1.0</FileVersion>
+        <Version>0.2.1.0</Version>
+        <Authors>Y.J.K</Authors>
+        <Product>天气日历</Product>
+        <PackageProjectUrl>https://github.com/YJammak/Weather</PackageProjectUrl>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="RestSharp" Version="108.0.2" />
-    <PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="108.0.2" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="RestSharp" Version="108.0.2" />
+        <PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="108.0.2" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Update="Resource.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Resource.resx</DependentUpon>
+        </Compile>
+    </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="Resource.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Update="Resource.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+    </ItemGroup>
 
 </Project>
diff --git a/src/WeatherCalendar/WeatherCalendar.csproj b/src/WeatherCalendar/WeatherCalendar.csproj
@@ -2,16 +2,16 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0-windows</TargetFramework>
+        <TargetFramework>net7.0-windows</TargetFramework>
         <UseWPF>true</UseWPF>
         <ApplicationIcon>Icon.ico</ApplicationIcon>
         <Copyright>Copyright © 2021-2022 Y.J.K. All rights reserved.</Copyright>
-        <AssemblyVersion>0.3.0.0</AssemblyVersion>
-        <FileVersion>0.4.0.0</FileVersion>
-        <Version>0.4.0.0</Version>
+        <AssemblyVersion>0.4.2.0</AssemblyVersion>
+        <FileVersion>0.4.2.0</FileVersion>
+        <Version>0.4.2.0</Version>
         <Authors>Y.J.K</Authors>
         <Product>天气日历</Product>
-        <PackageProjectUrl>https://github.com/yjk282/Weather</PackageProjectUrl>
+        <PackageProjectUrl>https://github.com/YJammak/Weather</PackageProjectUrl>
     </PropertyGroup>
 
     <ItemGroup>
@@ -30,16 +30,16 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.73" />
+        <PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.74" />
         <PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="NLog" Version="5.0.4" />
+        <PackageReference Include="NLog" Version="5.0.5" />
         <PackageReference Include="NPinyin.Core" Version="3.0.0" />
         <PackageReference Include="ReactiveUI.Events.WPF" Version="15.1.1" />
         <PackageReference Include="ReactiveUI.Fody" Version="18.3.1" />
         <PackageReference Include="ReactiveUI.Validation" Version="3.0.1" />
         <PackageReference Include="ReactiveUI.WPF" Version="18.3.1" />
-        <PackageReference Include="System.Management" Version="6.0.0" />
+        <PackageReference Include="System.Management" Version="7.0.0" />
         <PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
         <PackageReference Include="Ymiot.Core" Version="0.1.0" />
     </ItemGroup>