diff --git a/README.md b/README.md index cf743eaf..ba6350cf 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,8 @@ JinhuaChen-OMEC seedtyx KleinPan -yxhq +yxhq +AiHaibara ## Backers diff --git a/build/build.cake b/build/build.cake index 7538862b..7f9bffa8 100644 --- a/build/build.cake +++ b/build/build.cake @@ -10,61 +10,63 @@ Task("Build") .IsDependentOn("Clean") .Does(() => { - var vsLatest = VSWhereLatest(); - var msBuildPath = vsLatest?.CombineWithFilePath("./MSBuild/Current/Bin/MSBuild.exe"); - NuGetRestore("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj"); + NuGetRestore("../src/HandyControl.sln"); - var settingsNet40 = new MSBuildSettings + var settingsNet40 = new DotNetCoreBuildSettings { Configuration = "Release", - ToolPath = msBuildPath, - }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net40")).FullPath); + OutputDirectory = "lib/net40" + }; - var settingsNet45 = new MSBuildSettings + var settingsNet45 = new DotNetCoreBuildSettings { - Configuration = "Release-Net45", - ToolPath = msBuildPath, - }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net45")).FullPath); + Configuration = "Release", + Framework = "net45", + OutputDirectory = "lib/net45" + }; - var settingsNet462 = new MSBuildSettings + var settingsNet462 = new DotNetCoreBuildSettings { - Configuration = "Release-Net462", - ToolPath = msBuildPath, - }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net462")).FullPath); + Configuration = "Release", + Framework = "net462", + OutputDirectory = "lib/net462" + }; - var settingsNet47 = new MSBuildSettings + var settingsNet47 = new DotNetCoreBuildSettings { - Configuration = "Release-Net47", - ToolPath = msBuildPath, - }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net47")).FullPath); + Configuration = "Release", + Framework = "net47", + OutputDirectory = "lib/net47" + }; - var settingsNet48 = new MSBuildSettings + var settingsNet48 = new DotNetCoreBuildSettings { - Configuration = "Release-Net48", - ToolPath = msBuildPath, - }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net48")).FullPath); + Configuration = "Release", + Framework = "net48", + OutputDirectory = "lib/net48" + }; var settingsCore30 = new DotNetCoreBuildSettings { + Configuration = "Release", Framework = "netcoreapp3.0", - Configuration = "Release-Core30", OutputDirectory = "lib/netcoreapp3.0" }; var settingsCore31 = new DotNetCoreBuildSettings { + Configuration = "Release", Framework = "netcoreapp3.1", - Configuration = "Release-Core31", OutputDirectory = "lib/netcoreapp3.1" }; - MSBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40); - MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet45); - MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet462); - MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet47); - MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet48); - DotNetCoreBuild("../src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj", settingsCore30); - DotNetCoreBuild("../src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj", settingsCore31); + DotNetCoreBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet45); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet462); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet47); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet48); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsCore30); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsCore31); }); RunTarget(target); \ No newline at end of file diff --git a/build/build.nuspec b/build/build.nuspec index f48902dc..1fc45976 100644 --- a/build/build.nuspec +++ b/build/build.nuspec @@ -2,19 +2,19 @@ HandyControl - 2.4.0 + 2.5.0 HandyOrg HandyOrg HandyOrg - false + true + LICENSE + icon.png https://github.com/NaBian/HandyControl - https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/icon.png Contains some commonly used simple WPF controls Changes are detailed at https://github.com/HandyOrg/HandyControl/releases Copyright © HandyOrg 2018-2020 - WPF C# Control - + @@ -24,47 +24,77 @@ + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj b/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj deleted file mode 100644 index 9a72efda..00000000 --- a/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj +++ /dev/null @@ -1,552 +0,0 @@ - - - WinExe - true - HandyControlDemo - HandyControlDemo - 2.5.0 - ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico - Debug-Core30;Debug-Core31;Release-Core30;Release-Core31 - Copyright © HandyOrg 2018-2020 - 2.5.0 - 2.5.0 - 8.0 - HandyOrg - - - TRACE;Core - netcoreapp3.0 - false - NU1701;0108 - - - TRACE;Core - netcoreapp3.1 - - - TRACE;Core - netcoreapp3.0 - - - TRACE;Core - netcoreapp3.1 - 0108;NU1701 - - - - - - - - - - Data\MessageToken.cs - True - True - MessageToken.tt - - - Properties\Langs\LangProvider.cs - True - True - LangProvider.tt - - - Properties\Langs\Lang.Designer.cs - True - True - Lang.resx - - - - - - - - - - - - - - Data\DemoInfo.json - - - Resources\Img\Cover.png - - - Resources\Img\QQ\1.gif - - - Resources\Img\QQ\2.gif - - - Resources\Img\QQ\3.gif - - - Resources\Img\QQ\4.gif - - - Resources\Img\QQ\5.gif - - - Resources\Img\QQ\6.gif - - - Resources\Img\QQ\7.gif - - - Resources\Img\QQ\8.gif - - - Resources\Img\QQ\9.gif - - - Resources\Img\QQ\10.gif - - - Resources\Img\1.jpg - - - Resources\Img\2.jpg - - - Resources\Img\3.jpg - - - Resources\Img\4.jpg - - - Resources\Img\5.jpg - - - Resources\Img\Album\1.jpg - - - Resources\Img\Album\10.jpg - - - Resources\Img\Album\2.jpg - - - Resources\Img\Album\3.jpg - - - Resources\Img\Album\4.jpg - - - Resources\Img\Album\5.jpg - - - Resources\Img\Album\6.jpg - - - Resources\Img\Album\7.jpg - - - Resources\Img\Album\8.jpg - - - Resources\Img\Album\9.jpg - - - Resources\Img\Avatar\avatar1.png - - - Resources\Img\Avatar\avatar2.png - - - Resources\Img\Avatar\avatar3.png - - - Resources\Img\Avatar\avatar4.png - - - Resources\Img\Avatar\avatar5.png - - - Resources\Img\Avatar\avatar6.png - - - Resources\Img\b1.jpg - - - Resources\Img\b2.jpg - - - Resources\Img\car_chase.gif - - - Resources\Img\Chat\chat_back1.jpg - - - Resources\Img\Chat\chat_back2.jpg - - - Resources\Img\Flag\cn.png - - - Resources\Img\Flag\en.png - - - Resources\Img\Flag\fa.png - - - Resources\Img\Flag\fr.png - - - Resources\Img\Flag\ko-KR.png - - - Resources\Img\Flag\ru.png - - - Resources\Img\Flag\tr.png - - - Resources\Img\icon-white.ico - - - Resources\Img\icon.ico - - - Resources\Img\qq_group_1.jpg - - - Resources\Img\qq_group_2.jpg - - - Resources\Img\LeftMainContent\Animation_16x.png - - - Resources\Img\LeftMainContent\BorderElement_16x.png - - - Resources\Img\LeftMainContent\Brush_16x.png - - - Resources\Img\LeftMainContent\Bubble_16xLG.png - - - Resources\Img\LeftMainContent\ButtonClick_16x.png - - - Resources\Img\LeftMainContent\Calendar_16x.png - - - Resources\Img\LeftMainContent\Carousel_16x.png - - - Resources\Img\LeftMainContent\CheckBox_16x.png - - - Resources\Img\LeftMainContent\ColorPalette_16x.png - - - Resources\Img\LeftMainContent\ColorWheel_16x.png - - - Resources\Img\LeftMainContent\ComboBox_16x.png - - - Resources\Img\LeftMainContent\ContextMenu_16x.png - - - Resources\Img\LeftMainContent\DataGrid_16x.png - - - Resources\Img\LeftMainContent\DatePicker_16x.png - - - Resources\Img\LeftMainContent\DetailDataView_16x.png - - - Resources\Img\LeftMainContent\Dialog_16x.png - - - Resources\Img\LeftMainContent\DotLarge_16x.png - - - Resources\Img\LeftMainContent\Expander_16x.png - - - Resources\Img\LeftMainContent\FlipVertical_16x.png - - - Resources\Img\LeftMainContent\Flow_16x.png - - - Resources\Img\LeftMainContent\GoToTop_16x.png - - - Resources\Img\LeftMainContent\GroupBox_16x.png - - - Resources\Img\LeftMainContent\HoverMenu_16x.png - - - Resources\Img\LeftMainContent\ImageBrowser_16x.png - - - Resources\Img\LeftMainContent\Label_16x.png - - - Resources\Img\LeftMainContent\LinearCarousel_16x.png - - - Resources\Img\LeftMainContent\ListBox_16x.png - - - Resources\Img\LeftMainContent\ListView_16x.png - - - Resources\Img\LeftMainContent\Loading_Blue_16x.png - - - Resources\Img\LeftMainContent\Message_16x.png - - - Resources\Img\LeftMainContent\NotificationHub_16x.png - - - Resources\Img\LeftMainContent\NumericListBox_16x.png - - - Resources\Img\LeftMainContent\Paginator_16x.png - - - Resources\Img\LeftMainContent\Panel_16x.png - - - Resources\Img\LeftMainContent\PasswordBox_16x.png - - - Resources\Img\LeftMainContent\Path_16x.png - - - Resources\Img\LeftMainContent\ProgressBar_16x.png - - - Resources\Img\LeftMainContent\ProgressButton_16x.png - - - Resources\Img\LeftMainContent\RadioButton_16x.png - - - Resources\Img\LeftMainContent\RepeatButton_16x.png - - - Resources\Img\LeftMainContent\RichTextBox_16x.png - - - Resources\Img\LeftMainContent\ScrollBox_16x.png - - - Resources\Img\LeftMainContent\Search_16x.png - - - Resources\Img\LeftMainContent\Shield_16x.png - - - Resources\Img\LeftMainContent\Slider_16x.png - - - Resources\Img\LeftMainContent\SortAscending_grey_16x.png - - - Resources\Img\LeftMainContent\SplitterControl_16x.png - - - Resources\Img\LeftMainContent\Star.png - - - Resources\Img\LeftMainContent\TabPage_16x.png - - - Resources\Img\LeftMainContent\Tag_16x.png - - - Resources\Img\LeftMainContent\TextBlock_16x.png - - - Resources\Img\LeftMainContent\TextBox_16x.png - - - Resources\Img\LeftMainContent\Timeline_16x.png - - - Resources\Img\LeftMainContent\TimePicker_16x.png - - - Resources\Img\LeftMainContent\Time_color_16x.png - - - Resources\Img\LeftMainContent\Toggle_16x.png - - - Resources\Img\LeftMainContent\ToolBar_16x.png - - - Resources\Img\LeftMainContent\Transfer_16x.png - - - Resources\Img\LeftMainContent\TreeView_16x.png - - - Resources\Img\LeftMainContent\User_16x.png - - - Resources\Img\LeftMainContent\WindowsForm_16x.png - - - Resources\Img\LeftMainContent\GridPane_16x.png - - - Resources\Img\under_construction.gif - - - Resources\Img\DevOps\DevOps-Boards.png - - - Resources\Img\DevOps\DevOps-Overview.png - - - Resources\Img\DevOps\DevOps-Pipelines.png - - - Resources\Img\DevOps\DevOps-Repos.png - - - Resources\Img\DevOps\DevOps-TestPlans.png - - - Resources\Img\LeftMainContent\MainMenuControl_16x.png - - - Resources\fabric-icons.ttf - - - Resources\Registry.txt - - - Resources\Img\LeftMainContent\brackets_Square_16xLG.png - - - Resources\Img\LeftMainContent\ButtonGroup_16x.png - - - Resources\Img\LeftMainContent\VSO_Card_16x.png - - - Resources\Img\LeftMainContent\ImageStack_16x.png - - - Resources\Img\LeftMainContent\Dynamic_16x.png - - - Resources\Img\LeftMainContent\PolygonHexagon_16x.png - - - Resources\Img\LeftMainContent\HandyControl.png - - - Resources\Img\LeftMainContent\Procedure_16x.png - - - Resources\Img\Dance.png - - - Resources\Img\LeftMainContent\thumbs_up.png - - - Resources\Img\LeftMainContent\SplitButton_16x.png - - - Resources\Img\LeftMainContent\DataGenerator_16x.png - - - Resources\Img\LeftMainContent\DottedSplitter_16x.png - - - Resources\Img\LeftMainContent\PopupCursor_16x.png - - - Resources\Img\LeftMainContent\TransitioningContentControl_16x.png - - - Resources\Img\LeftMainContent\View_Portrait_16x.png - - - Resources\Img\LeftMainContent\TransformRelative_16x.png - - - Resources\Img\LeftMainContent\Effects_16x.png - - - Resources\Img\LeftMainContent\Ellipsis_16x.png - - - Resources\Img\LeftMainContent\WPFFlowDocument_16x.png - - - Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png - - - Resources\Img\LeftMainContent\frame_16xLG.png - - - Resources\Img\cloud.png - - - Resources\Img\LeftMainContent\WindowScreenshot_16x.png - - - - - Properties\Langs\Lang.tr.resx - - - Properties\Langs\Lang.en.resx - - - Properties\Langs\Lang.fa.resx - - - Properties\Langs\Lang.fr.resx - - - Properties\Langs\Lang.ko-KR.resx - - - Properties\Langs\Lang.ru.resx - - - Properties\Langs\Lang.resx - PublicResXFileCodeGenerator - Lang.Designer.cs - - - - - Properties\App.config - - - - - Data\MessageToken.tt - TextTemplatingFileGenerator - MessageToken.cs - - - Properties\Langs\LangProvider.tt - TextTemplatingFileGenerator - LangProvider.cs - - - - - TextTemplatingFileGenerator - - - - \ No newline at end of file diff --git a/src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj b/src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj deleted file mode 100644 index f56a2141..00000000 --- a/src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj +++ /dev/null @@ -1,159 +0,0 @@ - - - true - HandyControl - HandyControl - 2.5.0 - 2.5.0 - false - false - Copyright © HandyOrg 2018-2020 - Contains some commonly used simple WPF controls - Debug-Core30;Debug-Core31;Release-Core30;Release-Core31 - 8.0 - HandyOrg - HandyControl - - - TRACE;Core - netcoreapp3.0 - 0067;0649 - - - TRACE;Core - netcoreapp3.1 - 0067;0649 - - - TRACE;Core - netcoreapp3.0 - 0067;0649;1591 - - - TRACE;Core - netcoreapp3.1 - 0067;0649;1591 - - - - Properties\Langs\Lang.Designer.cs - True - True - Lang.resx - - - Properties\Langs\LangProvider.cs - True - True - LangProvider.tt - - - - - Properties\Langs\Lang.tr.resx - - - Properties\Langs\Lang.en.resx - - - Properties\Langs\Lang.fa.resx - - - Properties\Langs\Lang.fr.resx - - - Properties\Langs\Lang.ko-KR.resx - - - Properties\Langs\Lang.ru.resx - - - Properties\Langs\Lang.resx - PublicResXFileCodeGenerator - Lang.Designer.cs - - - Properties\CoreAssemblyInfo.cs - - - - - Properties\Langs\LangProvider.tt - TextTemplatingFileGenerator - LangProvider.cs - - - - - - Resources\dropper.cur - - - - - Resources\Effects\BrightnessEffect.ps - - - Resources\Effects\ColorComplementEffect.ps - - - Resources\Effects\ColorMatrixEffect.ps - - - Resources\Effects\ContrastEffect.ps - - - Resources\Effects\GrayScaleEffect.ps - - - - - Resources\Images\GlowWindow\bottom.png - - - Resources\Images\GlowWindow\bottomleft.png - - - Resources\Images\GlowWindow\bottomright.png - - - Resources\Images\GlowWindow\cornerbottomleft.png - - - Resources\Images\GlowWindow\cornerbottomright.png - - - Resources\Images\GlowWindow\cornertopleft.png - - - Resources\Images\GlowWindow\cornertopright.png - - - Resources\Images\GlowWindow\left.png - - - Resources\Images\GlowWindow\leftbottom.png - - - Resources\Images\GlowWindow\lefttop.png - - - Resources\Images\GlowWindow\right.png - - - Resources\Images\GlowWindow\rightbottom.png - - - Resources\Images\GlowWindow\righttop.png - - - Resources\Images\GlowWindow\top.png - - - Resources\Images\GlowWindow\topleft.png - - - Resources\Images\GlowWindow\topright.png - - - diff --git a/src/Directory.Build.Props b/src/Directory.Build.Props new file mode 100644 index 00000000..7afc4ff0 --- /dev/null +++ b/src/Directory.Build.Props @@ -0,0 +1,11 @@ + + + true + 2.5.0.1 + 2.5.0.1 + 2.5.0.1 + 8.0 + Copyright © HandyOrg 2018-2020 + HandyOrg + + \ No newline at end of file diff --git a/src/HandyControl.sln b/src/HandyControl.sln index 45fa85fc..bee946d8 100644 --- a/src/HandyControl.sln +++ b/src/HandyControl.sln @@ -17,12 +17,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", " EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net_40", "Net_40", "{35E3F9C0-8924-4536-BE09-F3761FDBF066}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core_GE30", "Core_GE30", "{B838C973-06F0-48A1-B259-A357AAF2D8D4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Core_GE30", "Core_GE30\HandyControl_Core_GE30\HandyControl_Core_GE30.csproj", "{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Core_GE30", "Core_GE30\HandyControlDemo_Core_GE30\HandyControlDemo_Core_GE30.csproj", "{D7107690-8592-4F9F-9379-9B82C1C15D2A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_40", "Net_40\HandyControl_Net_40\HandyControl_Net_40.csproj", "{32204503-2EF0-4681-AE13-AA1FEB6C658A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_40", "Net_40\HandyControlDemo_Net_40\HandyControlDemo_Net_40.csproj", "{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}" @@ -31,172 +25,52 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Sh EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 4 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 4 + Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 + Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 5 Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13 - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{be4a567d-b6e0-413e-8f64-e1a53b4f9366}*SharedItemsImports = 5 Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{c4694269-c9b8-45d5-87f8-d0088c532510}*SharedItemsImports = 13 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d7107690-8592-4f9f-9379-9b82c1c15d2a}*SharedItemsImports = 5 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d8ae88f8-c36b-4d10-a7f9-22ffcfba5231}*SharedItemsImports = 4 - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 4 + Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d8ae88f8-c36b-4d10-a7f9-22ffcfba5231}*SharedItemsImports = 5 + Shared\HandyControl_Shared\HandyControl_Shared.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug-Core30|Any CPU = Debug-Core30|Any CPU - Debug-Core31|Any CPU = Debug-Core31|Any CPU + Debug|Any CPU = Debug|Any CPU Debug-Net40|Any CPU = Debug-Net40|Any CPU - Debug-Net45|Any CPU = Debug-Net45|Any CPU - Debug-Net462|Any CPU = Debug-Net462|Any CPU - Debug-Net47|Any CPU = Debug-Net47|Any CPU - Debug-Net48|Any CPU = Debug-Net48|Any CPU - Release-Core30|Any CPU = Release-Core30|Any CPU - Release-Core31|Any CPU = Release-Core31|Any CPU + Release|Any CPU = Release|Any CPU Release-Net40|Any CPU = Release-Net40|Any CPU - Release-Net45|Any CPU = Release-Net45|Any CPU - Release-Net462|Any CPU = Release-Net462|Any CPU - Release-Net47|Any CPU = Release-Net47|Any CPU - Release-Net48|Any CPU = Release-Net48|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Core31|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Core30|Any CPU.ActiveCfg = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Core31|Any CPU.ActiveCfg = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net40|Any CPU.ActiveCfg = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Core31|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Core30|Any CPU.ActiveCfg = Release-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Core31|Any CPU.ActiveCfg = Release-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net40|Any CPU.ActiveCfg = Release-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core30|Any CPU.ActiveCfg = Debug-Core30|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core30|Any CPU.Build.0 = Debug-Core30|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core31|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core31|Any CPU.Build.0 = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net40|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net45|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net462|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net47|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net48|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core30|Any CPU.ActiveCfg = Release-Core30|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core30|Any CPU.Build.0 = Release-Core30|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core31|Any CPU.ActiveCfg = Release-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core31|Any CPU.Build.0 = Release-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net40|Any CPU.ActiveCfg = Release-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net45|Any CPU.ActiveCfg = Release-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net462|Any CPU.ActiveCfg = Release-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net47|Any CPU.ActiveCfg = Release-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net48|Any CPU.ActiveCfg = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core30|Any CPU.ActiveCfg = Debug-Core30|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core30|Any CPU.Build.0 = Debug-Core30|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core31|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core31|Any CPU.Build.0 = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net40|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net45|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net462|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net47|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net48|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core30|Any CPU.ActiveCfg = Release-Core30|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core30|Any CPU.Build.0 = Release-Core30|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core31|Any CPU.ActiveCfg = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core31|Any CPU.Build.0 = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net40|Any CPU.ActiveCfg = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net45|Any CPU.ActiveCfg = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net462|Any CPU.ActiveCfg = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net47|Any CPU.ActiveCfg = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net48|Any CPU.ActiveCfg = Release-Core31|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Core30|Any CPU.ActiveCfg = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Core31|Any CPU.ActiveCfg = Debug|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release|Any CPU.Build.0 = Release|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release|Any CPU.Build.0 = Release|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU + {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net40|Any CPU.Build.0 = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net45|Any CPU.ActiveCfg = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net462|Any CPU.ActiveCfg = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net47|Any CPU.ActiveCfg = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net48|Any CPU.ActiveCfg = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Core30|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Core31|Any CPU.ActiveCfg = Release|Any CPU + {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release|Any CPU.ActiveCfg = Release|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net40|Any CPU.Build.0 = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net45|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net462|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net47|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net48|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Core30|Any CPU.ActiveCfg = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Core31|Any CPU.ActiveCfg = Debug|Any CPU + {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net40|Any CPU.Build.0 = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net45|Any CPU.ActiveCfg = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net462|Any CPU.ActiveCfg = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net47|Any CPU.ActiveCfg = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net48|Any CPU.ActiveCfg = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Core30|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Core31|Any CPU.ActiveCfg = Release|Any CPU + {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release|Any CPU.ActiveCfg = Release|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net40|Any CPU.Build.0 = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net45|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net462|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net47|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net48|Any CPU.ActiveCfg = Release|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core30|Any CPU.Build.0 = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core31|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core31|Any CPU.Build.0 = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net40|Any CPU.Build.0 = Debug-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core30|Any CPU.ActiveCfg = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core30|Any CPU.Build.0 = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core31|Any CPU.ActiveCfg = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core31|Any CPU.Build.0 = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net40|Any CPU.ActiveCfg = Release-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net40|Any CPU.Build.0 = Release-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net40|Any CPU.Build.0 = Debug|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.Build.0 = Release|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net40|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -206,8 +80,6 @@ Global {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7} = {2F551C62-77F7-4FA5-8AD7-FCF53E92AE08} {AAC11083-FACA-405D-9197-5C1212D65656} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} {C4694269-C9B8-45D5-87F8-D0088C532510} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366} = {B838C973-06F0-48A1-B259-A357AAF2D8D4} - {D7107690-8592-4F9F-9379-9B82C1C15D2A} = {B838C973-06F0-48A1-B259-A357AAF2D8D4} {32204503-2EF0-4681-AE13-AA1FEB6C658A} = {35E3F9C0-8924-4536-BE09-F3761FDBF066} {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} = {35E3F9C0-8924-4536-BE09-F3761FDBF066} {D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} diff --git a/src/HandyControl_Core_GE30.sln b/src/HandyControl_Core_GE30.sln deleted file mode 100644 index 5d0f3b84..00000000 --- a/src/HandyControl_Core_GE30.sln +++ /dev/null @@ -1,56 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28729.10 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{60DCDCCA-3902-49EB-BC24-488143BE832E}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControl_Shared", "Shared\HandyControl_Shared\HandyControl_Shared.shproj", "{AAC11083-FACA-405D-9197-5C1212D65656}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", "Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.shproj", "{C4694269-C9B8-45D5-87F8-D0088C532510}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core_GE30", "Core_GE30", "{7BB7D82E-48B1-4673-91B6-37D563A0A624}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Core_GE30", "Core_GE30\HandyControl_Core_GE30\HandyControl_Core_GE30.csproj", "{A85722CF-CDF4-4164-94E4-EB71E543361A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Core_GE30", "Core_GE30\HandyControlDemo_Core_GE30\HandyControlDemo_Core_GE30.csproj", "{BF712555-531A-4C8D-9AB5-3109DC178A8E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{c4694269-c9b8-45d5-87f8-d0088c532510}*SharedItemsImports = 13 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A85722CF-CDF4-4164-94E4-EB71E543361A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A85722CF-CDF4-4164-94E4-EB71E543361A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A85722CF-CDF4-4164-94E4-EB71E543361A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A85722CF-CDF4-4164-94E4-EB71E543361A}.Release|Any CPU.Build.0 = Release|Any CPU - {BF712555-531A-4C8D-9AB5-3109DC178A8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF712555-531A-4C8D-9AB5-3109DC178A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF712555-531A-4C8D-9AB5-3109DC178A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF712555-531A-4C8D-9AB5-3109DC178A8E}.Release|Any CPU.Build.0 = Release|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.Build.0 = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.ActiveCfg = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.Build.0 = Release-Net48|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {AAC11083-FACA-405D-9197-5C1212D65656} = {60DCDCCA-3902-49EB-BC24-488143BE832E} - {C4694269-C9B8-45D5-87F8-D0088C532510} = {60DCDCCA-3902-49EB-BC24-488143BE832E} - {A85722CF-CDF4-4164-94E4-EB71E543361A} = {7BB7D82E-48B1-4673-91B6-37D563A0A624} - {BF712555-531A-4C8D-9AB5-3109DC178A8E} = {7BB7D82E-48B1-4673-91B6-37D563A0A624} - {D8A4748C-0500-4F63-BC47-3506658C68F7} = {60DCDCCA-3902-49EB-BC24-488143BE832E} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6C8B9B9F-B396-4C31-BA28-11BCB1ED94C5} - EndGlobalSection -EndGlobal diff --git a/src/HandyControl_Net_40.sln b/src/HandyControl_Net_40.sln deleted file mode 100644 index e33e7cc8..00000000 --- a/src/HandyControl_Net_40.sln +++ /dev/null @@ -1,58 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28729.10 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net_40", "Net_40", "{763DABFC-950A-4965-97CB-15C59A928401}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{0938270D-E9F0-489B-AF9E-5C5AD7C69897}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControl_Shared", "Shared\HandyControl_Shared\HandyControl_Shared.shproj", "{AAC11083-FACA-405D-9197-5C1212D65656}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", "Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.shproj", "{C4694269-C9B8-45D5-87F8-D0088C532510}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_40", "Net_40\HandyControl_Net_40\HandyControl_Net_40.csproj", "{32204503-2EF0-4681-AE13-AA1FEB6C658A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_40", "Net_40\HandyControlDemo_Net_40\HandyControlDemo_Net_40.csproj", "{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 4 - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{c4694269-c9b8-45d5-87f8-d0088c532510}*SharedItemsImports = 13 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d8ae88f8-c36b-4d10-a7f9-22ffcfba5231}*SharedItemsImports = 4 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release|Any CPU.Build.0 = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release|Any CPU.Build.0 = Release|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.ActiveCfg = Debug-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.Build.0 = Debug-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.ActiveCfg = Release-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.Build.0 = Release-Net40|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {AAC11083-FACA-405D-9197-5C1212D65656} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - {C4694269-C9B8-45D5-87F8-D0088C532510} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - {32204503-2EF0-4681-AE13-AA1FEB6C658A} = {763DABFC-950A-4965-97CB-15C59A928401} - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} = {763DABFC-950A-4965-97CB-15C59A928401} - {D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179} - EndGlobalSection -EndGlobal diff --git a/src/HandyControl_Net_GE45.sln b/src/HandyControl_Net_GE45.sln deleted file mode 100644 index 34b9d63d..00000000 --- a/src/HandyControl_Net_GE45.sln +++ /dev/null @@ -1,100 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28729.10 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_GE45", "Net_GE45\HandyControl_Net_GE45\HandyControl_Net_GE45.csproj", "{DC966E3D-BCFF-4652-98CF-070E5494749A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_GE45", "Net_GE45\HandyControlDemo_Net_GE45\HandyControlDemo_Net_GE45.csproj", "{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net_GE45", "Net_GE45", "{2F551C62-77F7-4FA5-8AD7-FCF53E92AE08}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{0938270D-E9F0-489B-AF9E-5C5AD7C69897}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControl_Shared", "Shared\HandyControl_Shared\HandyControl_Shared.shproj", "{AAC11083-FACA-405D-9197-5C1212D65656}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", "Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.shproj", "{C4694269-C9B8-45D5-87F8-D0088C532510}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 4 - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{c4694269-c9b8-45d5-87f8-d0088c532510}*SharedItemsImports = 13 - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 4 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug-Net45|Any CPU = Debug-Net45|Any CPU - Debug-Net462|Any CPU = Debug-Net462|Any CPU - Debug-Net47|Any CPU = Debug-Net47|Any CPU - Debug-Net48|Any CPU = Debug-Net48|Any CPU - Release-Net45|Any CPU = Release-Net45|Any CPU - Release-Net462|Any CPU = Release-Net462|Any CPU - Release-Net47|Any CPU = Release-Net47|Any CPU - Release-Net48|Any CPU = Release-Net48|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {DC966E3D-BCFF-4652-98CF-070E5494749A} = {2F551C62-77F7-4FA5-8AD7-FCF53E92AE08} - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7} = {2F551C62-77F7-4FA5-8AD7-FCF53E92AE08} - {AAC11083-FACA-405D-9197-5C1212D65656} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - {C4694269-C9B8-45D5-87F8-D0088C532510} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - {D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179} - EndGlobalSection -EndGlobal diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj index 2afd198a..ddfbf73d 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -1,75 +1,20 @@ - - - + - Debug - AnyCPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} WinExe - HandyControlDemo HandyControlDemo - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE;netle45;netle40 - prompt - 4 - v4.0 - 8.0 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE;netle45;netle40 - prompt - 4 - v4.0 - 8.0 - 0108 - - + HandyControlDemo + net40 ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico - - - OnOutputUpdated + 0108 - - - - 4.0 - - - - - - - - 6.0.1 - - - 5.4.1.1 - - - 11.0.2 - + + + @@ -84,11 +29,6 @@ True LangProvider.tt - - Properties\AssemblyInfo.cs - - - Properties\Langs\Lang.Designer.cs True @@ -97,6 +37,21 @@ + + + + + + + + + + + Data\DemoInfo.json + + + Resources\Img\Cover.png + Resources\Img\QQ\1.gif @@ -232,6 +187,12 @@ Resources\Img\icon.ico + + Resources\Img\qq_group_1.jpg + + + Resources\Img\qq_group_2.jpg + Resources\Img\LeftMainContent\Animation_16x.png @@ -349,6 +310,9 @@ Resources\Img\LeftMainContent\RadioButton_16x.png + + Resources\Img\LeftMainContent\RepeatButton_16x.png + Resources\Img\LeftMainContent\RichTextBox_16x.png @@ -412,22 +376,111 @@ Resources\Img\LeftMainContent\WindowsForm_16x.png + + Resources\Img\LeftMainContent\GridPane_16x.png + Resources\Img\under_construction.gif + + Resources\Img\DevOps\DevOps-Boards.png + + + Resources\Img\DevOps\DevOps-Overview.png + + + Resources\Img\DevOps\DevOps-Pipelines.png + + + Resources\Img\DevOps\DevOps-Repos.png + + + Resources\Img\DevOps\DevOps-TestPlans.png + + + Resources\Img\LeftMainContent\MainMenuControl_16x.png + + + Resources\fabric-icons.ttf + + + Resources\Registry.txt + + + Resources\Img\LeftMainContent\brackets_Square_16xLG.png + + + Resources\Img\LeftMainContent\ButtonGroup_16x.png + + + Resources\Img\LeftMainContent\VSO_Card_16x.png + + + Resources\Img\LeftMainContent\ImageStack_16x.png + + + Resources\Img\LeftMainContent\Dynamic_16x.png + + + Resources\Img\LeftMainContent\PolygonHexagon_16x.png + + + Resources\Img\LeftMainContent\HandyControl.png + + + Resources\Img\LeftMainContent\Procedure_16x.png + + + Resources\Img\Dance.png + + + Resources\Img\LeftMainContent\thumbs_up.png + + + Resources\Img\LeftMainContent\SplitButton_16x.png + + + Resources\Img\LeftMainContent\DataGenerator_16x.png + + + Resources\Img\LeftMainContent\DottedSplitter_16x.png + + + Resources\Img\LeftMainContent\PopupCursor_16x.png + + + Resources\Img\LeftMainContent\TransitioningContentControl_16x.png + + + Resources\Img\LeftMainContent\View_Portrait_16x.png + + + Resources\Img\LeftMainContent\TransformRelative_16x.png + + + Resources\Img\LeftMainContent\Effects_16x.png + + + Resources\Img\LeftMainContent\Ellipsis_16x.png + + + Resources\Img\LeftMainContent\WPFFlowDocument_16x.png + + + Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png + + + Resources\Img\LeftMainContent\frame_16xLG.png + + + Resources\Img\cloud.png + + + Resources\Img\LeftMainContent\WindowScreenshot_16x.png + - - {d8a4748c-0500-4f63-bc47-3506658c68f7} - HandyControlDemo_Code - - - {32204503-2ef0-4681-ae13-aa1feb6c658a} - HandyControl_Net_40 - - - - + Properties\Langs\Lang.tr.resx @@ -456,14 +509,6 @@ Properties\App.config - - - Resources\fabric-icons.ttf - - - Resources\Registry.txt - - Data\MessageToken.tt @@ -475,119 +520,13 @@ TextTemplatingFileGenerator LangProvider.cs - - Resources\Img\LeftMainContent\Effects_16x.png - - - Resources\Img\LeftMainContent\TransformRelative_16x.png - - - Resources\Img\LeftMainContent\View_Portrait_16x.png - - - Resources\Img\LeftMainContent\TransitioningContentControl_16x.png - - - Resources\Img\LeftMainContent\PopupCursor_16x.png - - - Resources\Img\Cover.png - - - Resources\Img\LeftMainContent\DottedSplitter_16x.png - - - Resources\Img\qq_group_1.jpg - - - Resources\Img\qq_group_2.jpg - - - Resources\Img\LeftMainContent\DataGenerator_16x.png - - - Resources\Img\LeftMainContent\SplitButton_16x.png - - - Resources\Img\LeftMainContent\thumbs_up.png - - - Resources\Img\LeftMainContent\Procedure_16x.png - - - Resources\Img\LeftMainContent\HandyControl.png - - - Resources\Img\LeftMainContent\PolygonHexagon_16x.png - - - Resources\Img\LeftMainContent\Dynamic_16x.png - - - Resources\Img\Dance.png - - - Resources\Img\LeftMainContent\ImageStack_16x.png - - - Resources\Img\LeftMainContent\VSO_Card_16x.png - - - Resources\Img\LeftMainContent\ButtonGroup_16x.png - - - Resources\Img\LeftMainContent\brackets_Square_16xLG.png - - - Resources\Img\LeftMainContent\GridPane_16x.png - - - Resources\Img\LeftMainContent\MainMenuControl_16x.png - - - Resources\Img\DevOps\DevOps-Boards.png - - - Resources\Img\DevOps\DevOps-Overview.png - - - Resources\Img\DevOps\DevOps-Pipelines.png - - - Resources\Img\DevOps\DevOps-Repos.png - - - Resources\Img\DevOps\DevOps-TestPlans.png - - - Resources\Img\LeftMainContent\RepeatButton_16x.png - - - Resources\Img\LeftMainContent\Ellipsis_16x.png - - - Resources\Img\LeftMainContent\WPFFlowDocument_16x.png - - - Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png - - - Resources\Img\LeftMainContent\frame_16xLG.png - - - Resources\Img\cloud.png - - - Resources\Img\LeftMainContent\WindowScreenshot_16x.png - - - Data\DemoInfo.json - + + TextTemplatingFileGenerator + - if not exist Langs md Langs rd /s /q Langs\en diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj index deeacd6e..9cfc2faa 100644 --- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj +++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj @@ -1,47 +1,49 @@ - - + - Debug - AnyCPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A} - library - HandyControl HandyControl - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 + HandyControl + net40 + Contains some commonly used simple WPF controls HandyControl - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE;netle45;netle40 - prompt - 4 - v4.0 - 8.0 - - - pdbonly - true - bin\Release\ - TRACE;netle45;netle40 - prompt - 4 - bin\Release\HandyControl.xml - v4.0 - 8.0 + true + snupkg 0067;0649;1591 + + bin\$(Configuration)\$(TargetFramework)\HandyControl.xml + + + + 3.0.1 + + + + + Designer + XamlIntelliSenseFileGenerator + + + MSBuild:Compile + Designer + + + Designer + XamlIntelliSenseFileGenerator + + + Designer + XamlIntelliSenseFileGenerator + + + Designer + XamlIntelliSenseFileGenerator + + + Designer + XamlIntelliSenseFileGenerator + + - - Properties\NetAssemblyInfo.cs - Properties\Langs\Lang.Designer.cs True @@ -55,47 +57,6 @@ LangProvider.tt - - - - - - - - - - - - - Designer - XamlIntelliSenseFileGenerator - - - MSBuild:Compile - Designer - - - Designer - XamlIntelliSenseFileGenerator - - - Designer - XamlIntelliSenseFileGenerator - - - Designer - XamlIntelliSenseFileGenerator - - - Designer - XamlIntelliSenseFileGenerator - - - - - 3.0.1 - - Properties\Langs\Lang.tr.resx @@ -103,10 +64,10 @@ Properties\Langs\Lang.en.resx - + Properties\Langs\Lang.fa.resx - + Properties\Langs\Lang.fr.resx @@ -120,12 +81,18 @@ PublicResXFileCodeGenerator Lang.Designer.cs + + Properties\CoreAssemblyInfo.cs + + + Properties\Langs\LangProvider.tt TextTemplatingFileGenerator LangProvider.cs + Resources\dropper.cur @@ -198,8 +165,6 @@ Resources\Images\GlowWindow\topright.png - - diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj index 9219c787..c8cce33f 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -1,155 +1,20 @@ - - - + - Debug - AnyCPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7} WinExe - HandyControlDemo HandyControlDemo - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - - v4.5 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.5 - 8.0 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.6.2 - 8.0 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.7 - 8.0 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.8 - 8.0 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - v4.5 - 8.0 + HandyControlDemo + netcoreapp3.0;netcoreapp3.1;net45;net462;net47;net48 + ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico 0108 - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - v4.6.2 - 8.0 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - v4.7 - 8.0 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - v4.8 - 8.0 - - - ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico - - - OnOutputUpdated - - + - - - - - 4.0 - - - - - - - - {d8a4748c-0500-4f63-bc47-3506658c68f7} - HandyControlDemo_Code - - - {dc966e3d-bcff-4652-98cf-070e5494749a} - HandyControl_Net_GE45 - - - - - 6.0.1 - - - 5.4.1.1 - - - 11.0.2 - + + + + @@ -164,9 +29,6 @@ True LangProvider.tt - - Properties\AssemblyInfo.cs - Properties\Langs\Lang.Designer.cs True @@ -175,6 +37,21 @@ + + + + + + + + + + + Data\DemoInfo.json + + + Resources\Img\Cover.png + Resources\Img\QQ\1.gif @@ -310,6 +187,12 @@ Resources\Img\icon.ico + + Resources\Img\qq_group_1.jpg + + + Resources\Img\qq_group_2.jpg + Resources\Img\LeftMainContent\Animation_16x.png @@ -427,6 +310,9 @@ Resources\Img\LeftMainContent\RadioButton_16x.png + + Resources\Img\LeftMainContent\RepeatButton_16x.png + Resources\Img\LeftMainContent\RichTextBox_16x.png @@ -490,123 +376,12 @@ Resources\Img\LeftMainContent\WindowsForm_16x.png - - Resources\Img\under_construction.gif - - - - - Properties\Langs\Lang.tr.resx - - - Properties\Langs\Lang.en.resx - - - Properties\Langs\Lang.fa.resx - - - Properties\Langs\Lang.fr.resx - - - Properties\Langs\Lang.ko-KR.resx - - - Properties\Langs\Lang.ru.resx - - - Properties\Langs\Lang.resx - PublicResXFileCodeGenerator - Lang.Designer.cs - Designer - - - - - Properties\App.config - - - - - Resources\Img\LeftMainContent\RepeatButton_16x.png - - - - - Properties\Langs\LangProvider.tt - TextTemplatingFileGenerator - LangProvider.cs - - - Data\MessageToken.tt - TextTemplatingFileGenerator - MessageToken.cs - - - Resources\Img\LeftMainContent\Effects_16x.png - - - Resources\Img\LeftMainContent\TransformRelative_16x.png - - - Resources\Img\LeftMainContent\View_Portrait_16x.png - - - Resources\Img\LeftMainContent\TransitioningContentControl_16x.png - - - Resources\Img\LeftMainContent\PopupCursor_16x.png - - - Resources\Img\Cover.png - - - Resources\Img\LeftMainContent\DottedSplitter_16x.png - - - Resources\Img\qq_group_1.jpg - - - Resources\Img\qq_group_2.jpg - - - Resources\Img\LeftMainContent\DataGenerator_16x.png - - - Resources\Img\LeftMainContent\SplitButton_16x.png - - - Resources\Img\LeftMainContent\thumbs_up.png - - - Resources\Img\LeftMainContent\Procedure_16x.png - - - Resources\Img\LeftMainContent\HandyControl.png - - - Resources\Img\LeftMainContent\PolygonHexagon_16x.png - - - Resources\Img\LeftMainContent\Dynamic_16x.png - - - Resources\Img\Dance.png - - - Resources\Img\LeftMainContent\ImageStack_16x.png - - - Resources\Img\LeftMainContent\VSO_Card_16x.png - - - Resources\Img\LeftMainContent\ButtonGroup_16x.png - - - Resources\Img\LeftMainContent\brackets_Square_16xLG.png - Resources\Img\LeftMainContent\GridPane_16x.png + + Resources\Img\under_construction.gif + Resources\Img\DevOps\DevOps-Boards.png @@ -625,6 +400,66 @@ Resources\Img\LeftMainContent\MainMenuControl_16x.png + + Resources\fabric-icons.ttf + + + Resources\Registry.txt + + + Resources\Img\LeftMainContent\brackets_Square_16xLG.png + + + Resources\Img\LeftMainContent\ButtonGroup_16x.png + + + Resources\Img\LeftMainContent\VSO_Card_16x.png + + + Resources\Img\LeftMainContent\ImageStack_16x.png + + + Resources\Img\LeftMainContent\Dynamic_16x.png + + + Resources\Img\LeftMainContent\PolygonHexagon_16x.png + + + Resources\Img\LeftMainContent\HandyControl.png + + + Resources\Img\LeftMainContent\Procedure_16x.png + + + Resources\Img\Dance.png + + + Resources\Img\LeftMainContent\thumbs_up.png + + + Resources\Img\LeftMainContent\SplitButton_16x.png + + + Resources\Img\LeftMainContent\DataGenerator_16x.png + + + Resources\Img\LeftMainContent\DottedSplitter_16x.png + + + Resources\Img\LeftMainContent\PopupCursor_16x.png + + + Resources\Img\LeftMainContent\TransitioningContentControl_16x.png + + + Resources\Img\LeftMainContent\View_Portrait_16x.png + + + Resources\Img\LeftMainContent\TransformRelative_16x.png + + + Resources\Img\LeftMainContent\Effects_16x.png + Resources\Img\LeftMainContent\Ellipsis_16x.png @@ -645,20 +480,53 @@ - - Resources\fabric-icons.ttf - - - Resources\Registry.txt - + + Properties\Langs\Lang.tr.resx + + + Properties\Langs\Lang.en.resx + + + Properties\Langs\Lang.fa.resx + + + Properties\Langs\Lang.fr.resx + + + Properties\Langs\Lang.ko-KR.resx + + + Properties\Langs\Lang.ru.resx + + + Properties\Langs\Lang.resx + PublicResXFileCodeGenerator + Lang.Designer.cs + - - Data\DemoInfo.json - + + Properties\App.config + + + + + Data\MessageToken.tt + TextTemplatingFileGenerator + MessageToken.cs + + + Properties\Langs\LangProvider.tt + TextTemplatingFileGenerator + LangProvider.cs + + + + + TextTemplatingFileGenerator + - if not exist Langs md Langs rd /s /q Langs\en diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj index ea78f607..e75238a9 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj +++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj @@ -1,124 +1,18 @@ - - + - Debug - AnyCPU - {DC966E3D-BCFF-4652-98CF-070E5494749A} - library - HandyControl HandyControl - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - - v4.5 - - - true - full - false - bin\Debug\ - DEBUG;TRACE;netle45 - prompt - 4 - v4.5 - netgt40 - 8.0 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.6.2 - netgt40 - 8.0 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.7 - netgt40 - 8.0 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.8 - netgt40 - 8.0 - - - pdbonly - true - bin\Release\Net45\ - TRACE;netle45 - prompt - 4 - bin\Release\HandyControl.xml - v4.5 - netgt40 - 8.0 + HandyControl + netcoreapp3.0;netcoreapp3.1;net45;net462;net47;net48 + Contains some commonly used simple WPF controls + HandyControl + true + snupkg 0067;0649;1591 - - pdbonly - true - bin\Release\Net462\ - TRACE - prompt - 4 - bin\Release\HandyControl.xml - v4.6.2 - netgt40 - 8.0 - 0067;0649;1591 - - - pdbonly - true - bin\Release\Net47\ - TRACE - prompt - 4 - bin\Release\HandyControl.xml - v4.7 - netgt40 - 8.0 - 0067;0649;1591 - - - pdbonly - true - bin\Release\Net48\ - TRACE - prompt - 4 - bin\Release\HandyControl.xml - v4.8 - netgt40 - 8.0 - 0067;0649;1591 + + bin\$(Configuration)\$(TargetFramework)\HandyControl.xml - - Properties\NetAssemblyInfo.cs - Properties\Langs\Lang.Designer.cs True @@ -133,26 +27,16 @@ - - - - - - - - - - - + Properties\Langs\Lang.tr.resx Properties\Langs\Lang.en.resx - + Properties\Langs\Lang.fa.resx - + Properties\Langs\Lang.fr.resx @@ -165,14 +49,19 @@ Properties\Langs\Lang.resx PublicResXFileCodeGenerator Lang.Designer.cs - Designer + + Properties\CoreAssemblyInfo.cs + + + Properties\Langs\LangProvider.tt TextTemplatingFileGenerator LangProvider.cs + Resources\dropper.cur @@ -245,6 +134,4 @@ Resources\Images\GlowWindow\topright.png - - \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj index d307144e..06779b68 100644 --- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj +++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj @@ -1,997 +1,863 @@ - - - + - Debug - AnyCPU - {D8A4748C-0500-4F63-BC47-3506658C68F7} - Library - HandyControlDemoCode + true HandyControlDemoCode - v4.0 - 512 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE;netle45;netle40 - prompt - 4 - v4.0 - 8.0 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.5 - 8.0 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.6.2 - 8.0 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.7 - 8.0 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.8 - 8.0 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE;netle45;netle40 - prompt - 4 - v4.0 - 8.0 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - v4.5 - 8.0 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - v4.6.2 - 8.0 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - v4.7 - 8.0 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - v4.8 - 8.0 - - - + HandyControlDemoCode + netcoreapp3.0;netcoreapp3.1;net40;net45;net462;net47;net48 - - - - + Window\AboutWindow.xaml - + Window\BlurWindow.xaml - + Window\CommonWindow.xaml - + Window\CustomNonClientAreaWindow.xaml - + Window\DialogDemoWindow.xaml - + Window\GlowWindow.xaml - + Window\GrowlDemoWindow.xaml - + Window\NativeCommonWindow.xaml - + Window\NavigationWindow.xaml - + Window\NoNonClientAreaDragableWindow.xaml - + UserControl\Basic\Avatar.xaml - + UserControl\Basic\ChatBox.xaml - + UserControl\Basic\InteractiveDialog.xaml - + UserControl\Basic\TextDialog.xaml - + UserControl\Basic\TextDialogWithTimer.xaml - + UserControl\Controls\AnimationPathDemoCtl.xaml - + UserControl\Controls\BadgeDemoCtl.xaml - + UserControl\Controls\ButtonGroupDemoCtl.xaml - + UserControl\Controls\CalendarWithClockDemoCtl.xaml - + UserControl\Controls\CardDemoCtl.xaml - + UserControl\Controls\CarouselDemoCtl.xaml - + UserControl\Controls\ChatBubbleDemoCtl.xaml - + UserControl\Controls\CirclePanelDemoCtl.xaml - + UserControl\Controls\ClockDemoCtl.xaml - + UserControl\Controls\ColorPickerDemoCtl.xaml - + UserControl\Controls\ComboBoxDemoCtl.xaml - + UserControl\Controls\CompareSliderDemoCtl.xaml - + UserControl\Controls\CoverFlowDemoCtl.xaml - + UserControl\Controls\CoverViewDemoCtl.xaml - + UserControl\Controls\DatePickerDemoCtl.xaml - + UserControl\Controls\DateTimePickerDemoCtl.xaml - + UserControl\Controls\DialogDemoCtl.xaml - + UserControl\Controls\DividerDemoCtl.xaml - + UserControl\Controls\DrawerDemoCtl.xaml - + UserControl\Controls\FlipClockDemoCtl.xaml - + UserControl\Controls\FloatingBlockDemoCtl.xaml - + UserControl\Controls\GifImageDemoCtl.xaml - + UserControl\Controls\GotoTopDemoCtl.xaml - + UserControl\Controls\GravatarDemoCtl.xaml - + UserControl\Controls\GridDemoCtl.xaml - + UserControl\Controls\GrowlDemoCtl.xaml - + UserControl\Controls\HoneycombPanelDemoCtl.xaml - + UserControl\Controls\ImageBlockDemoCtl.xaml - + UserControl\Controls\ImageBrowserDemoCtl.xaml - + UserControl\Controls\LoadingDemoCtl.xaml - + UserControl\Controls\MagnifierDemoCtl.xaml - + UserControl\Controls\NotificationDemoCtl.xaml - + UserControl\Controls\NotifyIconDemoCtl.xaml - + UserControl\Controls\NumericUpDownDemoCtl.xaml - + UserControl\Controls\OutlineTextDemoCtl.xaml - + UserControl\Controls\PaginationDemoCtl.xaml - + UserControl\Controls\PasswordBoxDemoCtl.xaml - + UserControl\Controls\PinBoxDemoCtl.xaml - + UserControl\Controls\PoptipDemoCtl.xaml - + UserControl\Controls\PreviewSliderDemoCtl.xaml - + UserControl\Controls\ProgressBarDemoCtl.xaml - + UserControl\Controls\ProgressButtonDemoCtl.xaml - + UserControl\Controls\RangeSliderDemoCtl.xaml - + UserControl\Controls\RateDemoCtl.xaml - + UserControl\Controls\RelativePanelDemoCtl.xaml - + UserControl\Controls\RunningBlockDemoCtl.xaml - + UserControl\Controls\ScreenshotDemoCtl.xaml - + UserControl\Controls\ScrollViewerDemoCtl.xaml - + UserControl\Controls\SearchBarDemoCtl.xaml - + UserControl\Controls\ShieldDemoCtl.xaml - + UserControl\Controls\SideMenuDemoCtl.xaml - + UserControl\Controls\SplitButtonDemoCtl.xaml - + UserControl\Controls\SpriteDemoCtl.xaml - + UserControl\Controls\StepBarDemoCtl.xaml - + UserControl\Controls\TabControlDemoCtl.xaml - + UserControl\Controls\TagDemoCtl.xaml - + UserControl\Controls\TextBoxDemoCtl.xaml - + UserControl\Controls\TimeBarDemoCtl.xaml - + UserControl\Controls\TimePickerDemoCtl.xaml - + UserControl\Controls\TransferDemoCtl.xaml - + UserControl\Controls\TransitioningContentControlDemoCtl.xaml - + UserControl\Controls\WaterfallPanelDemoCtl.xaml - + UserControl\Controls\WindowDemoCtl.xaml - + UserControl\Styles\BorderDemoCtl.xaml - + UserControl\Styles\BrushDemoCtl.xaml - + UserControl\Styles\ButtonDemoCtl.xaml - + UserControl\Styles\CalendarDemoCtl.xaml - + UserControl\Styles\CheckBoxDemoCtl.xaml - + UserControl\Styles\DataGridDemoCtl.xaml - + UserControl\Styles\ExpanderDemoCtl.xaml - + UserControl\Styles\FlowDocumentDemoCtl.xaml - + UserControl\Styles\FrameDemoCtl.xaml - + UserControl\Styles\GroupBoxDemoCtl.xaml - + UserControl\Styles\LabelDemoCtl.xaml - + UserControl\Styles\ListBoxDemoCtl.xaml - + UserControl\Styles\ListViewDemoCtl.xaml - + UserControl\Styles\MenuDemoCtl.xaml - + UserControl\Styles\NativeComboBoxDemoCtl.xaml - + UserControl\Styles\NativeDatePickerDemoCtl.xaml - + UserControl\Styles\NativePasswordBoxDemoCtl.xaml - + UserControl\Styles\NativeProgressBarDemoCtl.xaml - + UserControl\Styles\NativeScrollViewerDemoCtl.xaml - + UserControl\Styles\NativeTabControlDemoCtl.xaml - + UserControl\Styles\NativeTextBoxDemoCtl.xaml - + UserControl\Styles\NativeWindowDemoCtl.xaml - + UserControl\Styles\RadioButtonDemoCtl.xaml - + UserControl\Styles\RepeatButtonDemoCtl.xaml - + UserControl\Styles\RichTextBoxDemoCtl.xaml - + UserControl\Styles\SliderDemoCtl.xaml - + UserControl\Styles\TextBlockDemoCtl.xaml - + UserControl\Styles\ToggleButtonDemoCtl.xaml - + UserControl\Styles\ToolBarDemoCtl.xaml - + UserControl\Styles\TreeViewDemoCtl.xaml - + UserControl\Tools\EffectsDemoCtl.xaml - + UserControl\Tools\GeometryAnimationDemoCtl.xaml - + UserControl\Tools\HatchBrushGeneratorDemoCtl.xaml - + Window\AboutWindow.xaml.cs AboutWindow.xaml - + Window\BlurWindow.xaml.cs BlurWindow.xaml - + Window\CommonWindow.xaml.cs CommonWindow.xaml - + Window\CustomNonClientAreaWindow.xaml.cs CustomNonClientAreaWindow.xaml - + Window\DialogDemoWindow.xaml.cs DialogDemoWindow.xaml - + Window\GlowWindow.xaml.cs GlowWindow.xaml - + Window\GrowlDemoWindow.xaml.cs GrowlDemoWindow.xaml - + Window\NativeCommonWindow.xaml.cs NativeCommonWindow.xaml - + Window\NavigationWindow.xaml.cs NavigationWindow.xaml - + Window\NoNonClientAreaDragableWindow.xaml.cs NoNonClientAreaDragableWindow.xaml - + UserControl\Basic\Avatar.xaml.cs Avatar.xaml - + UserControl\Basic\ChatBox.xaml.cs ChatBox.xaml - + UserControl\Basic\IFull.cs - + UserControl\Basic\InteractiveDialog.xaml.cs InteractiveDialog.xaml - + UserControl\Basic\TextDialog.xaml.cs TextDialog.xaml - + UserControl\Basic\TextDialogWithTimer.xaml.cs TextDialogWithTimer.xaml - + UserControl\Controls\AnimationPathDemoCtl.xaml.cs AnimationPathDemoCtl.xaml - + UserControl\Controls\BadgeDemoCtl.xaml.cs BadgeDemoCtl.xaml - + UserControl\Controls\ButtonGroupDemoCtl.xaml.cs ButtonGroupDemoCtl.xaml - + UserControl\Controls\CalendarWithClockDemoCtl.xaml.cs CalendarWithClockDemoCtl.xaml - + UserControl\Controls\CardDemoCtl.xaml.cs CardDemoCtl.xaml - + UserControl\Controls\CarouselDemoCtl.xaml.cs CarouselDemoCtl.xaml - + UserControl\Controls\ChatBubbleDemoCtl.xaml.cs ChatBubbleDemoCtl.xaml - + UserControl\Controls\CirclePanelDemoCtl.xaml.cs CirclePanelDemoCtl.xaml - + UserControl\Controls\ClockDemoCtl.xaml.cs ClockDemoCtl.xaml - + UserControl\Controls\ColorPickerDemoCtl.xaml.cs ColorPickerDemoCtl.xaml - + UserControl\Controls\ComboBoxDemoCtl.xaml.cs ComboBoxDemoCtl.xaml - + UserControl\Controls\CompareSliderDemoCtl.xaml.cs CompareSliderDemoCtl.xaml - + UserControl\Controls\CoverFlowDemoCtl.xaml.cs CoverFlowDemoCtl.xaml - + UserControl\Controls\CoverViewDemoCtl.xaml.cs CoverViewDemoCtl.xaml - + UserControl\Controls\DatePickerDemoCtl.xaml.cs DatePickerDemoCtl.xaml - + UserControl\Controls\DateTimePickerDemoCtl.xaml.cs DateTimePickerDemoCtl.xaml - + UserControl\Controls\DialogDemoCtl.xaml.cs DialogDemoCtl.xaml - + UserControl\Controls\DividerDemoCtl.xaml.cs DividerDemoCtl.xaml - + UserControl\Controls\DrawerDemoCtl.xaml.cs DrawerDemoCtl.xaml - + UserControl\Controls\FlipClockDemoCtl.xaml.cs FlipClockDemoCtl.xaml - + UserControl\Controls\FloatingBlockDemoCtl.xaml.cs FloatingBlockDemoCtl.xaml - + UserControl\Controls\GifImageDemoCtl.xaml.cs GifImageDemoCtl.xaml - + UserControl\Controls\GotoTopDemoCtl.xaml.cs GotoTopDemoCtl.xaml - + UserControl\Controls\GravatarDemoCtl.xaml.cs GravatarDemoCtl.xaml - + UserControl\Controls\GridDemoCtl.xaml.cs GridDemoCtl.xaml - + UserControl\Controls\GrowlDemoCtl.xaml.cs GrowlDemoCtl.xaml - + UserControl\Controls\HoneycombPanelDemoCtl.xaml.cs HoneycombPanelDemoCtl.xaml - + UserControl\Controls\ImageBlockDemoCtl.xaml.cs ImageBlockDemoCtl.xaml - + UserControl\Controls\ImageBrowserDemoCtl.xaml.cs ImageBrowserDemoCtl.xaml - + UserControl\Controls\LoadingDemoCtl.xaml.cs LoadingDemoCtl.xaml - + UserControl\Controls\MagnifierDemoCtl.xaml.cs MagnifierDemoCtl.xaml - + UserControl\Controls\NotificationDemoCtl.xaml.cs NotificationDemoCtl.xaml - + UserControl\Controls\NotifyIconDemoCtl.xaml.cs NotifyIconDemoCtl.xaml - + UserControl\Controls\NumericUpDownDemoCtl.xaml.cs NumericUpDownDemoCtl.xaml - + UserControl\Controls\OutlineTextDemoCtl.xaml.cs OutlineTextDemoCtl.xaml - + UserControl\Controls\PaginationDemoCtl.xaml.cs PaginationDemoCtl.xaml - + UserControl\Controls\PasswordBoxDemoCtl.xaml.cs PasswordBoxDemoCtl.xaml - + UserControl\Controls\PinBoxDemoCtl.xaml.cs PinBoxDemoCtl.xaml - + UserControl\Controls\PoptipDemoCtl.xaml.cs PoptipDemoCtl.xaml - + UserControl\Controls\PreviewSliderDemoCtl.xaml.cs PreviewSliderDemoCtl.xaml - + UserControl\Controls\ProgressBarDemoCtl.xaml.cs ProgressBarDemoCtl.xaml - + UserControl\Controls\ProgressButtonDemoCtl.xaml.cs ProgressButtonDemoCtl.xaml - + UserControl\Controls\RangeSliderDemoCtl.xaml.cs RangeSliderDemoCtl.xaml - + UserControl\Controls\RateDemoCtl.xaml.cs RateDemoCtl.xaml - + UserControl\Controls\RelativePanelDemoCtl.xaml.cs RelativePanelDemoCtl.xaml - + UserControl\Controls\RunningBlockDemoCtl.xaml.cs RunningBlockDemoCtl.xaml - + UserControl\Controls\ScreenshotDemoCtl.xaml.cs ScreenshotDemoCtl.xaml - + UserControl\Controls\ScrollViewerDemoCtl.xaml.cs ScrollViewerDemoCtl.xaml - + UserControl\Controls\SearchBarDemoCtl.xaml.cs SearchBarDemoCtl.xaml - + UserControl\Controls\ShieldDemoCtl.xaml.cs ShieldDemoCtl.xaml - + UserControl\Controls\SideMenuDemoCtl.xaml.cs SideMenuDemoCtl.xaml - + UserControl\Controls\SplitButtonDemoCtl.xaml.cs SplitButtonDemoCtl.xaml - + UserControl\Controls\SpriteDemoCtl.xaml.cs SpriteDemoCtl.xaml - + UserControl\Controls\StepBarDemoCtl.xaml.cs StepBarDemoCtl.xaml - + UserControl\Controls\TabControlDemoCtl.xaml.cs TabControlDemoCtl.xaml - + UserControl\Controls\TagDemoCtl.xaml.cs TagDemoCtl.xaml - + UserControl\Controls\TextBoxDemoCtl.xaml.cs TextBoxDemoCtl.xaml - + UserControl\Controls\TimeBarDemoCtl.xaml.cs TimeBarDemoCtl.xaml - + UserControl\Controls\TimePickerDemoCtl.xaml.cs TimePickerDemoCtl.xaml - + UserControl\Controls\TransferDemoCtl.xaml.cs TransferDemoCtl.xaml - + UserControl\Controls\TransitioningContentControlDemoCtl.xaml.cs TransitioningContentControlDemoCtl.xaml - + UserControl\Controls\WaterfallPanelDemoCtl.xaml.cs WaterfallPanelDemoCtl.xaml - + UserControl\Controls\WindowDemoCtl.xaml.cs WindowDemoCtl.xaml - + UserControl\Styles\BorderDemoCtl.xaml.cs BorderDemoCtl.xaml - + UserControl\Styles\BrushDemoCtl.xaml.cs BrushDemoCtl.xaml - + UserControl\Styles\ButtonDemoCtl.xaml.cs ButtonDemoCtl.xaml - + UserControl\Styles\CalendarDemoCtl.xaml.cs CalendarDemoCtl.xaml - + UserControl\Styles\CheckBoxDemoCtl.xaml.cs CheckBoxDemoCtl.xaml - + UserControl\Styles\DataGridDemoCtl.xaml.cs DataGridDemoCtl.xaml - + UserControl\Styles\ExpanderDemoCtl.xaml.cs ExpanderDemoCtl.xaml - + UserControl\Styles\FlowDocumentDemoCtl.xaml.cs FlowDocumentDemoCtl.xaml - + UserControl\Styles\FrameDemoCtl.xaml.cs FrameDemoCtl.xaml - + UserControl\Styles\GroupBoxDemoCtl.xaml.cs GroupBoxDemoCtl.xaml - + UserControl\Styles\LabelDemoCtl.xaml.cs LabelDemoCtl.xaml - + UserControl\Styles\ListBoxDemoCtl.xaml.cs ListBoxDemoCtl.xaml - + UserControl\Styles\ListViewDemoCtl.xaml.cs ListViewDemoCtl.xaml - + UserControl\Styles\MenuDemoCtl.xaml.cs MenuDemoCtl.xaml - + UserControl\Styles\NativeComboBoxDemoCtl.xaml.cs NativeComboBoxDemoCtl.xaml - + UserControl\Styles\NativeDatePickerDemoCtl.xaml.cs NativeDatePickerDemoCtl.xaml - + UserControl\Styles\NativePasswordBoxDemoCtl.xaml.cs NativePasswordBoxDemoCtl.xaml - + UserControl\Styles\NativeProgressBarDemoCtl.xaml.cs NativeProgressBarDemoCtl.xaml - + UserControl\Styles\NativeScrollViewerDemoCtl.xaml.cs NativeScrollViewerDemoCtl.xaml - + UserControl\Styles\NativeTabControlDemoCtl.xaml.cs NativeTabControlDemoCtl.xaml - + UserControl\Styles\NativeTextBoxDemoCtl.xaml.cs NativeTextBoxDemoCtl.xaml - + UserControl\Styles\NativeWindowDemoCtl.xaml.cs NativeWindowDemoCtl.xaml - + UserControl\Styles\RadioButtonDemoCtl.xaml.cs RadioButtonDemoCtl.xaml - + UserControl\Styles\RepeatButtonDemoCtl.xaml.cs RepeatButtonDemoCtl.xaml - + UserControl\Styles\RichTextBoxDemoCtl.xaml.cs RichTextBoxDemoCtl.xaml - + UserControl\Styles\SliderDemoCtl.xaml.cs SliderDemoCtl.xaml - + UserControl\Styles\TextBlockDemoCtl.xaml.cs TextBlockDemoCtl.xaml - + UserControl\Styles\ToggleButtonDemoCtl.xaml.cs ToggleButtonDemoCtl.xaml - + UserControl\Styles\ToolBarDemoCtl.xaml.cs ToolBarDemoCtl.xaml - + UserControl\Styles\TreeViewDemoCtl.xaml.cs TreeViewDemoCtl.xaml - + UserControl\Tools\EffectsDemoCtl.xaml.cs EffectsDemoCtl.xaml - + UserControl\Tools\GeometryAnimationDemoCtl.xaml.cs GeometryAnimationDemoCtl.xaml - + UserControl\Tools\HatchBrushGeneratorDemoCtl.xaml.cs HatchBrushGeneratorDemoCtl.xaml - + ViewModel\ChatBoxViewModel.cs - + ViewModel\InteractiveDialogViewModel.cs - + ViewModel\ComboBoxDemoViewModel.cs - + ViewModel\BadgeDemoViewModel.cs - + ViewModel\CardDemoViewModel.cs - + ViewModel\CoverViewModel.cs - + ViewModel\DialogDemoViewModel.cs - + ViewModel\GrowlDemoViewModel.cs - + ViewModel\ImageBrowserDemoViewModel.cs - + ViewModel\NotificationDemoViewModel.cs - + ViewModel\NotifyIconDemoViewModel.cs - + ViewModel\PaginationDemoViewModel.cs - + ViewModel\SearchBarDemoViewModel.cs - + ViewModel\SideMenuDemoViewModel.cs - + ViewModel\SplitButtonDemoViewModel.cs - + ViewModel\SpriteDemoViewModel.cs - + ViewModel\StepBarDemoViewModel.cs - + ViewModel\TabControlDemoViewModel.cs - + ViewModel\WindowDemoViewModel.cs - + ViewModel\DemoViewModelBase!1.cs - + ViewModel\ItemsDisplayViewModel.cs - + ViewModel\MainViewModel.cs - + ViewModel\NoUserViewModel.cs - - - - - - \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs index 3393add0..57004b4e 100644 --- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs +++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.IO; using System.Net; -#if !netle40 +#if !NET40 using System.Runtime; #endif using System.Security.Authentication; @@ -26,7 +26,7 @@ namespace HandyControlDemo public App() { -#if !netle40 +#if !NET40 var cachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache"; if (!Directory.Exists(cachePath)) { diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs index a9d82b6b..4da6f859 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs +++ b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs @@ -12,7 +12,7 @@ namespace HandyControlDemo.Data public string Title { get => _title; -#if netle40 +#if NET40 set => Set(nameof(Title), ref _title, value); #else set => Set(ref _title, value); @@ -24,7 +24,7 @@ namespace HandyControlDemo.Data public int SelectedIndex { get => _selectedIndex; -#if netle40 +#if NET40 set => Set(nameof(SelectedIndex), ref _selectedIndex, value); #else set => Set(ref _selectedIndex, value); diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs index 72e4010f..7543d5e4 100644 --- a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs @@ -43,7 +43,7 @@ namespace HandyControlDemo.ViewModel public string ChatString { get => _chatString; -#if netle40 +#if NET40 set => Set(nameof(ChatString), ref _chatString, value); #else set => Set(ref _chatString, value); diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs index 2e483e9d..55bf69eb 100644 --- a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs @@ -14,7 +14,7 @@ namespace HandyControlDemo.ViewModel public string Result { get => _result; -#if netle40 +#if NET40 set => Set(nameof(Result), ref _result, value); #else set => Set(ref _result, value); @@ -26,7 +26,7 @@ namespace HandyControlDemo.ViewModel public string Message { get => _message; -#if netle40 +#if NET40 set => Set(nameof(Message), ref _message, value); #else set => Set(ref _message, value); diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs index b06bfe4e..01dcbc71 100644 --- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs @@ -11,7 +11,7 @@ namespace HandyControlDemo.ViewModel public int Count { get => _count; -#if netle40 +#if NET40 set => Set(nameof(Count), ref _count, value); #else set => Set(ref _count, value); diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs index 51c379a5..c2999df9 100644 --- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs @@ -2,7 +2,7 @@ using System.Windows; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; -#if !netle40 +#if !NET40 using System.Threading.Tasks; #endif using HandyControl.Controls; @@ -20,7 +20,7 @@ namespace HandyControlDemo.ViewModel public string DialogResult { get => _dialogResult; -#if netle40 +#if NET40 set => Set(nameof(DialogResult), ref _dialogResult, value); #else set => Set(ref _dialogResult, value); @@ -42,7 +42,7 @@ namespace HandyControlDemo.ViewModel } } -#if netle40 +#if NET40 public RelayCommand ShowInteractiveDialogCmd => new Lazy>(() => new RelayCommand(ShowInteractiveDialog)).Value; diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs index 5dd38997..782fd4e2 100644 --- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs @@ -17,7 +17,7 @@ namespace HandyControlDemo.ViewModel public ShowAnimation ShowAnimation { get => _showAnimation; -#if netle40 +#if NET40 set => Set(nameof(ShowAnimation) ,ref _showAnimation, value); #else set => Set(ref _showAnimation, value); @@ -29,7 +29,7 @@ namespace HandyControlDemo.ViewModel public bool StaysOpen { get => _staysOpen; -#if netle40 +#if NET40 set => Set(nameof(StaysOpen) ,ref _staysOpen, value); #else set => Set(ref _staysOpen, value); diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs index 9d84a0ed..89531105 100644 --- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs @@ -18,7 +18,7 @@ namespace HandyControlDemo.ViewModel public string Content { get => _content; -#if netle40 +#if NET40 set => Set(nameof(Content), ref _content, value); #else set => Set(ref _content, value); @@ -32,7 +32,7 @@ namespace HandyControlDemo.ViewModel get => _contextMenuIsShow; set { -#if netle40 +#if NET40 Set(nameof(ContextMenuIsShow), ref _contextMenuIsShow, value); #else Set(ref _contextMenuIsShow, value); @@ -52,7 +52,7 @@ namespace HandyControlDemo.ViewModel public bool ContextMenuIsBlink { get => _contextMenuIsBlink; -#if netle40 +#if NET40 set => Set(nameof(ContextMenuIsBlink), ref _contextMenuIsBlink, value); #else set => Set(ref _contextMenuIsBlink, value); @@ -66,7 +66,7 @@ namespace HandyControlDemo.ViewModel get => _contextContentIsShow; set { -#if netle40 +#if NET40 Set(nameof(ContextContentIsShow), ref _contextContentIsShow, value); #else Set(ref _contextContentIsShow, value); @@ -86,7 +86,7 @@ namespace HandyControlDemo.ViewModel public bool ContextContentIsBlink { get => _contextContentIsBlink; -#if netle40 +#if NET40 set => Set(nameof(ContextContentIsBlink), ref _contextContentIsBlink, value); #else set => Set(ref _contextContentIsBlink, value); diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs index d3cd65fd..c6c933bc 100644 --- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs @@ -26,7 +26,7 @@ namespace HandyControlDemo.ViewModel public int PageIndex { get => _pageIndex; -#if netle40 +#if NET40 set => Set(nameof(PageIndex), ref _pageIndex, value); #else set => Set(ref _pageIndex, value); diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs index efe95b8e..d7bc9c5d 100644 --- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs @@ -17,7 +17,7 @@ namespace HandyControlDemo.ViewModel public int StepIndex { get => _stepIndex; -#if netle40 +#if NET40 set => Set(nameof(StepIndex), ref _stepIndex, value); #else set => Set(ref _stepIndex, value); diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase!1.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase!1.cs index 229ecc1d..4b959131 100644 --- a/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase!1.cs +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase!1.cs @@ -16,7 +16,7 @@ namespace HandyControlDemo.ViewModel public IList DataList { get => _dataList; -#if netle40 +#if NET40 set => Set(nameof(DataList), ref _dataList, value); #else set => Set(ref _dataList, value); diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs index 6ede3a6e..26f41e71 100644 --- a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs @@ -9,7 +9,7 @@ namespace HandyControlDemo.ViewModel { public ItemsDisplayViewModel(Func> getDatAction) { -#if netle40 +#if NET40 Task.Factory.StartNew(() => DataList = getDatAction?.Invoke()); #else Task.Run(() => DataList = getDatAction?.Invoke()); diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs index b631d91c..043def39 100644 --- a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs @@ -59,7 +59,7 @@ namespace HandyControlDemo.ViewModel DemoInfoCollection = new ObservableCollection(); -#if netle40 +#if NET40 Task.Factory.StartNew(() => { DataList = dataService.GetDemoDataList(); @@ -101,7 +101,7 @@ namespace HandyControlDemo.ViewModel public object SubContent { get => _subContent; -#if netle40 +#if NET40 set => Set(nameof(SubContent), ref _subContent, value); #else set => Set(ref _subContent, value); @@ -114,7 +114,7 @@ namespace HandyControlDemo.ViewModel public object ContentTitle { get => _contentTitle; -#if netle40 +#if NET40 set => Set(nameof(ContentTitle), ref _contentTitle, value); #else set => Set(ref _contentTitle, value); diff --git a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs index 3b465a63..a8ed5d5e 100644 --- a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs +++ b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs @@ -14,7 +14,22 @@ namespace HandyControlDemo.Window var versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location); CopyRight = versionInfo.LegalCopyright; - Version = $"v {versionInfo.FileVersion}"; +#if NET40 + var netVersion = "NET 40"; +#elif NET45 + var netVersion = "NET 45"; +#elif NET462 + var netVersion = "NET 462"; +#elif NET47 + var netVersion = "NET 47"; +#elif NET48 + var netVersion = "NET 48"; +#elif NETCOREAPP3_0 + var netVersion = "CORE 30"; +#elif NETCOREAPP3_1 + var netVersion = "CORE 31"; +#endif + Version = $"v {versionInfo.FileVersion} {netVersion}"; } public static readonly DependencyProperty CopyRightProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs index 65a469b3..e85bfe44 100644 --- a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs +++ b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs @@ -348,7 +348,7 @@ namespace HandyControl.Controls GrowlWindow.Show(true); -#if netle40 +#if NET40 Application.Current.Dispatcher?.Invoke(new Action(() => { var ctl = new Growl @@ -397,7 +397,7 @@ namespace HandyControl.Controls /// private static void Show(GrowlInfo growlInfo) { -#if netle40 +#if NET40 Application.Current.Dispatcher?.Invoke(new Action(() => { var ctl = new Growl diff --git a/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs index 203d06a5..75188dbd 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs @@ -5,7 +5,7 @@ using System.Windows.Controls; using System.Windows.Controls.Primitives; using System.Windows.Data; using System.Windows.Input; -#if netle40 +#if NET40 using System.Windows.Threading; #endif using HandyControl.Data; @@ -18,7 +18,7 @@ namespace HandyControl.Controls [TemplatePart(Name = AutoPopupAutoComplete, Type = typeof(Popup))] public class ComboBox : System.Windows.Controls.ComboBox, IDataInput { -#if netle40 +#if NET40 private string _searchText; @@ -71,7 +71,7 @@ namespace HandyControl.Controls if (AutoComplete) { -#if netle40 +#if NET40 _autoCompleteTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(500) @@ -84,7 +84,7 @@ namespace HandyControl.Controls { UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged, Mode = BindingMode.OneWayToSource, -#if !netle40 +#if !NET40 Delay = 500, #endif Source = this @@ -96,7 +96,7 @@ namespace HandyControl.Controls } } -#if netle40 +#if NET40 private void AutoCompleteTimer_Tick(object sender, EventArgs e) { @@ -119,7 +119,7 @@ namespace HandyControl.Controls } } -#if !netle40 +#if !NET40 protected override void OnDropDownClosed(EventArgs e) { base.OnDropDownClosed(e); @@ -142,7 +142,7 @@ namespace HandyControl.Controls _isAutoCompleteAction = false; base.OnSelectionChanged(e); VerifyData(); -#if netle40 +#if NET40 _isAutoCompleteAction = true; #endif } @@ -312,7 +312,7 @@ namespace HandyControl.Controls var ctl = (ComboBox)d; if (ctl._isAutoCompleteAction) { -#if netle40 +#if NET40 ctl._searchText = e.NewValue as string; ctl._autoCompleteTimer.Stop(); ctl._autoCompleteTimer.Start(); diff --git a/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs b/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs index 330de099..37815e53 100644 --- a/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs +++ b/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs @@ -201,7 +201,7 @@ namespace HandyControl.Controls return; } -#if netle45 +#if NET40 || NET45 _formattedText = new FormattedText( Text, CultureInfo.CurrentUICulture, diff --git a/src/Shared/HandyControl_Shared/Controls/Text/SimpleText.cs b/src/Shared/HandyControl_Shared/Controls/Text/SimpleText.cs index 84830748..422bef2e 100644 --- a/src/Shared/HandyControl_Shared/Controls/Text/SimpleText.cs +++ b/src/Shared/HandyControl_Shared/Controls/Text/SimpleText.cs @@ -129,7 +129,7 @@ namespace HandyControl.Controls return; } -#if netle45 +#if NET40 || NET45 _formattedText = new FormattedText( Text, CultureInfo.CurrentUICulture, diff --git a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs index a406243c..007ea146 100644 --- a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs +++ b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs @@ -8,7 +8,7 @@ using HandyControl.Data; using HandyControl.Tools; using HandyControl.Tools.Extension; using HandyControl.Tools.Interop; -#if netle40 +#if NET40 using Microsoft.Windows.Shell; #else using System.Windows.Shell; @@ -104,7 +104,7 @@ namespace HandyControl.Controls public Window() { -#if netle40 +#if NET40 var chrome = new WindowChrome { CornerRadius = new CornerRadius(), diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs index 47236686..8f9bfc8a 100644 --- a/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs +++ b/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel; using System.Globalization; -#if !netle40 +#if !NET40 using System.Runtime.CompilerServices; #endif using System.Windows; @@ -76,7 +76,7 @@ namespace HandyControl.Tools public event PropertyChangedEventHandler PropertyChanged; -#if netle40 +#if NET40 protected virtual void OnPropertyChanged(string propertyName) { PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs index ae465d22..b951640a 100644 --- a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs +++ b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs @@ -134,7 +134,7 @@ namespace HandyControl.Tools { InteropValues.APPBARDATA appBarData = default; var autoHide = InteropMethods.SHAppBarMessage(4, ref appBarData) != 0; -#if netle40 +#if NET40 return WindowResizeBorderThickness.Add(new Thickness(autoHide ? -8 : 0)); #elif Core var hdc = InteropMethods.GetDC(IntPtr.Zero);