From 389d2ef8b3d083836c2cc73bfbc53b34c401afa8 Mon Sep 17 00:00:00 2001 From: AlaricGilbert Date: Sun, 6 Oct 2019 01:38:26 +0800 Subject: [PATCH] migrate to .net core --- .../BiliCommenter.Console.csproj | 2 +- BiliCommenter.sln | 12 +- BiliCommenter/App.config | 27 --- BiliCommenter/BiliCommenter.csproj | 177 ++---------------- BiliCommenter/MainWindow.xaml | 20 +- BiliCommenter/Properties/AssemblyInfo.cs | 55 ------ .../Properties/Resources.Designer.cs | 63 ------- BiliCommenter/Properties/Resources.resx | 117 ------------ BiliCommenter/packages.config | 8 - BiliCore/BiliCore.csproj | 2 +- 10 files changed, 35 insertions(+), 448 deletions(-) delete mode 100644 BiliCommenter/App.config delete mode 100644 BiliCommenter/Properties/AssemblyInfo.cs delete mode 100644 BiliCommenter/Properties/Resources.Designer.cs delete mode 100644 BiliCommenter/Properties/Resources.resx delete mode 100644 BiliCommenter/packages.config diff --git a/BiliCommenter.Console/BiliCommenter.Console.csproj b/BiliCommenter.Console/BiliCommenter.Console.csproj index d99f219..90339ff 100644 --- a/BiliCommenter.Console/BiliCommenter.Console.csproj +++ b/BiliCommenter.Console/BiliCommenter.Console.csproj @@ -9,7 +9,7 @@ - + diff --git a/BiliCommenter.sln b/BiliCommenter.sln index 5879452..f543b3f 100644 --- a/BiliCommenter.sln +++ b/BiliCommenter.sln @@ -3,22 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28407.52 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BiliCommenter", "BiliCommenter\BiliCommenter.csproj", "{67B4635B-60B7-4DC8-9611-0B2D47D9C150}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BiliCore", "BiliCore\BiliCore.csproj", "{366D01A5-B07E-4D58-8AAA-8136601D2736}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BiliCommenter.Console", "BiliCommenter.Console\BiliCommenter.Console.csproj", "{EA443500-6744-48D7-B3F6-A412AB581AF7}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BiliCommenter", "BiliCommenter\BiliCommenter.csproj", "{66348A4C-3E1A-4DAB-BFB2-893BB4FF7B36}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {67B4635B-60B7-4DC8-9611-0B2D47D9C150}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67B4635B-60B7-4DC8-9611-0B2D47D9C150}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67B4635B-60B7-4DC8-9611-0B2D47D9C150}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67B4635B-60B7-4DC8-9611-0B2D47D9C150}.Release|Any CPU.Build.0 = Release|Any CPU {366D01A5-B07E-4D58-8AAA-8136601D2736}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {366D01A5-B07E-4D58-8AAA-8136601D2736}.Debug|Any CPU.Build.0 = Debug|Any CPU {366D01A5-B07E-4D58-8AAA-8136601D2736}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -27,6 +23,10 @@ Global {EA443500-6744-48D7-B3F6-A412AB581AF7}.Debug|Any CPU.Build.0 = Debug|Any CPU {EA443500-6744-48D7-B3F6-A412AB581AF7}.Release|Any CPU.ActiveCfg = Release|Any CPU {EA443500-6744-48D7-B3F6-A412AB581AF7}.Release|Any CPU.Build.0 = Release|Any CPU + {66348A4C-3E1A-4DAB-BFB2-893BB4FF7B36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {66348A4C-3E1A-4DAB-BFB2-893BB4FF7B36}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66348A4C-3E1A-4DAB-BFB2-893BB4FF7B36}.Release|Any CPU.ActiveCfg = Release|Any CPU + {66348A4C-3E1A-4DAB-BFB2-893BB4FF7B36}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BiliCommenter/App.config b/BiliCommenter/App.config deleted file mode 100644 index 1dd5bd7..0000000 --- a/BiliCommenter/App.config +++ /dev/null @@ -1,27 +0,0 @@ - - - - -
- - - - - - - - - False - - - True - - - - - - True - - - - diff --git a/BiliCommenter/BiliCommenter.csproj b/BiliCommenter/BiliCommenter.csproj index 8ab3df1..699ab13 100644 --- a/BiliCommenter/BiliCommenter.csproj +++ b/BiliCommenter/BiliCommenter.csproj @@ -1,175 +1,32 @@ - - - + + - Debug - AnyCPU - {67B4635B-60B7-4DC8-9611-0B2D47D9C150} WinExe - BiliCommenter - BiliCommenter - v4.6.1 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - true - false - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - true - 0 - 1.0.0.%2a - false - true - PackageReference - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - default - true - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - logo.ico + netcoreapp3.0 + true + - - ..\packages\ControlzEx.4.0.0-alpha0222\lib\net45\ControlzEx.dll - True - - - ..\packages\MahApps.Metro.2.0.0-alpha0212\lib\net45\MahApps.Metro.dll - True - - - ..\packages\Microsoft.Xaml.Behaviors.Wpf.1.0.1\lib\net45\Microsoft.Xaml.Behaviors.dll - - - ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - - - - - - - - - - 4.0 - - - - - False - + + + + + - - MSBuild:Compile - Designer - - - WelcomeWindow.xaml - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - Designer - MSBuild:Compile - + + + - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - + + - + - - - False - Microsoft .NET Framework 4.6.1 %28x86 和 x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - {366d01a5-b07e-4d58-8aaa-8136601d2736} - BiliCore - - - - - - - - - + \ No newline at end of file diff --git a/BiliCommenter/MainWindow.xaml b/BiliCommenter/MainWindow.xaml index d7e1951..0883bb1 100644 --- a/BiliCommenter/MainWindow.xaml +++ b/BiliCommenter/MainWindow.xaml @@ -81,8 +81,8 @@ -