Skip to content

Commit 12432b0

Browse files
ryu-sryu-s
committed
.NETに移行
1 parent 2dd2faf commit 12432b0

File tree

65 files changed

+301
-581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+301
-581
lines changed

‎BigoIF/BigoIF.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net462</TargetFramework>
3+
<TargetFramework>net60-windows</TargetFramework>
44
<LangVersion>8.0</LangVersion>
55
<EnableNETAnalyzers>true</EnableNETAnalyzers>
66
<Configurations>Release;Beta;Alpha;Debug</Configurations>

‎BigoSitePlugin/BigoSitePlugin.csproj‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
33
<UseWPF>true</UseWPF>
4-
<TargetFramework>net462</TargetFramework>
4+
<TargetFramework>net60-windows</TargetFramework>
55
<LangVersion>8.0</LangVersion>
66
<Configurations>Release;Beta;Alpha;Debug</Configurations>
77
</PropertyGroup>
@@ -37,7 +37,7 @@
3737
<DebugSymbols>true</DebugSymbols>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.2" />
40+
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.0" />
4141
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
4242
<PackageReference Include="System.ServiceModel.Primitives" Version="4.8.1" />
4343
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
@@ -49,14 +49,4 @@
4949
<ProjectReference Include="..\ISitePlugin\SitePlugin.csproj" />
5050
<ProjectReference Include="..\SitePluginCommon\SitePluginCommon.csproj" />
5151
</ItemGroup>
52-
<ItemGroup>
53-
<Reference Include="Microsoft.CSharp" />
54-
<Reference Include="PresentationCore" />
55-
<Reference Include="PresentationFramework" />
56-
<Reference Include="System.Net.Http" />
57-
<Reference Include="System.Web" />
58-
<Reference Include="System.Windows" />
59-
<Reference Include="System.Xaml" />
60-
<Reference Include="WindowsBase" />
61-
</ItemGroup>
6252
</Project>

‎BigoSitePluginTests/BigoSitePluginTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net472</TargetFramework>
3+
<TargetFramework>net60-windows</TargetFramework>
44
<LangVersion>8.0</LangVersion>
55
<Configurations>Release;Beta;Alpha;Debug</Configurations>
66
</PropertyGroup>

‎BouyomiPlugin/BouyomiChanClient.cs‎

Lines changed: 200 additions & 200 deletions
Large diffs are not rendered by default.

‎BouyomiPlugin/BouyomiPlugin.csproj‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
33
<UseWPF>true</UseWPF>
4-
<TargetFramework>net462</TargetFramework>
4+
<TargetFramework>net60-windows</TargetFramework>
55
<LangVersion>8.0</LangVersion>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
77
<Configurations>Release;Beta;Alpha;Debug</Configurations>
@@ -36,8 +36,9 @@
3636
<DebugSymbols>true</DebugSymbols>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.2" />
39+
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.0" />
4040
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
41+
<PackageReference Include="System.ComponentModel.Composition" Version="7.0.0" />
4142
<PackageReference Include="System.ServiceModel.Primitives" Version="4.8.1" />
4243
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
4344
</ItemGroup>
@@ -61,15 +62,4 @@
6162
<ProjectReference Include="..\WhowatchIF\WhowatchIF.csproj" />
6263
<ProjectReference Include="..\YouTubeLiveIF\YouTubeLiveIF.csproj" />
6364
</ItemGroup>
64-
<ItemGroup>
65-
<Reference Include="Microsoft.CSharp" />
66-
<Reference Include="PresentationCore" />
67-
<Reference Include="PresentationFramework" />
68-
<Reference Include="System.Net.Http" />
69-
<Reference Include="System.Runtime.Remoting" />
70-
<Reference Include="System.Web" />
71-
<Reference Include="System.Windows" />
72-
<Reference Include="System.Xaml" />
73-
<Reference Include="WindowsBase" />
74-
</ItemGroup>
7565
</Project>

‎BouyomiPlugin/ConfigViewModel.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
using System;
44
using System.Diagnostics;
55
using System.Windows.Input;
6+
7+
namespace FNF.Utility
8+
{
9+
10+
/// <summary>
11+
/// 声の種類。(0:デフォルト、1～8:AquesTalk、10001～：SAPI5)
12+
/// </summary>
13+
public enum VoiceType { Default = 0, Female1 = 1, Female2 = 2, Male1 = 3, Male2 = 4, Imd1 = 5, Robot1 = 6, Machine1 = 7, Machine2 = 8 }
14+
}
615
namespace BouyomiPlugin
716
{
817
class ConfigViewModel : ViewModelBase

‎BouyomiPlugin/IpcTalker.cs‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎BouyomiPlugin/main.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ public void ShowSettingView()
775775
}
776776
public BouyomiPlugin()
777777
{
778-
_talker = new IpcTalker();
778+
_talker = new TcpTalker("127.0.0.1", 50001);
779779
_options = new Options();
780780
}
781781

‎BrowserCookieImplementations/BrowserCookieImplementations.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net462</TargetFramework>
3+
<TargetFramework>net60</TargetFramework>
44
<LangVersion>8.0</LangVersion>
55
<Configurations>Release;Beta;Alpha;Debug</Configurations>
66
</PropertyGroup>
@@ -36,8 +36,8 @@
3636
<DebugSymbols>true</DebugSymbols>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<PackageReference Include="BouncyCastle" Version="1.8.9" />
40-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
39+
<PackageReference Include="BouncyCastle.NetCore" Version="1.9.0" />
40+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.117" />
4141
</ItemGroup>
4242
<ItemGroup>
4343
<ProjectReference Include="..\BrowserCookieInterfaces\BrowserCookieInterfaces.csproj" />

‎BrowserCookieImplementationsTests/BrowserCookieImplementationsTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net472</TargetFramework>
3+
<TargetFramework>net60</TargetFramework>
44
<LangVersion>8.0</LangVersion>
55
<Configurations>Release;Beta;Alpha;Debug</Configurations>
66
</PropertyGroup>

0 commit comments

Comments
 (0)