diff --git a/Source/Demos/Wif.Demo.Common/Properties/AssemblyInfo.cs b/Source/Demos/Wif.Demo.Common/Properties/AssemblyInfo.cs deleted file mode 100644 index 4313769..0000000 --- a/Source/Demos/Wif.Demo.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 有关程序集的一般信息由以下 -// 控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("Wif.Demo.Common")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Wif.Demo.Common")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// 将 ComVisible 设置为 false 会使此程序集中的类型 -//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 -//请将此类型的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("90ebbcf7-7825-4091-ad73-326543cfca88")] - -// 程序集的版本信息由下列四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 -//通过使用 "*"，如下所示: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Source/Demos/Wif.Demo.Common/Wif.Demo.Common.csproj b/Source/Demos/Wif.Demo.Common/Wif.Demo.Common.csproj index 0ca3d07..be62882 100644 --- a/Source/Demos/Wif.Demo.Common/Wif.Demo.Common.csproj +++ b/Source/Demos/Wif.Demo.Common/Wif.Demo.Common.csproj @@ -1,4 +1,5 @@ - + + net472;netcoreapp3.1;net5.0-windows true @@ -9,4 +10,15 @@ ..\Output\Release\ - \ No newline at end of file + + + + + + + + + + + + diff --git a/Source/Demos/Wif.Demo/App.config b/Source/Demos/Wif.Demo/App.config deleted file mode 100644 index 56efbc7..0000000 --- a/Source/Demos/Wif.Demo/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Source/Demos/Wif.Demo/App.xaml.cs b/Source/Demos/Wif.Demo/App.xaml.cs index 7a9d5c7..bf6bbcd 100644 --- a/Source/Demos/Wif.Demo/App.xaml.cs +++ b/Source/Demos/Wif.Demo/App.xaml.cs @@ -9,7 +9,7 @@ namespace Wif.Demo { /// - /// App.xaml 的交互逻辑 + /// Interaction logic for App.xaml /// public partial class App : Application { diff --git a/Source/Demos/Wif.Demo/AssemblyInfo.cs b/Source/Demos/Wif.Demo/AssemblyInfo.cs new file mode 100644 index 0000000..8b5504e --- /dev/null +++ b/Source/Demos/Wif.Demo/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/Source/Demos/Wif.Demo/MainViewModel.cs b/Source/Demos/Wif.Demo/MainViewModel.cs index 8a40cef..c70e508 100644 --- a/Source/Demos/Wif.Demo/MainViewModel.cs +++ b/Source/Demos/Wif.Demo/MainViewModel.cs @@ -1,4 +1,9 @@ -using System.Collections.ObjectModel; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; using Frontier.Wif.Core.ComponentModel; using Wif.Demo.Common; @@ -34,30 +39,30 @@ public ObservableCollection MobilePhoneCollection public MainViewModel() { var model = MobilePhoneSingletonModel.Instance; - model.Brand = Brand.Apple; - model.NumberOfCPUCore = NumberOfCPUCore.Quad; - model.RAM = RAM._4GB; - model.ROM = ROM._64GB; + model.Brand = Brand.Apple; + model.NumberOfCPUCore = NumberOfCPUCore.Quad; + model.RAM = RAM._4GB; + model.ROM = ROM._64GB; model.ScreenResolution = ScreenResolution.FHD; - model.ScreenSize = 5.2f; + model.ScreenSize = 5.2f; MobilePhoneCollection.Add(model); - model = MobilePhoneSingletonModel.Instance; - model.Brand = Brand.Apple; - model.NumberOfCPUCore = NumberOfCPUCore.Quad; - model.RAM = RAM._4GB; - model.ROM = ROM._64GB; + model = MobilePhoneSingletonModel.Instance; + model.Brand = Brand.Apple; + model.NumberOfCPUCore = NumberOfCPUCore.Quad; + model.RAM = RAM._4GB; + model.ROM = ROM._64GB; model.ScreenResolution = ScreenResolution.FHD; - model.ScreenSize = 5.2f; + model.ScreenSize = 5.2f; MobilePhoneCollection.Add(model); - model = MobilePhoneSingletonModel.Instance; - model.Brand = Brand.Apple; - model.NumberOfCPUCore = NumberOfCPUCore.Quad; - model.RAM = RAM._4GB; - model.ROM = ROM._64GB; + model = MobilePhoneSingletonModel.Instance; + model.Brand = Brand.Apple; + model.NumberOfCPUCore = NumberOfCPUCore.Quad; + model.RAM = RAM._4GB; + model.ROM = ROM._64GB; model.ScreenResolution = ScreenResolution.FHD; - model.ScreenSize = 5.2f; + model.ScreenSize = 5.2f; MobilePhoneCollection.Add(model); } } diff --git a/Source/Demos/Wif.Demo/MainWindow.xaml b/Source/Demos/Wif.Demo/MainWindow.xaml index 0be785a..dd073d0 100644 --- a/Source/Demos/Wif.Demo/MainWindow.xaml +++ b/Source/Demos/Wif.Demo/MainWindow.xaml @@ -1,13 +1,13 @@  diff --git a/Source/Demos/Wif.Demo/MainWindow.xaml.cs b/Source/Demos/Wif.Demo/MainWindow.xaml.cs index bcfcbcf..e5d3b38 100644 --- a/Source/Demos/Wif.Demo/MainWindow.xaml.cs +++ b/Source/Demos/Wif.Demo/MainWindow.xaml.cs @@ -1,9 +1,22 @@ -using System.Windows; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; namespace Wif.Demo { /// - /// MainWindow.xaml 的交互逻辑 + /// Interaction logic for MainWindow.xaml /// public partial class MainWindow : Window { diff --git a/Source/Demos/Wif.Demo/Properties/AssemblyInfo.cs b/Source/Demos/Wif.Demo/Properties/AssemblyInfo.cs deleted file mode 100644 index d5106ec..0000000 --- a/Source/Demos/Wif.Demo/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows; - -// 有关程序集的一般信息由以下 -// 控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("Wif.Demo")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Wif.Demo")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// 将 ComVisible 设置为 false 会使此程序集中的类型 -//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 -//请将此类型的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -//若要开始生成可本地化的应用程序，请设置 -//.csproj 文件中的 CultureYouAreCodingWith -//例如，如果您在源文件中使用的是美国英语， -//使用的是美国英语，请将 设置为 en-US。 然后取消 -//对以下 NeutralResourceLanguage 特性的注释。 更新 -//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。 - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, //主题特定资源词典所处位置 - //(未在页面中找到资源时使用， - //或应用程序资源字典中找到时使用) - ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置 - //(未在页面中找到资源时使用， - //、应用程序或任何主题专用资源字典中找到时使用) -)] - - -// 程序集的版本信息由下列四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 -// 方法是按如下所示使用“*”: : -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Source/Demos/Wif.Demo/Properties/Resources.Designer.cs b/Source/Demos/Wif.Demo/Properties/Resources.Designer.cs deleted file mode 100644 index 68bf337..0000000 --- a/Source/Demos/Wif.Demo/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本: 4.0.30319.42000 -// -// 对此文件的更改可能导致不正确的行为，如果 -// 重新生成代码，则所做更改将丢失。 -// -//------------------------------------------------------------------------------ - -namespace Wif.Demo.Properties -{ - - - /// - /// 强类型资源类，用于查找本地化字符串等。 - /// - // 此类是由 StronglyTypedResourceBuilder - // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 - // 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen - // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// 返回此类使用的缓存 ResourceManager 实例。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Wif.Demo.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// 覆盖当前线程的 CurrentUICulture 属性 - /// 使用此强类型的资源类的资源查找。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/Source/Demos/Wif.Demo/Properties/Resources.resx b/Source/Demos/Wif.Demo/Properties/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/Source/Demos/Wif.Demo/Properties/Resources.resx +++ /dev/null @@ -1,117 +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 - - \ No newline at end of file diff --git a/Source/Demos/Wif.Demo/Properties/Settings.Designer.cs b/Source/Demos/Wif.Demo/Properties/Settings.Designer.cs deleted file mode 100644 index 960391e..0000000 --- a/Source/Demos/Wif.Demo/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +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 Wif.Demo.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/Source/Demos/Wif.Demo/Properties/Settings.settings b/Source/Demos/Wif.Demo/Properties/Settings.settings deleted file mode 100644 index 033d7a5..0000000 --- a/Source/Demos/Wif.Demo/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Source/Demos/Wif.Demo/Wif.Demo.csproj b/Source/Demos/Wif.Demo/Wif.Demo.csproj index 641ca65..80f2d59 100644 --- a/Source/Demos/Wif.Demo/Wif.Demo.csproj +++ b/Source/Demos/Wif.Demo/Wif.Demo.csproj @@ -1,5 +1,7 @@ - + + + WinExe net472;netcoreapp3.1;net5.0-windows true @@ -9,9 +11,28 @@ ..\Output\Release\ - + + + + + + + + + + + + 4.0 + + - - \ No newline at end of file + + + + + + + + diff --git a/Source/Wif.Core/Wif.Core.csproj b/Source/Wif.Core/Wif.Core.csproj index 4cc9bf0..ba41c05 100644 --- a/Source/Wif.Core/Wif.Core.csproj +++ b/Source/Wif.Core/Wif.Core.csproj @@ -26,7 +26,7 @@ - + diff --git a/Source/Wif.Infrastructure/Wif.Infrastructure.csproj b/Source/Wif.Infrastructure/Wif.Infrastructure.csproj index f6ad13d..62139fe 100644 --- a/Source/Wif.Infrastructure/Wif.Infrastructure.csproj +++ b/Source/Wif.Infrastructure/Wif.Infrastructure.csproj @@ -35,7 +35,7 @@ - + diff --git a/Source/Wif.Utilities/Wif.Utilities.csproj b/Source/Wif.Utilities/Wif.Utilities.csproj index 5a125f2..a5c1929 100644 --- a/Source/Wif.Utilities/Wif.Utilities.csproj +++ b/Source/Wif.Utilities/Wif.Utilities.csproj @@ -30,10 +30,9 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + - diff --git a/Source/Wif.sln b/Source/Wif.sln index 476dddc..78545b3 100644 --- a/Source/Wif.sln +++ b/Source/Wif.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29021.104 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wif.Core", "Wif.Core\Wif.Core.csproj", "{5D4BB5FC-7A4F-47A4-B412-E70544F621DB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wif.Core", "Wif.Core\Wif.Core.csproj", "{5D4BB5FC-7A4F-47A4-B412-E70544F621DB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wif.Infrastructure", "Wif.Infrastructure\Wif.Infrastructure.csproj", "{F13AB426-9BE1-4DE0-BC00-8A4211D37333}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wif.Infrastructure", "Wif.Infrastructure\Wif.Infrastructure.csproj", "{F13AB426-9BE1-4DE0-BC00-8A4211D37333}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{3D304D8A-7D0E-499E-A355-597E184DE572}" ProjectSection(SolutionItems) = preProject @@ -14,11 +14,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{3D304D8A-7 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{AC606DC5-103B-474C-93C0-A29F1710BC67}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wif.Demo", "Demos\Wif.Demo\Wif.Demo.csproj", "{FA2799D2-7CE2-4C5A-9F6D-534D8EC7E817}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wif.Utilities", "Wif.Utilities\Wif.Utilities.csproj", "{0F11E648-32C4-4024-89A7-AB9B5556B787}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wif.Demo.Common", "Demos\Wif.Demo.Common\Wif.Demo.Common.csproj", "{90EBBCF7-7825-4091-AD73-326543CFCA88}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wif.Demo", "Demos\Wif.Demo\Wif.Demo.csproj", "{F1EF357F-A4AD-4563-8246-B798557AB438}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wif.Utilities", "Wif.Utilities\Wif.Utilities.csproj", "{0F11E648-32C4-4024-89A7-AB9B5556B787}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wif.Demo.Common", "Demos\Wif.Demo.Common\Wif.Demo.Common.csproj", "{6941374F-5D7B-4CBC-BA6D-DAE69C538397}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -34,25 +34,25 @@ Global {F13AB426-9BE1-4DE0-BC00-8A4211D37333}.Debug|Any CPU.Build.0 = Debug|Any CPU {F13AB426-9BE1-4DE0-BC00-8A4211D37333}.Release|Any CPU.ActiveCfg = Release|Any CPU {F13AB426-9BE1-4DE0-BC00-8A4211D37333}.Release|Any CPU.Build.0 = Release|Any CPU - {FA2799D2-7CE2-4C5A-9F6D-534D8EC7E817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA2799D2-7CE2-4C5A-9F6D-534D8EC7E817}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA2799D2-7CE2-4C5A-9F6D-534D8EC7E817}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA2799D2-7CE2-4C5A-9F6D-534D8EC7E817}.Release|Any CPU.Build.0 = Release|Any CPU - {90EBBCF7-7825-4091-AD73-326543CFCA88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90EBBCF7-7825-4091-AD73-326543CFCA88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90EBBCF7-7825-4091-AD73-326543CFCA88}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90EBBCF7-7825-4091-AD73-326543CFCA88}.Release|Any CPU.Build.0 = Release|Any CPU {0F11E648-32C4-4024-89A7-AB9B5556B787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0F11E648-32C4-4024-89A7-AB9B5556B787}.Debug|Any CPU.Build.0 = Debug|Any CPU {0F11E648-32C4-4024-89A7-AB9B5556B787}.Release|Any CPU.ActiveCfg = Release|Any CPU {0F11E648-32C4-4024-89A7-AB9B5556B787}.Release|Any CPU.Build.0 = Release|Any CPU + {F1EF357F-A4AD-4563-8246-B798557AB438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1EF357F-A4AD-4563-8246-B798557AB438}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1EF357F-A4AD-4563-8246-B798557AB438}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1EF357F-A4AD-4563-8246-B798557AB438}.Release|Any CPU.Build.0 = Release|Any CPU + {6941374F-5D7B-4CBC-BA6D-DAE69C538397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6941374F-5D7B-4CBC-BA6D-DAE69C538397}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6941374F-5D7B-4CBC-BA6D-DAE69C538397}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6941374F-5D7B-4CBC-BA6D-DAE69C538397}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {FA2799D2-7CE2-4C5A-9F6D-534D8EC7E817} = {AC606DC5-103B-474C-93C0-A29F1710BC67} - {90EBBCF7-7825-4091-AD73-326543CFCA88} = {AC606DC5-103B-474C-93C0-A29F1710BC67} + {F1EF357F-A4AD-4563-8246-B798557AB438} = {AC606DC5-103B-474C-93C0-A29F1710BC67} + {6941374F-5D7B-4CBC-BA6D-DAE69C538397} = {AC606DC5-103B-474C-93C0-A29F1710BC67} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F6A80D75-127C-4C04-B6D0-B8C54D3F57AB}