Permalink
Browse files

Fixes to O2_Misc_Microsoft_MPL_Libs

removed 3.5 O2Platform projects
  • Loading branch information...
1 parent ed504f5 commit a501a25cd06e6fded8c8bdbbf350e252e7547033 @DinisCruz DinisCruz committed Jul 23, 2013
Showing with 187 additions and 682 deletions.
  1. +2 −1 .gitignore
  2. +1 −2 Misc_Microsoft_MPL_Libs/HtmlAgilityPack/ExtensionMethods/HtmlAgilityPack_ExtensionMethods.cs
  3. +1 −1 Misc_Microsoft_MPL_Libs/HtmlAgilityPack/ExtensionMethods/XTypedElement_ExtensionMethods.cs
  4. +0 −1 Misc_Microsoft_MPL_Libs/HtmlAgilityPack/HtmlNode.cs
  5. +1 −1 Misc_Microsoft_MPL_Libs/O2_Misc_Microsoft_MPL_Libs.csproj
  6. +1 −1 Misc_Microsoft_MPL_Libs/O2_Misc_Microsoft_MPL_Libs.sln
  7. +17 −30 O2.Platform.exe/O2_Platform.csproj
  8. +2 −6 O2.Platform.exe/Program.cs
  9. +2 −2 O2.Platform.exe/Properties/AssemblyInfo.cs
  10. +8 −0 O2.Platform.exe/packages.config
  11. +0 −145 O2.Platform.exe_3.5_x64/O2_Platform_3.5_x64.csproj
  12. +0 −21 O2.Platform.exe_3.5_x64/Program.cs
  13. +0 −37 O2.Platform.exe_3.5_x64/Properties/AssemblyInfo.cs
  14. +0 −47 O2.Platform.exe_3.5_x64/Properties/app.manifest
  15. +0 −15 O2.Platform.exe_3.5_x64/app.config
  16. +0 −143 O2.Platform.exe_3.5_x86/O2_Platform_3.5_x86.csproj
  17. +0 −21 O2.Platform.exe_3.5_x86/Program.cs
  18. +0 −47 O2.Platform.exe_3.5_x86/Properties/app.manifest
  19. +0 −15 O2.Platform.exe_3.5_x86/app.config
  20. +19 −11 O2.Platform.exe_4.0_x64/O2_Platform_4.0_x64.csproj
  21. +0 −21 O2.Platform.exe_4.0_x64/Program.cs
  22. +7 −0 O2.Platform.exe_4.0_x64/packages.config
  23. +8 −9 {O2.Platform.exe_3.5_x86 → UnitTests/UnitTests.O2Platform.exe}/Properties/AssemblyInfo.cs
  24. +20 −0 UnitTests/UnitTests.O2Platform.exe/Test_Program.cs
  25. +81 −0 UnitTests/UnitTests.O2Platform.exe/UnitTests.O2Platform.exe.csproj
  26. +8 −0 UnitTests/UnitTests.O2Platform.exe/packages.config
  27. +6 −105 VisualStudio Solution Files/O2.Platform.4.0 - Main Projects.sln
  28. +3 −0 VisualStudio Solution Files/packages/repositories.config
