update to .NET 8

WeihanLi · Nov 24, 2023 · 3f6e1f9 · 3f6e1f9
1 parent 2bd74eb
commit 3f6e1f9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 21 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-		<VersionMajor>2</VersionMajor>
-		<VersionMinor>3</VersionMinor>
+		<VersionMajor>3</VersionMajor>
+		<VersionMinor>0</VersionMinor>
 		<VersionPatch>0</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 		<VersionSuffix Condition="'$(Configuration)'=='DEBUG'">preview</VersionSuffix>
@@ -13,6 +13,6 @@
     <RepositoryUrl>https://github.com/WeihanLi/DbTool</RepositoryUrl>
 
     <Authors>DbTool Contributors</Authors>
-    <Copyright>Copyright 2017-2022 (c) WeihanLi</Copyright>
+    <Copyright>Copyright 2017-2023 (c) WeihanLi</Copyright>
   </PropertyGroup>
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -3,8 +3,7 @@ schedules:
   displayName: Build every day at 10:00 UTC
   branches:
     include:
-    - master
-  always: true
+    - '*'
 
 trigger:
   branches:
@@ -16,11 +15,11 @@ pool:
 
 steps:
 - task: UseDotNet@2
-  displayName: 'Use .NET Core sdk'
+  displayName: 'Use .NET SDK'
   inputs:
     packageType: sdk
-    version: 6.0.x
-    includePreviewVersions: true
+    version: 8.0.x
+    # includePreviewVersions: true
 
 - script: dotnet --info
   displayName: "dotnet info"

diff --git a/src/DbTool.ControlLib/DbTool.ControlLib.csproj b/src/DbTool.ControlLib/DbTool.ControlLib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/src/DbTool/DbTool.csproj b/src/DbTool/DbTool.csproj
@@ -2,14 +2,13 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <RootNamespace>DbTool</RootNamespace>
     <AssemblyName>DbTool</AssemblyName>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <ApplicationIcon>DbTool.ico</ApplicationIcon>
-    <DbToolPackageVersion>2.1.1</DbToolPackageVersion>
+    <DbToolPackageVersion>3.0.0</DbToolPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,9 +18,9 @@
     <Page Remove="out\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WeihanLi.Extensions.Localization.Json" Version="1.0.3" />
-    <PackageReference Include="WeihanLi.Common" Version="1.0.52" />
-    <PackageReference Include="WeihanLi.Npoi" Version="2.2.0" />
+    <PackageReference Include="WeihanLi.Extensions.Localization.Json" Version="2.0.0" />
+    <PackageReference Include="WeihanLi.Common" Version="1.0.60" />
+    <PackageReference Include="WeihanLi.Npoi" Version="2.4.2" />
     <PackageReference Include="DbTool.Core" Version="$(DbToolPackageVersion)" />
     <PackageReference Include="DbTool.DbProvider.MySql" Version="$(DbToolPackageVersion)" />
     <PackageReference Include="DbTool.DbProvider.PostgreSql" Version="$(DbToolPackageVersion)" />

diff --git a/src/DbTool/MainWindow.xaml.cs b/src/DbTool/MainWindow.xaml.cs
@@ -419,14 +419,13 @@ private async void BtnConnectDb_OnClick(object sender, RoutedEventArgs e)
 
     private string? ChooseFolder()
     {
-        var dialog = new System.Windows.Forms.FolderBrowserDialog
+        var dialog = new OpenFolderDialog()
         {
-            Description = _localizer["ChooseDirTip"],
-            ShowNewFolderButton = true
+            Title = _localizer["ChooseDirTip"]
         };
-        if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+        if (dialog.ShowDialog() == true)
         {
-            return dialog.SelectedPath;
+            return dialog.FolderName;
         }
         return null;
     }

diff --git a/test/DbTool.Test/DbTool.Test.csproj b/test/DbTool.Test/DbTool.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>