Skip to content
Browse files

Updated FluentSharp Dlls, removed auto install/download of O2 scripts

  • Loading branch information...
1 parent 9dfcda8 commit 9ece2a12e987bef63d77d7f3fafef2f7c00a70f9 @DinisCruz DinisCruz committed Feb 26, 2013
View
21 O2.Platform.VisualStudio_2010/ExtensionMethods/VisualStudio_2010_ExtensionMethods.cs
@@ -1,28 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using Microsoft.VisualStudio;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.PlatformUI;
-using Microsoft.VisualStudio.Platform.WindowManagement;
-using Microsoft.VisualStudio.Platform.WindowManagement.DTE;
-using System.Windows.Forms.Integration;
+using Microsoft.VisualStudio.Shell;
using WinForms = System.Windows.Forms;
-using EnvDTE;
-using EnvDTE80;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.FluentSharp.VisualStudio;
namespace O2.FluentSharp.VisualStudio.ExtensionMethods
{
-
-
public static class VisualStudio_2010_ExtensionMethods_Packages
{
public static Package package(this VisualStudio_2010 visualStudio)
View
130 O2.Platform.VisualStudio_2010/ExtensionMethods/VisualStudio_2010_ExtensionMethods_DTE.cs
@@ -27,90 +27,90 @@ public static DTE2 dte(this VisualStudio_2010 visualStudio)
{
return VisualStudio_2010.DTE2;
}
+ }
+ public static class VisualStudio_2010_ExtensionMethods_DTE_StatusBar
+ {
+ public static string statusBar(this VisualStudio_2010 visualStudio)
+ {
+ return visualStudio.dte().StatusBar.Text;
+ }
+ public static VisualStudio_2010 statusBar(this VisualStudio_2010 visualStudio, string text)
+ {
+ visualStudio.dte().StatusBar.Text = text;
+ return visualStudio;
+ }
+ }
- public static class VisualStudio_2010_ExtensionMethods_DTE_StatusBar
+ public static class VisualStudio_2010_ExtensionMethods_DTE_OutputWindow
+ {
+ public static EnvDTE.OutputWindowPane outputWindow(this VisualStudio_2010 visualStudio)
+ {
+ return visualStudio.dte().ToolWindows.OutputWindow.ActivePane;
+ }
+ public static EnvDTE.OutputWindowPane outputWindow(this VisualStudio_2010 visualStudio, string name)
{
- public static string statusBar(this VisualStudio_2010 visualStudio)
+ try
{
- return visualStudio.dte().StatusBar.Text;
+ return visualStudio.dte().ToolWindows.OutputWindow.OutputWindowPanes.Item(name);
}
- public static VisualStudio_2010 statusBar(this VisualStudio_2010 visualStudio, string text)
+ catch
{
- visualStudio.dte().StatusBar.Text = text;
- return visualStudio;
+ "could not find output Window with name: {0}".error(name);
+ return null;
}
}
-
- public static class VisualStudio_2010_ExtensionMethods_DTE_OutputWindow
+ public static EnvDTE.OutputWindowPane outputWindow_Create(this DTE2 dte, string name, bool logError)
{
- public static EnvDTE.OutputWindowPane outputWindow(this VisualStudio_2010 visualStudio)
+ try
{
- return visualStudio.dte().ToolWindows.OutputWindow.ActivePane;
+ return dte.ToolWindows.OutputWindow.OutputWindowPanes.Add(name);
}
- public static EnvDTE.OutputWindowPane outputWindow(this VisualStudio_2010 visualStudio, string name)
+ catch (Exception ex)
{
- try
- {
- return visualStudio.dte().ToolWindows.OutputWindow.OutputWindowPanes.Item(name);
- }
- catch
- {
- "could not find output Window with name: {0}".error(name);
- return null;
- }
+ if (logError)
+ ex.log("[in create_OutputWindow]");
+ return null;
}
- public static EnvDTE.OutputWindowPane outputWindow_Create(this DTE2 dte, string name, bool logError)
- {
- try
- {
- return dte.ToolWindows.OutputWindow.OutputWindowPanes.Add(name);
- }
- catch (Exception ex)
- {
- if (logError)
- ex.log("[in create_OutputWindow]");
- return null;
- }
- }
- public static EnvDTE.OutputWindowPane outputWindow_Create(this VisualStudio_2010 visualStudio, string name)
- {
- var outputWindow = visualStudio.outputWindow(name);
- if (outputWindow.notNull())
- {
- "[create_OutputWindow] there was already an output window called '{0}' so returning the existing one".debug(name);
- return outputWindow;
- }
- return visualStudio.dte().outputWindow_Create(name, true);
- }
- public static EnvDTE.OutputWindowPane writeLine(this EnvDTE.OutputWindowPane outputWindow, string text)
+ }
+ public static EnvDTE.OutputWindowPane outputWindow_Create(this VisualStudio_2010 visualStudio, string name)
+ {
+ var outputWindow = visualStudio.outputWindow(name);
+ if (outputWindow.notNull())
{
- outputWindow.OutputString(text.line());
+ "[create_OutputWindow] there was already an output window called '{0}' so returning the existing one".debug(name);
return outputWindow;
}
+ return visualStudio.dte().outputWindow_Create(name, true);
+ }
+ public static EnvDTE.OutputWindowPane writeLine(this EnvDTE.OutputWindowPane outputWindow, string text)
+ {
+ outputWindow.OutputString(text.line());
+ return outputWindow;
}
+ }
- public static class VisualStudio_2010_ExtensionMethods_DTE_CommandWindow
+ public static class VisualStudio_2010_ExtensionMethods_DTE_CommandWindow
+ {
+ public static EnvDTE.CommandWindow commandWindow(this VisualStudio_2010 visualStudio)
{
- public static EnvDTE.CommandWindow commandWindow(this VisualStudio_2010 visualStudio)
- {
- return visualStudio.dte().ToolWindows.CommandWindow;
- }
- public static EnvDTE.CommandWindow writeLine(this EnvDTE.CommandWindow commandWindow, string text)
- {
- commandWindow.OutputString(text.line());
- return commandWindow;
- }
- public static EnvDTE.CommandWindow sendInput_and_Execute(this EnvDTE.CommandWindow commandWindow, string input)
- {
- commandWindow.SendInput(input, true);
- return commandWindow;
- }
- public static EnvDTE.CommandWindow execute(this EnvDTE.CommandWindow commandWindow, string input)
- {
- commandWindow.sendInput_and_Execute(input);
- return commandWindow;
- }
+ return visualStudio.dte().ToolWindows.CommandWindow;
+ }
+ public static EnvDTE.CommandWindow writeLine(this EnvDTE.CommandWindow commandWindow, string text)
+ {
+ commandWindow.OutputString(text.line());
+ return commandWindow;
+ }
+ public static EnvDTE.CommandWindow sendInput_and_Execute(this EnvDTE.CommandWindow commandWindow, string input)
+ {
+ commandWindow.SendInput(input, true);
+ return commandWindow;
+ }
+ public static EnvDTE.CommandWindow execute(this EnvDTE.CommandWindow commandWindow, string input)
+ {
+ commandWindow.sendInput_and_Execute(input);
+ return commandWindow;
}
}
+
}
View
1 ...latform.VisualStudio_2010/ExtensionMethods/VisualStudio_2010_ExtensionMethods_Document.cs
@@ -10,6 +10,7 @@
using O2.DotNetWrappers.DotNet;
using O2.DotNetWrappers.ExtensionMethods;
using EnvDTE;
+using Microsoft.VisualStudio;
View
9 ...rm.VisualStudio_2010/ExtensionMethods/VisualStudio_2010_ExtensionMethods_Multiple_Guis.cs
@@ -1,13 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using WinForms = System.Windows.Forms;
+using WinForms = System.Windows.Forms;
using EnvDTE;
-using EnvDTE80;
using Microsoft.VisualStudio.Shell.Interop;
-using O2.DotNetWrappers.DotNet;
-using O2.FluentSharp.VisualStudio;
using O2.DotNetWrappers.ExtensionMethods;
namespace O2.FluentSharp.VisualStudio.ExtensionMethods
View
15 O2.Platform.VisualStudio_2010/NoSolution_Package.cs
@@ -28,11 +28,11 @@ public class NoSolution_Package : Package
public NoSolution_Package()
{
- O2ConfigSettings.O2Version = "O2_VS2010_4.4.16";
+ O2ConfigSettings.O2Version += "_VS2010";
PublicDI.config = new O2.Kernel.InterfacesBaseImpl.KO2Config();
- open.logViewer();
- //O2ConfigSettings.O2Version = "VisualStudio_v1.5.4";
- //Trace.WriteLine("In NoSolution_Package ctor");
+
+ //open.scriptEditor();
+ //open.logViewer();
}
/*public void showErrorInOutputWindow(Exception exToShow)
@@ -54,9 +54,9 @@ protected override void Initialize()
try
{
//These two assemblies must be on the localPath
- if (Assembly.Load("O2_FluentSharp_CoreLib") == null || Assembly.Load("O2_FluentSharp_REPL") == null)
+ if (Assembly.Load("FluentSharp.CoreLib") == null || Assembly.Load("FluentSharp.REPL") == null)
{
- Debug.WriteLine("[O2.FLuentSharp.VisualStudio] Error in loading O2_FluentSharp_CoreLib.exe or O2_FluentSharp_REPL.exe assemblies");
+ Debug.WriteLine("[O2.FLuentSharp.VisualStudio] Error in loading FluentSharp.CoreLib.dll or FluentSharp.REPL.exe assemblies");
return;
}
AssemblyResolver.Init(); //set's up assembly resolver (the O2.FluentSharp.CoreLib.dll must be on local path);
@@ -80,8 +80,7 @@ public void LocalInitialize()
VisualStudio_O2_Utils.open_LogViewer();
populateDefaultVSComObjects();
- VisualStudio_2010.Initialized = true;
- //VisualStudio_O2_Utils.compileAndExecuteScript(@"VS_Scripts\O2_Platform_Gui.cs", "O2_Platform_Gui", "buildGui");
+ VisualStudio_2010.Initialized = true;
O2Thread.mtaThread(
()=> new O2Platform_VisualStudio().loadO2PlatformVSEnvironment());
View
98 O2.Platform.VisualStudio_2010/O2.Platform.VisualStudio_2010.csproj
@@ -18,10 +18,11 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\O2_Platform_ReferencedAssemblies\O2_Assemblies\</OutputPath>
+ <OutputPath>bin\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <SkipPostSharp>True</SkipPostSharp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -33,6 +34,25 @@
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="FluentSharp.BCL, Version=5.1.1.0, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=MSIL">
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.BCL.5.0.78\lib\net35\FluentSharp.BCL.dll</HintPath>
+ </Reference>
+ <Reference Include="FluentSharp.CoreLib, Version=5.1.1.1, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=MSIL">
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.CoreLib.5.0.78\lib\net35\FluentSharp.CoreLib.dll</HintPath>
+ </Reference>
+ <Reference Include="FluentSharp.NGit, Version=5.1.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.NGit.5.0.78\lib\net40\FluentSharp.NGit.dll</HintPath>
+ </Reference>
+ <Reference Include="FluentSharp.REPL, Version=5.1.1.0, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=MSIL">
+ <ExecutableExtension>.exe</ExecutableExtension>
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.REPL.5.0.78\lib\net35\FluentSharp.REPL.exe</HintPath>
+ </Reference>
+ <Reference Include="FluentSharp.Roslyn, Version=5.1.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.Roslyn.5.0.78\lib\net40\FluentSharp.Roslyn.dll</HintPath>
+ </Reference>
+ <Reference Include="FluentSharp.WPF, Version=5.1.1.0, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=MSIL">
+ <HintPath>..\VisualStudio Solution Files\packages\FluentSharp.WPF.5.0.78\lib\net40\FluentSharp.WPF.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.OLE.Interop" />
@@ -49,21 +69,20 @@
<Private>false</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
- <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 Include="NGit">
+ <HintPath>..\..\O2.FluentSharp\O2.FluentSharp.NGit\_EmbededDlls\NGit.dll</HintPath>
+ <Private>False</Private>
</Reference>
- <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.5.3.0, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=MSIL">
- <ExecutableExtension>.exe</ExecutableExtension>
- <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.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 Include="O2_Platform_External_SharpDevelop, Version=5.1.1.0, Culture=neutral, PublicKeyToken=55a0f9bf4256d533, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\VisualStudio Solution Files\packages\O2.Platform.External.SharpDevelop.5.0.78\lib\net35\O2_Platform_External_SharpDevelop.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
+ <Reference Include="Roslyn.Compilers">
+ <HintPath>..\..\O2.FluentSharp\O2.FluentSharp.Roslyn\_EmbededDlls\Roslyn.Compilers.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
@@ -146,20 +165,43 @@
</Compile>
<Compile Include="Controls\WindowPane_WinForms.cs" />
<Compile Include="Controls\WindowPane_WPF.cs" />
- <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_Windows.cs" />
- <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_TO_ADD_TO_O2.cs" />
- <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_DTE.cs" />
- <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_WPF_WinForms.cs" />
- <Compile Include="ExtensionMethods\_VisualStudio_2010_ExtensionMethods_Empty.cs" />
- <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods.cs" />
- <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_Document.cs" />
- <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_ErrorList.cs" />
- <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_IVsUIShell.cs" />
- <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_Menus.cs" />
- <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_Multiple_Guis.cs" />
- <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_Projects.cs" />
+ <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_Document.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_DTE.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_ErrorList.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_IVsUIShell.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_Menus.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_Multiple_Guis.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_Projects.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_TO_ADD_TO_O2.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_Windows.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ExtensionMethods\VisualStudio_2010_ExtensionMethods_WPF_WinForms.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ExtensionMethods\_VisualStudio_2010_ExtensionMethods_Empty.cs">
+ <SubType>Code</SubType>
+ </Compile>
<Compile Include="NoSolution_Package.cs" />
- <Content Include="O2.Platform.VisualStudio_2010Package.cs.txt" />
<Compile Include="O2Platform_VisualStudio.cs" />
<Compile Include="Packages\Packages_for_ProvideAutoLoads.cs" />
<Compile Include="Packages\Package_IWpfTextViewCreationListener.cs" />
@@ -169,6 +211,7 @@
<Compile Include="VisualStudio_O2_Utils.cs" />
<Content Include="VS_Scripts\O2_Platform_Gui.cs">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ <IncludeInVSIX>true</IncludeInVSIX>
</Content>
</ItemGroup>
<ItemGroup>
@@ -202,6 +245,10 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="VS_O2_PlugIns\PoCs\Create Window to Show MainGui Live Preview.h2" />
+ <Content Include="VS_O2_PlugIns\Setup CatNet and TeamMentor.h2">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ <IncludeInVSIX>true</IncludeInVSIX>
+ </Content>
</ItemGroup>
<ItemGroup>
<None Include="Resources\Key.snk" />
@@ -228,6 +275,7 @@
<SubType>Designer</SubType>
</Page>
</ItemGroup>
+ <ItemGroup />
<PropertyGroup>
<UseCodebase>true</UseCodebase>
</PropertyGroup>
View
70 O2.Platform.VisualStudio_2010/O2.Platform.VisualStudio_2010Package.cs.txt
@@ -1,70 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Runtime.InteropServices;
-using System.ComponentModel.Design;
-using Microsoft.Win32;
-using Microsoft.VisualStudio;
-using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.OLE.Interop;
-using Microsoft.VisualStudio.Shell;
-using O2.FluentSharp.VisualStudio;
-using O2.Kernel;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.ExtensionMethods;
-using System.Windows.Forms;
-
-namespace O2.Platform.VisualStudio_2010_Extension
-{
- static class GuidList
- {
- public const string guidO2_Platform_VisualStudio_2010PkgString = "F886416F-3DBF-4DEE-9578-E7692FC59871";
- // public const string guidO2_Platform_VisualStudio_2010CmdSetString = "dcf44788-1870-4627-9dbb-910bee34c55c";
-
- // public static readonly Guid guidO2_Platform_VisualStudio_2010CmdSet = new Guid(guidO2_Platform_VisualStudio_2010CmdSetString);
- }
- [PackageRegistration(UseManagedResourcesOnly = true)]
- [Guid(GuidList.guidO2_Platform_VisualStudio_2010PkgString)]
- [ProvideAutoLoad(UIContextGuids80.NoSolution)] // ensures this gets called on VisualStudio start
- public sealed class O2_Platform_VisualStudio_2010Package : NoSolution_Package
- {
-
- public O2_Platform_VisualStudio_2010Package()
- {
- O2ConfigSettings.O2Version = "O2_VS2010_4.4.16";
- PublicDI.config = new O2.Kernel.InterfacesBaseImpl.KO2Config();
- open.logViewer();
- }
-
-
-
- /////////////////////////////////////////////////////////////////////////////
- // Overriden Package Implementation
- #region Package Members
-
- protected override void Initialize()
- {
- base.Initialize();
- if (Control.ModifierKeys == Keys.Shift)
- open.scriptEditor();
- try
- {
- VisualStudio_O2_Utils.waitForDTEObject();
- "[O2_Platform_VisualStudio_2010Package] Package: {0}, DTE: {1}".info(VisualStudio_2010.Package, VisualStudio_2010.DTE2);
-
- CompileEngine.LocalFoldersToSearchForCodeFiles.Add(this.type().assemblyLocation().parentFolder()); // so that "{file}".local() is able to find files included with this
- //CompileEngine.clearCompilationCache();
- VisualStudio_O2_Utils.compileAndExecuteScript(@"VS_Scripts\O2_Platform_Gui.cs", "O2_Platform_Gui", "buildGui");
- }
- catch (Exception ex)
- {
- ex.log("in O2_Platform_VisualStudio_2010Package Initialize");
- }
-
-
-
- }
- #endregion
-
- }
-}
View
8 O2.Platform.VisualStudio_2010/O2Platform_VisualStudio.cs
@@ -8,11 +8,7 @@
using O2.Kernel.InterfacesBaseImpl;
namespace O2.FluentSharp.VisualStudio
-{
- public class VS_O2_MemoryLogger : MemoryLogger
- {
- public override
- }
+{
public class O2Platform_VisualStudio
{
public void loadO2PlatformVSEnvironment()
@@ -22,7 +18,7 @@ public void loadO2PlatformVSEnvironment()
VisualStudio_O2_Utils.waitForDTEObject();
VisualStudio_O2_Utils.waitForOutputWindow();
- VisualStudio_2010.O2_OutputWindow.
+ //VisualStudio_2010.O2_OutputWindow.
"[O2_Platform_VisualStudio_2010Package] Package: {0}, DTE: {1}".info(VisualStudio_2010.Package, VisualStudio_2010.DTE2);
CompileEngine.LocalFoldersToSearchForCodeFiles.Add(this.type().assemblyLocation().parentFolder()); // so that "{file}".local() is able to find files included with this
View
6 O2.Platform.VisualStudio_2010/Properties/AssemblyInfo.cs
@@ -7,7 +7,7 @@
// 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("Owasp O2 Platform")]
+[assembly: AssemblyTitle("Owasp O2 Platform - VisualStudio 2010")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("O2 Platform")]
@@ -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.5.3.1")]
-[assembly: AssemblyFileVersion("4.5.3.1")]
+[assembly: AssemblyVersion("5.1.1.1")]
+[assembly: AssemblyFileVersion("5.1.1.1")]
View
30 O2.Platform.VisualStudio_2010/VS_O2_PlugIns/Create O2 Platform Menu.h2
@@ -1,30 +1,24 @@
-<?xml version="1.0"?>
-<H2>
- <SourceCode>
"In Create TeamMentor Menu Script".info();
var visualStudio = new VisualStudio_2010();
var o2PlatformGui = new O2_Platform_Gui();
var replMenu = visualStudio.dte().add_TopMenu("REPL");
-replMenu.add_Menu_Button("C# REPL - VisualStudio 2010 API", () =&gt; visualStudio.open_ScriptEditor_With_VisualStudio_API())
- .add_Menu_Button("C# REPL - VisualStudio 2010 API (code sample)", () =&gt; visualStudio.open_ScriptEditor_With_VisualStudio_CodeSample())
- .add_Menu_Button("C# REPL - 'Hello World'", () =&gt; visualStudio.open_ScriptEditor().set_Code("return \"Hello World\";"))
- .add_Menu_Button("C# REPL - Tool Creator", () =&gt; open.scriptEditor())
- .add_Menu_Button("Log Viewer", () =&gt; visualStudio.open_LogViewer());
+replMenu.add_Menu_Button("C# REPL - VisualStudio 2010 API", () => visualStudio.open_ScriptEditor_With_VisualStudio_API())
+.add_Menu_Button("C# REPL - VisualStudio 2010 API (code sample)", () => visualStudio.open_ScriptEditor_With_VisualStudio_CodeSample())
+.add_Menu_Button("C# REPL - 'Hello World'", () => visualStudio.open_ScriptEditor().set_Code("return \"Hello World\";"))
+.add_Menu_Button("C# REPL - Tool Creator", () => open.scriptEditor())
+.add_Menu_Button("Log Viewer", () => visualStudio.open_LogViewer());
var o2Menu = replMenu.add_SubMenu("O2 Platform",0);
-o2Menu .add_Menu_Button("O2 VisualStudio PlugIns Editor", ()=&gt; o2PlatformGui.openScriptsViewer())
- .add_Menu_Button("Development Environment", () =&gt; open.devEnvironment())
- .add_Menu_Button("O2Script: Util - O2 Available scripts", ()=&gt; "Util - O2 Available scripts.h2".local().executeH2Script())
- .add_Menu_Button("O2Script: Main O2 Gui", () =&gt; "Main O2 Gui.h2".local().executeH2Script())
- .add_Menu_Button("Update O2 Scripts (download from GitHub)", () =&gt; O2Scripts.downloadO2Scripts());
-
+o2Menu .add_Menu_Button("O2 VisualStudio PlugIns Editor", ()=> o2PlatformGui.openScriptsViewer())
+.add_Menu_Button("Development Environment", () => open.devEnvironment())
+.add_Menu_Button("O2Script: Util - O2 Available scripts", ()=> "Util - O2 Available scripts.h2".local().executeH2Script())
+.add_Menu_Button("O2Script: Main O2 Gui", () => "Main O2 Gui.h2".local().executeH2Script())
+.add_Menu_Button("Update O2 Scripts (download from GitHub)", () => O2Scripts.downloadO2Scripts());
+
return visualStudio;
//using O2.FluentSharp.REPL
//using O2.Platform.VisualStudio_2010_Extension
-//O2File:VS_Scripts\O2_Platform_Gui.cs
-</SourceCode>
- <ReferencedAssemblies />
-</H2>
+//O2File:VS_Scripts\O2_Platform_Gui.cs
View
3 O2.Platform.VisualStudio_2010/VS_O2_PlugIns/Setup CatNet and TeamMentor.h2
@@ -0,0 +1,3 @@
+var localDevFolder = @"E:\O2_V4\O2 Platform REPOS\O2.Platform.CatNet";
+CompileEngine.LocalFoldersToSearchForCodeFiles.add_If_Not_There(localDevFolder);
+ @"VS_Scripts\TeamMentor_Gui.cs".local().executeFirstMethod();
View
3 O2.Platform.VisualStudio_2010/VS_Scripts/O2_Platform_Gui.cs
@@ -30,7 +30,8 @@ public O2_Platform_Gui buildGui()
public O2_Platform_Gui installO2Scripts()
{
- VisualStudio_O2_Utils.installO2Scripts_IfDoesntExist();
+ "Skipping: VisualStudio_O2_Utils.installO2Scripts_IfDoesntExist();".info();
+ //VisualStudio_O2_Utils.installO2Scripts_IfDoesntExist();
return this;
}
public O2_Platform_Gui createTopLevelMenu()
View
13 O2.Platform.VisualStudio_2010/VisualStudio_O2_Utils.cs
@@ -16,14 +16,14 @@ namespace O2.FluentSharp.VisualStudio
{
public class VisualStudio_O2_Utils
{
- public static void installO2Scripts_IfDoesntExist()
+ /*public static void installO2Scripts_IfDoesntExist()
{
if (PublicDI.config.LocalScriptsFolder.dirExists().isFalse())
{
O2Scripts.downloadO2Scripts();
}
- }
+ } */
public static Thread compileAndExecuteScript(string scriptFile, string type, string method)
{
"[VisualStudio_O2_Utils]: compileAndExecuteScript: {0}!{1}.{2}".debug(scriptFile, type, method);
@@ -90,8 +90,7 @@ public static bool waitForOutputWindow()
public static void addVisualStudioReferencesForCompilation()
{
CompileEngine.DefaultReferencedAssemblies
- .add_OnlyNewItems(//needed for VS scripting
- "O2_FluentSharp_VisualStudio_2010.dll",
+ .add_OnlyNewItems(//needed for VS scripting
"Microsoft.VisualStudio.Shell.10.0.dll",
"Microsoft.VisualStudio.Shell.Interop.dll",
"Microsoft.VisualStudio.Shell.Interop.8.0.dll",
@@ -110,12 +109,14 @@ public static void addVisualStudioReferencesForCompilation()
"Microsoft.VisualStudio.CoreUtility.dll",
"Microsoft.VisualStudio.Platform.VSEditor.dll",
"Microsoft.VisualStudio.Text.Data.dll",
- "O2_FluentSharp_WPF.dll",
+ "FluentSharp.WPF.dll",
//needed for WPF
"PresentationFramework.dll",
"PresentationCore.dll",
"WindowsBase.dll",
- "System.Xaml.dll"
+ "System.Xaml.dll",
+ //needed for FluentSharp ExtensionMethods
+ "O2.Platform.VisualStudio_2010.dll"
);
CompileEngine.DefaultUsingStatements
.add_OnlyNewItems("O2.FluentSharp.VisualStudio",
View
14 O2.Platform.VisualStudio_2010/app.config
@@ -1,19 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
- <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.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.5.2.0" newVersion="4.5.2.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="O2_FluentSharp_REPL" publicKeyToken="55a0f9bf4256d533" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.4.3.0" newVersion="4.4.3.0" />
- </dependentAssembly>
- </assemblyBinding>
</runtime>
</configuration>
View
11 O2.Platform.VisualStudio_2010/packages.config
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <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.BCL" version="5.0.78" targetFramework="net40" />
+ <package id="FluentSharp.CoreLib" version="5.0.78" targetFramework="net40" />
+ <package id="FluentSharp.NGit" version="5.0.78" targetFramework="net40" />
+ <package id="FluentSharp.REPL" version="5.0.78" targetFramework="net40" />
+ <package id="FluentSharp.Roslyn" version="5.0.78" targetFramework="net40" />
<package id="FluentSharp.VisualStudio2010" version="4.4.2.0" targetFramework="net40" />
- <package id="FluentSharp.WPF" version="4.5.2.0" targetFramework="net40" />
+ <package id="FluentSharp.WPF" version="5.0.78" targetFramework="net40" />
+ <package id="O2.Platform.External.SharpDevelop" version="5.0.78" targetFramework="net40" />
</packages>
View
3 O2.Platform.VisualStudio_2010/source.extension.vsixmanifest
@@ -3,9 +3,10 @@
<Identifier Id="F886416F-3DBF-4DEE-9578-E7692FC59871">
<Name>VisualStudio C# REPL - O2 Platform</Name>
<Author>OWASP O2 Platform</Author>
- <Version>4.4.16</Version>
+ <Version>5.0.0.1</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)
+5.0.x.x - update to 5.x version of FluentSharp
4.4.14 - update to latest version of FluentSharp dlls</Description>
<Locale>1033</Locale>
<MoreInfoUrl>http://o2platform.wordpress.com</MoreInfoUrl>

0 comments on commit 9ece2a1

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