Permalink
Browse files

Merge branch 'sitecore8' of https://github.com/SitecorePowerShell/Con…

…sole into sitecore8

Issue #263
  • Loading branch information...
AdamNaj committed Jan 24, 2015
2 parents bd45969 + a10a64f commit 8985e371b4a5595441421bc92ddbf9e1b29f555e
Showing with 48 additions and 49 deletions.
  1. +3 −0 .gitignore
  2. +9 −38 Cognifide.PowerShell.csproj
  3. +22 −0 Cognifide.PowerShell.sln
  4. +14 −11 Core/Modules/ModuleManager.cs
View
@@ -214,9 +214,12 @@ pip-log.txt
!/Libraries/PowerShell.MamlGenerator.dll
# Sitecore
deploy.targets
/Website/
/Database/
/Databases/
/Data/*/
/Data/*
!/Data/packages/
!/Data/serialization/
/Data/serialization/security/
@@ -79,18 +79,20 @@
<Reference Include="Sitecore.Client">
<HintPath>$(SitecorePath)\bin\Sitecore.Client.dll</HintPath>
</Reference>
<Reference Include="Sitecore.ExperienceEditor, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Sitecore.ExperienceEditor">
<SpecificVersion>False</SpecificVersion>
<HintPath>Libraries\80\Sitecore.ExperienceEditor.dll</HintPath>
<HintPath>$(LibrariesPath)\Sitecore.ExperienceEditor.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Kernel, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Sitecore.Kernel">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(SitecorePath)\bin\Sitecore.Kernel.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Logging, Version=1.2.0.30715, Culture=neutral, processorArchitecture=MSIL" />
<Reference Include="Sitecore.Update, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Sitecore.Logging">
<HintPath>$(LibrariesPath)\Sitecore.Logging.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Update">
<SpecificVersion>False</SpecificVersion>
<HintPath>Libraries\Sitecore.Update.dll</HintPath>
<HintPath>$(LibrariesPath)\Sitecore.Update.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
@@ -444,35 +446,6 @@
<Content Include="sitecore modules\PowerShell\Styles\ListView.css" />
<Content Include="sitecore modules\PowerShell\Styles\Runner.css" />
<Content Include="sitecore modules\PowerShell\Styles\VariablePrompt.css" />
<Content Include="sitecore\shell\Applications\PowerShell\ConfirmChoice.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="sitecore\shell\Applications\PowerShell\PowerShellConsole.xml" />
<Content Include="sitecore\shell\Applications\PowerShell\PowerShellResultViewerList.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="sitecore\shell\Applications\PowerShell\PowerShellMultiValuePrompt.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="sitecore\shell\Applications\PowerShell\PowerShellResultViewerText.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="sitecore\shell\Applications\PowerShell\DownloadFile.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="sitecore\shell\Applications\PowerShell\GetStringResponse.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="sitecore\shell\Applications\PowerShell\PowerShellRunner.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="sitecore\shell\Applications\PowerShell\PowerShellIse.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="sitecore\shell\Applications\PowerShell\PowerShellScriptBrowser.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="sitecore\shell\Override\Controls\Splitters\HSplitter.xml" />
</ItemGroup>
<ItemGroup>
<Content Include="App_Config\Include\Cognifide.PowerShell.config">
@@ -484,7 +457,6 @@
<Content Include="sitecore modules\PowerShell\Assets\Sitecore.Views.ps1xml" />
<Content Include="sitecore modules\PowerShell\Services\RemoteScriptCall.ashx" />
<Content Include="sitecore modules\PowerShell\Services\web.config" />
<None Include="sitecore\shell\Themes\Standard\PowerShell.zip" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -506,8 +478,7 @@
</VisualStudio>
</ProjectExtensions>
<PropertyGroup>
<PostBuildEvent>:xcopy C:\Users\Michael.West\Documents\GitHub\Console\Data\*.* C:\inetpub\wwwroot\Sitecore7\Data\*.* /s /e /c /y
xcopy C:\Projects\sitecorepowershell\Trunk\bin\Debug\Cognifide.PowerShell*.* C:\inetpub\wwwroot\Sitecore8\Website\bin\*.* /s /e /c /y</PostBuildEvent>
<PostBuildEvent>REM xcopy C:\Projects\sitecorepowershell\Trunk\bin\Debug\Cognifide.PowerShell*.* C:\inetpub\wwwroot\Sitecore8\Website\bin\*.* /s /e /c /y</PostBuildEvent>
</PropertyGroup>
<!-- 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
@@ -0,0 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cognifide.PowerShell", "Cognifide.PowerShell.csproj", "{FAC57610-989C-4D7E-8D58-CCC914688096}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FAC57610-989C-4D7E-8D58-CCC914688096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FAC57610-989C-4D7E-8D58-CCC914688096}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FAC57610-989C-4D7E-8D58-CCC914688096}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FAC57610-989C-4D7E-8D58-CCC914688096}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -22,23 +22,26 @@ public static List<Module> Modules
if (modules == null)
{
modules = new List<Module>();
Item masterLibrary = Factory.GetDatabase(ApplicationSettings.ScriptLibraryDb).GetItem(ApplicationSettings.ScriptLibraryPath);
Item masterLibrary =
Factory.GetDatabase(ApplicationSettings.ScriptLibraryDb)
.GetItem(ApplicationSettings.ScriptLibraryPath);
if (masterLibrary != null)
{
modules.Add(new Module(masterLibrary,true));
modules.Add(new Module(masterLibrary, true));
foreach (Item item in masterLibrary.GetChildren())
{
if (item.TemplateName.Equals("PowerShell Script Module", StringComparison.InvariantCulture))
{
modules.Add(new Module(item, false));
}
}
}
Item coreLibrary = Factory.GetDatabase("core").GetItem(ApplicationSettings.ScriptLibraryPath);
if (coreLibrary != null)
if (coreLibrary != null)
{
modules.Add(new Module(coreLibrary,true));
}
foreach (Item item in masterLibrary.GetChildren())
{
if (item.TemplateName.Equals("PowerShell Script Module", StringComparison.InvariantCulture))
{
modules.Add(new Module(item,false));
}
modules.Add(new Module(coreLibrary, true));
}
}
return modules;

0 comments on commit 8985e37

Please sign in to comment.