View
@@ -13,4 +13,5 @@ binaries
*.nupkg
/VisualStudio Solution Files/packages
/O2_Platform_Installer/Debug/O2_Platform_Installer.msi
-/O2_Platform_Installer/Debug/setup.exe
+/O2_Platform_Installer/Debug/setup.exe
+*.ncrunchsolution
@@ -7,14 +7,13 @@
using System.Windows.Forms;
using System.Collections.Generic;
using FluentSharp.CoreLib;
-using O2.DotNetWrappers.ExtensionMethods;
//O2Ref:System.Xml.Linq.dll
//O2Ref:System.Xml.dll
//O2File:_Extra_methods_WinForms_TreeView.cs
-namespace O2.XRules.Database.Utils
+namespace FluentSharp.For_HtmlAgilityPack
{
public static class HtmlAgilityPack_ExtensionMethods
{
@@ -7,7 +7,7 @@
using System.Xml.Linq;
using System.Windows.Forms;
-namespace O2.DotNetWrappers.ExtensionMethods
+namespace FluentSharp.For_XmlSchemaLinq
{
public static class XTypedElement_ExtensionMethods
{
@@ -5,7 +5,6 @@
using System.Xml;
using System.Xml.XPath;
using FluentSharp.CoreLib;
-using O2.DotNetWrappers.ExtensionMethods;
namespace HtmlAgilityPack
{
@@ -419,7 +419,7 @@
<None Include="Irony_Parser\Parsing\Construction\_about_parser_construction.txt" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\O2.FluentSharp\O2.FluentSharp.CoreLib\FluentSharp.CoreLib.csproj">
+ <ProjectReference Include="..\..\FluentSharp\FluentSharp.CoreLib\FluentSharp.CoreLib.csproj">
<Project>{0A7CE0E0-B092-43B5-AB80-99BA909019C9}</Project>
<Name>FluentSharp.CoreLib</Name>
</ProjectReference>
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2_Misc_Microsoft_MPL_Libs", "O2_Misc_Microsoft_MPL_Libs.csproj", "{BB1489A2-57AB-4A8D-A4DA-7C7E444512B8}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentSharp.CoreLib", "..\..\O2.FluentSharp\O2.FluentSharp.CoreLib\FluentSharp.CoreLib.csproj", "{0A7CE0E0-B092-43B5-AB80-99BA909019C9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentSharp.CoreLib", "..\..\FluentSharp\FluentSharp.CoreLib\FluentSharp.CoreLib.csproj", "{0A7CE0E0-B092-43B5-AB80-99BA909019C9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -73,7 +73,23 @@
<NoWin32Manifest>true</NoWin32Manifest>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="FluentSharp.CoreLib">
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.CoreLib.5.3.112\lib\net35\FluentSharp.CoreLib.dll</HintPath>
+ </Reference>
+ <Reference Include="FluentSharp.NGit">
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.NGit.5.3.112\lib\net40\FluentSharp.NGit.dll</HintPath>
+ </Reference>
+ <Reference Include="FluentSharp.REPL">
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.REPL.5.3.112\lib\net35\FluentSharp.REPL.exe</HintPath>
+ </Reference>
+ <Reference Include="FluentSharp.SharpDevelopEditor">
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.SharpDevelopEditor.5.3.112\lib\net35\FluentSharp.SharpDevelopEditor.dll</HintPath>
+ </Reference>
+ <Reference Include="FluentSharp.WinForms">
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.WinForms.5.3.112\lib\net35\FluentSharp.WinForms.dll</HintPath>
+ </Reference>
<Reference Include="System" />
+ <Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
@@ -117,6 +133,7 @@
<None Include="app.config">
<SubType>Designer</SubType>
</None>
+ <None Include="packages.config" />
<None Include="Properties\app.manifest" />
</ItemGroup>
<ItemGroup>
@@ -137,36 +154,6 @@
<DefaultIcon>O2Logo.ico</DefaultIcon>
</FileAssociation>
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\O2.FluentSharp\O2.FluentSharp.BCL\FluentSharp.BCL.csproj">
- <Project>{DF7E73CB-02AC-4689-BB8C-AC21FFCCDDC5}</Project>
- <Name>FluentSharp.BCL</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\O2.FluentSharp\O2.FluentSharp.CoreLib\FluentSharp.CoreLib.csproj">
- <Project>{0A7CE0E0-B092-43B5-AB80-99BA909019C9}</Project>
- <Name>FluentSharp.CoreLib</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\O2.FluentSharp\O2.FluentSharp.NGit\FluentSharp.NGit.csproj">
- <Project>{B1AAFDA3-2A9F-4BBD-9A08-F0890BA886C1}</Project>
- <Name>FluentSharp.NGit</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\O2.FluentSharp\O2.FluentSharp.REPL\FluentSharp.REPL.csproj">
- <Project>{D742BBEF-BFDC-477F-9880-5E0E2C89B6B2}</Project>
- <Name>FluentSharp.REPL</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\O2.FluentSharp\O2.FluentSharp.Roslyn\FluentSharp.Roslyn.csproj">
- <Project>{1D5E7298-537E-409B-8059-2040CA60B55A}</Project>
- <Name>FluentSharp.Roslyn</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\O2.FluentSharp\O2.FluentSharp.WPF\FluentSharp.WPF.csproj">
- <Project>{874D79CB-629F-4E56-AB00-9836EB21F69C}</Project>
- <Name>FluentSharp.WPF</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\O2.FluentSharp\O2_External_SharpDevelop\O2_External_SharpDevelop.csproj">
- <Project>{E76BCE43-8511-4CE8-A965-C0150F713CE9}</Project>
- <Name>O2_External_SharpDevelop</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.
@@ -1,10 +1,6 @@
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
using System;
-using System.Reflection;
-using System.IO;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.FluentSharp.REPL;
-using O2.Kernel;
+using FluentSharp.REPL.Utils;
namespace O2.Platform
{
@@ -15,7 +11,7 @@ public class Program
/// </summary>
[STAThread]
- static void Main(string[] args)
+ public static void Main(string[] args)
{
//new O2_Setup().startO2(args);
O2Launch.o2Gui(args);
@@ -33,5 +33,5 @@
// 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("5.1.0.*")]
-[assembly: AssemblyFileVersion("5.1.0.0")]
+[assembly: AssemblyVersion("5.3.0.*")]
+[assembly: AssemblyFileVersion("5.3.0.0")]
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="FluentSharp.CoreLib" version="5.3.112" targetFramework="net40" />
+ <package id="FluentSharp.NGit" version="5.3.112" targetFramework="net40" />
+ <package id="FluentSharp.REPL" version="5.3.112" targetFramework="net40" />
+ <package id="FluentSharp.SharpDevelopEditor" version="5.3.112" targetFramework="net40" />
+ <package id="FluentSharp.WinForms" version="5.3.112" targetFramework="net40" />
+</packages>
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{65AD96BC-A489-43EF-8BA9-75AA57F05106}</ProjectGuid>
- <OutputType>WinExe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>O2.Platform</RootNamespace>
- <AssemblyName>O2 Platform - 3.5 x64</AssemblyName>
- <FileAlignment>512</FileAlignment>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <ManifestCertificateThumbprint>4803CBA9CEFB3E39BED805EC44F043311994C953</ManifestCertificateThumbprint>
- <ManifestKeyFile>O2_XRules_Database_TemporaryKey.pfx</ManifestKeyFile>
- <GenerateManifests>false</GenerateManifests>
- <SignManifests>false</SignManifests>
- <ApplicationIcon>
- </ApplicationIcon>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- <TargetFrameworkProfile />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>false</DebugSymbols>
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\binaries\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <PlatformTarget>x64</PlatformTarget>
- <NoStdLib>false</NoStdLib>
- <NoWarn>1607</NoWarn>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup>
- <TargetZone>LocalIntranet</TargetZone>
- </PropertyGroup>
- <PropertyGroup>
- <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
- <Visible>False</Visible>
- <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <None Include="app.config" />
- <None Include="Properties\app.manifest" />
- </ItemGroup>
- <ItemGroup>
- <FileAssociation Include=".h2">
- <Visible>False</Visible>
- <Description>O2 H2 Script</Description>
- <Progid>O2.XRule.Script.h2</Progid>
- <DefaultIcon>H2Logo.ico</DefaultIcon>
- </FileAssociation>
- <FileAssociation Include=".o2">
- <Visible>False</Visible>
- <Description>O2 XRule Script</Description>
- <Progid>O2.XRule.Script.o2</Progid>
- <DefaultIcon>O2Logo.ico</DefaultIcon>
- </FileAssociation>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\O2.FluentSharp\O2.FluentSharp.CoreLib\FluentSharp.CoreLib.csproj">
- <Project>{0A7CE0E0-B092-43B5-AB80-99BA909019C9}</Project>
- <Name>FluentSharp.CoreLib</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\O2.FluentSharp\O2.FluentSharp.REPL\FluentSharp.REPL.csproj">
- <Project>{D742BBEF-BFDC-477F-9880-5E0E2C89B6B2}</Project>
- <Name>FluentSharp.REPL</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.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
@@ -1,21 +0,0 @@
-// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
-using System;
-using O2.FluentSharp.REPL;
-using O2.Kernel;
-
-namespace O2.Platform
-{
- static class Program
- {
- /// <summary>
- /// The main entry point for the application.
- /// </summary>
-
- [STAThread]
- static void Main(string[] args)
- {
- //new O2_Setup().startO2(args);
- O2Launch.o2Gui(args);
- }
- }
-}
@@ -1,37 +0,0 @@
-// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("O2_XRules_Database")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("O2_XRules_Database")]
-[assembly: AssemblyCopyright("Copyright © 2009")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("367b3ee7-0902-48fa-a518-ed766848f4f9")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// 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("4.1.0.*")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
Oops, something went wrong.

0 comments on commit a501a25

Please sign in to comment.