Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

number of changes and new features

  • Loading branch information...
commit ea5e297e7e43e8b1c99dca34d5212fe6c1502f15 1 parent 7ea1fe8
@DinisCruz DinisCruz authored
Showing with 358 additions and 301 deletions.
  1. +1 −6 Misc_Microsoft_MPL_Libs/HtmlAgilityPack/ExtensionMethods/XTypedElement_ExtensionMethods.cs
  2. +4 −3 Misc_Microsoft_MPL_Libs/O2_Misc_Microsoft_MPL_Libs.csproj
  3. +2 −2 Misc_Microsoft_MPL_Libs/Properties/AssemblyInfo.cs
  4. +6 −0 O2.Platform.exe/O2_Platform.csproj
  5. +5 −5 O2.Platform.exe/Program.cs
  6. +2 −2 O2.Platform.exe/Properties/AssemblyInfo.cs
  7. +3 −0  O2.Platform.exe/app.config
  8. +2 −2 O2.Platform.exe_3.5_x64/Properties/AssemblyInfo.cs
  9. +2 −2 O2.Platform.exe_3.5_x86/Properties/AssemblyInfo.cs
  10. +2 −2 O2.Platform.exe_4.0_x64/Properties/AssemblyInfo.cs
  11. BIN  O2.VisualStudio.AddIn/AssemblyInfo.cs
  12. +150 −150 O2.VisualStudio.AddIn/O2.VisualStudio.AddIn.csproj
  13. +27 −59 O2_External_IE/ExtensionMethods/IE_Controls_ExtensionMethods.cs
  14. +0 −5 O2_External_IE/O2_External_IE.csproj
  15. +38 −0 O2_External_IE/O2_External_IE.sln
  16. +2 −2 O2_External_IE/Properties/AssemblyInfo.cs
  17. +3 −1 O2_External_SharpDevelop/Properties/AssemblyInfo.cs
  18. +14 −3 ...arpDevelop/_O2SharpDevelop/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs
  19. +82 −55 ...rpDevelop/_O2SharpDevelop/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/ProjectContentRegistry.cs
  20. +0 −1  O2_External_WinFormsUI/O2_External_WinFormsUI.csproj
  21. +1 −1  O2_External_WinFormsUI/Properties/AssemblyInfo.cs
  22. +12 −0 VisualStudio Solution Files/O2.Platform.4.0 - All Projects.sln
