Skip to content

Commit

Permalink
migrate to .net core
Browse files Browse the repository at this point in the history
  • Loading branch information
AlaricGilbert committed Oct 5, 2019
1 parent 509c180 commit 389d2ef
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 448 deletions.
2 changes: 1 addition & 1 deletion BiliCommenter.Console/BiliCommenter.Console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions BiliCommenter.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
27 changes: 0 additions & 27 deletions BiliCommenter/App.config

This file was deleted.

177 changes: 17 additions & 160 deletions BiliCommenter/BiliCommenter.csproj
Original file line number Diff line number Diff line change
@@ -1,175 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{67B4635B-60B7-4DC8-9611-0B2D47D9C150}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>BiliCommenter</RootNamespace>
<AssemblyName>BiliCommenter</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<AutorunEnabled>true</AutorunEnabled>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>default</LangVersion>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>logo.ico</ApplicationIcon>
<TargetFramework>netcoreapp3.0</TargetFramework>
<UseWPF>true</UseWPF>
</PropertyGroup>

<ItemGroup>
<Reference Include="ControlzEx, Version=4.0.0.0, Culture=neutral, PublicKeyToken=69f1c32f803d307e, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.4.0.0-alpha0222\lib\net45\ControlzEx.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MahApps.Metro, Version=2.0.0.0, Culture=neutral, PublicKeyToken=51482d6f650b2b3f, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.2.0.0-alpha0212\lib\net45\MahApps.Metro.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Xaml.Behaviors, Version=1.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.0.1\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework">
<Private>False</Private>
</Reference>
<None Remove="avatar\ic_22.png" />
<None Remove="avatar\ic_22_hide.png" />
<None Remove="avatar\ic_33.png" />
<None Remove="avatar\ic_33_hide.png" />
</ItemGroup>

<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="WelcomeWindow.xaml.cs">
<DependentUpon>WelcomeWindow.xaml</DependentUpon>
</Compile>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="WelcomeWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0490" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
</ItemGroup>

<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<ProjectReference Include="..\BiliCore\BiliCore.csproj" />
</ItemGroup>

<ItemGroup>
<Resource Include="avatar\ic_22.png" />
<Resource Include="avatar\ic_22_hide.png" />
<Resource Include="avatar\ic_22_hide.png"/>
<Resource Include="avatar\ic_33.png" />
<Resource Include="avatar\ic_33_hide.png" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.6.1 %28x86 和 x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BiliCore\BiliCore.csproj">
<Project>{366d01a5-b07e-4d58-8aaa-8136601d2736}</Project>
<Name>BiliCore</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Resource Include="logo.ico" />
</ItemGroup>
<ItemGroup>
<Resource Include="watermark.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

</Project>
20 changes: 10 additions & 10 deletions BiliCommenter/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
</Grid.RowDefinitions>
<Button Content="Add/Update" Grid.Row="1" Click="AddOrUpdate"/>
<Button Content="Remove" Grid.Row="3" Click="Remove"/>
<Button Content="Add/Update" Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}" Grid.Row="1" Click="AddOrUpdate"/>
<Button Content="Remove" Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}" Grid.Row="3" Click="Remove"/>
</Grid>
</Grid>
<Grid Grid.Row="2">
Expand All @@ -98,7 +98,7 @@
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Button Content="Emoji" Name="EmojiButton" Click="EmojiButton_Click"/>
<Button Content="Emoji" Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}" Name="EmojiButton" Click="EmojiButton_Click"/>
<Label Grid.Column="1" Name="MessageTBStatus" HorizontalAlignment="Right"/>
</Grid>
</Grid>
Expand Down Expand Up @@ -151,19 +151,19 @@
mahCtrls:TextBoxHelper.IsWaitingForData="True"
mahCtrls:TextBoxHelper.UseFloatingWatermark="True"
mahCtrls:TextBoxHelper.Watermark="Password"
Style="{StaticResource MetroButtonRevealedPasswordBox}"
Style="{StaticResource MahApps.Styles.PasswordBox.ButtonRevealed}"
KeyDown="PasswordBox_KeyDown"/>

<StackPanel Orientation="Horizontal" Margin="10 10 10 10">
<Button
Content="Login"
Width="180"
Style="{DynamicResource AccentedSquareButtonStyle}"
Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}"
Click="LoginButton_Click"/>
<Button
Content="Cancel"
Width="180"
Style="{DynamicResource AccentedSquareButtonStyle}" Margin="20,0,0,0"
Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}" Margin="20,0,0,0"
Click="ChangeLoginFlyout"/>
</StackPanel>
<Label Margin="10 10 10 10" Name="ResultLabel" Foreground="Red" ></Label>
Expand All @@ -176,14 +176,14 @@
<Label Content="Username:" Margin="10 10 0 10"/>
<Label Content="" Margin="0 10 10 10" Name="UsernameLabel"/>
</StackPanel>
<Button Content="Logout" Margin="20 10 20 10" Style="{DynamicResource AccentedSquareButtonStyle}" Click="LogoutButton_Click"/>
<Button Content="Logout" Margin="20 10 20 10" Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}" Click="LogoutButton_Click"/>
</StackPanel>
</mahCtrls:Flyout>
<mahCtrls:Flyout Name="SettingsFlyout" Header="Settings" Position="Right" Width="200" Theme="Accent">
<StackPanel Orientation="Vertical">
<mahCtrls:ToggleSwitch Margin="30 10 10 10" Name="IsSaveAccessKey" OnLabel="保存登陆状态" OffLabel="不保存登陆状态" Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"/>
<mahCtrls:ToggleSwitch Margin="30 10 10 10" Name="IsInheritTasks" OnLabel="继承任务状态" OffLabel="不继承任务状态" Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"/>
<Button Margin="10 10 10 10" Content="SAVE" Click="UpdateSettings"/>
<mahCtrls:ToggleSwitch Margin="30 10 10 10" Name="IsSaveAccessKey" OnLabel="保存登陆状态" OffLabel="不保存登陆状态" Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}"/>
<mahCtrls:ToggleSwitch Margin="30 10 10 10" Name="IsInheritTasks" OnLabel="继承任务状态" OffLabel="不继承任务状态" Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}"/>
<Button Margin="10 10 10 10" Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}" Content="SAVE" Click="UpdateSettings"/>
</StackPanel>
</mahCtrls:Flyout>
<mahCtrls:Flyout Name="EmojiFlyout"
Expand Down
55 changes: 0 additions & 55 deletions BiliCommenter/Properties/AssemblyInfo.cs

This file was deleted.

Loading

0 comments on commit 389d2ef

Please sign in to comment.