number of changes and new features

o2platform · Jul 17, 2012 · ea5e297 · ea5e297
1 parent 7ea1fe8
commit ea5e297
Show file tree

Hide file tree

Showing 22 changed files with 358 additions and 301 deletions.
diff --git a/Misc_Microsoft_MPL_Libs/HtmlAgilityPack/ExtensionMethods/XTypedElement_ExtensionMethods.cs b/Misc_Microsoft_MPL_Libs/HtmlAgilityPack/ExtensionMethods/XTypedElement_ExtensionMethods.cs
@@ -14,19 +14,14 @@ public static XElement xElement(this XTypedElement xTypedElement)
         {
             return (XElement)xTypedElement.prop("Untyped");
         }
-
         public static string xElementName(this XTypedElement xTypedElement)
         {
             return xTypedElement.xElement().Name.str();
-        }
+        }
-
-
-
     }
 
     public static class XTypedElement_ExtensionMethods_TreeView
     {
-
         public static TreeNode add_Node(this TreeView treeView, XElement xElement)
         {
             return treeView.add_Node(xElement.name(), xElement, xElement.hasDataForChildTreeNodes());

diff --git a/Misc_Microsoft_MPL_Libs/O2_Misc_Microsoft_MPL_Libs.csproj b/Misc_Microsoft_MPL_Libs/O2_Misc_Microsoft_MPL_Libs.csproj
@@ -56,9 +56,6 @@
     <Reference Include="Microsoft.Build.Utilities.v3.5">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
-    <Reference Include="O2_FluentSharp_CoreLib, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\FluentSharp.CoreLib.4.0.0.1\lib\net40\O2_FluentSharp_CoreLib.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -425,6 +422,10 @@
       <Project>{DF7E73CB-02AC-4689-BB8C-AC21FFCCDDC5}</Project>
       <Name>O2.FluentSharp.BCL</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\O2.FluentSharp\O2.FluentSharp.CoreLib\O2.FluentSharp.CoreLib.csproj">
+      <Project>{0A7CE0E0-B092-43B5-AB80-99BA909019C9}</Project>
+      <Name>O2.FluentSharp.CoreLib</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Misc_Microsoft_MPL_Libs/Properties/AssemblyInfo.cs b/Misc_Microsoft_MPL_Libs/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
+// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("4.1.0.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/O2.Platform.exe/O2_Platform.csproj b/O2.Platform.exe/O2_Platform.csproj
@@ -147,6 +147,12 @@
       <DefaultIcon>O2Logo.ico</DefaultIcon>
     </FileAssociation>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\O2.FluentSharp\O2.FluentSharp.CoreLib\O2.FluentSharp.CoreLib.csproj">
+      <Project>{0A7CE0E0-B092-43B5-AB80-99BA909019C9}</Project>
+      <Name>O2.FluentSharp.CoreLib</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/O2.Platform.exe/Program.cs b/O2.Platform.exe/Program.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Reflection;
 using System.IO;
-//using O2.Kernel;
+using O2.Kernel;
 
 namespace O2.Platform
 {
@@ -16,11 +16,11 @@ static class Program
         static void Main(string[] args)
         {            
 			//new O2_Setup().startO2(args);
-            //launch.o2Gui(args);
+            launch.o2Gui(args);
-            launch_O2Gui_Via_Emebeded_Assembly(args);
+            //launch_O2Gui_Via_Emebeded_Assembly(args);
         }
 
-        public static void launch_O2Gui_Via_Emebeded_Assembly(string[] args)
+/*        public static void launch_O2Gui_Via_Emebeded_Assembly(string[] args)
         {
             var resourceName = "O2.Platform._Dlls_Embeded.O2_FluentSharp_CoreLib.dll";
             var assemblyStream = Assembly.GetEntryAssembly().GetManifestResourceStream(resourceName);
@@ -29,7 +29,7 @@ public static void launch_O2Gui_Via_Emebeded_Assembly(string[] args)
             var type = assembly.GetType("O2.Kernel.launch");
             var method = type.GetMethod("o2Gui");
             method.Invoke(null, new object[] { args });
-        }                
+        }      */          
 
 
     }

diff --git a/O2.Platform.exe/Properties/AssemblyInfo.cs b/O2.Platform.exe/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
+// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.*")]
+[assembly: AssemblyVersion("4.1.0.*")]
 [assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/O2.Platform.exe/app.config b/O2.Platform.exe/app.config
@@ -8,4 +8,7 @@
     <add key="ClientSettingsProvider.ServiceUri" value=""/>
     <add key="Offline" value="false"/>
   </appSettings>
+  <runtime>
+    <loadFromRemoteSources enabled="true"/>
+  </runtime>
 </configuration>
diff --git a/O2.Platform.exe_3.5_x64/Properties/AssemblyInfo.cs b/O2.Platform.exe_3.5_x64/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
+// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.*")]
+[assembly: AssemblyVersion("4.1.0.*")]
 [assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/O2.Platform.exe_3.5_x86/Properties/AssemblyInfo.cs b/O2.Platform.exe_3.5_x86/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
+// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.*")]
+[assembly: AssemblyVersion("4.1.0.*")]
 [assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/O2.Platform.exe_4.0_x64/Properties/AssemblyInfo.cs b/O2.Platform.exe_4.0_x64/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
+// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.*")]
+[assembly: AssemblyVersion("4.1.0.*")]
 [assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/O2.VisualStudio.AddIn/AssemblyInfo.cs b/O2.VisualStudio.AddIn/AssemblyInfo.cs