View
7 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());
View
7 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.
View
4 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.0.0")]
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("4.1.0.*")]
[assembly: AssemblyFileVersion("1.0.0.0")]
View
6 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.
View
10 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_Via_Emebeded_Assembly(args);
+ launch.o2Gui(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 });
- }
+ } */
}
View
4 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.2.*")]
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("4.1.0.*")]
[assembly: AssemblyFileVersion("1.2.0.0")]
View
3  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>
View
4 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.2.*")]
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("4.1.0.*")]
[assembly: AssemblyFileVersion("1.2.0.0")]
View
4 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.2.*")]
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("4.1.0.*")]
[assembly: AssemblyFileVersion("1.2.0.0")]
View
4 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.2.*")]
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("4.1.0.*")]
[assembly: AssemblyFileVersion("1.2.0.0")]
View
BIN  O2.VisualStudio.AddIn/AssemblyInfo.cs
Binary file not shown
View
300 O2.VisualStudio.AddIn/O2.VisualStudio.AddIn.csproj
@@ -1,151 +1,151 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.30424</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{B7428492-91D8-4B25-936C-7EA58DB0F01B}</ProjectGuid>
- <OutputType>Library</OutputType>
- <StartupObject>
- </StartupObject>
- <NoStandardLibraries>false</NoStandardLibraries>
- <AssemblyName>O2.VisualStudio</AssemblyName>
- <DeploymentDirectory>.\bin\</DeploymentDirectory>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <Optimize>false</Optimize>
- <OutputPath>..\binaries\</OutputPath>
- <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <WarningLevel>3</WarningLevel>
- <IncrementalBuild>false</IncrementalBuild>
- <DocumentationFile>
- </DocumentationFile>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugSymbols>false</DebugSymbols>
- <Optimize>true</Optimize>
- <OutputPath>.\bin\Release\</OutputPath>
- <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
- <DefineConstants>TRACE</DefineConstants>
- <WarningLevel>4</WarningLevel>
- <IncrementalBuild>false</IncrementalBuild>
- <DocumentationFile>O2_Platform_VisualStudio_AddIn.xml</DocumentationFile>
- </PropertyGroup>
- <PropertyGroup>
- <RootNamespace>O2.VisualStudio</RootNamespace>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <EmbedInteropTypes>False</EmbedInteropTypes>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Data" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="AssemblyInfo.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Connect.cs">
- <SubType>Code</SubType>
- </Compile>
- </ItemGroup>
- <ItemGroup>
- <COMReference Include="EnvDTE">
- <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
- <VersionMajor>8</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>primary</WrapperTool>
- <Isolated>False</Isolated>
- <EmbedInteropTypes>False</EmbedInteropTypes>
- </COMReference>
- <COMReference Include="EnvDTE100">
- <Guid>{26AD1324-4B7C-44BC-84F8-B86AED45729F}</Guid>
- <VersionMajor>10</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>primary</WrapperTool>
- <Isolated>False</Isolated>
- <EmbedInteropTypes>False</EmbedInteropTypes>
- </COMReference>
- <COMReference Include="EnvDTE80">
- <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
- <VersionMajor>8</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>primary</WrapperTool>
- <Isolated>False</Isolated>
- <EmbedInteropTypes>False</EmbedInteropTypes>
- </COMReference>
- <COMReference Include="EnvDTE90">
- <Guid>{2CE2370E-D744-4936-A090-3FFFE667B0E1}</Guid>
- <VersionMajor>9</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>primary</WrapperTool>
- <Isolated>False</Isolated>
- <EmbedInteropTypes>False</EmbedInteropTypes>
- </COMReference>
- <COMReference Include="Microsoft.VisualStudio.CommandBars">
- <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid>
- <VersionMajor>8</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>primary</WrapperTool>
- <Isolated>False</Isolated>
- <EmbedInteropTypes>False</EmbedInteropTypes>
- </COMReference>
- <COMReference Include="stdole">
- <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
- <VersionMajor>2</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>primary</WrapperTool>
- <Isolated>False</Isolated>
- <EmbedInteropTypes>False</EmbedInteropTypes>
- </COMReference>
- </ItemGroup>
- <ItemGroup>
- <Content Include="O2_Platform_VisualStudio_AddIn.AddIn">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
- <ItemGroup />
- <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
- <PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
- <ProjectExtensions />
- <Target Name="AfterBuild">
- <PropertyGroup>
- <DllName>$(AssemblyName).dll</DllName>
- <PdbName>$(AssemblyName).pdb</PdbName>
- <DocFileName>$(AssemblyName).xml</DocFileName>
- </PropertyGroup>
- <Delete Condition="Exists('$(DeploymentDirectory)$(DllName)')" Files="$(DeploymentDirectory)$(DllName)">
- </Delete>
- <Delete Condition="Exists('$(DeploymentDirectory)$(PdbName)')" Files="$(DeploymentDirectory)$(PdbName)">
- </Delete>
- <Delete Condition="Exists('$(DeploymentDirectory)$(DocFileName)')" Files="$(DeploymentDirectory)$(DocFileName)">
- </Delete>
- <Copy Condition="Exists('$(OutputPath)$(DllName)')" SourceFiles="$(OutputPath)$(DllName)" DestinationFolder="$(DeploymentDirectory)">
- <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
- </Copy>
- <Copy Condition="Exists('$(OutputPath)$(PdbName)')" SourceFiles="$(OutputPath)$(PdbName)" DestinationFolder="$(DeploymentDirectory)">
- <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
- </Copy>
- <Copy Condition="Exists('$(OutputPath)$(DocFileName)')" SourceFiles="$(OutputPath)$(DocFileName)" DestinationFolder="$(DeploymentDirectory)">
- <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
- </Copy>
- </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.30424</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{B7428492-91D8-4B25-936C-7EA58DB0F01B}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <StartupObject>
+ </StartupObject>
+ <NoStandardLibraries>false</NoStandardLibraries>
+ <AssemblyName>O2.VisualStudio</AssemblyName>
+ <DeploymentDirectory>.\bin\</DeploymentDirectory>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <Optimize>false</Optimize>
+ <OutputPath>..\binaries\</OutputPath>
+ <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <WarningLevel>3</WarningLevel>
+ <IncrementalBuild>false</IncrementalBuild>
+ <DocumentationFile>
+ </DocumentationFile>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugSymbols>false</DebugSymbols>
+ <Optimize>true</Optimize>
+ <OutputPath>.\bin\Release\</OutputPath>
+ <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+ <DefineConstants>TRACE</DefineConstants>
+ <WarningLevel>4</WarningLevel>
+ <IncrementalBuild>false</IncrementalBuild>
+ <DocumentationFile>O2_Platform_VisualStudio_AddIn.xml</DocumentationFile>
+ </PropertyGroup>
+ <PropertyGroup>
+ <RootNamespace>O2.VisualStudio</RootNamespace>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml" />
+ <Reference Include="Microsoft.CSharp" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Connect.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <COMReference Include="EnvDTE">
+ <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
+ <VersionMajor>8</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>primary</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </COMReference>
+ <COMReference Include="EnvDTE100">
+ <Guid>{26AD1324-4B7C-44BC-84F8-B86AED45729F}</Guid>
+ <VersionMajor>10</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>primary</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </COMReference>
+ <COMReference Include="EnvDTE80">
+ <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
+ <VersionMajor>8</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>primary</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </COMReference>
+ <COMReference Include="EnvDTE90">
+ <Guid>{2CE2370E-D744-4936-A090-3FFFE667B0E1}</Guid>
+ <VersionMajor>9</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>primary</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </COMReference>
+ <COMReference Include="Microsoft.VisualStudio.CommandBars">
+ <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid>
+ <VersionMajor>8</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>primary</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </COMReference>
+ <COMReference Include="stdole">
+ <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
+ <VersionMajor>2</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>primary</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </COMReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="O2_Platform_VisualStudio_AddIn.AddIn">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
+ <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+ <ProjectExtensions />
+ <Target Name="AfterBuild">
+ <PropertyGroup>
+ <DllName>$(AssemblyName).dll</DllName>
+ <PdbName>$(AssemblyName).pdb</PdbName>
+ <DocFileName>$(AssemblyName).xml</DocFileName>
+ </PropertyGroup>
+ <Delete Condition="Exists('$(DeploymentDirectory)$(DllName)')" Files="$(DeploymentDirectory)$(DllName)">
+ </Delete>
+ <Delete Condition="Exists('$(DeploymentDirectory)$(PdbName)')" Files="$(DeploymentDirectory)$(PdbName)">
+ </Delete>
+ <Delete Condition="Exists('$(DeploymentDirectory)$(DocFileName)')" Files="$(DeploymentDirectory)$(DocFileName)">
+ </Delete>
+ <Copy Condition="Exists('$(OutputPath)$(DllName)')" SourceFiles="$(OutputPath)$(DllName)" DestinationFolder="$(DeploymentDirectory)">
+ <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+ </Copy>
+ <Copy Condition="Exists('$(OutputPath)$(PdbName)')" SourceFiles="$(OutputPath)$(PdbName)" DestinationFolder="$(DeploymentDirectory)">
+ <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+ </Copy>
+ <Copy Condition="Exists('$(OutputPath)$(DocFileName)')" SourceFiles="$(OutputPath)$(DocFileName)" DestinationFolder="$(DeploymentDirectory)">
+ <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+ </Copy>
+ </Target>
</Project>
View
86 O2_External_IE/ExtensionMethods/IE_Controls_ExtensionMethods.cs
@@ -12,14 +12,14 @@ namespace O2.External.IE.ExtensionMethods
{
public static class IE_Controls_ExtensionMethods
{
- public static O2BrowserIE add_Browser(this Control control)
+ /*public static O2BrowserIE add_Browser(this Control control)
{
//var browserType = "O2_External_IE.dll".type("O2BrowserIE");
- //return hostControl.add_Control(browserType);
- return (O2BrowserIE)control.add_WebBrowser();
- }
-
- public static IO2Browser add_WebBrowser(this Control control)
+ //return hostControl.add_Control(browserType);
+ return (O2BrowserIE)control.add_O2_Browser_IE();
+ }*/
+
+ public static IO2Browser add_O2_Browser_IE(this Control control)
{
return (IO2Browser) control.invokeOnThread(
() =>
@@ -28,8 +28,7 @@ public static IO2Browser add_WebBrowser(this Control control)
control.Controls.Add(o2BrowserIE);
return o2BrowserIE;
});
- }
-
+ }
public static IO2Browser add_WebBrowserWithLocationBar(this Control control)
{
return control.add_WebBrowserWithLocationBar("");
@@ -65,8 +64,8 @@ public static IO2Browser add_WebBrowserWithLocationBar(this Control control, str
control.Controls.Add(splitControl);
var textBox = splitControl.Panel1.add_TextBox();
//textBox.Multiline = false;
- textBox.Dock = DockStyle.Fill;
- var webBrowser = splitControl.Panel2.add_WebBrowser();
+ textBox.Dock = DockStyle.Fill;
+ var webBrowser = splitControl.Panel2.add_O2_Browser_IE();
webBrowser.onDocumentCompleted +=
htmlPage => textBox.set_Text(htmlPage.PageUri.ToString());
@@ -188,16 +187,6 @@ public static bool contains(this O2BrowserIE o2BrowserIE, List<string> stringsTo
return false;
}
- public static O2BrowserIE silent(this O2BrowserIE o2BrowserIE, bool value)
- {
- return (O2BrowserIE)o2BrowserIE.invokeOnThread(
- () =>
- {
- o2BrowserIE.ActiveXInstance.prop("Silent", value);
- return o2BrowserIE;
- });
- }
-
public static ExtendedWebBrowser.IWebBrowser2 activeX(this O2BrowserIE o2BrowserIE)
{
return (ExtendedWebBrowser.IWebBrowser2)o2BrowserIE.ActiveXInstance;
@@ -207,46 +196,25 @@ public static O2BrowserIE openBlank(this O2BrowserIE o2BrowserIE)
{
o2BrowserIE.openSync("about:blank");
return o2BrowserIE;
- }
-
- public static string cookie(this O2BrowserIE o2BrowserIE)
- {
- return (string)o2BrowserIE.invokeOnThread(() => o2BrowserIE.document().Cookie);
- }
-
- public static O2BrowserIE cookie(this O2BrowserIE o2BrowserIE, string value)
- {
- return (O2BrowserIE)o2BrowserIE.invokeOnThread(
- () =>
- {
- var document = o2BrowserIE.document();
- if (document != null)
- document.Cookie = value;
- return o2BrowserIE;
- });
- }
-
- public static O2BrowserIE clearCookie(this O2BrowserIE o2BrowserIE)
- {
- return o2BrowserIE.cookie("");
- }
+ }
+
+ public static void logBeforeNavigate(this O2BrowserIE o2BrowserIE)
+ {
+ o2BrowserIE.BeforeNavigate +=
+ (URL, flags, postData, headers)
+ =>
+ {
+ "on before Navigate for {0}".format(URL).debug();
+ if (postData != null)
+ {
+ "post flags: {0}".format(flags).info();
+ "post headers: {0}".format(headers).info();
+ "post url: {0}".format(URL).info();
+ "post data: {0}".format(((byte[])postData).ascii()).info();
+ }
+ };
+ }
- public static void logBeforeNavigate(this O2BrowserIE o2BrowserIE)
- {
- o2BrowserIE.BeforeNavigate +=
- (URL, flags, postData, headers)
- =>
- {
- "on before Navigate for {0}".format(URL).debug();
- if (postData != null)
- {
- "post flags: {0}".format(flags).info();
- "post headers: {0}".format(headers).info();
- "post url: {0}".format(URL).info();
- "post data: {0}".format(((byte[])postData).ascii()).info();
- }
- };
- }
public static IO2HtmlPage open(this Uri uri)
{
View
5 O2_External_IE/O2_External_IE.csproj
@@ -111,11 +111,6 @@
<Project>{D742BBEF-BFDC-477F-9880-5E0E2C89B6B2}</Project>
<Name>O2.FluentSharp.REPL</Name>
</ProjectReference>
- <ProjectReference Include="..\O2_External_SharpDevelop\O2_External_SharpDevelop.csproj">
- <Project>{E76BCE43-8511-4CE8-A965-C0150F713CE9}</Project>
- <Name>O2_External_SharpDevelop</Name>
- <Private>False</Private>
- </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.
View
38 O2_External_IE/O2_External_IE.sln
@@ -0,0 +1,38 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2_External_IE", "O2_External_IE.csproj", "{F6942664-5E64-4182-B3EB-11F481F461FB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2.FluentSharp.BCL", "..\..\O2.FluentSharp\O2.FluentSharp.BCL\O2.FluentSharp.BCL.csproj", "{DF7E73CB-02AC-4689-BB8C-AC21FFCCDDC5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2.FluentSharp.REPL", "..\..\O2.FluentSharp\O2.FluentSharp.REPL\O2.FluentSharp.REPL.csproj", "{D742BBEF-BFDC-477F-9880-5E0E2C89B6B2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2.FluentSharp.CoreLib", "..\..\O2.FluentSharp\O2.FluentSharp.CoreLib\O2.FluentSharp.CoreLib.csproj", "{0A7CE0E0-B092-43B5-AB80-99BA909019C9}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {F6942664-5E64-4182-B3EB-11F481F461FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F6942664-5E64-4182-B3EB-11F481F461FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F6942664-5E64-4182-B3EB-11F481F461FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F6942664-5E64-4182-B3EB-11F481F461FB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DF7E73CB-02AC-4689-BB8C-AC21FFCCDDC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DF7E73CB-02AC-4689-BB8C-AC21FFCCDDC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DF7E73CB-02AC-4689-BB8C-AC21FFCCDDC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DF7E73CB-02AC-4689-BB8C-AC21FFCCDDC5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D742BBEF-BFDC-477F-9880-5E0E2C89B6B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D742BBEF-BFDC-477F-9880-5E0E2C89B6B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D742BBEF-BFDC-477F-9880-5E0E2C89B6B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D742BBEF-BFDC-477F-9880-5E0E2C89B6B2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0A7CE0E0-B092-43B5-AB80-99BA909019C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0A7CE0E0-B092-43B5-AB80-99BA909019C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0A7CE0E0-B092-43B5-AB80-99BA909019C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0A7CE0E0-B092-43B5-AB80-99BA909019C9}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
View
4 O2_External_IE/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.0.0")]
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("4.1.0.*")]
[assembly: AssemblyFileVersion("1.0.0.0")]
View
4 O2_External_SharpDevelop/Properties/AssemblyInfo.cs
@@ -36,4 +36,6 @@
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
-*/
+*/
+using System.Reflection;
+[assembly: AssemblyVersionAttribute("4.1.0.*")]
View
17 ...pDevelop/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs
@@ -843,8 +843,10 @@ public SearchTypeResult SearchType(SearchTypeRequest request)
}
}
}
- }
-
+ }
+
+ var maxLoop = 50; //DC: see details below (hack to try to prevent an infinit loop here);
+
for (IUsingScope usingScope = request.CurrentUsingScope; usingScope != null; usingScope = usingScope.Parent) {
string fullname;
if (string.IsNullOrEmpty(usingScope.NamespaceName)) {
@@ -881,7 +883,16 @@ public SearchTypeResult SearchType(SearchTypeRequest request)
return result;
}
}
- }
+ }
+
+ if (usingScope == usingScope.Parent) //DC: 7/13/2012 - there seemed to be an infinit loop here on Method Stream creation
+ {
+ if (maxLoop-- < 1)
+ break;
+ }
+ else
+ {
+ }
}
if (defaultImports != null) {
View
137 ...Develop/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/ProjectContentRegistry.cs
@@ -227,62 +227,89 @@ protected virtual IProjectContent LoadProjectContent(string itemInclude, string
int pos = shortName.IndexOf(',');
if (pos > 0)
shortName = shortName.Substring(0, pos);
-
-
- Assembly assembly = File.Exists(shortName)
- ? Assembly.LoadFrom(shortName)
- : GetDefaultAssembly(shortName);
- ReflectionProjectContent pc = null;
- if (assembly != null) {
- if (persistence != null) {
- pc = persistence.LoadProjectContentByAssemblyName(assembly.FullName);
- }
- if (pc == null) {
- pc = new ReflectionProjectContent(assembly, this);
- if (persistence != null) {
- persistence.SaveProjectContent(pc);
- }
- }
- } else {
- // find real file name for cecil:
- if (File.Exists(itemFileName)) {
- if (persistence != null) {
- pc = persistence.LoadProjectContentByAssemblyName(itemFileName);
- }
- if (pc == null) {
- pc = CecilReader.LoadAssembly(itemFileName, this);
-
- if (persistence != null) {
- persistence.SaveProjectContent(pc);
- }
- }
- } else {
- DomAssemblyName asmName = GacInterop.FindBestMatchingAssemblyName(itemInclude);
- if (persistence != null && asmName != null) {
- //LoggingService.Debug("Looking up in DOM cache: " + asmName.FullName);
- pc = persistence.LoadProjectContentByAssemblyName(asmName.FullName);
- }
- if (pc == null && asmName != null) {
- string subPath = Path.Combine(asmName.ShortName, GetVersion__Token(asmName));
- subPath = Path.Combine(subPath, asmName.ShortName + ".dll");
- foreach (string dir in Directory.GetDirectories(GacInterop.GacRootPath, "GAC*")) {
- itemFileName = Path.Combine(dir, subPath);
- if (File.Exists(itemFileName)) {
- pc = CecilReader.LoadAssembly(itemFileName, this);
- if (persistence != null) {
- persistence.SaveProjectContent(pc);
- }
- break;
- }
- }
- }
- if (pc == null) {
- HostCallback.ShowAssemblyLoadErrorInternal(itemFileName, itemInclude, "Could not find assembly file.");
- }
- }
- }
- return pc;
+
+// var a = O2.DotNetWrappers.ExtensionMethods.Reflection_ExtensionMethods_Assemby.assembly(shortName);
+ try
+ {
+ Assembly assembly = File.Exists(shortName)
+ ? Assembly.LoadFrom(shortName)
+ : GetDefaultAssembly(shortName);
+ ReflectionProjectContent pc = null;
+ if (assembly != null)
+ {
+ if (persistence != null)
+ {
+ pc = persistence.LoadProjectContentByAssemblyName(assembly.FullName);
+ }
+ if (pc == null)
+ {
+ pc = new ReflectionProjectContent(assembly, this);
+ if (persistence != null)
+ {
+ persistence.SaveProjectContent(pc);
+ }
+ }
+ }
+ else
+ {
+ // find real file name for cecil:
+ if (File.Exists(itemFileName))
+ {
+ if (persistence != null)
+ {
+ pc = persistence.LoadProjectContentByAssemblyName(itemFileName);
+ }
+ if (pc == null)
+ {
+ pc = CecilReader.LoadAssembly(itemFileName, this);
+
+ if (persistence != null)
+ {
+ persistence.SaveProjectContent(pc);
+ }
+ }
+ }
+ else
+ {
+ DomAssemblyName asmName = GacInterop.FindBestMatchingAssemblyName(itemInclude);
+ if (persistence != null && asmName != null)
+ {
+ //LoggingService.Debug("Looking up in DOM cache: " + asmName.FullName);
+ pc = persistence.LoadProjectContentByAssemblyName(asmName.FullName);
+ }
+ if (pc == null && asmName != null)
+ {
+ string subPath = Path.Combine(asmName.ShortName, GetVersion__Token(asmName));
+ subPath = Path.Combine(subPath, asmName.ShortName + ".dll");
+ foreach (string dir in Directory.GetDirectories(GacInterop.GacRootPath, "GAC*"))
+ {
+ itemFileName = Path.Combine(dir, subPath);
+ if (File.Exists(itemFileName))
+ {
+ pc = CecilReader.LoadAssembly(itemFileName, this);
+ if (persistence != null)
+ {
+ persistence.SaveProjectContent(pc);
+ }
+ break;
+ }
+ }
+ }
+ if (pc == null)
+ {
+ HostCallback.ShowAssemblyLoadErrorInternal(itemFileName, itemInclude, "Could not find assembly file.");
+ }
+ }
+ }
+ return pc;
+ }
+ catch (Exception ex)
+ {
+ O2.Kernel.PublicDI.log.ex(ex);
+
+ return null;
+ }
}
static string GetVersion__Token(DomAssemblyName asmName)
View
1  O2_External_WinFormsUI/O2_External_WinFormsUI.csproj
@@ -57,7 +57,6 @@
<Reference Include="System.Xml" />
<Reference Include="WeifenLuo.WinFormsUI.Docking">
<HintPath>_External_Dlls\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
- <Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
View
2  O2_External_WinFormsUI/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("4.1.0.*")]
[assembly: AssemblyFileVersion("1.0.0.0")]
View
12 VisualStudio Solution Files/O2.Platform.4.0 - All Projects.sln
@@ -22,6 +22,18 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2.FluentSharp.Roslyn", "..\..\O2.FluentSharp\O2.FluentSharp.Roslyn\O2.FluentSharp.Roslyn.csproj", "{1D5E7298-537E-409B-8059-2040CA60B55A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2_Platform", "..\O2.Platform.exe\O2_Platform.csproj", "{83957D55-86AB-4C26-9F82-6182999F09E8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {E76BCE43-8511-4CE8-A965-C0150F713CE9} = {E76BCE43-8511-4CE8-A965-C0150F713CE9}
+ {F6942664-5E64-4182-B3EB-11F481F461FB} = {F6942664-5E64-4182-B3EB-11F481F461FB}
+ {EED5F98D-00BA-4D9B-A9E7-A7794AD50132} = {EED5F98D-00BA-4D9B-A9E7-A7794AD50132}
+ {B7428492-91D8-4B25-936C-7EA58DB0F01B} = {B7428492-91D8-4B25-936C-7EA58DB0F01B}
+ {1D5E7298-537E-409B-8059-2040CA60B55A} = {1D5E7298-537E-409B-8059-2040CA60B55A}
+ {BB1489A2-57AB-4A8D-A4DA-7C7E444512B8} = {BB1489A2-57AB-4A8D-A4DA-7C7E444512B8}
+ {B1AAFDA3-2A9F-4BBD-9A08-F0890BA886C1} = {B1AAFDA3-2A9F-4BBD-9A08-F0890BA886C1}
+ {DF7E73CB-02AC-4689-BB8C-AC21FFCCDDC5} = {DF7E73CB-02AC-4689-BB8C-AC21FFCCDDC5}
+ {0A7CE0E0-B092-43B5-AB80-99BA909019C9} = {0A7CE0E0-B092-43B5-AB80-99BA909019C9}
+ {D742BBEF-BFDC-477F-9880-5E0E2C89B6B2} = {D742BBEF-BFDC-477F-9880-5E0E2C89B6B2}
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2_Platform_3.5_x86", "..\O2.Platform.exe_3.5_x86\O2_Platform_3.5_x86.csproj", "{FA9C85CC-70A7-4F0B-9816-16AC0128BFED}"
EndProject
Please sign in to comment.
Something went wrong with that request. Please try again.