Removed Settings file. It is not meant for storing constants and most entries were obsolete anyway.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>

XenModel/BrandManager.cs

@@ -73,6 +73,7 @@ namespace XenAdmin.Core
         public const string XENCENTER_VERSION = "[BRANDING_PRODUCT_VERSION]";
         public const string COMPANY_NAME_LEGAL = "[BRANDING_COMPANY_NAME_LEGAL]";
         public const string BRAND_CONSOLE = "[XenCenter]";
+        public const string VM_TOOLS = "[Citrix VM Tools]";
 
         /// <summary>
         /// Returns null if no match is found.

XenOvfTransport/Import.cs

@@ -287,7 +287,7 @@ namespace XenOvfTransport
                 VM.hard_shutdown(xenSession, vm);
 
             while (VM.get_power_state(xenSession, vm) != vm_power_state.Halted)
-                Thread.Sleep(Properties.Settings.Default.FixupPollTimeAsMs);
+                Thread.Sleep(1000);
 
             // Save its original memory configuration.
             long staticMemoryMin  = VM.get_memory_static_min(xenSession, vm);
@@ -296,12 +296,12 @@ namespace XenOvfTransport
             long dynamicMemoryMax = VM.get_memory_dynamic_max(xenSession, vm);
 
             // Minimize the memory capacity for the fixup OS.
-            long fixupMemorySize = Properties.Settings.Default.FixupOsMemorySizeAsMB * Util.BINARY_MEGA;
+            long fixupMemorySize = 256 * Util.BINARY_MEGA;
 
             VM.set_memory_limits(xenSession, vm, fixupMemorySize, fixupMemorySize, fixupMemorySize, fixupMemorySize);
 
             // Run the fixup OS on the VM.
-            InstallSectionStartVirtualMachine(xenSession, vm, Properties.Settings.Default.FixupDurationAsSeconds);
+            InstallSectionStartVirtualMachine(xenSession, vm, 600);
 
             // Restore the original memory configuration.
             VM.set_memory_limits(xenSession, vm, staticMemoryMin, staticMemoryMax, dynamicMemoryMin, dynamicMemoryMax);
@@ -336,7 +336,7 @@ namespace XenOvfTransport
 
             // Wait for it to start.
             while (VM.get_power_state(xenSession, vm) != vm_power_state.Running)
-                Thread.Sleep(Properties.Settings.Default.FixupPollTimeAsMs);
+                Thread.Sleep(1000);
 
             // Let it run for the requested duration.
             int bootStopDelayAsMs = initialBootStopDelayAsSeconds * 1000;
