Increased version to 3.5.5 and fixed merge conflicts in MLib_Test dem…

…o app
Dirkster99 · May 13, 2019 · 92a3729 · 92a3729
1 parent c058634
commit 92a3729
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 11 deletions.
diff --git a/source/Components/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs b/source/Components/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs
@@ -24,7 +24,7 @@ internal static class _XceedVersionInfo
   public const string BaseVersion = "3.5";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
-  ".4.0";
+  ".5.0";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string PublicKeyToken = "ba83ff368b7563c6";
 

diff --git a/source/MLibTest/MLibTest/Demos/PanesTemplateSelector.cs b/source/MLibTest/MLibTest/Demos/PanesTemplateSelector.cs
@@ -36,8 +36,6 @@ public PanesTemplateSelector()
         /// </summary>
         public DataTemplate ColorPickerViewTemplate { get; set; }
 
-        public DataTemplate Tooln_ViewTemplate { get; set; }
-
         /// <summary>
         /// Gets a template for simple testing tool windows.
         /// </summary>

diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/WorkSpaceViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/WorkSpaceViewModel.cs
@@ -106,9 +106,6 @@ internal class WorkSpaceViewModel : MLibTest.ViewModels.Base.ViewModelBase, IWor
         private Tool3_ViewModel _Tool3;
 
         private FileViewModel _activeDocument = null;
-        private Tool1_ViewModel _Tool1;
-        private Tool2_ViewModel _Tool2;
-        private Tool3_ViewModel _Tool3;
         #endregion private fields
 
         #region constructors

diff --git a/source/MLibTest/MLibTest/MLibTest.csproj b/source/MLibTest/MLibTest/MLibTest.csproj
@@ -84,17 +84,12 @@
     <Compile Include="Demos\ViewModels\Tools\Tool2_ViewModel.cs" />
     <Compile Include="Demos\ViewModels\Tools\Tool3_ViewModel.cs" />
     <Compile Include="Demos\ViewModels\Tools\Tool1_ViewModel.cs" />
-    <Compile Include="Demos\ViewModels\Tools\FileStatsViewModel.cs" />
     <Compile Include="Demos\ViewModels\AD\FileViewModel.cs" />
     <Compile Include="Demos\ViewModels\AD\PaneViewModel.cs" />
     <Compile Include="Demos\ViewModels\AD\ToolViewModel.cs" />
-    <Compile Include="Demos\ViewModels\Tools\ColorPickerViewModel.cs" />
     <Compile Include="Demos\ViewModels\Interfaces\IWorkSpaceViewModel.cs" />
     <Compile Include="Demos\ViewModels\Tools\ColorPickerViewModel.cs" />
     <Compile Include="Demos\ViewModels\Tools\FileStatsViewModel.cs" />
-    <Compile Include="Demos\ViewModels\Tools\Tool1_ViewModel.cs" />
-    <Compile Include="Demos\ViewModels\Tools\Tool2_ViewModel.cs" />
-    <Compile Include="Demos\ViewModels\Tools\Tool3_ViewModel.cs" />
     <Compile Include="Demos\ViewModels\WorkSpaceViewModel.cs" />
     <Compile Include="Demos\ViewModels\Views\ColorSelectionView.xaml.cs">
       <DependentUpon>ColorSelectionView.xaml</DependentUpon>