Merge pull request #2 from Dirkster99/AvalonDock_Version_3_3

Added Version 3.3 source from XCeed
Dirkster99 · Mar 9, 2018 · dfa5ebb · dfa5ebb
2 parents d3b3781 + 11115a6
commit dfa5ebb
Show file tree

Hide file tree

Showing 25 changed files with 10,005 additions and 8,681 deletions.
diff --git a/source/AvalonDock.sln b/source/AvalonDock.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2003
+VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock.TestApp", "AvalonDock.TestApp\AvalonDock.TestApp.csproj", "{339BC0D5-2A54-40ED-9850-7ED65182E6E1}"
 EndProject
@@ -68,16 +68,16 @@ Global
 		{AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Release|x86.Build.0 = Release|x86
 		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x64.ActiveCfg = Debug|x64
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x64.Build.0 = Debug|x64
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x64.Build.0 = Debug|Any CPU
 		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x86.Build.0 = Debug|Any CPU
 		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x64.ActiveCfg = Release|x64
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x64.Build.0 = Release|x64
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x86.ActiveCfg = Release|x86
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x86.Build.0 = Release|x86
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x64.ActiveCfg = Release|Any CPU
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x64.Build.0 = Release|Any CPU
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x86.ActiveCfg = Release|Any CPU
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x86.Build.0 = Release|Any CPU
 		{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Debug|x64.ActiveCfg = Debug|x64
@@ -92,16 +92,16 @@ Global
 		{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Release|x86.Build.0 = Release|x86
 		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x64.ActiveCfg = Debug|x64
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x64.Build.0 = Debug|x64
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x86.ActiveCfg = Debug|x64
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x86.Build.0 = Debug|x64
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x64.Build.0 = Debug|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x86.Build.0 = Debug|Any CPU
 		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x64.ActiveCfg = Release|x64
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x64.Build.0 = Release|x64
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x86.ActiveCfg = Release|x86
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x86.Build.0 = Release|x86
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x64.ActiveCfg = Release|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x64.Build.0 = Release|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x86.ActiveCfg = Release|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x86.Build.0 = Release|Any CPU
 		{BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs
@@ -21,7 +21,7 @@ This program is provided to you under the terms of the Microsoft Public
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "2.3";
+  public const string BaseVersion = "3.3";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";

diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs
@@ -25,12 +25,12 @@ This program is provided to you under the terms of the Microsoft Public
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle( "Xceed Extended WPF Toolkit - AvalonDock Metro Theme" )]
+[assembly: AssemblyTitle( "Xceed Toolkit for WPF - AvalonDock Metro Theme" )]
 [assembly: AssemblyDescription( "This assembly implements the Metro Theme for the AvalonDock layout system." )]
 
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Xceed Extended WPF Toolkit - AvalonDock" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2014" )]
+[assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
 
 
 
@@ -64,6 +64,6 @@ This program is provided to you under the terms of the Microsoft Public
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
-////[assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
+[assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
 [assembly: AssemblyKeyName( "" )]
 #pragma warning restore 1699