From 56fe76e61efdff77a60ba1802994877fbb22aea3 Mon Sep 17 00:00:00 2001 From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498> Date: Sat, 23 Jun 2012 01:58:53 +0000 Subject: [PATCH] --- source/Cosmos.sln | 28 +----- .../Cosmos.Deploy.TrivialFTP.Test/App.xaml | 2 +- .../Cosmos.Deploy.TrivialFTP.Test/App.xaml.cs | 5 +- ...csproj => Cosmos.Deploy.Pixie.Test.csproj} | 4 +- ...=> Cosmos.Deploy.Pixie.Test.csproj.vspscc} | 0 .../MainWindow.xaml | 2 +- .../MainWindow.xaml.cs | 2 +- .../Properties/Resources.Designer.cs | 95 ++++++++++--------- .../Properties/Settings.Designer.cs | 28 +++--- 9 files changed, 71 insertions(+), 95 deletions(-) rename source2/Cosmos.Deploy.TrivialFTP.Test/{Cosmos.Deploy.TrivialFTP.Test.csproj => Cosmos.Deploy.Pixie.Test.csproj} (94%) rename source2/Cosmos.Deploy.TrivialFTP.Test/{Cosmos.Deploy.TrivialFTP.Test.csproj.vspscc => Cosmos.Deploy.Pixie.Test.csproj.vspscc} (100%) diff --git a/source/Cosmos.sln b/source/Cosmos.sln index 74d85abc6..e605af4c7 100644 --- a/source/Cosmos.sln +++ b/source/Cosmos.sln @@ -218,13 +218,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VMWareLib", "..\source2\VMW EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deploy", "Deploy", "{FD42844B-2767-4DF4-B0AF-EA5F7CB11528}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.Pixie", "..\source2\Cosmos.Deploy.TrivialFTP\Cosmos.Deploy.Pixie.csproj", "{287A4DA7-9A8B-4F64-913F-1828DA67F16A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.TrivialFTP.Test", "..\source2\Cosmos.Deploy.TrivialFTP.Test\Cosmos.Deploy.TrivialFTP.Test.csproj", "{95C06A4F-8AF9-43E6-BB0E-6EC79C67DC28}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.Pixie.Test", "..\source2\Cosmos.Deploy.TrivialFTP.Test\Cosmos.Deploy.Pixie.Test.csproj", "{95C06A4F-8AF9-43E6-BB0E-6EC79C67DC28}" EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 61 + SccNumberOfProjects = 60 SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} SccTeamFoundationServer = https://tfs.codeplex.com/tfs/tfs04 SccLocalPath0 = . @@ -462,14 +460,10 @@ Global SccProjectTopLevelParentUniqueName58 = Cosmos.sln SccProjectName58 = ../source2/VMWareLib SccLocalPath58 = ..\\source2\\VMWareLib - SccProjectUniqueName59 = ..\\source2\\Cosmos.Deploy.TrivialFTP.Test\\Cosmos.Deploy.TrivialFTP.Test.csproj + SccProjectUniqueName59 = ..\\source2\\Cosmos.Deploy.TrivialFTP.Test\\Cosmos.Deploy.Pixie.Test.csproj SccProjectTopLevelParentUniqueName59 = Cosmos.sln SccProjectName59 = ../source2/Cosmos.Deploy.TrivialFTP.Test SccLocalPath59 = ..\\source2\\Cosmos.Deploy.TrivialFTP.Test - SccProjectUniqueName60 = ..\\source2\\Cosmos.Deploy.TrivialFTP\\Cosmos.Deploy.Pixie.csproj - SccProjectTopLevelParentUniqueName60 = Cosmos.sln - SccProjectName60 = ../source2/Cosmos.Deploy.TrivialFTP - SccLocalPath60 = ..\\source2\\Cosmos.Deploy.TrivialFTP EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Builder|Any CPU = Builder|Any CPU @@ -1421,21 +1415,6 @@ Global {76CDB55D-55E3-4B53-AE33-12EC31430826}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {76CDB55D-55E3-4B53-AE33-12EC31430826}.Release|Mixed Platforms.Build.0 = Release|Any CPU {76CDB55D-55E3-4B53-AE33-12EC31430826}.Release|x86.ActiveCfg = Release|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Builder|Any CPU.ActiveCfg = Release|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Builder|Any CPU.Build.0 = Release|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Builder|Mixed Platforms.ActiveCfg = Release|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Builder|Mixed Platforms.Build.0 = Release|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Builder|x86.ActiveCfg = Release|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Debug|x86.ActiveCfg = Debug|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Release|Any CPU.Build.0 = Release|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {287A4DA7-9A8B-4F64-913F-1828DA67F16A}.Release|x86.ActiveCfg = Release|Any CPU {95C06A4F-8AF9-43E6-BB0E-6EC79C67DC28}.Builder|Any CPU.ActiveCfg = Release|x86 {95C06A4F-8AF9-43E6-BB0E-6EC79C67DC28}.Builder|Mixed Platforms.ActiveCfg = Release|x86 {95C06A4F-8AF9-43E6-BB0E-6EC79C67DC28}.Builder|Mixed Platforms.Build.0 = Release|x86 @@ -1535,7 +1514,6 @@ Global {D048E0B1-8B2B-4A99-8376-7FC8A0656A05} = {9588D51E-243F-4ABA-AED2-A77DA0634209} {6C14B7D1-CACB-4049-A0BD-9CAC5CFCF2C2} = {CD291145-6AD0-41CD-9986-2044F41660DE} {86F88A09-6801-4474-BFC8-EF09F3A9B89D} = {CD291145-6AD0-41CD-9986-2044F41660DE} - {287A4DA7-9A8B-4F64-913F-1828DA67F16A} = {FD42844B-2767-4DF4-B0AF-EA5F7CB11528} {95C06A4F-8AF9-43E6-BB0E-6EC79C67DC28} = {FD42844B-2767-4DF4-B0AF-EA5F7CB11528} EndGlobalSection EndGlobal diff --git a/source2/Cosmos.Deploy.TrivialFTP.Test/App.xaml b/source2/Cosmos.Deploy.TrivialFTP.Test/App.xaml index ccbf890f3..9fc4e27de 100644 --- a/source2/Cosmos.Deploy.TrivialFTP.Test/App.xaml +++ b/source2/Cosmos.Deploy.TrivialFTP.Test/App.xaml @@ -1,4 +1,4 @@ - diff --git a/source2/Cosmos.Deploy.TrivialFTP.Test/App.xaml.cs b/source2/Cosmos.Deploy.TrivialFTP.Test/App.xaml.cs index 6e82a09e5..3928a4491 100644 --- a/source2/Cosmos.Deploy.TrivialFTP.Test/App.xaml.cs +++ b/source2/Cosmos.Deploy.TrivialFTP.Test/App.xaml.cs @@ -5,10 +5,7 @@ using System.Data; using System.Linq; using System.Windows; -namespace Cosmos.Deploy.TrivialFTP.Test { - /// - /// Interaction logic for App.xaml - /// +namespace Cosmos.Deploy.Pixie.Test { public partial class App : Application { } } diff --git a/source2/Cosmos.Deploy.TrivialFTP.Test/Cosmos.Deploy.TrivialFTP.Test.csproj b/source2/Cosmos.Deploy.TrivialFTP.Test/Cosmos.Deploy.Pixie.Test.csproj similarity index 94% rename from source2/Cosmos.Deploy.TrivialFTP.Test/Cosmos.Deploy.TrivialFTP.Test.csproj rename to source2/Cosmos.Deploy.TrivialFTP.Test/Cosmos.Deploy.Pixie.Test.csproj index 7b29a4194..2941b8cab 100644 --- a/source2/Cosmos.Deploy.TrivialFTP.Test/Cosmos.Deploy.TrivialFTP.Test.csproj +++ b/source2/Cosmos.Deploy.TrivialFTP.Test/Cosmos.Deploy.Pixie.Test.csproj @@ -8,8 +8,8 @@ {95C06A4F-8AF9-43E6-BB0E-6EC79C67DC28} WinExe Properties - Cosmos.Deploy.TrivialFTP.Test - Cosmos.Deploy.TrivialFTP.Test + Cosmos.Deploy.Pixie.Test + Cosmos.Deploy.Pixie.Test v4.0 Client 512 diff --git a/source2/Cosmos.Deploy.TrivialFTP.Test/Cosmos.Deploy.TrivialFTP.Test.csproj.vspscc b/source2/Cosmos.Deploy.TrivialFTP.Test/Cosmos.Deploy.Pixie.Test.csproj.vspscc similarity index 100% rename from source2/Cosmos.Deploy.TrivialFTP.Test/Cosmos.Deploy.TrivialFTP.Test.csproj.vspscc rename to source2/Cosmos.Deploy.TrivialFTP.Test/Cosmos.Deploy.Pixie.Test.csproj.vspscc diff --git a/source2/Cosmos.Deploy.TrivialFTP.Test/MainWindow.xaml b/source2/Cosmos.Deploy.TrivialFTP.Test/MainWindow.xaml index 1c2c34c89..e1c0a0c76 100644 --- a/source2/Cosmos.Deploy.TrivialFTP.Test/MainWindow.xaml +++ b/source2/Cosmos.Deploy.TrivialFTP.Test/MainWindow.xaml @@ -1,4 +1,4 @@ - diff --git a/source2/Cosmos.Deploy.TrivialFTP.Test/MainWindow.xaml.cs b/source2/Cosmos.Deploy.TrivialFTP.Test/MainWindow.xaml.cs index 74b07c074..f02f96578 100644 --- a/source2/Cosmos.Deploy.TrivialFTP.Test/MainWindow.xaml.cs +++ b/source2/Cosmos.Deploy.TrivialFTP.Test/MainWindow.xaml.cs @@ -12,7 +12,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace Cosmos.Deploy.TrivialFTP.Test { +namespace Cosmos.Deploy.Pixie.Test { /// /// Interaction logic for MainWindow.xaml /// diff --git a/source2/Cosmos.Deploy.TrivialFTP.Test/Properties/Resources.Designer.cs b/source2/Cosmos.Deploy.TrivialFTP.Test/Properties/Resources.Designer.cs index 179211cbd..059ef9e4e 100644 --- a/source2/Cosmos.Deploy.TrivialFTP.Test/Properties/Resources.Designer.cs +++ b/source2/Cosmos.Deploy.TrivialFTP.Test/Properties/Resources.Designer.cs @@ -8,55 +8,56 @@ // //------------------------------------------------------------------------------ -namespace Cosmos.Deploy.TrivialFTP.Test.Properties { - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - +namespace Cosmos.Deploy.Pixie.Test.Properties { + using System; + + /// - /// Returns the cached ResourceManager instance used by this class. + /// A strongly-typed resource class, for looking up localized strings, etc. /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if ((resourceMan == null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Cosmos.Deploy.TrivialFTP.Test.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Cosmos.Deploy.Pixie.Test.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } } - return resourceMan; - } } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - } } diff --git a/source2/Cosmos.Deploy.TrivialFTP.Test/Properties/Settings.Designer.cs b/source2/Cosmos.Deploy.TrivialFTP.Test/Properties/Settings.Designer.cs index c1ad7bab5..8497f4194 100644 --- a/source2/Cosmos.Deploy.TrivialFTP.Test/Properties/Settings.Designer.cs +++ b/source2/Cosmos.Deploy.TrivialFTP.Test/Properties/Settings.Designer.cs @@ -8,19 +8,19 @@ // //------------------------------------------------------------------------------ -namespace Cosmos.Deploy.TrivialFTP.Test.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.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; - } +namespace Cosmos.Deploy.Pixie.Test.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.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; + } + } } - } }