• R/O
  • HTTP
  • SSH
  • HTTPS

wpts: Commit

Wikipedia翻訳支援ツール


Commit MetaInfo

Revisionbc93a82b962e3f9544835ea6846d708cee5a5167 (tree)
Time2019-12-13 00:06:42
Authorhoneplus <honeplus@user...>
Commiterhoneplus

Log Message

#39835 .NET Frameworkを4.0→4.7.2に更新してVS2019でコンパイルできるよう整備

Change Summary

Incremental Difference

--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
22 *.bak
33 .project
44 .settings
5+.vs
56 TestResult.xml
67 *.sln.VisualState.xml
78 *.chm
--- a/HmLib/HmLib.csproj
+++ b/HmLib/HmLib.csproj
@@ -1,5 +1,5 @@
11 <?xml version="1.0" encoding="utf-8"?>
2-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33 <PropertyGroup>
44 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,9 +10,10 @@
1010 <AppDesignerFolder>Properties</AppDesignerFolder>
1111 <RootNamespace>Honememo</RootNamespace>
1212 <AssemblyName>hmlib</AssemblyName>
13- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1414 <FileAlignment>512</FileAlignment>
15- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
15+ <TargetFrameworkProfile>
16+ </TargetFrameworkProfile>
1617 </PropertyGroup>
1718 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819 <DebugSymbols>true</DebugSymbols>
@@ -24,6 +25,7 @@
2425 <WarningLevel>4</WarningLevel>
2526 <DocumentationFile>bin\Debug\hmlib.XML</DocumentationFile>
2627 <RunCodeAnalysis>false</RunCodeAnalysis>
28+ <Prefer32Bit>false</Prefer32Bit>
2729 </PropertyGroup>
2830 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2931 <DebugType>pdbonly</DebugType>
@@ -33,6 +35,7 @@
3335 <ErrorReport>prompt</ErrorReport>
3436 <WarningLevel>4</WarningLevel>
3537 <DocumentationFile>bin\Release\hmlib.XML</DocumentationFile>
38+ <Prefer32Bit>false</Prefer32Bit>
3639 </PropertyGroup>
3740 <ItemGroup>
3841 <Reference Include="Microsoft.CSharp" />
@@ -72,7 +75,6 @@
7275 </ItemGroup>
7376 <ItemGroup />
7477 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
75- <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.7\StyleCop.Targets" />
7678 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7779 Other similar extension points exist, see Microsoft.Common.targets.
7880 <Target Name="BeforeBuild">
--- a/HmLib/Properties/AssemblyInfo.cs
+++ b/HmLib/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@
33 // HmLibのアセンブリソース</summary>
44 //
55 // <copyright file="AssemblyInfo.cs" company="honeplusのメモ帳">
6-// Copyright (C) 2013 Honeplus. All rights reserved.</copyright>
6+// Copyright (C) 2019 Honeplus. All rights reserved.</copyright>
77 // <author>
88 // Honeplus</author>
99 // ================================================================================================
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
2020 [assembly: AssemblyConfiguration("")]
2121 [assembly: AssemblyCompany("")]
2222 [assembly: AssemblyProduct("HmLib")]
23-[assembly: AssemblyCopyright("Copyright (C) Honeplus 2013")]
23+[assembly: AssemblyCopyright("Copyright (C) Honeplus 2019")]
2424 [assembly: AssemblyTrademark("")]
2525 [assembly: AssemblyCulture("")]
2626
@@ -42,7 +42,7 @@ using System.Runtime.InteropServices;
4242 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
4343 // 既定値にすることができます:
4444 // [assembly: AssemblyVersion("1.0.*")]
45-[assembly: AssemblyVersion("0.5.*")]
45+[assembly: AssemblyVersion("0.6.*")]
4646
4747 // 本ライブラリをC#以外の言語からも利用可能となるよう共通言語仕様準拠とする
4848 [assembly: System.CLSCompliant(true)]
--- a/HmLibTest/HmLibTest.csproj
+++ b/HmLibTest/HmLibTest.csproj
@@ -1,5 +1,5 @@
11 <?xml version="1.0" encoding="utf-8"?>
2-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33 <PropertyGroup>
44 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
1010 <AppDesignerFolder>Properties</AppDesignerFolder>
1111 <RootNamespace>Honememo</RootNamespace>
1212 <AssemblyName>HmLibTest</AssemblyName>
13- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1414 <FileAlignment>512</FileAlignment>
1515 <TargetFrameworkProfile>
1616 </TargetFrameworkProfile>
@@ -24,6 +24,7 @@
2424 <ErrorReport>prompt</ErrorReport>
2525 <WarningLevel>4</WarningLevel>
2626 <DocumentationFile>bin\Debug\HmLibTest.XML</DocumentationFile>
27+ <Prefer32Bit>false</Prefer32Bit>
2728 </PropertyGroup>
2829 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2930 <DebugType>pdbonly</DebugType>
@@ -32,6 +33,7 @@
3233 <DefineConstants>TRACE</DefineConstants>
3334 <ErrorReport>prompt</ErrorReport>
3435 <WarningLevel>4</WarningLevel>
36+ <Prefer32Bit>false</Prefer32Bit>
3537 </PropertyGroup>
3638 <ItemGroup>
3739 <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -75,7 +77,6 @@
7577 <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
7678 </ItemGroup>
7779 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
78- <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.7\StyleCop.Targets" />
7980 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8081 Other similar extension points exist, see Microsoft.Common.targets.
8182 <Target Name="BeforeBuild">
--- a/HmLibTest/Properties/AssemblyInfo.cs
+++ b/HmLibTest/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@
33 // HmLib(テスト)のアセンブリソース</summary>
44 //
55 // <copyright file="AssemblyInfo.cs" company="honeplusのメモ帳">
6-// Copyright (C) 2013 Honeplus. All rights reserved.</copyright>
6+// Copyright (C) 2019 Honeplus. All rights reserved.</copyright>
77 // <author>
88 // Honeplus</author>
99 // ================================================================================================
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
2020 [assembly: AssemblyConfiguration("")]
2121 [assembly: AssemblyCompany("")]
2222 [assembly: AssemblyProduct("HmLib")]
23-[assembly: AssemblyCopyright("Copyright (C) Honeplus 2013")]
23+[assembly: AssemblyCopyright("Copyright (C) Honeplus 2019")]
2424 [assembly: AssemblyTrademark("")]
2525 [assembly: AssemblyCulture("")]
2626
@@ -42,4 +42,4 @@ using System.Runtime.InteropServices;
4242 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
4343 // 既定値にすることができます:
4444 // [assembly: AssemblyVersion("1.0.*")]
45-[assembly: AssemblyVersion("0.5.*")]
45+[assembly: AssemblyVersion("0.6.*")]
--- a/Wptscs/Properties/AssemblyInfo.cs
+++ b/Wptscs/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@
33 // Wikipedia翻訳支援ツールのアセンブリソース</summary>
44 //
55 // <copyright file="AssemblyInfo.cs" company="honeplusのメモ帳">
6-// Copyright (C) 2014 Honeplus. All rights reserved.</copyright>
6+// Copyright (C) 2019 Honeplus. All rights reserved.</copyright>
77 // <author>
88 // Honeplus</author>
99 // ================================================================================================
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
2020 [assembly: AssemblyConfiguration("")]
2121 [assembly: AssemblyCompany("")]
2222 [assembly: AssemblyProduct("Wikipedia 翻訳支援ツール")]
23-[assembly: AssemblyCopyright("Copyright (C) Honeplus 2014")]
23+[assembly: AssemblyCopyright("Copyright (C) Honeplus 2019")]
2424 [assembly: AssemblyTrademark("")]
2525 [assembly: AssemblyCulture("")]
2626
@@ -37,4 +37,4 @@ using System.Runtime.InteropServices;
3737 // Minor Version
3838 // Build Number
3939 // Revision
40-[assembly: AssemblyVersion("1.31.*")]
40+[assembly: AssemblyVersion("1.32.*")]
--- a/Wptscs/Properties/Resources.Designer.cs
+++ b/Wptscs/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
11 //------------------------------------------------------------------------------
22 // <auto-generated>
33 // このコードはツールによって生成されました。
4-// ランタイム バージョン:4.0.30319.18033
4+// ランタイム バージョン:4.0.30319.42000
55 //
66 // このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
77 // コードが再生成されるときに損失したりします。
@@ -19,7 +19,7 @@ namespace Honememo.Wptscs.Properties {
1919 // または Visual Studio のようなツールを使用して自動生成されました。
2020 // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に
2121 // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。
22- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
22+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
2323 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
2424 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
2525 internal class Resources {
@@ -47,7 +47,7 @@ namespace Honememo.Wptscs.Properties {
4747 }
4848
4949 /// <summary>
50- /// 厳密に型指定されたこのリソース クラスを使用して、すべての検索リソースに対し、
50+ /// すべてについて、現在のスレッドの CurrentUICulture プロパティをオーバーライドします
5151 /// 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。
5252 /// </summary>
5353 [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
--- a/Wptscs/Properties/Settings.Designer.cs
+++ b/Wptscs/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
11 //------------------------------------------------------------------------------
22 // <auto-generated>
33 // このコードはツールによって生成されました。
4-// ランタイム バージョン:4.0.30319.18033
4+// ランタイム バージョン:4.0.30319.42000
55 //
66 // このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
77 // コードが再生成されるときに損失したりします。
@@ -12,7 +12,7 @@ namespace Honememo.Wptscs.Properties {
1212
1313
1414 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
15- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
15+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")]
1616 internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
1717
1818 private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -103,62 +103,6 @@ namespace Honememo.Wptscs.Properties {
103103
104104 [global::System.Configuration.ApplicationScopedSettingAttribute()]
105105 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
106- [global::System.Configuration.DefaultSettingValueAttribute("<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<ArrayOfString xmlns:xsi=\"http://www.w3." +
107- "org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\r\n <s" +
108- "tring>CURRENTYEAR</string>\r\n <string>CURRENTMONTH</string>\r\n <string>CURRENTMO" +
109- "NTHNAME</string>\r\n <string>CURRENTMONTHNAMEGEN</string>\r\n <string>CURRENTMONTH" +
110- "ABBREV</string>\r\n <string>CURRENTDAY</string>\r\n <string>CURRENTDAY2</string>\r\n" +
111- " <string>CURRENTDOW</string>\r\n <string>CURRENTDAYNAME</string>\r\n <string>CURR" +
112- "ENTTIME</string>\r\n <string>CURRENTHOUR</string>\r\n <string>CURRENTWEEK</string>" +
113- "\r\n <string>CURRENTTIMESTAMP</string>\r\n <string>LOCALYEAR</string>\r\n <string>L" +
114- "OCALMONTH</string>\r\n <string>LOCALMONTHNAME</string>\r\n <string>LOCALMONTHNAMEG" +
115- "EN</string>\r\n <string>LOCALMONTHABBREV</string>\r\n <string>LOCALDAY</string>\r\n " +
116- " <string>LOCALDAY2</string>\r\n <string>LOCALDOW</string>\r\n <string>LOCALDAYNAME" +
117- "</string>\r\n <string>LOCALTIME</string>\r\n <string>LOCALHOUR</string>\r\n <string" +
118- ">LOCALWEEK</string>\r\n <string>LOCALTIMESTAMP</string>\r\n <string>SITENAME</stri" +
119- "ng>\r\n <string>SERVER</string>\r\n <string>SERVERNAME</string>\r\n <string>DIRMARK" +
120- "</string>\r\n <string>DIRECTIONMARK</string>\r\n <string>SCRIPTPATH</string>\r\n <s" +
121- "tring>STYLEPATH</string>\r\n <string>CURRENTVERSION</string>\r\n <string>CONTENTLA" +
122- "NGUAGE</string>\r\n <string>CONTENTLANG</string>\r\n <string>REVISIONID</string>\r\n" +
123- " <string>REVISIONDAY</string>\r\n <string>REVISIONDAY2</string>\r\n <string>REVIS" +
124- "IONMONTH</string>\r\n <string>REVISIONYEAR</string>\r\n <string>REVISIONTIMESTAMP<" +
125- "/string>\r\n <string>REVISIONUSER</string>\r\n <string>PAGESIZE</string>\r\n <strin" +
126- "g>PROTECTIONLEVEL</string>\r\n <string>DISPLAYTITLE</string>\r\n <string>DEFAULTSO" +
127- "RT</string>\r\n <string>DEFAULTSORTKEY</string>\r\n <string>DEFAULTCATEGORYSORT</s" +
128- "tring>\r\n <string>NUMBEROFPAGES</string>\r\n <string>NUMBEROFARTICLES</string>\r\n " +
129- " <string>NUMBEROFFILES</string>\r\n <string>NUMBEROFEDITS</string>\r\n <string>NUM" +
130- "BEROFVIEWS</string>\r\n <string>NUMBEROFUSERS</string>\r\n <string>NUMBEROFADMINS<" +
131- "/string>\r\n <string>NUMBEROFACTIVEUSERS</string>\r\n <string>PAGESINCATEGORY</str" +
132- "ing>\r\n <string>PAGESINCAT</string>\r\n <string>NUMBERINGROUP</string>\r\n <string" +
133- ">NUMINGROUP</string>\r\n <string>PAGESINNS</string>\r\n <string>PAGESINNAMESPACE</" +
134- "string>\r\n <string>FULLPAGENAME</string>\r\n <string>PAGENAME</string>\r\n <string" +
135- ">BASEPAGENAME</string>\r\n <string>SUBPAGENAME</string>\r\n <string>SUBJECTPAGENAM" +
136- "E</string>\r\n <string>TALKPAGENAME</string>\r\n <string>FULLPAGENAMEE</string>\r\n " +
137- " <string>PAGENAMEE</string>\r\n <string>BASEPAGENAMEE</string>\r\n <string>SUBPAGE" +
138- "NAMEE</string>\r\n <string>SUBJECTPAGENAMEE</string>\r\n <string>TALKPAGENAMEE</st" +
139- "ring>\r\n <string>NAMESPACE</string>\r\n <string>SUBJECTSPACE</string>\r\n <string>" +
140- "ARTICLESPACE</string>\r\n <string>TALKSPACE</string>\r\n <string>NAMESPACEE</strin" +
141- "g>\r\n <string>SUBJECTSPACEE</string>\r\n <string>TALKSPACEE</string>\r\n <string>l" +
142- "ocalurl</string>\r\n <string>fullurl</string>\r\n <string>filepath</string>\r\n <st" +
143- "ring>urlencode</string>\r\n <string>anchorencode</string>\r\n <string>ns</string>\r" +
144- "\n <string>lc</string>\r\n <string>lcfirst</string>\r\n <string>uc</string>\r\n <st" +
145- "ring>ucfirst</string>\r\n <string>formatnum</string>\r\n <string>#dateformat</stri" +
146- "ng>\r\n <string>#formatdate</string>\r\n <string>padleft</string>\r\n <string>padri" +
147- "ght</string>\r\n <string>plural</string>\r\n <string>grammar</string>\r\n <string>i" +
148- "nt</string>\r\n <string>#language</string>\r\n <string>#special</string>\r\n <strin" +
149- "g>#tag</string>\r\n <string>gender</string>\r\n <string>groupconvert</string>\r\n <" +
150- "string>#expr</string>\r\n <string>#if</string>\r\n <string>#ifeq</string>\r\n <stri" +
151- "ng>#ifexist</string>\r\n <string>#ifexpr</string>\r\n <string>#switch</string>\r\n " +
152- "<string>#time</string>\r\n <string>#rel2abs</string>\r\n <string>#titleparts</stri" +
153- "ng>\r\n <string>#iferror</string>\r\n</ArrayOfString>")]
154- public global::System.Collections.Specialized.StringCollection MediaWikiMagicWords {
155- get {
156- return ((global::System.Collections.Specialized.StringCollection)(this["MediaWikiMagicWords"]));
157- }
158- }
159-
160- [global::System.Configuration.ApplicationScopedSettingAttribute()]
161- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
162106 [global::System.Configuration.DefaultSettingValueAttribute("/w/api.php?action=query&prop=revisions&titles=$1&redirects&rvprop=timestamp|conte" +
163107 "nt&format=xml")]
164108 public string MediaWikiContentApi {
@@ -282,6 +226,105 @@ namespace Honememo.Wptscs.Properties {
282226 }
283227 }
284228
229+ [global::System.Configuration.UserScopedSettingAttribute()]
230+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
231+ [global::System.Configuration.DefaultSettingValueAttribute("")]
232+ public string LastSelectedLanguage {
233+ get {
234+ return ((string)(this["LastSelectedLanguage"]));
235+ }
236+ set {
237+ this["LastSelectedLanguage"] = value;
238+ }
239+ }
240+
241+ [global::System.Configuration.UserScopedSettingAttribute()]
242+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
243+ [global::System.Configuration.DefaultSettingValueAttribute("Wikipedia")]
244+ public string LastSelectedConfiguration {
245+ get {
246+ return ((string)(this["LastSelectedConfiguration"]));
247+ }
248+ set {
249+ this["LastSelectedConfiguration"] = value;
250+ }
251+ }
252+
253+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
254+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
255+ [global::System.Configuration.DefaultSettingValueAttribute(".xml")]
256+ public string ConfigurationExtension {
257+ get {
258+ return ((string)(this["ConfigurationExtension"]));
259+ }
260+ }
261+
262+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
263+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
264+ [global::System.Configuration.DefaultSettingValueAttribute("/w/api.php?action=query&prop=langlinks&titles=$1&redirects=&lllimit=500&format=xm" +
265+ "l")]
266+ public string MediaWikiInterlanguageApi {
267+ get {
268+ return ((string)(this["MediaWikiInterlanguageApi"]));
269+ }
270+ }
271+
272+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
273+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
274+ [global::System.Configuration.DefaultSettingValueAttribute("<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<ArrayOfString xmlns:xsi=\"http://www.w3." +
275+ "org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\r\n <s" +
276+ "tring>CURRENTYEAR</string>\r\n <string>CURRENTMONTH</string>\r\n <string>CURRENTMO" +
277+ "NTHNAME</string>\r\n <string>CURRENTMONTHNAMEGEN</string>\r\n <string>CURRENTMONTH" +
278+ "ABBREV</string>\r\n <string>CURRENTDAY</string>\r\n <string>CURRENTDAY2</string>\r\n" +
279+ " <string>CURRENTDOW</string>\r\n <string>CURRENTDAYNAME</string>\r\n <string>CURR" +
280+ "ENTTIME</string>\r\n <string>CURRENTHOUR</string>\r\n <string>CURRENTWEEK</string>" +
281+ "\r\n <string>CURRENTTIMESTAMP</string>\r\n <string>LOCALYEAR</string>\r\n <string>L" +
282+ "OCALMONTH</string>\r\n <string>LOCALMONTHNAME</string>\r\n <string>LOCALMONTHNAMEG" +
283+ "EN</string>\r\n <string>LOCALMONTHABBREV</string>\r\n <string>LOCALDAY</string>\r\n " +
284+ " <string>LOCALDAY2</string>\r\n <string>LOCALDOW</string>\r\n <string>LOCALDAYNAME" +
285+ "</string>\r\n <string>LOCALTIME</string>\r\n <string>LOCALHOUR</string>\r\n <string" +
286+ ">LOCALWEEK</string>\r\n <string>LOCALTIMESTAMP</string>\r\n <string>SITENAME</stri" +
287+ "ng>\r\n <string>SERVER</string>\r\n <string>SERVERNAME</string>\r\n <string>DIRMARK" +
288+ "</string>\r\n <string>DIRECTIONMARK</string>\r\n <string>SCRIPTPATH</string>\r\n <s" +
289+ "tring>STYLEPATH</string>\r\n <string>CURRENTVERSION</string>\r\n <string>CONTENTLA" +
290+ "NGUAGE</string>\r\n <string>CONTENTLANG</string>\r\n <string>REVISIONID</string>\r\n" +
291+ " <string>REVISIONDAY</string>\r\n <string>REVISIONDAY2</string>\r\n <string>REVIS" +
292+ "IONMONTH</string>\r\n <string>REVISIONYEAR</string>\r\n <string>REVISIONTIMESTAMP<" +
293+ "/string>\r\n <string>REVISIONUSER</string>\r\n <string>PAGESIZE</string>\r\n <strin" +
294+ "g>PROTECTIONLEVEL</string>\r\n <string>DISPLAYTITLE</string>\r\n <string>DEFAULTSO" +
295+ "RT</string>\r\n <string>DEFAULTSORTKEY</string>\r\n <string>DEFAULTCATEGORYSORT</s" +
296+ "tring>\r\n <string>NUMBEROFPAGES</string>\r\n <string>NUMBEROFARTICLES</string>\r\n " +
297+ " <string>NUMBEROFFILES</string>\r\n <string>NUMBEROFEDITS</string>\r\n <string>NUM" +
298+ "BEROFVIEWS</string>\r\n <string>NUMBEROFUSERS</string>\r\n <string>NUMBEROFADMINS<" +
299+ "/string>\r\n <string>NUMBEROFACTIVEUSERS</string>\r\n <string>PAGESINCATEGORY</str" +
300+ "ing>\r\n <string>PAGESINCAT</string>\r\n <string>NUMBERINGROUP</string>\r\n <string" +
301+ ">NUMINGROUP</string>\r\n <string>PAGESINNS</string>\r\n <string>PAGESINNAMESPACE</" +
302+ "string>\r\n <string>FULLPAGENAME</string>\r\n <string>PAGENAME</string>\r\n <string" +
303+ ">BASEPAGENAME</string>\r\n <string>SUBPAGENAME</string>\r\n <string>SUBJECTPAGENAM" +
304+ "E</string>\r\n <string>TALKPAGENAME</string>\r\n <string>FULLPAGENAMEE</string>\r\n " +
305+ " <string>PAGENAMEE</string>\r\n <string>BASEPAGENAMEE</string>\r\n <string>SUBPAGE" +
306+ "NAMEE</string>\r\n <string>SUBJECTPAGENAMEE</string>\r\n <string>TALKPAGENAMEE</st" +
307+ "ring>\r\n <string>NAMESPACE</string>\r\n <string>SUBJECTSPACE</string>\r\n <string>" +
308+ "ARTICLESPACE</string>\r\n <string>TALKSPACE</string>\r\n <string>NAMESPACEE</strin" +
309+ "g>\r\n <string>SUBJECTSPACEE</string>\r\n <string>TALKSPACEE</string>\r\n <string>l" +
310+ "ocalurl</string>\r\n <string>fullurl</string>\r\n <string>filepath</string>\r\n <st" +
311+ "ring>urlencode</string>\r\n <string>anchorencode</string>\r\n <string>ns</string>\r" +
312+ "\n <string>lc</string>\r\n <string>lcfirst</string>\r\n <string>uc</string>\r\n <st" +
313+ "ring>ucfirst</string>\r\n <string>formatnum</string>\r\n <string>#dateformat</stri" +
314+ "ng>\r\n <string>#formatdate</string>\r\n <string>padleft</string>\r\n <string>padri" +
315+ "ght</string>\r\n <string>plural</string>\r\n <string>grammar</string>\r\n <string>i" +
316+ "nt</string>\r\n <string>#language</string>\r\n <string>#special</string>\r\n <strin" +
317+ "g>#tag</string>\r\n <string>gender</string>\r\n <string>groupconvert</string>\r\n <" +
318+ "string>#expr</string>\r\n <string>#if</string>\r\n <string>#ifeq</string>\r\n <stri" +
319+ "ng>#ifexist</string>\r\n <string>#ifexpr</string>\r\n <string>#switch</string>\r\n " +
320+ "<string>#time</string>\r\n <string>#rel2abs</string>\r\n <string>#titleparts</stri" +
321+ "ng>\r\n <string>#iferror</string>\r\n</ArrayOfString>")]
322+ public global::System.Collections.Specialized.StringCollection MediaWikiMagicWords {
323+ get {
324+ return ((global::System.Collections.Specialized.StringCollection)(this["MediaWikiMagicWords"]));
325+ }
326+ }
327+
285328 [global::System.Configuration.ApplicationScopedSettingAttribute()]
286329 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
287330 [global::System.Configuration.DefaultSettingValueAttribute("<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<ArrayOfString xmlns:xsi=\"http://www.w3." +
@@ -326,48 +369,5 @@ namespace Honememo.Wptscs.Properties {
326369 return ((global::System.Collections.Specialized.StringCollection)(this["MediaWikiInterwikiPrefixs"]));
327370 }
328371 }
329-
330- [global::System.Configuration.UserScopedSettingAttribute()]
331- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
332- [global::System.Configuration.DefaultSettingValueAttribute("")]
333- public string LastSelectedLanguage {
334- get {
335- return ((string)(this["LastSelectedLanguage"]));
336- }
337- set {
338- this["LastSelectedLanguage"] = value;
339- }
340- }
341-
342- [global::System.Configuration.UserScopedSettingAttribute()]
343- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
344- [global::System.Configuration.DefaultSettingValueAttribute("Wikipedia")]
345- public string LastSelectedConfiguration {
346- get {
347- return ((string)(this["LastSelectedConfiguration"]));
348- }
349- set {
350- this["LastSelectedConfiguration"] = value;
351- }
352- }
353-
354- [global::System.Configuration.ApplicationScopedSettingAttribute()]
355- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
356- [global::System.Configuration.DefaultSettingValueAttribute(".xml")]
357- public string ConfigurationExtension {
358- get {
359- return ((string)(this["ConfigurationExtension"]));
360- }
361- }
362-
363- [global::System.Configuration.ApplicationScopedSettingAttribute()]
364- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
365- [global::System.Configuration.DefaultSettingValueAttribute("/w/api.php?action=query&prop=langlinks&titles=$1&redirects=&lllimit=500&format=xm" +
366- "l")]
367- public string MediaWikiInterlanguageApi {
368- get {
369- return ((string)(this["MediaWikiInterlanguageApi"]));
370- }
371- }
372372 }
373373 }
--- a/Wptscs/Readme.txt
+++ b/Wptscs/Readme.txt
@@ -1,9 +1,9 @@
11 =====================================================================
22 【タイトル】 Wikipedia 翻訳支援ツール
3-【ファイル】 wptscs131.msi, wptscs131.zip, wptscs131-src.zip
4-【作成月日】 2014/4/4
3+【ファイル】 wptscs132.msi, wptscs132.zip, wptscs132-src.zip
4+【作成月日】 2019/12/11
55 【制 作 者】 Honeplus
6-【動作環境】 Windows 7/8.1 での動作を確認。要.NET Framework 4.0 Client Profile または 4.5
6+【動作環境】 Windows 10 での動作を確認。要.NET Framework 4.7.2
77 【配布形態】 修正BSDライセンス
88 【HomePage】 https://ja.osdn.net/projects/wptscs/
99 =====================================================================
@@ -33,7 +33,7 @@ Wiktionary.xml : Wiktionary用の設定ファイル
3333 アプリケーション上で設定した内容は、上記設定ファイルには反映されません。
3434 ユーザーごとのフォルダに出力されます。
3535 設定ファイルを直接修正、または削除して初期値に戻したい場合は、
36-下記のようなパスにあるファイルを更新してください(以下はWindows 8.1の例)。
36+下記のようなパスにあるファイルを更新してください(以下はWindows 10の例)。
3737
3838 C:\Users\[ユーザー名]\AppData\Roaming\Honememo\Wikipedia 翻訳支援ツール\[バージョン番号]\config.xml
3939 C:\Users\[ユーザー名]\AppData\Local\Honememo\wptscs.exe_[~]\[バージョン番号]\user.config
@@ -105,10 +105,9 @@ zip版の場合は展開したファイルを削除してください。
105105
106106
107107 ・ソースについて
108-wptscs131-src.zip としてソースファイル一式を配布しています。
109-開発環境はVisual Studio 2013 Express for Windows Desktopです。
110-その他外部ツールとしてコーディングスタイルチェック用のStyleCopを使用しています。
111-また、インストーラの作成にはWiXを使用しています。
108+wptscs132-src.zip としてソースファイル一式を配布しています。
109+開発環境はVisual Studio Community 2019です。
110+インストーラの作成にはWiXを使用しています。
112111
113112
114113
@@ -200,6 +199,8 @@ Ver1.30 2013/03/10 言語間リンクの取得を自前の解析処理を使わ
200199 ※ 設定ファイルに互換性はありますが、一部設定項目の変更・追加・削除が発生しています。
201200 独自の設定を追加している場合、変更が必要になる可能性があります。
202201 Ver1.31 2014/04/04 記事名のエスケープを明示的に行うようにし、扱えない文字が残っていたのを修正。
202+Ver1.32 2019/12/11 TLS1.0/1.1のサポート終了でエラーとなる問題を修正。
203+ ※ 本バージョンから、.NET Frameworkが4.0→4.7へと変わります。XPなど古いOSでは動作しません。
203204
204205
205206 ・仕様上の制限
--- a/Wptscs/Wptscs.csproj
+++ b/Wptscs/Wptscs.csproj
@@ -1,5 +1,5 @@
11 <?xml version="1.0" encoding="utf-8"?>
2-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33 <PropertyGroup>
44 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,12 +11,13 @@
1111 <RootNamespace>Honememo.Wptscs</RootNamespace>
1212 <AssemblyName>wptscs</AssemblyName>
1313 <ApplicationIcon>App.ico</ApplicationIcon>
14- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1515 <FileUpgradeFlags>
1616 </FileUpgradeFlags>
1717 <OldToolsVersion>2.0</OldToolsVersion>
1818 <UpgradeBackupLocation />
19- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
19+ <TargetFrameworkProfile>
20+ </TargetFrameworkProfile>
2021 </PropertyGroup>
2122 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2223 <DebugSymbols>true</DebugSymbols>
@@ -28,6 +29,7 @@
2829 <WarningLevel>4</WarningLevel>
2930 <DocumentationFile>bin\Debug\wptscs.XML</DocumentationFile>
3031 <RunCodeAnalysis>false</RunCodeAnalysis>
32+ <Prefer32Bit>false</Prefer32Bit>
3133 </PropertyGroup>
3234 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3335 <DebugType>pdbonly</DebugType>
@@ -37,6 +39,7 @@
3739 <ErrorReport>prompt</ErrorReport>
3840 <WarningLevel>4</WarningLevel>
3941 <DocumentationFile>bin\Release\wptscs.XML</DocumentationFile>
42+ <Prefer32Bit>false</Prefer32Bit>
4043 </PropertyGroup>
4144 <ItemGroup>
4245 <Reference Include="System" />
@@ -176,7 +179,6 @@
176179 </ProjectReference>
177180 </ItemGroup>
178181 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
179- <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.7\StyleCop.Targets" />
180182 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
181183 Other similar extension points exist, see Microsoft.Common.targets.
182184 <Target Name="BeforeBuild">
--- a/Wptscs/app.config
+++ b/Wptscs/app.config
@@ -18,8 +18,7 @@
1818 </setting>
1919 <setting name="MediaWikiMagicWords" serializeAs="Xml">
2020 <value>
21- <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
21+ <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
2322 <string>CURRENTYEAR</string>
2423 <string>CURRENTMONTH</string>
2524 <string>CURRENTMONTHNAME</string>
@@ -161,8 +160,7 @@
161160 </setting>
162161 <setting name="MediaWikiInterwikiPrefixs" serializeAs="Xml">
163162 <value>
164- <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
165- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
163+ <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
166164 <string>acronym</string>
167165 <string>advogato</string>
168166 <string>annotationwiki</string>
@@ -272,19 +270,19 @@
272270 <userSettings>
273271 <Honememo.Wptscs.Properties.Settings>
274272 <setting name="SaveDirectory" serializeAs="String">
275- <value />
273+ <value/>
276274 </setting>
277275 <setting name="LastSelectedSource" serializeAs="String">
278276 <value>en</value>
279277 </setting>
280278 <setting name="LastSelectedTarget" serializeAs="String">
281- <value />
279+ <value/>
282280 </setting>
283281 <setting name="UserAgent" serializeAs="String">
284- <value />
282+ <value/>
285283 </setting>
286284 <setting name="Referer" serializeAs="String">
287- <value />
285+ <value/>
288286 </setting>
289287 <setting name="CacheExpire" serializeAs="String">
290288 <value>15.00:00:00</value>
@@ -302,11 +300,11 @@
302300 <value>2000</value>
303301 </setting>
304302 <setting name="LastSelectedLanguage" serializeAs="String">
305- <value />
303+ <value/>
306304 </setting>
307305 <setting name="LastSelectedConfiguration" serializeAs="String">
308306 <value>Wikipedia</value>
309307 </setting>
310308 </Honememo.Wptscs.Properties.Settings>
311309 </userSettings>
312-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
310+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
--- a/WptscsTest/Properties/AssemblyInfo.cs
+++ b/WptscsTest/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@
33 // Wikipedia翻訳支援ツール(テスト)のアセンブリソース</summary>
44 //
55 // <copyright file="AssemblyInfo.cs" company="honeplusのメモ帳">
6-// Copyright (C) 2014 Honeplus. All rights reserved.</copyright>
6+// Copyright (C) 2019 Honeplus. All rights reserved.</copyright>
77 // <author>
88 // Honeplus</author>
99 // ================================================================================================
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
2020 [assembly: AssemblyConfiguration("")]
2121 [assembly: AssemblyCompany("")]
2222 [assembly: AssemblyProduct("Wikipedia 翻訳支援ツール")]
23-[assembly: AssemblyCopyright("Copyright (C) Honeplus 2014")]
23+[assembly: AssemblyCopyright("Copyright (C) Honeplus 2019")]
2424 [assembly: AssemblyTrademark("")]
2525 [assembly: AssemblyCulture("")]
2626
@@ -42,4 +42,4 @@ using System.Runtime.InteropServices;
4242 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
4343 // 既定値にすることができます:
4444 // [assembly: AssemblyVersion("1.0.*")]
45-[assembly: AssemblyVersion("1.31.*")]
45+[assembly: AssemblyVersion("1.32.*")]
--- a/WptscsTest/WptscsTest.csproj
+++ b/WptscsTest/WptscsTest.csproj
@@ -1,5 +1,5 @@
11 <?xml version="1.0" encoding="utf-8"?>
2-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33 <PropertyGroup>
44 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
1010 <AppDesignerFolder>Properties</AppDesignerFolder>
1111 <RootNamespace>Honememo.Wptscs</RootNamespace>
1212 <AssemblyName>WptscsTest</AssemblyName>
13- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1414 <FileAlignment>512</FileAlignment>
1515 <TargetFrameworkProfile>
1616 </TargetFrameworkProfile>
@@ -24,6 +24,7 @@
2424 <ErrorReport>prompt</ErrorReport>
2525 <WarningLevel>4</WarningLevel>
2626 <DocumentationFile>bin\Debug\WptscsTest.XML</DocumentationFile>
27+ <Prefer32Bit>false</Prefer32Bit>
2728 </PropertyGroup>
2829 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2930 <DebugType>pdbonly</DebugType>
@@ -32,6 +33,7 @@
3233 <DefineConstants>TRACE</DefineConstants>
3334 <ErrorReport>prompt</ErrorReport>
3435 <WarningLevel>4</WarningLevel>
36+ <Prefer32Bit>false</Prefer32Bit>
3537 </PropertyGroup>
3638 <ItemGroup>
3739 <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -278,7 +280,6 @@
278280 </None>
279281 </ItemGroup>
280282 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
281- <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.7\StyleCop.Targets" />
282283 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
283284 Other similar extension points exist, see Microsoft.Common.targets.
284285 <Target Name="BeforeBuild">
Show on old repository browser