Skip to content
Browse files

updated dlls

  • Loading branch information...
1 parent c85845f commit 1bc5aa239398e10a3516d1ce97bb6bdb5469f2d8 @DinisCruz DinisCruz committed
View
20 O2.Platform.VisualStudio_2010/O2.Platform.VisualStudio_2010.csproj
@@ -44,19 +44,18 @@
<Private>false</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
- <Reference Include="O2_FluentSharp_BCL, Version=4.4.2.0, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=MSIL">
- <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.BCL.4.4.2.0\lib\net35\O2_FluentSharp_BCL.dll</HintPath>
+ <Reference Include="O2_FluentSharp_BCL, Version=4.5.2.0, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=MSIL">
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.BCL.4.5.2.0\lib\net35\O2_FluentSharp_BCL.dll</HintPath>
</Reference>
- <Reference Include="O2_FluentSharp_CoreLib, Version=4.4.2.0, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=MSIL">
- <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.CoreLib.4.4.2.0\lib\net35\O2_FluentSharp_CoreLib.dll</HintPath>
+ <Reference Include="O2_FluentSharp_CoreLib, Version=4.5.2.0, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=MSIL">
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.CoreLib.4.5.2.0\lib\net35\O2_FluentSharp_CoreLib.dll</HintPath>
</Reference>
- <Reference Include="O2_FluentSharp_REPL, Version=4.4.3.0, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=x86">
+ <Reference Include="O2_FluentSharp_REPL, Version=4.5.3.0, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=MSIL">
<ExecutableExtension>.exe</ExecutableExtension>
- <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.REPL.4.4.3.0\lib\net35\O2_FluentSharp_REPL.exe</HintPath>
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.REPL.4.5.3.0\lib\net35\O2_FluentSharp_REPL.exe</HintPath>
</Reference>
- <Reference Include="O2_FluentSharp_WPF, Version=4.4.0.0, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.WPF.4.4.0.0\lib\net40\O2_FluentSharp_WPF.dll</HintPath>
+ <Reference Include="O2_FluentSharp_WPF, Version=4.5.2.0, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=MSIL">
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.WPF.4.5.2.0\lib\net40\O2_FluentSharp_WPF.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
@@ -162,6 +161,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
+ <Content Include="VS_O2_PlugIns\Compile and Display a O2 UserControl inside VS.h2">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
</ItemGroup>
<ItemGroup>
<None Include="Resources\Key.snk" />
View
4 O2.Platform.VisualStudio_2010/O2.Platform.VisualStudio_2010Package.cs
@@ -31,8 +31,10 @@ public sealed class O2_Platform_VisualStudio_2010Package : NoSolution_Package
public O2_Platform_VisualStudio_2010Package()
{
- O2ConfigSettings.O2Version = "O2_VS2010_4.4.14";
+ O2ConfigSettings.O2Version = "O2_VS2010_4.4.16";
PublicDI.config = new O2.Kernel.InterfacesBaseImpl.KO2Config();
+ "aaa".popupWindow();
+ open.logViewer();
}
View
4 O2.Platform.VisualStudio_2010/Properties/AssemblyInfo.cs
@@ -29,8 +29,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("4.4.14.0")]
-[assembly: AssemblyFileVersion("4.4.14.0")]
+[assembly: AssemblyVersion("4.5.3.1")]
+[assembly: AssemblyFileVersion("4.5.3.1")]
View
98 ...latform.VisualStudio_2010/VS_O2_PlugIns/Compile and Display a O2 UserControl inside VS.h2
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<H2>
+ <SourceCode>var visualStudio = new VisualStudio_2010();
+
+var autoCreate = false;
+
+var topPanel = "topPanel__".o2Cache&lt;Panel&gt;(()=&gt; visualStudio.open_Panel("Auto Compile and Render User Controls"))
+ .add_Panel(true);
+
+topPanel.add_Label("Waiting for UserControl to Render ....")
+ .textSize(20).fill(true).text_Center();
+
+
+Action&lt;string&gt; currentFile = null;
+Action&lt;string&gt; compiledType = null;
+Assembly lastCompiledAssembly = null;
+Control lastControlCreated = null;
+var logViewer = topPanel.insert_LogViewer();
+var logViewer_splitContainer = logViewer.splitContainer().panel2Collapsed(true);
+
+bool busy = false;
+Action compileAndCreate =
+ ()=&gt;{
+ busy = true;
+ topPanel.enabled(false);
+ O2Thread.mtaThread(
+ ()=&gt;{
+ var file = visualStudio.activeFile();
+ var filesToCompile = file.wrapOnList();
+ var designerFile = file.replace(".cs", ".Designer.cs");
+ if (designerFile.fileExists())
+ filesToCompile.add(designerFile);
+
+ var assembly = new CompileEngine(false).compileSourceFiles(filesToCompile);
+ if (assembly.notNull())
+ {
+ var type = assembly.types().first();
+ compiledType(type.str());
+ if (type.baseTypes().contains(typeof(UserControl)))
+ topPanel.enabled(true).clear().add_Control(type);
+ else
+ "{0} compile type was not an UserControl: {1}".error(file.fileName(),type.str());
+ }
+ else
+ topPanel.enabled(false).controls(true).pink();
+ busy = false;
+ });
+ };
+Action&lt;Document&gt; refresh =
+ (document)=&gt;{
+ if(document.notNull())
+ {
+ if (autoCreate)
+ compileAndCreate();
+ }
+ };
+VisualStudio_2010.on_DocumentSaved.clear().add(
+ (document)=&gt;{
+ if (busy.isFalse())
+ refresh(document);
+ });
+
+VisualStudio_2010.on_ActiveDocumentChange.clear()
+ .add((document)=&gt;{
+ currentFile(visualStudio.activeFile().fileName());
+ //refresh(document);
+ });
+
+topPanel.insert_Above_ToolStrip()
+ .add_Play("Compile and Create Control",compileAndCreate)
+ .add("REPL Control", "accessories_text_editor", ()=&gt; lastControlCreated.script_Me())
+ .add_CheckBox("Auto Create (on Save)", (value)=&gt;{ autoCreate = value; compileAndCreate(); })
+ .add("View Logs","btShowHidePythonLogExecutionOutputData_Image", ()=&gt;logViewer_splitContainer.panel2Collapsed(false));
+
+topPanel.insert_Above_ToolStrip()
+ .add_Text("Active Document:").add_TextBox("", ref currentFile)
+ .add_Text("Compiled Type") .add_TextBox("", 200, ref compiledType);
+
+
+refresh(default(Document));
+return topPanel;
+//using O2.Platform.BCL.O2_Views_ASCX
+//using EnvDTE
+//using System.Reflection
+
+//if (control.baseTypes().contains(typeof(UserControl)))
+// "test".popupWindow().add_Control(control);
+//return visualStudio.typeFullName();
+//return visualStudio.activeDocument();
+// return VisualStudio_2010.DTE2.ActiveDocument;
+return visualStudio.dte();
+//using O2.FluentSharp.VisualStudio
+//using EnvDTE80
+
+//O2File:E:\O2_V4\O2.Platform.Scripts\Utils\ExtensionMethods\_Extra_methods_To_Add_to_Main_CodeBase.cs
+//O2File:E:\O2_V4\O2.Platform.Scripts\3rdParty\Microsoft\VisualStudio\Inside VisualStudio 2010\VisualStudio_2010_ExtensionMethods_ExtraMethods.cs</SourceCode>
+ <ReferencedAssemblies />
+</H2>
View
4 O2.Platform.VisualStudio_2010/app.config
@@ -4,11 +4,11 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="O2_FluentSharp_CoreLib" publicKeyToken="55a0f9bf4256d533" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.4.2.0" newVersion="4.4.2.0" />
+ <bindingRedirect oldVersion="0.0.0.0-4.5.2.0" newVersion="4.5.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="O2_FluentSharp_BCL" publicKeyToken="55a0f9bf4256d533" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.4.2.0" newVersion="4.4.2.0" />
+ <bindingRedirect oldVersion="0.0.0.0-4.5.2.0" newVersion="4.5.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="O2_FluentSharp_REPL" publicKeyToken="55a0f9bf4256d533" culture="neutral" />
View
8 O2.Platform.VisualStudio_2010/packages.config
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="FluentSharp.BCL" version="4.4.2.0" targetFramework="net40" />
- <package id="FluentSharp.CoreLib" version="4.4.2.0" targetFramework="net40" />
- <package id="FluentSharp.REPL" version="4.4.3.0" targetFramework="net40" />
+ <package id="FluentSharp.BCL" version="4.5.2.0" targetFramework="net40" />
+ <package id="FluentSharp.CoreLib" version="4.5.2.0" targetFramework="net40" />
+ <package id="FluentSharp.REPL" version="4.5.3.0" targetFramework="net40" />
<package id="FluentSharp.VisualStudio2010" version="4.4.2.0" targetFramework="net40" />
- <package id="FluentSharp.WPF" version="4.4.0.0" targetFramework="net40" />
+ <package id="FluentSharp.WPF" version="4.5.2.0" targetFramework="net40" />
</packages>
View
2 O2.Platform.VisualStudio_2010/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
<Identifier Id="F886416F-3DBF-4DEE-9578-E7692FC59871">
<Name>VisualStudio C# REPL - O2 Platform</Name>
<Author>OWASP O2 Platform</Author>
- <Version>4.4.14</Version>
+ <Version>4.4.16</Version>
<Description xml:space="preserve">VisualStudio 2010 Extension for the which provides a real-time C# REPL for VisualStudio (based on the OWASP O2 Platform and FluentSharp API)
4.4.14 - update to latest version of FluentSharp dlls</Description>
View
2 O2.Platform.exe_3.5_x64/Program.cs
@@ -12,7 +12,7 @@ static class Program
[STAThread]
static void Main(string[] args)
- {
+ {
//new O2_Setup().startO2(args);
launch.o2Gui(args);
}
View
4 O2_External_SharpDevelop/Properties/AssemblyInfo.cs
@@ -41,4 +41,6 @@
using System;
[assembly: CLSCompliant(false)]
-[assembly: AssemblyVersionAttribute("4.4.0")]
+[assembly: AssemblyVersionAttribute("4.5.2")]
+[assembly: AssemblyTitleAttribute("O2's fork of External SharpDevelop")]
+[assembly: AssemblyFileVersionAttribute("4.5.2")]
View
10 VisualStudio Solution Files/O2.Platform.4.0 - Main Projects.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2_External_SharpDevelop", "..\O2_External_SharpDevelop\O2_External_SharpDevelop.csproj", "{E76BCE43-8511-4CE8-A965-C0150F713CE9}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FluentSharp", "FluentSharp", "{AA501B54-FD82-4D72-941A-51B920FA9D34}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FluentSharp - Other", "FluentSharp - Other", "{AA501B54-FD82-4D72-941A-51B920FA9D34}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Projects required for ScriptEditor", "Projects required for ScriptEditor", "{6FCA1DD0-DFF6-48E3-9EE2-2D887360EB13}"
EndProject
@@ -42,6 +42,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2.FluentSharp.WPF", "..\..
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2.FluentSharp.VisualStudio_2010", "..\..\O2.FluentSharp\O2.FluentSharp.VisualStudio_2010\O2.FluentSharp.VisualStudio_2010.csproj", "{38AFBBBD-48E5-4792-B90E-B9A1A540F906}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FluentSharp - Main", "FluentSharp - Main", "{D6F3850C-4B6A-4BC3-A568-1D522A72B027}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -109,10 +111,10 @@ Global
{BB1489A2-57AB-4A8D-A4DA-7C7E444512B8} = {6FCA1DD0-DFF6-48E3-9EE2-2D887360EB13}
{B1AAFDA3-2A9F-4BBD-9A08-F0890BA886C1} = {AA501B54-FD82-4D72-941A-51B920FA9D34}
{1D5E7298-537E-409B-8059-2040CA60B55A} = {AA501B54-FD82-4D72-941A-51B920FA9D34}
- {DF7E73CB-02AC-4689-BB8C-AC21FFCCDDC5} = {AA501B54-FD82-4D72-941A-51B920FA9D34}
- {0A7CE0E0-B092-43B5-AB80-99BA909019C9} = {AA501B54-FD82-4D72-941A-51B920FA9D34}
- {D742BBEF-BFDC-477F-9880-5E0E2C89B6B2} = {AA501B54-FD82-4D72-941A-51B920FA9D34}
{874D79CB-629F-4E56-AB00-9836EB21F69C} = {AA501B54-FD82-4D72-941A-51B920FA9D34}
{38AFBBBD-48E5-4792-B90E-B9A1A540F906} = {AA501B54-FD82-4D72-941A-51B920FA9D34}
+ {DF7E73CB-02AC-4689-BB8C-AC21FFCCDDC5} = {D6F3850C-4B6A-4BC3-A568-1D522A72B027}
+ {0A7CE0E0-B092-43B5-AB80-99BA909019C9} = {D6F3850C-4B6A-4BC3-A568-1D522A72B027}
+ {D742BBEF-BFDC-477F-9880-5E0E2C89B6B2} = {D6F3850C-4B6A-4BC3-A568-1D522A72B027}
EndGlobalSection
EndGlobal

0 comments on commit 1bc5aa2

Please sign in to comment.
Something went wrong with that request. Please try again.