Permalink
Browse files

minor changes

  • Loading branch information...
DinisCruz committed Jul 29, 2012
1 parent 9c2837b commit 10599484123665f24d6132bec7a3a292f0303842
Showing with 671 additions and 823 deletions.
  1. +2 −1 .gitignore
  2. +3 −12 O2.Platform.exe/O2_Platform.csproj
  3. +2 −2 O2.Platform.exe/Program.cs
  4. +3 −2 O2.Platform.exe_3.5_x64/O2_Platform_3.5_x64.csproj
  5. +14 −14 O2_External_SharpDevelop/O2_External_SharpDevelop.csproj
  6. BIN O2_External_SharpDevelop/TmpKey.snk
  7. +419 −419 O2_External_SharpDevelop/_O2SharpDevelop/CodeCompletion/O2CodeCompletion.cs
  8. +25 −14 ...evelop/_O2SharpDevelop/ICSharpCode.SharpDevelop.Dom/Project/Src/ReflectionLayer/DomPersistence.cs
  9. +2 −2 ...ernal_SharpDevelop/_O2SharpDevelop/ICSharpCode.TextEditor/Project/Src/Document/AbstractSegment.cs
  10. +1 −1 ...arpDevelop/_O2SharpDevelop/ICSharpCode.TextEditor/Project/Src/Document/LineManager/LineManager.cs
  11. +1 −1 ...p/_O2SharpDevelop/ICSharpCode.TextEditor/Project/Src/Gui/CompletionWindow/CodeCompletionWindow.cs
  12. +1 −1 O2_External_SharpDevelop/_O2SharpDevelop/ICSharpCode.TextEditor/Project/Src/Gui/TextEditorControl.cs
  13. +1 −7 O2_External_WinFormsUI/{DI.cs → DI.cs.txt}
  14. +46 −36 O2_External_WinFormsUI/Forms/O2AscxGUI.cs
  15. +10 −10 O2_External_WinFormsUI/Forms/O2GuiWithDockPanel.Controllers.cs
  16. +24 −24 O2_External_WinFormsUI/Forms/O2GuiWithDockPanel.cs
  17. +8 −7 O2_External_WinFormsUI/O2Environment/O2DockContent.cs
  18. +32 −32 O2_External_WinFormsUI/O2Environment/O2DockPanel.cs
  19. +32 −31 O2_External_WinFormsUI/O2Environment/O2DockUtils.cs
  20. +9 −7 O2_External_WinFormsUI/O2Environment/O2MessagesHandler.cs
  21. +2 −6 O2_External_WinFormsUI/O2_External_WinFormsUI.csproj
  22. BIN O2_External_WinFormsUI/_External_Dlls/WeifenLuo.WinFormsUI.Docking.dll
  23. BIN O2_External_WinFormsUI/_External_Dlls/_WeifenLuo.WinFormsUI.Docking.dll.previousVersion
  24. BIN O2_External_WinFormsUI/_External_Dlls/nunit.framework.dll
  25. +17 −17 VisualStudio Solution Files/{O2.VisualStudio.AddIn.sln → O2.FluentSharp.VisualStudio_2010.sln}
  26. +0 −26 VisualStudio Solution Files/O2.Platform.3.5.sln.txt
  27. +0 −82 VisualStudio Solution Files/O2.Platform.4.0 - (for MonoDevelop).sln
  28. +17 −37 ...lStudio Solution Files/{O2.Platform.4.0 - All Projects.sln → O2.Platform.4.0 - Main Projects.sln}
  29. +0 −32 VisualStudio Solution Files/O2.Platform.4.0.sln
