From dbdcb4601c55e35aef63ee3e2619f72bad857e04 Mon Sep 17 00:00:00 2001 From: HeBianGu <908293466@qq.com> Date: Fri, 8 Apr 2022 11:23:41 +0800 Subject: [PATCH] 4.0.10 --- Solution/hebiangu/WPF-Controls-nuget.sln | 23 ++- .../HeBianGu.App.Above.Share.projitems | 9 - .../HeBianGu.App.Above/App.config | 6 - .../HeBianGu.App.Above}/App.xaml | 0 .../HeBianGu.App.Above}/App.xaml.cs | 0 .../HeBianGu.App.Above.csproj | 114 ++++++------ .../HeBianGu.App.Above/packages.config | 51 +++--- .../HeBianGu.App.Blur.csproj | 116 ++++++------ .../HeBianGu.App.Blur/packages.config | 58 +++--- .../HeBianGu.App.Chart.csproj | 99 +++++----- .../HeBianGu.App.Chart/packages.config | 49 ++--- .../HeBianGu.App.Creator.csproj | 169 +++++++++--------- .../HeBianGu.App.Creator/packages.config | 83 ++++----- .../HeBianGu.App.Disk.csproj | 119 ++++++------ .../HeBianGu.App.Disk/packages.config | 59 +++--- .../HeBianGu.App.Manager.csproj | 139 +++++++------- .../HeBianGu.App.Manager/packages.config | 69 +++---- .../HeBianGu.App.Map/HeBianGu.App.Map.csproj | 135 +++++++------- .../HeBianGu.App.Map/packages.config | 67 +++---- .../View/Home/HomeControl.xaml | 53 +++--- .../ViewModel/Performer/PerformerViewModel.cs | 2 +- .../HeBianGu.App.Media.csproj | 21 ++- .../HeBianGu.App.Menu.csproj | 99 +++++----- .../HeBianGu.App.Menu/packages.config | 49 ++--- .../HeBianGu.App.Office.csproj | 103 +++++------ .../HeBianGu.App.Office/packages.config | 51 +++--- .../HeBianGu.App.Repository.csproj | 127 ++++++------- .../HeBianGu.App.Repository/packages.config | 63 +++---- .../HeBianGu.App.Scene.csproj | 111 ++++++------ .../HeBianGu.App.Scene/packages.config | 55 +++--- .../HeBianGu.App.Screen.csproj | 80 ++++----- .../HeBianGu.App.Screen/packages.config | 40 ++--- .../HeBianGu.App.Tool.csproj | 99 +++++----- .../HeBianGu.App.Tool/packages.config | 49 ++--- .../HeBianGu.App.Touch.csproj | 91 +++++----- .../HeBianGu.App.Touch/packages.config | 45 ++--- 36 files changed, 1273 insertions(+), 1230 deletions(-) delete mode 100644 Source/ApplicationNuget/HeBianGu.App.Above/App.config rename Source/{Application/HeBianGu.App.Above.Share => ApplicationNuget/HeBianGu.App.Above}/App.xaml (100%) rename Source/{Application/HeBianGu.App.Above.Share => ApplicationNuget/HeBianGu.App.Above}/App.xaml.cs (100%) diff --git a/Solution/hebiangu/WPF-Controls-nuget.sln b/Solution/hebiangu/WPF-Controls-nuget.sln index 53851592..7ed311d6 100644 --- a/Solution/hebiangu/WPF-Controls-nuget.sln +++ b/Solution/hebiangu/WPF-Controls-nuget.sln @@ -53,8 +53,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Map", "Map", "{BAFA4C15-D73 EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HeBianGu.App.Map.Share", "..\..\Source\Application\HeBianGu.App.Map.Share\HeBianGu.App.Map.Share.shproj", "{47F376B3-0B65-4043-A11B-9ECEDD2F37CB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeBianGu.App.Creator", "..\..\Source\Application\HeBianGu.App.Creator\HeBianGu.App.Creator.csproj", "{0BB365CE-AF08-423C-899F-9080DAE3AC81}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Creator", "Creator", "{27CD0240-564D-41ED-857E-BF8CB2E331C2}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HeBianGu.App.Creator.Share", "..\..\Source\Application\HeBianGu.App.Creator.Share\HeBianGu.App.Creator.Share.shproj", "{D44586A9-376F-41DF-BC29-30C6B3564FBD}" @@ -101,9 +99,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeBianGu.App.Tool", "..\..\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeBianGu.App.Touch", "..\..\Source\ApplicationNuget\HeBianGu.App.Touch\HeBianGu.App.Touch.csproj", "{8C203E8C-390F-4C01-B767-F0B679D1D2A8}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeBianGu.App.Creator", "..\..\Source\ApplicationNuget\HeBianGu.App.Creator\HeBianGu.App.Creator.csproj", "{0BB365CE-AF08-423C-899F-9080DAE3AC81}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\..\Source\ApplicationNuget\HeBianGu.App.Above.Share\HeBianGu.App.Above.Share.projitems*{0a96004e-40ce-453e-abf0-472072b97a5e}*SharedItemsImports = 4 ..\..\Source\Application\HeBianGu.App.Above.Share\HeBianGu.App.Above.Share.projitems*{0a96004e-40ce-453e-abf0-472072b97a5e}*SharedItemsImports = 4 ..\..\Source\Application\HeBianGu.App.Creator.Share\HeBianGu.App.Creator.Share.projitems*{0bb365ce-af08-423c-899f-9080dae3ac81}*SharedItemsImports = 4 ..\..\Source\Application\HeBianGu.App.Manager.Share\HeBianGu.App.Manager.Share.projitems*{249dafbf-cbe2-4013-a545-13c23a4e22fe}*SharedItemsImports = 13 @@ -144,14 +143,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Debug|x86.ActiveCfg = Debug|Any CPU - {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Debug|x86.Build.0 = Debug|Any CPU - {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Release|Any CPU.Build.0 = Release|Any CPU - {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Release|x86.ActiveCfg = Release|Any CPU - {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Release|x86.Build.0 = Release|Any CPU {0A96004E-40CE-453E-ABF0-472072B97A5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0A96004E-40CE-453E-ABF0-472072B97A5E}.Debug|Any CPU.Build.0 = Debug|Any CPU {0A96004E-40CE-453E-ABF0-472072B97A5E}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -272,6 +263,14 @@ Global {8C203E8C-390F-4C01-B767-F0B679D1D2A8}.Release|Any CPU.Build.0 = Release|Any CPU {8C203E8C-390F-4C01-B767-F0B679D1D2A8}.Release|x86.ActiveCfg = Release|x86 {8C203E8C-390F-4C01-B767-F0B679D1D2A8}.Release|x86.Build.0 = Release|x86 + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Debug|x86.ActiveCfg = Debug|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Debug|x86.Build.0 = Debug|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Release|Any CPU.Build.0 = Release|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Release|x86.ActiveCfg = Release|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -301,7 +300,6 @@ Global {2A65DF78-6732-4B7A-B97C-FDFEAC7A1E8F} = {F89CC7DD-BD6D-4AD6-99F0-6933833435E7} {BAFA4C15-D733-46BD-B637-96C4125EBEBE} = {F89CC7DD-BD6D-4AD6-99F0-6933833435E7} {47F376B3-0B65-4043-A11B-9ECEDD2F37CB} = {BAFA4C15-D733-46BD-B637-96C4125EBEBE} - {0BB365CE-AF08-423C-899F-9080DAE3AC81} = {27CD0240-564D-41ED-857E-BF8CB2E331C2} {27CD0240-564D-41ED-857E-BF8CB2E331C2} = {F89CC7DD-BD6D-4AD6-99F0-6933833435E7} {D44586A9-376F-41DF-BC29-30C6B3564FBD} = {27CD0240-564D-41ED-857E-BF8CB2E331C2} {4EBAFF3C-09CA-4032-AFCD-117E9B28691C} = {F89CC7DD-BD6D-4AD6-99F0-6933833435E7} @@ -325,6 +323,7 @@ Global {371F5C99-D1DB-40A8-825E-8B3D285F8954} = {ADCB4AC8-66A7-4887-A0F8-177FA5D9EF8E} {BAD2CF42-C596-432E-BE8A-686F0EC4FC37} = {30987DDD-C502-40D1-8E3F-4B10F9198F4B} {8C203E8C-390F-4C01-B767-F0B679D1D2A8} = {2A65DF78-6732-4B7A-B97C-FDFEAC7A1E8F} + {0BB365CE-AF08-423C-899F-9080DAE3AC81} = {27CD0240-564D-41ED-857E-BF8CB2E331C2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3AFA651F-BC04-4393-B7B1-9B92532583D5} diff --git a/Source/Application/HeBianGu.App.Above.Share/HeBianGu.App.Above.Share.projitems b/Source/Application/HeBianGu.App.Above.Share/HeBianGu.App.Above.Share.projitems index eb927082..8fd649b0 100644 --- a/Source/Application/HeBianGu.App.Above.Share/HeBianGu.App.Above.Share.projitems +++ b/Source/Application/HeBianGu.App.Above.Share/HeBianGu.App.Above.Share.projitems @@ -9,9 +9,6 @@ HeBianGu.App.Above.Share - - App.xaml - @@ -179,10 +176,4 @@ MSBuild:Compile - - - Designer - MSBuild:Compile - - \ No newline at end of file diff --git a/Source/ApplicationNuget/HeBianGu.App.Above/App.config b/Source/ApplicationNuget/HeBianGu.App.Above/App.config deleted file mode 100644 index 8e156463..00000000 --- a/Source/ApplicationNuget/HeBianGu.App.Above/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Source/Application/HeBianGu.App.Above.Share/App.xaml b/Source/ApplicationNuget/HeBianGu.App.Above/App.xaml similarity index 100% rename from Source/Application/HeBianGu.App.Above.Share/App.xaml rename to Source/ApplicationNuget/HeBianGu.App.Above/App.xaml diff --git a/Source/Application/HeBianGu.App.Above.Share/App.xaml.cs b/Source/ApplicationNuget/HeBianGu.App.Above/App.xaml.cs similarity index 100% rename from Source/Application/HeBianGu.App.Above.Share/App.xaml.cs rename to Source/ApplicationNuget/HeBianGu.App.Above/App.xaml.cs diff --git a/Source/ApplicationNuget/HeBianGu.App.Above/HeBianGu.App.Above.csproj b/Source/ApplicationNuget/HeBianGu.App.Above/HeBianGu.App.Above.csproj index 33c3bca7..fae632bc 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Above/HeBianGu.App.Above.csproj +++ b/Source/ApplicationNuget/HeBianGu.App.Above/HeBianGu.App.Above.csproj @@ -38,80 +38,83 @@ - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.8\lib\net45\HeBianGu.Base.WpfBase.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.10\lib\net45\HeBianGu.Base.WpfBase.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.8\lib\net45\HeBianGu.Common.Expression.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.10\lib\net45\HeBianGu.Common.Expression.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Guide.4.0.8\lib\net45\HeBianGu.Control.Guide.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Guide.4.0.10\lib\net45\HeBianGu.Control.Guide.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.8\lib\net45\HeBianGu.Control.LeftMenu.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Host.4.0.10\lib\net45\HeBianGu.Control.Host.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.8\lib\net45\HeBianGu.Control.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.10\lib\net45\HeBianGu.Control.LeftMenu.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.8\lib\net45\HeBianGu.Control.MessageContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.10\lib\net45\HeBianGu.Control.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.8\lib\net45\HeBianGu.Control.MultiComboBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.10\lib\net45\HeBianGu.Control.MessageContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.8\lib\net45\HeBianGu.Control.Panel.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.10\lib\net45\HeBianGu.Control.MultiComboBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.8\lib\net45\HeBianGu.Control.PropertyGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.10\lib\net45\HeBianGu.Control.Panel.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.8\lib\net45\HeBianGu.Control.ScrollInto.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.10\lib\net45\HeBianGu.Control.PropertyGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollVewerLocator.4.0.8\lib\net45\HeBianGu.Control.ScrollVewerLocator.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.10\lib\net45\HeBianGu.Control.ScrollInto.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.8\lib\net45\HeBianGu.Control.ThemeSet.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollVewerLocator.4.0.10\lib\net45\HeBianGu.Control.ScrollVewerLocator.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.8\lib\net45\HeBianGu.Control.ToggleExpander.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.10\lib\net45\HeBianGu.Control.ThemeSet.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.8\lib\net45\HeBianGu.General.WpfControlLib.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.10\lib\net45\HeBianGu.Control.ToggleExpander.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.8\lib\net45\HeBianGu.Service.Animation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.10\lib\net45\HeBianGu.General.WpfControlLib.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.8\lib\net45\HeBianGu.Service.AppConfig.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.10\lib\net45\HeBianGu.Service.Animation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.8\lib\net45\HeBianGu.Service.MarkupExtension.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.10\lib\net45\HeBianGu.Service.AppConfig.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.8\lib\net45\HeBianGu.Service.Mvc.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.10\lib\net45\HeBianGu.Service.MarkupExtension.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.8\lib\net45\HeBianGu.Service.Mvp.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.10\lib\net45\HeBianGu.Service.Mvc.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.8\lib\net45\HeBianGu.Service.TypeConverter.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.10\lib\net45\HeBianGu.Service.Mvp.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Validation.4.0.8\lib\net45\HeBianGu.Service.Validation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.10\lib\net45\HeBianGu.Service.TypeConverter.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.8\lib\net45\HeBianGu.Systems.Setting.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Validation.4.0.10\lib\net45\HeBianGu.Service.Validation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.8\lib\net45\HeBianGu.Window.Link.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.10\lib\net45\HeBianGu.Systems.Setting.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.8\lib\net45\HeBianGu.Window.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.10\lib\net45\HeBianGu.Window.Link.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.8\lib\net45\HeBianGu.Window.MessageDialog.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.10\lib\net45\HeBianGu.Window.Message.dll + + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.10\lib\net45\HeBianGu.Window.MessageDialog.dll @@ -130,6 +133,9 @@ + + App.xaml + Code @@ -147,7 +153,6 @@ ResXFileCodeGenerator Resources.Designer.cs - SettingsSingleFileGenerator @@ -164,7 +169,12 @@ - + + + MSBuild:Compile + Designer + + \ No newline at end of file diff --git a/Source/ApplicationNuget/HeBianGu.App.Above/packages.config b/Source/ApplicationNuget/HeBianGu.App.Above/packages.config index 533541ac..edbd28cd 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Above/packages.config +++ b/Source/ApplicationNuget/HeBianGu.App.Above/packages.config @@ -1,29 +1,30 @@  - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/ApplicationNuget/HeBianGu.App.Blur/HeBianGu.App.Blur.csproj b/Source/ApplicationNuget/HeBianGu.App.Blur/HeBianGu.App.Blur.csproj index 90840dc5..342c6bbd 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Blur/HeBianGu.App.Blur.csproj +++ b/Source/ApplicationNuget/HeBianGu.App.Blur/HeBianGu.App.Blur.csproj @@ -71,92 +71,92 @@ - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.8\lib\net45\HeBianGu.Base.WpfBase.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.10\lib\net45\HeBianGu.Base.WpfBase.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.8\lib\net45\HeBianGu.Common.Expression.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.10\lib\net45\HeBianGu.Common.Expression.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.8\lib\net45\HeBianGu.Control.LeftMenu.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.10\lib\net45\HeBianGu.Control.LeftMenu.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.8\lib\net45\HeBianGu.Control.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.10\lib\net45\HeBianGu.Control.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.8\lib\net45\HeBianGu.Control.MessageContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.10\lib\net45\HeBianGu.Control.MessageContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.8\lib\net45\HeBianGu.Control.MultiComboBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.10\lib\net45\HeBianGu.Control.MultiComboBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.8\lib\net45\HeBianGu.Control.PagedDataGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.10\lib\net45\HeBianGu.Control.PagedDataGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.8\lib\net45\HeBianGu.Control.Panel.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.10\lib\net45\HeBianGu.Control.Panel.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PasswordBox.4.0.8\lib\net45\HeBianGu.Control.PasswordBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PasswordBox.4.0.10\lib\net45\HeBianGu.Control.PasswordBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.8\lib\net45\HeBianGu.Control.PropertyGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.10\lib\net45\HeBianGu.Control.PropertyGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.8\lib\net45\HeBianGu.Control.ScrollInto.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.10\lib\net45\HeBianGu.Control.ScrollInto.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.StoryBoard.4.0.8\lib\net45\HeBianGu.Control.StoryBoard.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.StoryBoard.4.0.10\lib\net45\HeBianGu.Control.StoryBoard.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.8\lib\net45\HeBianGu.Control.ThemeSet.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.10\lib\net45\HeBianGu.Control.ThemeSet.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.TreeListView.4.0.8\lib\net45\HeBianGu.Control.TreeListView.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.TreeListView.4.0.10\lib\net45\HeBianGu.Control.TreeListView.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.8\lib\net45\HeBianGu.General.WpfControlLib.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.10\lib\net45\HeBianGu.General.WpfControlLib.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.8\lib\net45\HeBianGu.Service.Animation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.10\lib\net45\HeBianGu.Service.Animation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.8\lib\net45\HeBianGu.Service.AppConfig.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.10\lib\net45\HeBianGu.Service.AppConfig.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.8\lib\net45\HeBianGu.Service.MarkupExtension.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.10\lib\net45\HeBianGu.Service.MarkupExtension.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.8\lib\net45\HeBianGu.Service.Mvp.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.10\lib\net45\HeBianGu.Service.Mvp.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.8\lib\net45\HeBianGu.Service.TypeConverter.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.10\lib\net45\HeBianGu.Service.TypeConverter.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Validation.4.0.8\lib\net45\HeBianGu.Service.Validation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Validation.4.0.10\lib\net45\HeBianGu.Service.Validation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.8\lib\net45\HeBianGu.Systems.Setting.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.10\lib\net45\HeBianGu.Systems.Setting.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Upgrade.4.0.8\lib\net45\HeBianGu.Systems.Upgrade.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Upgrade.4.0.10\lib\net45\HeBianGu.Systems.Upgrade.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.8\lib\net45\HeBianGu.Systems.XmlSerialize.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.10\lib\net45\HeBianGu.Systems.XmlSerialize.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Blur.4.0.8\lib\net45\HeBianGu.Window.Blur.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Blur.4.0.10\lib\net45\HeBianGu.Window.Blur.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Login.4.0.8\lib\net45\HeBianGu.Window.Login.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Login.4.0.10\lib\net45\HeBianGu.Window.Login.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.8\lib\net45\HeBianGu.Window.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.10\lib\net45\HeBianGu.Window.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.8\lib\net45\HeBianGu.Window.MessageDialog.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.10\lib\net45\HeBianGu.Window.MessageDialog.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Notify.4.0.8\lib\net45\HeBianGu.Window.Notify.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Notify.4.0.10\lib\net45\HeBianGu.Window.Notify.dll ..\..\..\Solution\hebiangu\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/Source/ApplicationNuget/HeBianGu.App.Blur/packages.config b/Source/ApplicationNuget/HeBianGu.App.Blur/packages.config index dc46be42..b67db9a7 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Blur/packages.config +++ b/Source/ApplicationNuget/HeBianGu.App.Blur/packages.config @@ -1,33 +1,33 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/ApplicationNuget/HeBianGu.App.Chart/HeBianGu.App.Chart.csproj b/Source/ApplicationNuget/HeBianGu.App.Chart/HeBianGu.App.Chart.csproj index 80978dbd..df73c720 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Chart/HeBianGu.App.Chart.csproj +++ b/Source/ApplicationNuget/HeBianGu.App.Chart/HeBianGu.App.Chart.csproj @@ -38,77 +38,80 @@ - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.8\lib\net45\HeBianGu.Base.WpfBase.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.10\lib\net45\HeBianGu.Base.WpfBase.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.8\lib\net45\HeBianGu.Common.Expression.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.10\lib\net45\HeBianGu.Common.Expression.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Chart2D.4.0.8\lib\net45\HeBianGu.Control.Chart2D.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Chart2D.4.0.10\lib\net45\HeBianGu.Control.Chart2D.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Guide.4.0.8\lib\net45\HeBianGu.Control.Guide.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Guide.4.0.10\lib\net45\HeBianGu.Control.Guide.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.8\lib\net45\HeBianGu.Control.LeftMenu.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Host.4.0.10\lib\net45\HeBianGu.Control.Host.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.8\lib\net45\HeBianGu.Control.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.10\lib\net45\HeBianGu.Control.LeftMenu.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.8\lib\net45\HeBianGu.Control.MessageContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.10\lib\net45\HeBianGu.Control.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.8\lib\net45\HeBianGu.Control.Panel.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.10\lib\net45\HeBianGu.Control.MessageContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.8\lib\net45\HeBianGu.Control.PropertyGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.10\lib\net45\HeBianGu.Control.Panel.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.8\lib\net45\HeBianGu.Control.ScrollInto.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.10\lib\net45\HeBianGu.Control.PropertyGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.8\lib\net45\HeBianGu.Control.ThemeSet.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.10\lib\net45\HeBianGu.Control.ScrollInto.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.8\lib\net45\HeBianGu.Control.ToggleExpander.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.10\lib\net45\HeBianGu.Control.ThemeSet.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.8\lib\net45\HeBianGu.General.WpfControlLib.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.10\lib\net45\HeBianGu.Control.ToggleExpander.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.8\lib\net45\HeBianGu.Service.Animation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.10\lib\net45\HeBianGu.General.WpfControlLib.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.8\lib\net45\HeBianGu.Service.AppConfig.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.10\lib\net45\HeBianGu.Service.Animation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.8\lib\net45\HeBianGu.Service.MarkupExtension.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.10\lib\net45\HeBianGu.Service.AppConfig.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.8\lib\net45\HeBianGu.Service.Mvc.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.10\lib\net45\HeBianGu.Service.MarkupExtension.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.8\lib\net45\HeBianGu.Service.Mvp.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.10\lib\net45\HeBianGu.Service.Mvc.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.8\lib\net45\HeBianGu.Service.TypeConverter.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.10\lib\net45\HeBianGu.Service.Mvp.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.8\lib\net45\HeBianGu.Systems.Setting.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.10\lib\net45\HeBianGu.Service.TypeConverter.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.8\lib\net45\HeBianGu.Window.Link.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.10\lib\net45\HeBianGu.Systems.Setting.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.8\lib\net45\HeBianGu.Window.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.10\lib\net45\HeBianGu.Window.Link.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.8\lib\net45\HeBianGu.Window.MessageDialog.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.10\lib\net45\HeBianGu.Window.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Start.4.0.8\lib\net45\HeBianGu.Window.Start.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.10\lib\net45\HeBianGu.Window.MessageDialog.dll + + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Start.4.0.10\lib\net45\HeBianGu.Window.Start.dll diff --git a/Source/ApplicationNuget/HeBianGu.App.Chart/packages.config b/Source/ApplicationNuget/HeBianGu.App.Chart/packages.config index 2e46baf2..cda5f01a 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Chart/packages.config +++ b/Source/ApplicationNuget/HeBianGu.App.Chart/packages.config @@ -1,28 +1,29 @@  - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/ApplicationNuget/HeBianGu.App.Creator/HeBianGu.App.Creator.csproj b/Source/ApplicationNuget/HeBianGu.App.Creator/HeBianGu.App.Creator.csproj index b202b67f..c1844d80 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Creator/HeBianGu.App.Creator.csproj +++ b/Source/ApplicationNuget/HeBianGu.App.Creator/HeBianGu.App.Creator.csproj @@ -38,128 +38,131 @@ - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.8\lib\net45\HeBianGu.Base.WpfBase.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.10\lib\net45\HeBianGu.Base.WpfBase.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.8\lib\net45\HeBianGu.Common.Expression.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.10\lib\net45\HeBianGu.Common.Expression.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Adorner.4.0.8\lib\net45\HeBianGu.Control.Adorner.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Adorner.4.0.10\lib\net45\HeBianGu.Control.Adorner.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Chart2D.4.0.8\lib\net45\HeBianGu.Control.Chart2D.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Chart2D.4.0.10\lib\net45\HeBianGu.Control.Chart2D.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Diagram.4.0.8\lib\net45\HeBianGu.Control.Diagram.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Diagram.4.0.10\lib\net45\HeBianGu.Control.Diagram.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Drawer.4.0.8\lib\net45\HeBianGu.Control.Drawer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Drawer.4.0.10\lib\net45\HeBianGu.Control.Drawer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Explorer.4.0.8\lib\net45\HeBianGu.Control.Explorer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Explorer.4.0.10\lib\net45\HeBianGu.Control.Explorer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Guide.4.0.8\lib\net45\HeBianGu.Control.Guide.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Guide.4.0.10\lib\net45\HeBianGu.Control.Guide.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.8\lib\net45\HeBianGu.Control.LeftMenu.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Host.4.0.10\lib\net45\HeBianGu.Control.Host.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.8\lib\net45\HeBianGu.Control.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.10\lib\net45\HeBianGu.Control.LeftMenu.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.8\lib\net45\HeBianGu.Control.MessageContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.10\lib\net45\HeBianGu.Control.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageListBox.4.0.8\lib\net45\HeBianGu.Control.MessageListBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.10\lib\net45\HeBianGu.Control.MessageContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.8\lib\net45\HeBianGu.Control.MultiComboBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageListBox.4.0.10\lib\net45\HeBianGu.Control.MessageListBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.8\lib\net45\HeBianGu.Control.PagedDataGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.10\lib\net45\HeBianGu.Control.MultiComboBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.8\lib\net45\HeBianGu.Control.Panel.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.10\lib\net45\HeBianGu.Control.PagedDataGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PasswordBox.4.0.8\lib\net45\HeBianGu.Control.PasswordBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.10\lib\net45\HeBianGu.Control.Panel.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.8\lib\net45\HeBianGu.Control.PropertyGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PasswordBox.4.0.10\lib\net45\HeBianGu.Control.PasswordBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.8\lib\net45\HeBianGu.Control.ScrollInto.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.10\lib\net45\HeBianGu.Control.PropertyGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollVewerLocator.4.0.8\lib\net45\HeBianGu.Control.ScrollVewerLocator.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.10\lib\net45\HeBianGu.Control.ScrollInto.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.8\lib\net45\HeBianGu.Control.ThemeSet.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollVewerLocator.4.0.10\lib\net45\HeBianGu.Control.ScrollVewerLocator.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.8\lib\net45\HeBianGu.Control.ToggleExpander.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.10\lib\net45\HeBianGu.Control.ThemeSet.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.8\lib\net45\HeBianGu.General.WpfControlLib.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.10\lib\net45\HeBianGu.Control.ToggleExpander.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.8\lib\net45\HeBianGu.Service.Animation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.10\lib\net45\HeBianGu.General.WpfControlLib.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.8\lib\net45\HeBianGu.Service.AppConfig.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.10\lib\net45\HeBianGu.Service.Animation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Converter.4.0.8\lib\net45\HeBianGu.Service.Converter.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.10\lib\net45\HeBianGu.Service.AppConfig.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.License.4.0.8\lib\net45\HeBianGu.Service.License.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Converter.4.0.10\lib\net45\HeBianGu.Service.Converter.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.8\lib\net45\HeBianGu.Service.MarkupExtension.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.License.4.0.10\lib\net45\HeBianGu.Service.License.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.8\lib\net45\HeBianGu.Service.Mvc.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.10\lib\net45\HeBianGu.Service.MarkupExtension.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.8\lib\net45\HeBianGu.Service.Mvp.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.10\lib\net45\HeBianGu.Service.Mvc.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.8\lib\net45\HeBianGu.Service.TypeConverter.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.10\lib\net45\HeBianGu.Service.Mvp.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Component.4.0.8\lib\net45\HeBianGu.Systems.Component.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.10\lib\net45\HeBianGu.Service.TypeConverter.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Identity.4.0.8\lib\net45\HeBianGu.Systems.Identity.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Component.4.0.10\lib\net45\HeBianGu.Systems.Component.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Project.4.0.8\lib\net45\HeBianGu.Systems.Project.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Identity.4.0.10\lib\net45\HeBianGu.Systems.Identity.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.8\lib\net45\HeBianGu.Systems.Setting.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Project.4.0.10\lib\net45\HeBianGu.Systems.Project.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Upgrade.4.0.8\lib\net45\HeBianGu.Systems.Upgrade.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.10\lib\net45\HeBianGu.Systems.Setting.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.8\lib\net45\HeBianGu.Systems.XmlSerialize.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Upgrade.4.0.10\lib\net45\HeBianGu.Systems.Upgrade.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.8\lib\net45\HeBianGu.Window.Link.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.10\lib\net45\HeBianGu.Systems.XmlSerialize.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Login.4.0.8\lib\net45\HeBianGu.Window.Login.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.10\lib\net45\HeBianGu.Window.Link.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.8\lib\net45\HeBianGu.Window.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Login.4.0.10\lib\net45\HeBianGu.Window.Login.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.8\lib\net45\HeBianGu.Window.MessageDialog.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.10\lib\net45\HeBianGu.Window.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Start.4.0.8\lib\net45\HeBianGu.Window.Start.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.10\lib\net45\HeBianGu.Window.MessageDialog.dll + + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Start.4.0.10\lib\net45\HeBianGu.Window.Start.dll @@ -209,6 +212,6 @@ - + \ No newline at end of file diff --git a/Source/ApplicationNuget/HeBianGu.App.Creator/packages.config b/Source/ApplicationNuget/HeBianGu.App.Creator/packages.config index 28e24b32..1e056df5 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Creator/packages.config +++ b/Source/ApplicationNuget/HeBianGu.App.Creator/packages.config @@ -1,45 +1,46 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/ApplicationNuget/HeBianGu.App.Disk/HeBianGu.App.Disk.csproj b/Source/ApplicationNuget/HeBianGu.App.Disk/HeBianGu.App.Disk.csproj index 089703ef..af4070b7 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Disk/HeBianGu.App.Disk.csproj +++ b/Source/ApplicationNuget/HeBianGu.App.Disk/HeBianGu.App.Disk.csproj @@ -38,92 +38,95 @@ - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.8\lib\net45\HeBianGu.Base.WpfBase.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.10\lib\net45\HeBianGu.Base.WpfBase.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.8\lib\net45\HeBianGu.Common.Expression.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.10\lib\net45\HeBianGu.Common.Expression.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Explorer.4.0.8\lib\net45\HeBianGu.Control.Explorer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Explorer.4.0.10\lib\net45\HeBianGu.Control.Explorer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Guide.4.0.8\lib\net45\HeBianGu.Control.Guide.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Guide.4.0.10\lib\net45\HeBianGu.Control.Guide.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.8\lib\net45\HeBianGu.Control.LeftMenu.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Host.4.0.10\lib\net45\HeBianGu.Control.Host.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.8\lib\net45\HeBianGu.Control.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.10\lib\net45\HeBianGu.Control.LeftMenu.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.8\lib\net45\HeBianGu.Control.MessageContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.10\lib\net45\HeBianGu.Control.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.8\lib\net45\HeBianGu.Control.MultiComboBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.10\lib\net45\HeBianGu.Control.MessageContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.8\lib\net45\HeBianGu.Control.PagedDataGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.10\lib\net45\HeBianGu.Control.MultiComboBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.8\lib\net45\HeBianGu.Control.Panel.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.10\lib\net45\HeBianGu.Control.PagedDataGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PasswordBox.4.0.8\lib\net45\HeBianGu.Control.PasswordBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.10\lib\net45\HeBianGu.Control.Panel.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.8\lib\net45\HeBianGu.Control.PropertyGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PasswordBox.4.0.10\lib\net45\HeBianGu.Control.PasswordBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.8\lib\net45\HeBianGu.Control.ScrollInto.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.10\lib\net45\HeBianGu.Control.PropertyGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.8\lib\net45\HeBianGu.Control.ThemeSet.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.10\lib\net45\HeBianGu.Control.ScrollInto.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.8\lib\net45\HeBianGu.Control.ToggleExpander.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.10\lib\net45\HeBianGu.Control.ThemeSet.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.8\lib\net45\HeBianGu.General.WpfControlLib.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.10\lib\net45\HeBianGu.Control.ToggleExpander.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.8\lib\net45\HeBianGu.Service.Animation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.10\lib\net45\HeBianGu.General.WpfControlLib.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.8\lib\net45\HeBianGu.Service.AppConfig.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.10\lib\net45\HeBianGu.Service.Animation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.8\lib\net45\HeBianGu.Service.MarkupExtension.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.10\lib\net45\HeBianGu.Service.AppConfig.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.8\lib\net45\HeBianGu.Service.Mvc.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.10\lib\net45\HeBianGu.Service.MarkupExtension.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.8\lib\net45\HeBianGu.Service.Mvp.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.10\lib\net45\HeBianGu.Service.Mvc.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.8\lib\net45\HeBianGu.Service.TypeConverter.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.10\lib\net45\HeBianGu.Service.Mvp.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Identity.4.0.8\lib\net45\HeBianGu.Systems.Identity.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.10\lib\net45\HeBianGu.Service.TypeConverter.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.8\lib\net45\HeBianGu.Systems.Setting.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Identity.4.0.10\lib\net45\HeBianGu.Systems.Identity.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.8\lib\net45\HeBianGu.Systems.XmlSerialize.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.10\lib\net45\HeBianGu.Systems.Setting.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.8\lib\net45\HeBianGu.Window.Link.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.10\lib\net45\HeBianGu.Systems.XmlSerialize.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.8\lib\net45\HeBianGu.Window.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.10\lib\net45\HeBianGu.Window.Link.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.8\lib\net45\HeBianGu.Window.MessageDialog.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.10\lib\net45\HeBianGu.Window.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Start.4.0.8\lib\net45\HeBianGu.Window.Start.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.10\lib\net45\HeBianGu.Window.MessageDialog.dll + + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Start.4.0.10\lib\net45\HeBianGu.Window.Start.dll diff --git a/Source/ApplicationNuget/HeBianGu.App.Disk/packages.config b/Source/ApplicationNuget/HeBianGu.App.Disk/packages.config index 6ea6886a..78ee92af 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Disk/packages.config +++ b/Source/ApplicationNuget/HeBianGu.App.Disk/packages.config @@ -1,33 +1,34 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/ApplicationNuget/HeBianGu.App.Manager/HeBianGu.App.Manager.csproj b/Source/ApplicationNuget/HeBianGu.App.Manager/HeBianGu.App.Manager.csproj index 0fab89ce..e912e650 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Manager/HeBianGu.App.Manager.csproj +++ b/Source/ApplicationNuget/HeBianGu.App.Manager/HeBianGu.App.Manager.csproj @@ -38,110 +38,113 @@ - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.8\lib\net45\HeBianGu.Base.WpfBase.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.10\lib\net45\HeBianGu.Base.WpfBase.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.8\lib\net45\HeBianGu.Common.Expression.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.10\lib\net45\HeBianGu.Common.Expression.dll ..\..\..\..\WPF-Controls\Solution\hebiangu\packages\HeBianGu.Common.TestData.1.0.0\lib\net45\HeBianGu.Common.TestData.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Adorner.4.0.8\lib\net45\HeBianGu.Control.Adorner.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Adorner.4.0.10\lib\net45\HeBianGu.Control.Adorner.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Drawer.4.0.8\lib\net45\HeBianGu.Control.Drawer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Drawer.4.0.10\lib\net45\HeBianGu.Control.Drawer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Explorer.4.0.8\lib\net45\HeBianGu.Control.Explorer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Explorer.4.0.10\lib\net45\HeBianGu.Control.Explorer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Filter.4.0.8\lib\net45\HeBianGu.Control.Filter.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Filter.4.0.10\lib\net45\HeBianGu.Control.Filter.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Guide.4.0.8\lib\net45\HeBianGu.Control.Guide.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Guide.4.0.10\lib\net45\HeBianGu.Control.Guide.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.8\lib\net45\HeBianGu.Control.LeftMenu.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Host.4.0.10\lib\net45\HeBianGu.Control.Host.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.8\lib\net45\HeBianGu.Control.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.10\lib\net45\HeBianGu.Control.LeftMenu.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.8\lib\net45\HeBianGu.Control.MessageContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.10\lib\net45\HeBianGu.Control.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.8\lib\net45\HeBianGu.Control.MultiComboBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.10\lib\net45\HeBianGu.Control.MessageContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.8\lib\net45\HeBianGu.Control.PagedDataGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.10\lib\net45\HeBianGu.Control.MultiComboBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.8\lib\net45\HeBianGu.Control.Panel.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.10\lib\net45\HeBianGu.Control.PagedDataGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Ping.4.0.8\lib\net45\HeBianGu.Control.Ping.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.10\lib\net45\HeBianGu.Control.Panel.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.8\lib\net45\HeBianGu.Control.PropertyGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Ping.4.0.10\lib\net45\HeBianGu.Control.Ping.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.8\lib\net45\HeBianGu.Control.ScrollInto.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.10\lib\net45\HeBianGu.Control.PropertyGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Shuttle.4.0.8\lib\net45\HeBianGu.Control.Shuttle.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.10\lib\net45\HeBianGu.Control.ScrollInto.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Step.4.0.8\lib\net45\HeBianGu.Control.Step.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Shuttle.4.0.10\lib\net45\HeBianGu.Control.Shuttle.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.8\lib\net45\HeBianGu.Control.ThemeSet.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Step.4.0.10\lib\net45\HeBianGu.Control.Step.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.8\lib\net45\HeBianGu.Control.ToggleExpander.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.10\lib\net45\HeBianGu.Control.ThemeSet.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.TopContainer.4.0.8\lib\net45\HeBianGu.Control.TopContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.10\lib\net45\HeBianGu.Control.ToggleExpander.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.8\lib\net45\HeBianGu.General.WpfControlLib.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.TopContainer.4.0.10\lib\net45\HeBianGu.Control.TopContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.8\lib\net45\HeBianGu.Service.Animation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.10\lib\net45\HeBianGu.General.WpfControlLib.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.8\lib\net45\HeBianGu.Service.AppConfig.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.10\lib\net45\HeBianGu.Service.Animation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.8\lib\net45\HeBianGu.Service.MarkupExtension.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.10\lib\net45\HeBianGu.Service.AppConfig.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.8\lib\net45\HeBianGu.Service.Mvc.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.10\lib\net45\HeBianGu.Service.MarkupExtension.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.8\lib\net45\HeBianGu.Service.Mvp.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.10\lib\net45\HeBianGu.Service.Mvc.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.8\lib\net45\HeBianGu.Service.TypeConverter.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.10\lib\net45\HeBianGu.Service.Mvp.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.8\lib\net45\HeBianGu.Systems.Setting.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.10\lib\net45\HeBianGu.Service.TypeConverter.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.8\lib\net45\HeBianGu.Systems.XmlSerialize.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.10\lib\net45\HeBianGu.Systems.Setting.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Float.4.0.8\lib\net45\HeBianGu.Window.Float.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.10\lib\net45\HeBianGu.Systems.XmlSerialize.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.8\lib\net45\HeBianGu.Window.Link.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Float.4.0.10\lib\net45\HeBianGu.Window.Float.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.8\lib\net45\HeBianGu.Window.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.10\lib\net45\HeBianGu.Window.Link.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.8\lib\net45\HeBianGu.Window.MessageDialog.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.10\lib\net45\HeBianGu.Window.Message.dll + + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.10\lib\net45\HeBianGu.Window.MessageDialog.dll diff --git a/Source/ApplicationNuget/HeBianGu.App.Manager/packages.config b/Source/ApplicationNuget/HeBianGu.App.Manager/packages.config index b5b7a1f0..10cd234c 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Manager/packages.config +++ b/Source/ApplicationNuget/HeBianGu.App.Manager/packages.config @@ -1,38 +1,39 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/ApplicationNuget/HeBianGu.App.Map/HeBianGu.App.Map.csproj b/Source/ApplicationNuget/HeBianGu.App.Map/HeBianGu.App.Map.csproj index 197d3b86..642ca1bc 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Map/HeBianGu.App.Map.csproj +++ b/Source/ApplicationNuget/HeBianGu.App.Map/HeBianGu.App.Map.csproj @@ -38,104 +38,107 @@ - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.8\lib\net45\HeBianGu.Base.WpfBase.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.10\lib\net45\HeBianGu.Base.WpfBase.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.8\lib\net45\HeBianGu.Common.Expression.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.10\lib\net45\HeBianGu.Common.Expression.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Drawer.4.0.8\lib\net45\HeBianGu.Control.Drawer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Drawer.4.0.10\lib\net45\HeBianGu.Control.Drawer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Guide.4.0.8\lib\net45\HeBianGu.Control.Guide.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Guide.4.0.10\lib\net45\HeBianGu.Control.Guide.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ImagePlayer.4.0.8\lib\net45\HeBianGu.Control.ImagePlayer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Host.4.0.10\lib\net45\HeBianGu.Control.Host.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.8\lib\net45\HeBianGu.Control.LeftMenu.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ImagePlayer.4.0.10\lib\net45\HeBianGu.Control.ImagePlayer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.8\lib\net45\HeBianGu.Control.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.10\lib\net45\HeBianGu.Control.LeftMenu.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.8\lib\net45\HeBianGu.Control.MessageContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.10\lib\net45\HeBianGu.Control.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.8\lib\net45\HeBianGu.Control.MultiComboBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.10\lib\net45\HeBianGu.Control.MessageContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.8\lib\net45\HeBianGu.Control.PagedDataGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.10\lib\net45\HeBianGu.Control.MultiComboBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.8\lib\net45\HeBianGu.Control.Panel.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.10\lib\net45\HeBianGu.Control.PagedDataGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Ping.4.0.8\lib\net45\HeBianGu.Control.Ping.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.10\lib\net45\HeBianGu.Control.Panel.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.8\lib\net45\HeBianGu.Control.PropertyGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Ping.4.0.10\lib\net45\HeBianGu.Control.Ping.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.8\lib\net45\HeBianGu.Control.ScrollInto.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.10\lib\net45\HeBianGu.Control.PropertyGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Shape.4.0.8\lib\net45\HeBianGu.Control.Shape.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.10\lib\net45\HeBianGu.Control.ScrollInto.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.8\lib\net45\HeBianGu.Control.ThemeSet.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Shape.4.0.10\lib\net45\HeBianGu.Control.Shape.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.8\lib\net45\HeBianGu.Control.ToggleExpander.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.10\lib\net45\HeBianGu.Control.ThemeSet.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.TopContainer.4.0.8\lib\net45\HeBianGu.Control.TopContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.10\lib\net45\HeBianGu.Control.ToggleExpander.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.8\lib\net45\HeBianGu.General.WpfControlLib.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.TopContainer.4.0.10\lib\net45\HeBianGu.Control.TopContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.8\lib\net45\HeBianGu.Service.Animation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.10\lib\net45\HeBianGu.General.WpfControlLib.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.8\lib\net45\HeBianGu.Service.AppConfig.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.10\lib\net45\HeBianGu.Service.Animation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.License.4.0.8\lib\net45\HeBianGu.Service.License.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.10\lib\net45\HeBianGu.Service.AppConfig.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.8\lib\net45\HeBianGu.Service.MarkupExtension.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.License.4.0.10\lib\net45\HeBianGu.Service.License.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.8\lib\net45\HeBianGu.Service.Mvc.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.10\lib\net45\HeBianGu.Service.MarkupExtension.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.8\lib\net45\HeBianGu.Service.Mvp.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.10\lib\net45\HeBianGu.Service.Mvc.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.8\lib\net45\HeBianGu.Service.TypeConverter.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.10\lib\net45\HeBianGu.Service.Mvp.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.8\lib\net45\HeBianGu.Systems.Setting.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.10\lib\net45\HeBianGu.Service.TypeConverter.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.8\lib\net45\HeBianGu.Systems.XmlSerialize.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.10\lib\net45\HeBianGu.Systems.Setting.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.8\lib\net45\HeBianGu.Window.Link.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.10\lib\net45\HeBianGu.Systems.XmlSerialize.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Menu.4.0.8\lib\net45\HeBianGu.Window.Menu.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.10\lib\net45\HeBianGu.Window.Link.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.8\lib\net45\HeBianGu.Window.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Menu.4.0.10\lib\net45\HeBianGu.Window.Menu.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.8\lib\net45\HeBianGu.Window.MessageDialog.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.10\lib\net45\HeBianGu.Window.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Notify.4.0.8\lib\net45\HeBianGu.Window.Notify.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.10\lib\net45\HeBianGu.Window.MessageDialog.dll + + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Notify.4.0.10\lib\net45\HeBianGu.Window.Notify.dll diff --git a/Source/ApplicationNuget/HeBianGu.App.Map/packages.config b/Source/ApplicationNuget/HeBianGu.App.Map/packages.config index b3150e8d..be89c20f 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Map/packages.config +++ b/Source/ApplicationNuget/HeBianGu.App.Map/packages.config @@ -1,37 +1,38 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/ApplicationNuget/HeBianGu.App.Media.Share/View/Home/HomeControl.xaml b/Source/ApplicationNuget/HeBianGu.App.Media.Share/View/Home/HomeControl.xaml index 29cd74c8..24658421 100644 --- a/Source/ApplicationNuget/HeBianGu.App.Media.Share/View/Home/HomeControl.xaml +++ b/Source/ApplicationNuget/HeBianGu.App.Media.Share/View/Home/HomeControl.xaml @@ -1,12 +1,11 @@  @@ -239,8 +238,12 @@ - - + + @@ -305,9 +308,9 @@ + h:GuideService.ParentTitle="首页" + h:GuideService.Title="影片详情" + h:GuideService.UseGuide="True"> - + @@ -349,7 +352,7 @@ - + @@ -423,14 +426,15 @@ + VerticalContentAlignment="Bottom" + h:ScrollViewerService.UseBottomEnd="False" + h:ScrollViewerService.UseDownLine="False" + h:ScrollViewerService.UseDownPage="False" + h:ScrollViewerService.UseTopHome="False" + h:ScrollViewerService.UseUpLine="False" + h:ScrollViewerService.UseUpPage="False" + MouseWheelOrientation="Horizontal" + Style="{StaticResource {x:Static h:ScrollViewerKeys.Tool}}"> @@ -439,7 +443,7 @@ - + -