From f850a1795978c05aa9be9c7fb56535d6e975097f Mon Sep 17 00:00:00 2001 From: Devin Date: Mon, 22 Apr 2019 15:35:57 +0800 Subject: [PATCH] Can build WinForm on net46 --- .../IME WL Converter Test.csproj | 2 +- .../Dictionaries.Designer.cs | 520 - src/IME WL Converter Win/Dictionaries.resx | 145 - src/IME WL Converter Win/Forms/MainForm.cs | 2 +- .../IME WL Converter Win.csproj | 50 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/Resources.Designer.cs | 4 +- .../Properties/Settings.Designer.cs | 10 +- .../Resources/Cangjie5.txt | 79316 ---------------- .../Resources/ChaoyinCodeMapping.txt | 413 - .../Resources/ChineseCode.txt | 21004 ---- src/IME WL Converter Win/Resources/Erbi.txt | 21004 ---- .../Resources/TouchPalPinyinDic.txt | 407 - .../Resources/WordPinyin.txt | 1339 - .../Resources/Zhengma.txt | 21004 ---- src/IME WL Converter Win/Resources/Zhuyin.txt | 404 - src/IME WL Converter Win/app.config | 3 - src/IME WL Converter WinForm.sln | 30 +- src/ImeWlConverterCore/ConsoleRun.cs | 1 - src/ImeWlConverterCore/IME/SelfDefining.cs | 2 +- .../ImeWlConverterCore-net46.csproj | 29 + 21 files changed, 86 insertions(+), 145609 deletions(-) delete mode 100644 src/IME WL Converter Win/Dictionaries.Designer.cs delete mode 100644 src/IME WL Converter Win/Dictionaries.resx delete mode 100644 src/IME WL Converter Win/Resources/Cangjie5.txt delete mode 100644 src/IME WL Converter Win/Resources/ChaoyinCodeMapping.txt delete mode 100644 src/IME WL Converter Win/Resources/ChineseCode.txt delete mode 100644 src/IME WL Converter Win/Resources/Erbi.txt delete mode 100644 src/IME WL Converter Win/Resources/TouchPalPinyinDic.txt delete mode 100644 src/IME WL Converter Win/Resources/WordPinyin.txt delete mode 100644 src/IME WL Converter Win/Resources/Zhengma.txt delete mode 100644 src/IME WL Converter Win/Resources/Zhuyin.txt delete mode 100644 src/IME WL Converter Win/app.config create mode 100644 src/ImeWlConverterCore/ImeWlConverterCore-net46.csproj diff --git a/src/IME WL Converter Win Test/IME WL Converter Test.csproj b/src/IME WL Converter Win Test/IME WL Converter Test.csproj index 5983d72c..d52d247c 100644 --- a/src/IME WL Converter Win Test/IME WL Converter Test.csproj +++ b/src/IME WL Converter Win Test/IME WL Converter Test.csproj @@ -74,7 +74,7 @@ - + {736D1A59-B755-4805-B0C7-F62EC12EB704} IME WL Converter Win diff --git a/src/IME WL Converter Win/Dictionaries.Designer.cs b/src/IME WL Converter Win/Dictionaries.Designer.cs deleted file mode 100644 index ac3b552e..00000000 --- a/src/IME WL Converter Win/Dictionaries.Designer.cs +++ /dev/null @@ -1,520 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Studyzy.IMEWLConverter { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Dictionaries { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Dictionaries() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Studyzy.IMEWLConverter.Dictionaries", typeof(Dictionaries).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to 日 a - ///曰 a - ///昌 aa - ///昍 aa - ///晶 aaa - ///晿 aaa - ///曑 aaah - ///曡 aaam - ///曐 aaam - ///曟 aaav - ///覸 aabuu - ///焸 aaf - ///鷼 aahaf - ///暒 aahm - ///暥 aajv - ///暘 aamh - ///晘 aamj - ///晹 aaph - ///暍 aapv - ///曝 aate - ///暻 aayf - ///明 ab - ///冐 ab - ///暝 abac - ///曖 abbe - ///暧 abbe - ///盟 abbt - ///覵 abbuu - ///焽 abf - ///晭 abgr ab'gr - ///鷳 abhaf - ///猒 abik - ///曌 abjcm - ///暈 abjj - ///暉 abjj - ///晕 abkq - ///晖 abkq - ///暖 abme - ///琞 abmgi - ///晍 abmr ab'mr - ///勗 abms - ///暩 abof - ///暚 abou - ///昷 abt - ///冒 abu - ///晛 abuu - ///昖 aci - ///暡 acim - ///顕 acmbc - ///晜 acnh - ///昐 acsh - ///杲 ad - ///晽 add - ///鷴 adhaf - ///晰 adhl - ///时 adi - ///昩 adj - ///暐 admq - ///暕 adwf adw'f - ///鄤 aenl - ///炅 af - ///炚 af - ///曭 afbf - ///暽 afdq - ///晱 af [rest of string was truncated]";. - /// - internal static string Cangjie5 { - get { - return ResourceManager.GetString("Cangjie5", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to a ki - ///ai ge - ///an hi - ///ang re - ///ao be - ///ba ak - ///bai ag - ///ban ah - ///bang ar - ///bao ab - ///bei aw - ///ben an - ///beng at - ///bi af - ///bian aj - ///biao am - ///bie ai - ///bin ad - ///bing as - ///bo a Y - ///bu av - ///ca pk - ///cai pg - ///can ph - ///cang pr - ///cao pb - ///ce pa - ///cen pn - ///ceng pt - ///cha bk - ///chai bg - ///chan bh - ///chang br - ///chao bb - ///che ba - ///chen bn - ///cheng bt - ///chi b Y - ///chong bu - ///chou by - ///chu bv - ///chua bf - ///chuai bs - ///chuan bo - ///chuang bj - ///chui bd - ///chun bl - ///chuo bx - ///ci p Y - ///cong pu - ///cou py - ///cu pv - ///cuan po - ///cui pd - ///cun pl /// [rest of string was truncated]";. - /// - internal static string ChaoyinCodeMapping { - get { - return ResourceManager.GetString("ChaoyinCodeMapping", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to 8140 丂 gnv kao3,yu2 0 - ///8141 丄 hgd shang4 0 - ///8142 丅 ghk xia4 0 - ///8143 丆 dgt shi2 0 - ///8144 丏 ghnn mian3 0 - ///8145 丒 vygf 0 - ///8146 丗 gkgd shi4 0 - ///8147 丟 gcu diu1 0 - ///8148 丠 uxgf qiu1 0 - ///8149 両 gmmk liang3 0 - ///814A 丣 gajn gjan you3 0 - ///814B 並 uogf uof bing4 0 - ///814C 丩 nhk jiu1 0 - ///814D 丮 nfhk ngk ji3 0 - ///814E 丯 ehk jie4 0 - ///814F 丱 njhg jnhg guan4 0 - ///8150 丳 kkjk chan3 0 - ///8151 丵 oguf oufj zhuo2 0 - ///8152 丷 uyt ba1 0 - ///8153 丼 fjyi jing3 0 - ///8154 乀 yyll fu2 0 - ///8155 乁 yyll gyi yi2 0 - ///8156 乂 qty rty yi4 0 - ///8157 乄 ny [rest of string was truncated]";. - /// - internal static string ChineseCode { - get { - return ResourceManager.GetString("ChineseCode", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to 〇 b o - ///吖 l - ///阿 m m a - ///啊 l - ///锕 z - ///錒 z - ///嗄 l l a - ///厑 k - ///哎 l l a - ///哀 y y a - ///唉 l l a - ///埃 v v a - ///挨 u u a - ///欸 v . . - ///溾 c - ///锿 z z a - ///鎄 z - ///啀 l - ///捱 u u a - ///皑 w w a - ///凒 y - ///嵦 g - ///溰 c - ///嘊 l - ///敱 g - ///敳 g - ///皚 w - ///癌 y y a - ///毐 j - ///昹 s - ///娾 c , , - ///嗳 l l a - ///矮 q q a - ///蔼 b b a - ///躷 w - ///噯 l - ///濭 c - ///﨟 b - ///藹 b - ///譪 y - ///霭 l l a - ///靄 l - ///艾 b b a - ///伌 f - ///爱 r r a - ///砹 k k a - ///硋 k - ///隘 m m a - ///嗌 l l a - ///塧 v - ///嫒 c , , a - ///愛 r - ///碍 k k a - ///叆 h - ///暧 s s [rest of string was truncated]";. - /// - internal static string Erbi { - get { - return ResourceManager.GetString("Erbi", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to 1,a - ///2,ai - ///3,an - ///4,ang - ///5,ao - ///7,ba - ///8,bai - ///9,ban - ///10,bang - ///11,bao - ///12,bei - ///13,ben - ///14,beng - ///15,bi - ///16,bian - ///18,biao - ///19,bie - ///20,bin - ///21,bing - ///22,bo - ///23,bu - ///25,ca - ///26,cai - ///27,can - ///28,cang - ///29,cao - ///30,ce - ///31,cen - ///32,ceng - ///33,cha - ///34,chai - ///35,chan - ///36,chang - ///37,chao - ///38,che - ///39,chen - ///40,cheng - ///41,chi - ///42,chong - ///43,chou - ///44,chu - ///45,chuai - ///46,chuan - ///47,chuang - ///48,chui - ///49,chun - ///50,chuo - ///51,ci - ///52,cong - ///53,cou - ///54,cu - ///56,cuan - ///59,cui - ///60,cun - ///61,cuo - ///63,da - ///64,dai - ///65,dan - ///66,dang - ///67,dao - ///68,de - ///69,dei - ///70,den - /// [rest of string was truncated]";. - /// - internal static string TouchPalPinyinDic { - get { - return ResourceManager.GetString("TouchPalPinyinDic", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to 'zeng'yi 曾毅 - ///'yin'yue 音乐 - ///'jin'xing 进行 - ///'liao'jie 了解 - ///'diao'cha 调查 - ///'mu'di 目的 - ///'ji'ou 奇偶 - ///'he'le 饸饹 - ///'xing'wei 行为 - ///'zhi'xing 执行 - ///'chong'qing 重庆 - ///'shi'xing 实行 - ///'ju'xing 举行 - ///'diao'yan 调研 - ///'gan'jue 感觉 - ///'chang'qi 长期 - ///'yun'xing 运行 - ///'liu'xing 流行 - ///'jue'de 觉得 - ///'zhu'ming 著名 - ///'qiang'diao 强调 - ///'xing'dong 行动 - ///'chong'xin 重新 - ///'xian'zhu 显著 - ///'fa'xing 发行 - ///'chang'de 长的 - ///'bu'liao 不了 - ///'zi'jue 自觉 - ///'zi'xing 自行 - ///'xi'zang 西藏 - ///'chang'chun 长春 - ///'zi'xi 仔细 - ///'chang'sha 长沙 - ///'lv'xing 履行 - ///'jue'se 角色 - ///'pian'yi 便宜 - ///'chang'jiang 长江 - ///'chong'fu [rest of string was truncated]";. - /// - internal static string WordPinyin { - get { - return ResourceManager.GetString("WordPinyin", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to 丨 ia iaaa - ///丩 zi ziaa - ///丬 ti tia - ///丫 ui udi - ///丰 ci ci - ///中 jv j jivv - ///丮 yb ydab - ///丯 ci pdi - ///丱 zi ziaa - ///卡 ia iai idai iid - ///串 jj jji jjv - ///丳 jj jjnd - ///卥 ij idos - ///临 km kdmk kmk - ///亅 ia iaaa - ///亊 du duxb - ///事 dj ajx dj djx djxb - ///乀 yd ydaa - ///乁 yd ydaa - ///丿 ma maaa - ///乃 ym ymv ymvv - ///乂 os osa - ///乄 zs msvv osaa zsvv - ///九 qy qy - ///亇 ri mxi rivv - ///久 rs rsv rsvv - ///么 mz mzs - ///乇 mh mhd - ///乊 mu mud - ///乆 zo zod - ///丸 qs qya qys [rest of string was truncated]";. - /// - internal static string Zhengma { - get { - return ResourceManager.GetString("Zhengma", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to ㄚ a - ///ㄞ ai - ///ㄢ an - ///ㄤ ang - ///ㄠ ao - ///ㄅㄚ ba - ///ㄅㄞ bai - ///ㄅㄢ ban - ///ㄅㄤ bang - ///ㄅㄠ bao - ///ㄅㄟ bei - ///ㄅㄣ ben - ///ㄅㄥ beng - ///ㄅㄧ bi - ///ㄅㄧㄢ bian - ///ㄅㄧㄠ biao - ///ㄅㄧㄝ bie - ///ㄅㄧㄣ bin - ///ㄅㄧㄥ bing - ///ㄅㄛ bo - ///ㄅㄨ bu - ///ㄘㄚ ca - ///ㄘㄞ cai - ///ㄘㄢ can - ///ㄘㄤ cang - ///ㄘㄠ cao - ///ㄘㄜ ce - ///ㄘㄣ cen - ///ㄘㄥ ceng - ///ㄔㄚ cha - ///ㄔㄞ chai - ///ㄔㄢ chan - ///ㄔㄤ chang - ///ㄔㄠ chao - ///ㄔㄜ che - ///ㄔㄣ chen - ///ㄔㄥ cheng - ///ㄔㄨㄥ chong - ///ㄔㄡ chou - ///ㄔㄨ chu - ///ㄔㄨㄞ chuai - ///ㄔㄨㄢ chuan - ///ㄔㄨㄤ chuang - ///ㄔㄨㄟ chui - ///ㄔㄨㄣ chun - ///ㄔㄨㄛ chuo - ///ㄘㄨㄥ cong - ///ㄘㄡ cou - ///ㄘㄨ cu - ///ㄘㄨㄢ cuan - ///ㄘㄨㄟ cui - ///ㄘㄨㄣ cun - ///ㄘㄨㄛ cuo - ///ㄉㄚ da - ///ㄉㄞ dai - ///ㄉㄢ dan - ///ㄉㄤ dang - ///ㄉㄠ dao - ///ㄉㄜ de - ///ㄉㄟ dei - ///ㄉㄥ [rest of string was truncated]";. - /// - internal static string Zhuyin { - get { - return ResourceManager.GetString("Zhuyin", resourceCulture); - } - } - } -} diff --git a/src/IME WL Converter Win/Dictionaries.resx b/src/IME WL Converter Win/Dictionaries.resx deleted file mode 100644 index 4bf751ba..00000000 --- a/src/IME WL Converter Win/Dictionaries.resx +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Resources\Cangjie5.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - Resources\ChaoyinCodeMapping.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - Resources\ChineseCode.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - Resources\Erbi.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - Resources\TouchPalPinyinDic.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - Resources\WordPinyin.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;gb2312 - - - Resources\Zhengma.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;gb2312 - - - Resources\Zhuyin.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - \ No newline at end of file diff --git a/src/IME WL Converter Win/Forms/MainForm.cs b/src/IME WL Converter Win/Forms/MainForm.cs index 7b884faa..7cbbfa66 100644 --- a/src/IME WL Converter Win/Forms/MainForm.cs +++ b/src/IME WL Converter Win/Forms/MainForm.cs @@ -31,7 +31,7 @@ public MainForm() private void LoadImeList() { - Assembly assembly = GetType().Assembly; + Assembly assembly =typeof(MainBody).Assembly; Type[] d = assembly.GetTypes(); var cbxImportItems = new List(); var cbxExportItems = new List(); diff --git a/src/IME WL Converter Win/IME WL Converter Win.csproj b/src/IME WL Converter Win/IME WL Converter Win.csproj index b4d481a9..5af0a0cd 100644 --- a/src/IME WL Converter Win/IME WL Converter Win.csproj +++ b/src/IME WL Converter Win/IME WL Converter Win.csproj @@ -1,5 +1,7 @@  - + + + Debug AnyCPU @@ -37,6 +39,10 @@ False False false + + + + true @@ -47,6 +53,7 @@ prompt 4 AllRules.ruleset + false pdbonly @@ -56,6 +63,7 @@ prompt 4 AllRules.ruleset + false D023E0A7D1F29511E571C5D888823CF5150F5061 @@ -125,11 +133,6 @@ ErbiTypeForm.cs - - True - True - Dictionaries.resx - Component @@ -218,10 +221,6 @@ ErbiTypeForm.cs - - ResXFileCodeGenerator - Dictionaries.Designer.cs - FilterConfigForm.cs @@ -262,7 +261,7 @@ XiaoxiaoConfigForm.cs - + SettingsSingleFileGenerator Settings.Designer.cs @@ -278,18 +277,10 @@ Always - - - - - - - - @@ -309,12 +300,27 @@ - - {15E0E7A3-A430-474B-BF3D-58466278D9E5} - ImeWlConverterCore + + {0d5f11e7-fab1-4660-99a3-5cdaf4ac72e8} + ImeWlConverterCore-net46 + + + + 此项目引用这台计算机上缺少的 NuGet 程序包。使用 NuGet 程序包还原可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + + + + + + + + + + +