diff --git a/CREDITS.md b/CREDITS.md
new file mode 100644
index 000000000..4cd855872
--- /dev/null
+++ b/CREDITS.md
@@ -0,0 +1,39 @@
+XenCenter Alumni
+================
+
+* Aaron Robson
+* Adrian Jachacy
+* Barbara Li
+* Brian Donegan
+* Callum McIntyre
+* Carmen Agimof
+* Cheng Zhang
+* Chris Harding
+* Daniel Lamping
+* Darren Matthews
+* Deane Smith
+* Ewan Mellor
+* Frederico Mazzone
+* Gabor Apati-Nagy
+* Henry Hughes
+* Hugh Warrington
+* Hui Zhang
+* Javier Alvarez-Valle
+* Jisheng Xing
+* John Naab
+* Johnni Aguirre
+* Julie Allen
+* Katherine Shann
+* Kun Ma
+* Letsibogo Ramadi
+* Michael Zhao
+* Mihaela Stoica
+* Milind Padhye
+* Rabin Karki
+* Sarah Vallieres
+* Seren Corbett
+* Stephen Rice
+* Stephen Turner
+* Tom Wilkie
+* Usha Mandya
+* Victor Rodriguez
diff --git a/WixInstaller/branding.wxi b/WixInstaller/branding.wxi
index 2959547a7..b3eadb202 100644
--- a/WixInstaller/branding.wxi
+++ b/WixInstaller/branding.wxi
@@ -37,7 +37,6 @@
-
diff --git a/WixInstaller/branding.wxs b/WixInstaller/branding.wxs
deleted file mode 100644
index 141922b39..000000000
--- a/WixInstaller/branding.wxs
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/XenAdmin/Dialogs/AddServerDialog.Designer.cs b/XenAdmin/Dialogs/AddServerDialog.Designer.cs
index cc666d5d3..adcabf8ec 100644
--- a/XenAdmin/Dialogs/AddServerDialog.Designer.cs
+++ b/XenAdmin/Dialogs/AddServerDialog.Designer.cs
@@ -66,7 +66,6 @@ namespace XenAdmin.Dialogs
this.CancelButton2.Name = "CancelButton2";
this.CancelButton2.UseVisualStyleBackColor = true;
this.CancelButton2.Click += new System.EventHandler(this.CancelButton2_Click);
- this.CancelButton2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.CancelButton2_KeyDown);
//
// ServerNameLabel
//
diff --git a/XenAdmin/Dialogs/AddServerDialog.cs b/XenAdmin/Dialogs/AddServerDialog.cs
index e2b5bf944..c97b7ed9a 100644
--- a/XenAdmin/Dialogs/AddServerDialog.cs
+++ b/XenAdmin/Dialogs/AddServerDialog.cs
@@ -36,7 +36,6 @@ using System.Text.RegularExpressions;
using System.Windows.Forms;
using XenAdmin.Core;
using XenAdmin.Network;
-using XenAdmin.TestResources;
using XenCenterLib;
namespace XenAdmin.Dialogs
@@ -218,36 +217,6 @@ namespace XenAdmin.Dialogs
return ServerNameComboBox.Text.Trim().Length > 0 && UsernameTextBox.Text.Trim().Length > 0;
}
- private void CancelButton2_KeyDown(object sender, KeyEventArgs e)
- {
- if (e.Control || e.Alt)
- {
- switch (e.KeyCode)
- {
- case Keys.D1:
- Launch(TestResource.Resource.InterestingProduction);
- break;
- case Keys.D2:
- Launch(TestResource.Resource.InterestingDevelopment);
- break;
- case Keys.D3:
- Launch(TestResource.Resource.InterestingXenApp);
- break;
- case Keys.D4:
- Launch(TestResource.Resource.Credits);
- break;
- default:
- break;
- }
- }
- }
-
- private void Launch(TestResource.Resource r)
- {
- ServerNameComboBox.Text = TestResource.Location(r);
- AddButton_Click(this, null);
- }
-
///
/// Used for testing. Parses text for a semi-colon separated list of files that are loaded by DbProxy.
///
diff --git a/XenAdmin/Dialogs/AddServerDialog.ja.resx b/XenAdmin/Dialogs/AddServerDialog.ja.resx
index 9c8ee3058..4eb811122 100644
--- a/XenAdmin/Dialogs/AddServerDialog.ja.resx
+++ b/XenAdmin/Dialogs/AddServerDialog.ja.resx
@@ -579,33 +579,6 @@
GrowAndShrink
-
- Segoe UI, 9pt
-
-
- 164, 7
-
-
- 220, 23
-
-
- 2
-
-
- False
-
-
- comboBoxClouds
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- flowLayoutPanel1
-
-
- 2
-
Fill
diff --git a/XenAdmin/Dialogs/AddServerDialog.zh-CN.resx b/XenAdmin/Dialogs/AddServerDialog.zh-CN.resx
index 1d3e3291a..148f7d292 100644
--- a/XenAdmin/Dialogs/AddServerDialog.zh-CN.resx
+++ b/XenAdmin/Dialogs/AddServerDialog.zh-CN.resx
@@ -579,33 +579,6 @@
GrowAndShrink
-
- Segoe UI, 9pt
-
-
- 6, 7
-
-
- 220, 23
-
-
- 2
-
-
- False
-
-
- comboBoxClouds
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- flowLayoutPanel1
-
-
- 2
-
Fill
diff --git a/XenAdmin/TestResources/TestResource.cs b/XenAdmin/TestResources/TestResource.cs
deleted file mode 100644
index f9fd79f75..000000000
--- a/XenAdmin/TestResources/TestResource.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright (c) Cloud Software Group, Inc.
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the
- * following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other
- * materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-using System.Collections.Generic;
-using System.IO;
-
-namespace XenAdmin.TestResources
-{
- static class TestResource
- {
- public enum Resource
- {
- InterestingProduction,
- InterestingDevelopment,
- InterestingXenApp,
- Credits,
- }
-
- private static readonly Dictionary Filenames = new Dictionary();
- static TestResource()
- {
- Filenames[Resource.InterestingProduction] = "interesting-production.xml";
- Filenames[Resource.InterestingDevelopment] = "interesting-development.xml";
- Filenames[Resource.InterestingXenApp] = "interesting-xenapp.xml";
- Filenames[Resource.Credits] = "credits.xml";
- }
-
- public static string Location(Resource r)
- {
- return Path.Combine(Path.Combine(Program.AssemblyDir, "TestResources"), Filenames[r]);
- }
- }
-}
diff --git a/XenAdmin/TestResources/credits.xml b/XenAdmin/TestResources/credits.xml
deleted file mode 100755
index 1536b1775..000000000
--- a/XenAdmin/TestResources/credits.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
-
-
-
-
diff --git a/XenAdmin/TestResources/interesting-development.xml b/XenAdmin/TestResources/interesting-development.xml
deleted file mode 100755
index f00dbe37b..000000000
--- a/XenAdmin/TestResources/interesting-development.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
-
-
-
-
\ No newline at end of file
diff --git a/XenAdmin/TestResources/interesting-production.xml b/XenAdmin/TestResources/interesting-production.xml
deleted file mode 100755
index 453416ab8..000000000
--- a/XenAdmin/TestResources/interesting-production.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/XenAdmin/TestResources/interesting-xenapp.xml b/XenAdmin/TestResources/interesting-xenapp.xml
deleted file mode 100755
index 62f8829db..000000000
--- a/XenAdmin/TestResources/interesting-xenapp.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj
index b55c12273..cd08bc107 100755
--- a/XenAdmin/XenAdmin.csproj
+++ b/XenAdmin/XenAdmin.csproj
@@ -4107,7 +4107,6 @@
WlbPage.cs
-
Code
@@ -6697,21 +6696,9 @@
WorkloadReports.cs
-
- PreserveNewest
-
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
Images\wizard_background.png