View
@@ -10,4 +10,5 @@ UpgradeLog.xml
*.userprefs
binaries
/Misc_Microsoft_MPL_Libs/packages
-*.nupkg
+*.nupkg
+/VisualStudio Solution Files/packages
@@ -76,21 +76,12 @@
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="..\..\O2.FluentSharp\binaries\O2_FluentSharp_BCL.dll">
- <Link>_Dlls_Embeded\O2_FluentSharp_BCL.dll</Link>
- </EmbeddedResource>
- <EmbeddedResource Include="..\..\O2.FluentSharp\binaries\O2_FluentSharp_CoreLib.dll">
- <Link>_Dlls_Embeded\O2_FluentSharp_CoreLib.dll</Link>
- </EmbeddedResource>
- <EmbeddedResource Include="..\..\O2.FluentSharp\binaries\O2_FluentSharp_NGit.dll">
- <Link>_Dlls_Embeded\O2_FluentSharp_NGit.dll</Link>
- </EmbeddedResource>
- <EmbeddedResource Include="..\..\O2.FluentSharp\binaries\O2_FluentSharp_REPL.dll">
- <Link>_Dlls_Embeded\O2_FluentSharp_REPL.dll</Link>
- </EmbeddedResource>
<EmbeddedResource Include="..\..\O2.FluentSharp\binaries\O2_FluentSharp_Roslyn.dll">
<Link>_Dlls_Embeded\O2_FluentSharp_Roslyn.dll</Link>
</EmbeddedResource>
+ <EmbeddedResource Include="..\..\O2.FluentSharp\binaries\O2_FluentSharp_REPL.exe">
+ <Link>_Dlls_Embeded\O2_FluentSharp_REPL.exe</Link>
+ </EmbeddedResource>
<Content Include="O2_Setup.cs.txt" />
<Content Include="O2_Setup.cs %28with no dependency on O2 Dlls%29.txt" />
<Compile Include="Program.cs" />
@@ -20,7 +20,7 @@ static void Main(string[] 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 @@ static void Main(string[] args)
var type = assembly.GetType("O2.Kernel.launch");
var method = type.GetMethod("o2Gui");
method.Invoke(null, new object[] { args });
- } */
+ } */
}
@@ -22,6 +22,8 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -36,8 +38,6 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -49,6 +49,7 @@
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
<PlatformTarget>x64</PlatformTarget>
+ <NoStdLib>false</NoStdLib>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -24,7 +24,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\binaries\</OutputPath>
+ <OutputPath>bin\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -39,11 +39,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
- <SignAssembly>false</SignAssembly>
+ <SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>TmpKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Cecil">
@@ -440,16 +439,6 @@
<Compile Include="_O2SharpDevelop\NRefactory\Project\Src\Visitors\VBNetConstructsConvertVisitor.cs" />
<Compile Include="_O2SharpDevelop\TextEditor_ExtensionMethods.cs" />
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\O2.FluentSharp\O2.FluentSharp.BCL\O2.FluentSharp.BCL.csproj">
- <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>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
@@ -490,6 +479,7 @@
<EmbeddedResource Include="_O2SharpDevelop\ICSharpCode.TextEditor\Project\Resources\Tex-Mode.xshd" />
<EmbeddedResource Include="_O2SharpDevelop\ICSharpCode.TextEditor\Project\Resources\VBNET-Mode.xshd" />
<EmbeddedResource Include="_O2SharpDevelop\ICSharpCode.TextEditor\Project\Resources\XML-Mode.xshd" />
+ <None Include="TmpKey.snk" />
<None Include="_O2SharpDevelop\NRefactory\Project\Src\Lexer\BuildKeywords.pl" />
<None Include="_O2SharpDevelop\NRefactory\Project\Src\Parser\CSharp\cs.ATG" />
<None Include="_O2SharpDevelop\NRefactory\Project\Src\Parser\Frames\Parser.frame" />
@@ -529,6 +519,16 @@
<ItemGroup>
<Folder Include="Controls\" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\O2.FluentSharp\O2.FluentSharp.BCL\O2.FluentSharp.BCL.csproj">
+ <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.
Other similar extension points exist, see Microsoft.Common.targets.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 1059948

Please sign in to comment.