@@ -344,8 +344,8 @@ namespace XenOvfTransport
 
             while (VM.get_power_state(xenSession, vm) == vm_power_state.Running)
             {
-                Thread.Sleep(Properties.Settings.Default.FixupPollTimeAsMs);
-                msRunning += Properties.Settings.Default.FixupPollTimeAsMs;
+                Thread.Sleep(1000);
+                msRunning += 1000;
 
                 if (msRunning > bootStopDelayAsMs)
                     break;
@@ -698,9 +698,10 @@ namespace XenOvfTransport
             if (system.VirtualSystemOtherConfigurationData == null || system.VirtualSystemOtherConfigurationData.Length <= 0)
             {
                 // DEFAULT should work for all of HVM type or 301
-                newVm.HVM_boot_policy = Properties.Settings.Default.xenBootOptions;
-                newVm.HVM_boot_params = SplitStringIntoDictionary(Properties.Settings.Default.xenBootParams);
-				newVm.platform = MakePlatformHash(Properties.Settings.Default.xenPlatformSetting);
+                newVm.HVM_boot_policy = "BIOS order";
+                newVm.HVM_boot_params = new Dictionary<string, string> {{"order", "dc"}};
+                newVm.platform = new Dictionary<string, string>
+                    {{"nx", "true"}, {"acpi", "true"}, {"apic", "true"}, {"pae", "true"}, {"stdvga", "0"}};
             }
             else
             {
@@ -719,7 +720,9 @@ namespace XenOvfTransport
                                 : new Dictionary<string, string> {{"order", xcsdValue}};
 							break;
                         case "platform":
-                            newVm.platform = MakePlatformHash(xcsd.Value.Value);
+                            newVm.platform = SplitStringIntoDictionary(xcsd.Value.Value);
+                            if (!newVm.platform.ContainsKey("nx"))
+                                newVm.platform.Add("nx", "true");
                             break;
 	                    case "nvram":
 		                    newVm.NVRAM = SplitStringIntoDictionary(xcsd.Value.Value);
@@ -872,17 +875,6 @@ namespace XenOvfTransport
 				.ToDictionary(o => o.FirstOrDefault(), o => o.LastOrDefault());
         }
 
-        private static Dictionary<string, string> MakePlatformHash(string platform)
-        {
-            var hPlatform = SplitStringIntoDictionary(platform);
-
-            // Handle the case when NX isn't in the platform string.
-            if (!hPlatform.ContainsKey("nx"))
-                hPlatform.Add("nx", "true");
-
-            return hPlatform;
-        }
-
         private static void AddResourceSettingData(Session xenSession, Action<string> OnUpdate, XenRef<VM> vmRef, RASD_Type rasd, string pathToOvf, string filename, string compression, string version, string passcode, bool metaDataOnly, string encryptionClass, ref int vifDeviceIndex)
         {
             switch (rasd.ResourceType.Value)
@@ -925,14 +917,13 @@ namespace XenOvfTransport
                                 // During Network Selection the UUID for Network was set in Connection Field
                                 // Makes data self contained here.
 
-                                if (rasd.Connection[0].Value.Contains(Properties.Settings.Default.xenNetworkKey) ||
-                                    rasd.Connection[0].Value.Contains(Properties.Settings.Default.xenNetworkUuidKey))
+                                if (rasd.Connection[0].Value.Contains("network=") ||
+                                    rasd.Connection[0].Value.Contains("XenNetwork="))
                                 {
                                     string[] s = rasd.Connection[0].Value.Split(',');
                                     for (int i = 0; i < s.Length; i++)
                                     {
-                                        if (s[i].StartsWith(Properties.Settings.Default.xenNetworkKey) ||
-                                            s[i].StartsWith(Properties.Settings.Default.xenNetworkUuidKey))
+                                        if (s[i].StartsWith("network=") || s[i].StartsWith("XenNetwork="))
                                         {
                                             string[] s1 = s[i].Split('=');
                                             netuuid = s1[1];
@@ -960,7 +951,7 @@ namespace XenOvfTransport
                                         net = netRef;
                                     }
                                     // ok find the default.
-                                    if (networks[netRef].bridge.ToLower().Contains(Properties.Settings.Default.xenDefaultNetwork))
+                                    if (networks[netRef].bridge.ToLower().Contains("xenbr0"))
                                     {
                                         netDefault = netRef;
                                     }
@@ -1112,7 +1103,7 @@ namespace XenOvfTransport
                                         {
                                             if (srDictionary[key].content_type.ToLower() == "iso" && srDictionary[key].type.ToLower() == "iso")
                                             {
-                                                if (srDictionary[key].name_label.ToLower().Equals(Properties.Settings.Default.xenTools.ToLower()))
+                                                if (srDictionary[key].name_label.ToLower().Equals(BrandManager.VM_TOOLS))
                                                 {
                                                     isoUuid = srDictionary[key].uuid;
                                                     break;

XenOvfTransport/Properties/Settings.Designer.cs

@@ -1,332 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XenOvfTransport.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("P2V Automatically created.")]
-        public string xenP2VDiskName {
-            get {
-                return ((string)(this["xenP2VDiskName"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("BIOS order")]
-        public string xenBootOptions {
-            get {
-                return ((string)(this["xenBootOptions"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("order=dc;")]
-        public string xenBootParams {
-            get {
-                return ((string)(this["xenBootParams"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("nx=true;acpi=true;apic=true;pae=true;stdvga=0;")]
-        public string xenPlatformSetting {
-            get {
-                return ((string)(this["xenPlatformSetting"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("network=")]
-        public string xenNetworkKey {
-            get {
-                return ((string)(this["xenNetworkKey"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("xenbr0")]
-        public string xenDefaultNetwork {
-            get {
-                return ((string)(this["xenDefaultNetwork"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("/var/run/sr-mount/{0}")]
-        public string xenISOMount {
-            get {
-                return ((string)(this["xenISOMount"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("/var/opt/xen/iso_import")]
-        public string xenISOTools {
-            get {
-                return ((string)(this["xenISOTools"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("xenserver-linuxfixup-disk.iso")]
-        public string XenFixupLabel {
-            get {
-                return ((string)(this["XenFixupLabel"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("sr=")]
-        public string xenSRKey {
-            get {
-                return ((string)(this["xenSRKey"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("device=")]
-        public string xenDeviceKey {
-            get {
-                return ((string)(this["xenDeviceKey"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("XenNetwork=")]
-        public string xenNetworkUuidKey {
-            get {
-                return ((string)(this["xenNetworkUuidKey"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("1.0.0")]
-        public string OVFVersion {
-            get {
-                return ((string)(this["OVFVersion"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("^(http|https|file|ftp)://*")]
-        public string uriRegex {
-            get {
-                return ((string)(this["uriRegex"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("DoNotUse_iSCSI_target")]
-        public string iSCSITargetName {
-            get {
-                return ((string)(this["iSCSITargetName"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute(@"<?xml version=""1.0"" encoding=""utf-16""?>
-<ArrayOfString xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
-  <string>Pool-wide network associated with eth0</string>
-  <string>Network 0</string>
-</ArrayOfString>")]
-        public global::System.Collections.Specialized.StringCollection iSCSINetworkName {
-            get {
-                return ((global::System.Collections.Specialized.StringCollection)(this["iSCSINetworkName"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("5")]
-        public int iSCSIConnectRetry {
-            get {
-                return ((int)(this["iSCSIConnectRetry"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Transfer VM for VDI {0}")]
-        public string iSCSITransferVM {
-            get {
-                return ((string)(this["iSCSITransferVM"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("1.5,1.6,LATEST")]
-        public string xenSupportedVersions {
-            get {
-                return ((string)(this["xenSupportedVersions"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute(@"<?xml version=""1.0"" encoding=""utf-16""?>
-<ArrayOfString xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
-  <string>network_config=auto #REQUIRED: MUST BE FIRST Values:  ""auto"" ""manual""</string>
-  <string>network_mode=dhcp #REQUIRED: MUST BE SECOND Values: ""dhcp"" ""manual""</string>
-  <string>network_port=3260 #OPTIONAL: port for config is manual</string>
-  <string>network_mac=00:00:00:00:00:00 #OPTIONAL: set mac address for config is manual</string>
-  <string>network_ip=192.168.2.69 #OPTIONAL: Required if mode is manual</string>
-  <string>network_mask=255.255.255.0 #OPTIONAL: Required if mode is manual</string>
-  <string>network_gateway=192.168.2.1 #OPTIONAL: Required if mode is manual</string>
-</ArrayOfString>")]
-        public global::System.Collections.Specialized.StringCollection iSCSITransferVMNetwork {
-            get {
-                return ((global::System.Collections.Specialized.StringCollection)(this["iSCSITransferVMNetwork"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("en-us")]
-        public string DEFAULT_CULTURE {
-            get {
-                return ((string)(this["DEFAULT_CULTURE"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute(@"<?xml version=""1.0"" encoding=""utf-16""?>
-<ArrayOfString xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
-  <string>\PAGEFILE.SYS</string>
-  <string>\HIBERFIL.SYS</string>
-  <string>\SYSTEM VOLUME INFORMATION</string>
-</ArrayOfString>")]
-        public global::System.Collections.Specialized.StringCollection EXCLUDED_FILES_COPY {
-            get {
-                return ((global::System.Collections.Specialized.StringCollection)(this["EXCLUDED_FILES_COPY"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute(".bz2")]
-        public string bzip2ext {
-            get {
-                return ((string)(this["bzip2ext"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("management  #Replace with Network UUID to change iSCSI network utilization.")]
-        public string iSCSITransferVMMgtNetwork {
-            get {
-                return ((string)(this["iSCSITransferVMMgtNetwork"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool CreateApplianceFolder {
-            get {
-                return ((bool)(this["CreateApplianceFolder"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string ApplianceFolderPath {
-            get {
-                return ((string)(this["ApplianceFolderPath"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("256")]
-        public long FixupOsMemorySizeAsMB {
-            get {
-                return ((long)(this["FixupOsMemorySizeAsMB"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("600")]
-        public int FixupDurationAsSeconds {
-            get {
-                return ((int)(this["FixupDurationAsSeconds"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("1000")]
-        public int FixupPollTimeAsMs {
-            get {
-                return ((int)(this["FixupPollTimeAsMs"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("[XenServer product] P2V (Orela) Server")]
-        public string p2vTemplate {
-            get {
-                return ((string)(this["p2vTemplate"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("[Citrix VM Tools]")]
-        public string xenTools {
-            get {
-                return ((string)(this["xenTools"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("[XenServer product] Transfer")]
-        public string iSCSITransferVMName {
-            get {
-                return ((string)(this["iSCSITransferVMName"]));
-            }
-        }
-    }
-}

XenOvfTransport/Properties/Settings.settings

@@ -1,120 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="XenOvfTransport.Properties" GeneratedClassName="Settings">
-  <Profiles />
-  <Settings>
-    <Setting Name="xenP2VDiskName" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">P2V Automatically created.</Value>
-    </Setting>
-    <Setting Name="xenBootOptions" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">BIOS order</Value>
-    </Setting>
-    <Setting Name="xenBootParams" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">order=dc;</Value>
-    </Setting>
-    <Setting Name="xenPlatformSetting" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">nx=true;acpi=true;apic=true;pae=true;stdvga=0;</Value>
-    </Setting>
-    <Setting Name="xenNetworkKey" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">network=</Value>
-    </Setting>
-    <Setting Name="xenDefaultNetwork" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">xenbr0</Value>
-    </Setting>
-    <Setting Name="xenISOMount" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">/var/run/sr-mount/{0}</Value>
-    </Setting>
-    <Setting Name="xenISOTools" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">/var/opt/xen/iso_import</Value>
-    </Setting>
-    <Setting Name="XenFixupLabel" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">xenserver-linuxfixup-disk.iso</Value>
-    </Setting>
-    <Setting Name="xenSRKey" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">sr=</Value>
-    </Setting>
-    <Setting Name="xenDeviceKey" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">device=</Value>
-    </Setting>
-    <Setting Name="xenNetworkUuidKey" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">XenNetwork=</Value>
-    </Setting>
-    <Setting Name="OVFVersion" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">1.0.0</Value>
-    </Setting>
-    <Setting Name="uriRegex" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">^(http|https|file|ftp)://*</Value>
-    </Setting>
-    <Setting Name="iSCSITargetName" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">DoNotUse_iSCSI_target</Value>
-    </Setting>
-    <Setting Name="iSCSINetworkName" Type="System.Collections.Specialized.StringCollection" Scope="Application">
-      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;string&gt;Pool-wide network associated with eth0&lt;/string&gt;
-  &lt;string&gt;Network 0&lt;/string&gt;
-&lt;/ArrayOfString&gt;</Value>
-    </Setting>
-    <Setting Name="iSCSIConnectRetry" Type="System.Int32" Scope="Application">
-      <Value Profile="(Default)">5</Value>
-    </Setting>
-    <Setting Name="iSCSITransferVM" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Transfer VM for VDI {0}</Value>
-    </Setting>
-    <Setting Name="xenSupportedVersions" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">1.5,1.6,LATEST</Value>
-    </Setting>
-    <Setting Name="iSCSITransferVMNetwork" Type="System.Collections.Specialized.StringCollection" Scope="Application">
-      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;string&gt;network_config=auto #REQUIRED: MUST BE FIRST Values:  "auto" "manual"&lt;/string&gt;
-  &lt;string&gt;network_mode=dhcp #REQUIRED: MUST BE SECOND Values: "dhcp" "manual"&lt;/string&gt;
-  &lt;string&gt;network_port=3260 #OPTIONAL: port for config is manual&lt;/string&gt;
-  &lt;string&gt;network_mac=00:00:00:00:00:00 #OPTIONAL: set mac address for config is manual&lt;/string&gt;
-  &lt;string&gt;network_ip=192.168.2.69 #OPTIONAL: Required if mode is manual&lt;/string&gt;
-  &lt;string&gt;network_mask=255.255.255.0 #OPTIONAL: Required if mode is manual&lt;/string&gt;
-  &lt;string&gt;network_gateway=192.168.2.1 #OPTIONAL: Required if mode is manual&lt;/string&gt;
-&lt;/ArrayOfString&gt;</Value>
-    </Setting>
-    <Setting Name="DEFAULT_CULTURE" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">en-us</Value>
-    </Setting>
-    <Setting Name="EXCLUDED_FILES_COPY" Type="System.Collections.Specialized.StringCollection" Scope="Application">
-      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;string&gt;\PAGEFILE.SYS&lt;/string&gt;
-  &lt;string&gt;\HIBERFIL.SYS&lt;/string&gt;
-  &lt;string&gt;\SYSTEM VOLUME INFORMATION&lt;/string&gt;
-&lt;/ArrayOfString&gt;</Value>
-    </Setting>
-    <Setting Name="bzip2ext" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">.bz2</Value>
-    </Setting>
-    <Setting Name="iSCSITransferVMMgtNetwork" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">management  #Replace with Network UUID to change iSCSI network utilization.</Value>
-    </Setting>
-    <Setting Name="CreateApplianceFolder" Type="System.Boolean" Scope="Application">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
-    <Setting Name="ApplianceFolderPath" Type="System.String" Scope="Application">
-      <Value Profile="(Default)" />
-    </Setting>
-    <Setting Name="FixupOsMemorySizeAsMB" Type="System.Int64" Scope="Application">
-      <Value Profile="(Default)">256</Value>
-    </Setting>
-    <Setting Name="FixupDurationAsSeconds" Type="System.Int32" Scope="Application">
-      <Value Profile="(Default)">600</Value>
-    </Setting>
-    <Setting Name="FixupPollTimeAsMs" Type="System.Int32" Scope="Application">
-      <Value Profile="(Default)">1000</Value>
-    </Setting>
-    <Setting Name="p2vTemplate" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">[XenServer product] P2V (Orela) Server</Value>
-    </Setting>
-    <Setting Name="xenTools" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">[Citrix VM Tools]</Value>
-    </Setting>
-    <Setting Name="iSCSITransferVMName" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">[XenServer product] Transfer</Value>
-    </Setting>
-  </Settings>
-</SettingsFile>

XenOvfTransport/XenOvfTransport.csproj

@@ -58,11 +58,6 @@
       <DependentUpon>Messages.resx</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CommandLib\CommandLib.csproj">
@@ -82,13 +77,6 @@
       <Name>XenOvfApi</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Messages.resx">
       <Generator>ResXFileCodeGenerator</Generator>

XenOvfTransport/app.config

@@ -1,157 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-	<configSections>
-		<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-			<section name="XenOvfTransport.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
-			<section name="XenTransport.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
-		</sectionGroup>
-	</configSections>
-	<applicationSettings>
-		<XenOvfTransport.Properties.Settings>
-   <setting name="xenP2VDiskName" serializeAs="String">
-    <value>P2V Automatically created.</value>
-   </setting>
-   <setting name="xenBootOptions" serializeAs="String">
-    <value>BIOS order</value>
-   </setting>
-   <setting name="xenBootParams" serializeAs="String">
-    <value>order=dc;</value>
-   </setting>
-   <setting name="xenPlatformSetting" serializeAs="String">
-    <value>nx=true;acpi=true;apic=true;pae=true;stdvga=0;</value>
-   </setting>
-   <setting name="xenNetworkKey" serializeAs="String">
-    <value>network=</value>
-   </setting>
-   <setting name="xenDefaultNetwork" serializeAs="String">
-    <value>xenbr0</value>
-   </setting>
-   <setting name="xenISOMount" serializeAs="String">
-    <value>/var/run/sr-mount/{0}</value>
-   </setting>
-   <setting name="xenISOTools" serializeAs="String">
-    <value>/var/opt/xen/iso_import</value>
-   </setting>
-   <setting name="XenFixupLabel" serializeAs="String">
-    <value>xenserver-linuxfixup-disk.iso</value>
-   </setting>
-   <setting name="xenSRKey" serializeAs="String">
-    <value>sr=</value>
-   </setting>
-   <setting name="xenDeviceKey" serializeAs="String">
-    <value>device=</value>
-   </setting>
-   <setting name="xenNetworkUuidKey" serializeAs="String">
-    <value>XenNetwork=</value>
-   </setting>
-   <setting name="OVFVersion" serializeAs="String">
-    <value>1.0.0</value>
-   </setting>
-   <setting name="uriRegex" serializeAs="String">
-    <value>^(http|https|file|ftp)://*</value>
-   </setting>
-   <setting name="iSCSITargetName" serializeAs="String">
-    <value>DoNotUse_iSCSI_target</value>
-   </setting>
-   <setting name="iSCSINetworkName" serializeAs="Xml">
-    <value>
-     <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <string>Pool-wide network associated with eth0</string>
-      <string>Network 0</string>
-     </ArrayOfString>
-    </value>
-   </setting>
-   <setting name="iSCSIConnectRetry" serializeAs="String">
-    <value>5</value>
-   </setting>
-   <setting name="iSCSITransferVM" serializeAs="String">
-    <value>Transfer VM for VDI {0}</value>
-   </setting>
-   <setting name="xenSupportedVersions" serializeAs="String">
-    <value>1.5,1.6,LATEST</value>
-   </setting>
-   <setting name="iSCSITransferVMNetwork" serializeAs="Xml">
-    <value>
-     <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <string>network_config=auto #REQUIRED: MUST BE FIRST Values:  "auto" "manual"</string>
-      <string>network_mode=dhcp #REQUIRED: MUST BE SECOND Values: "dhcp" "manual"</string>
-      <string>network_port=3260 #OPTIONAL: port for config is manual</string>
-      <string>network_mac=00:00:00:00:00:00 #OPTIONAL: set mac address for config is manual</string>
-      <string>network_ip=192.168.2.69 #OPTIONAL: Required if mode is manual</string>
-      <string>network_mask=255.255.255.0 #OPTIONAL: Required if mode is manual</string>
-      <string>network_gateway=192.168.2.1 #OPTIONAL: Required if mode is manual</string>
-     </ArrayOfString>
-    </value>
-   </setting>
-   <setting name="DEFAULT_CULTURE" serializeAs="String">
-    <value>en-us</value>
-   </setting>
-   <setting name="EXCLUDED_FILES_COPY" serializeAs="Xml">
-    <value>
-     <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <string>\PAGEFILE.SYS</string>
-      <string>\HIBERFIL.SYS</string>
-      <string>\SYSTEM VOLUME INFORMATION</string>
-     </ArrayOfString>
-    </value>
-   </setting>
-   <setting name="bzip2ext" serializeAs="String">
-    <value>.bz2</value>
-   </setting>
-   <setting name="iSCSITransferVMMgtNetwork" serializeAs="String">
-    <value>management  #Replace with Network UUID to change iSCSI network utilization.</value>
-   </setting>
-   <setting name="CreateApplianceFolder" serializeAs="String">
-    <value>True</value>
-   </setting>
-   <setting name="ApplianceFolderPath" serializeAs="String">
-    <value />
-   </setting>
-   <setting name="FixupOsMemorySizeAsMB" serializeAs="String">
-    <value>256</value>
-   </setting>
-   <setting name="FixupDurationAsSeconds" serializeAs="String">
-    <value>600</value>
-   </setting>
-   <setting name="FixupPollTimeAsMs" serializeAs="String">
-    <value>1000</value>
-   </setting>
-   <setting name="p2vTemplate" serializeAs="String">
-    <value>[XenServer product] P2V (Orela) Server</value>
-   </setting>
-   <setting name="xenTools" serializeAs="String">
-    <value>[Citrix VM Tools]</value>
-   </setting>
-   <setting name="iSCSITransferVMName" serializeAs="String">
-    <value>[XenServer product] Transfer</value>
-   </setting>
-  </XenOvfTransport.Properties.Settings>
-		<XenTransport.Properties.Settings>
-			<setting name="p2vTemplate" serializeAs="String">
-				<value>[XenServer product] P2V (Orela) Server</value>
-			</setting>
-			<setting name="xenP2VDiskName" serializeAs="String">
-				<value>P2V Automatically created.</value>
-			</setting>
-			<setting name="xenBootOptions" serializeAs="String">
-				<value>BIOS order</value>
-			</setting>
-			<setting name="xenBootParams" serializeAs="String">
-				<value>order=dc;</value>
-			</setting>
-			<setting name="xenPlatformSetting" serializeAs="String">
-				<value>acpi=true;apic=true;pae=true;stdvga=0;</value>
-			</setting>
-			<setting name="xenNetworkUuidKey" serializeAs="String">
-				<value>XenNetwork=</value>
-			</setting>
-			<setting name="xenDefaultNetwork" serializeAs="String">
-				<value>xenbr0</value>
-			</setting>
-		</XenTransport.Properties.Settings>
-	</applicationSettings>
-	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>
-</configuration>

scripts/re-branding.sh

@@ -106,7 +106,6 @@ rebranding_global ${REPO}/XenOvfApi/app.config
 
 #XenOvfTransport XenOvfTransport
 RESX_rebranding ${REPO}/XenOvfTransport/Messages
-rebranding_global ${REPO}/XenOvfTransport/app.config
 
 PRODUCT_GUID=$(uuidgen | tr [a-z] [A-Z] | tr -d [:space:])