Skip to content

Commit 8bc8add

Browse files
daviwildaviwil
committed
Merge pull request #92 from adamdriscoll/x86
X86 Host Support
2 parents a5eeded + 9770daa commit 8bc8add

8 files changed

+198
-1
lines changed

‎PowerShellEditorServices.sln

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
4+
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F594E7FD-1E72-4E51-A496-B019C2BA3180}"
77
EndProject
@@ -39,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices.Pr
3939
EndProject
4040
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices.Test.Protocol", "test\PowerShellEditorServices.Test.Protocol\PowerShellEditorServices.Test.Protocol.csproj", "{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}"
4141
EndProject
42+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices.Host.x86", "src\PowerShellEditorServices.Host.x86\PowerShellEditorServices.Host.x86.csproj", "{0E720BF8-84E3-4C56-BCEA-7D6FD34D8948}"
43+
EndProject
4244
Global
4345
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4446
Debug|Any CPU = Debug|Any CPU
@@ -81,6 +83,10 @@ Global
8183
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
8284
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
8385
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Release|Any CPU.Build.0 = Release|Any CPU
86+
{0E720BF8-84E3-4C56-BCEA-7D6FD34D8948}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
87+
{0E720BF8-84E3-4C56-BCEA-7D6FD34D8948}.Debug|Any CPU.Build.0 = Debug|Any CPU
88+
{0E720BF8-84E3-4C56-BCEA-7D6FD34D8948}.Release|Any CPU.ActiveCfg = Release|Any CPU
89+
{0E720BF8-84E3-4C56-BCEA-7D6FD34D8948}.Release|Any CPU.Build.0 = Release|Any CPU
8490
EndGlobalSection
8591
GlobalSection(SolutionProperties) = preSolution
8692
HideSolutionNode = FALSE
@@ -95,5 +101,6 @@ Global
95101
{6A20B9E9-DE66-456E-B4F5-ACFD1A95C3CA} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
96102
{F8A0946A-5D25-4651-8079-B8D5776916FB} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
97103
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
104+
{0E720BF8-84E3-4C56-BCEA-7D6FD34D8948} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
98105
EndGlobalSection
99106
EndGlobal

‎scripts/FetchLatestBuild.ps1

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ function Install-BuildPackage($packageName, $extension) {
4646
Install-BuildPackage "Microsoft.PowerShell.EditorServices" "dll"
4747
Install-BuildPackage "Microsoft.PowerShell.EditorServices.Protocol" "dll"
4848
Install-BuildPackage "Microsoft.PowerShell.EditorServices.Host" "exe"
49+
Install-BuildPackage "Microsoft.PowerShell.EditorServices.Host.x86" "exe"
4950

5051
# Open the BinariesToSign folder
5152
& start $binariesToSignPath

‎src/PowerShellEditorServices.Host.x86/Microsoft.PowerShell.EditorServices.Host.DebugAdapter.cmd

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
@echo off
2+
3+
REM This script is necessary until VS Code's debug adapter config allows command line parameters
4+
5+
setlocal
6+
cd /d %~dp0
7+
8+
Microsoft.PowerShell.EditorServices.Host.x86.exe /debugAdapter

‎src/PowerShellEditorServices.Host.x86/PowerShellEditorServices.Host.x86.csproj

+110
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{0E720BF8-84E3-4C56-BCEA-7D6FD34D8948}</ProjectGuid>
8+
<OutputType>Exe</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Microsoft.PowerShell.EditorServices.Host</RootNamespace>
11+
<AssemblyName>Microsoft.PowerShell.EditorServices.Host.x86</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
15+
<RestorePackages>true</RestorePackages>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18+
<PlatformTarget>x86</PlatformTarget>
19+
<DebugSymbols>true</DebugSymbols>
20+
<DebugType>full</DebugType>
21+
<Optimize>false</Optimize>
22+
<OutputPath>bin\Debug\</OutputPath>
23+
<DefineConstants>DEBUG;TRACE</DefineConstants>
24+
<ErrorReport>prompt</ErrorReport>
25+
<WarningLevel>4</WarningLevel>
26+
<DocumentationFile>
27+
</DocumentationFile>
28+
</PropertyGroup>
29+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30+
<PlatformTarget>x86</PlatformTarget>
31+
<DebugType>pdbonly</DebugType>
32+
<Optimize>true</Optimize>
33+
<OutputPath>bin\Release\</OutputPath>
34+
<DefineConstants>TRACE</DefineConstants>
35+
<ErrorReport>prompt</ErrorReport>
36+
<WarningLevel>4</WarningLevel>
37+
</PropertyGroup>
38+
<ItemGroup>
39+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" />
40+
<Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
42+
<Private>True</Private>
43+
</Reference>
44+
<Reference Include="Nito.AsyncEx.Concurrent, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll</HintPath>
46+
<Private>True</Private>
47+
</Reference>
48+
<Reference Include="Nito.AsyncEx.Enlightenment, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath>
50+
<Private>True</Private>
51+
</Reference>
52+
<Reference Include="System" />
53+
<Reference Include="System.Core" />
54+
<Reference Include="System.Xml.Linq" />
55+
<Reference Include="System.Data.DataSetExtensions" />
56+
<Reference Include="Microsoft.CSharp" />
57+
<Reference Include="System.Data" />
58+
<Reference Include="System.Xml" />
59+
<Reference Include="System.Management.Automation" />
60+
</ItemGroup>
61+
<ItemGroup>
62+
<Compile Include="..\PowerShellEditorServices.Host\Program.cs">
63+
<Link>Program.cs</Link>
64+
</Compile>
65+
<Compile Include="Properties\AssemblyInfo.cs" />
66+
</ItemGroup>
67+
<ItemGroup>
68+
<Content Include="Microsoft.PowerShell.EditorServices.Host.DebugAdapter.cmd">
69+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
70+
</Content>
71+
<None Include="..\PowerShellEditorServices.Host\App.config">
72+
<Link>App.config</Link>
73+
</None>
74+
<None Include="packages.config" />
75+
</ItemGroup>
76+
<ItemGroup>
77+
<ProjectReference Include="..\..\submodules\PSScriptAnalyzer\Engine\ScriptAnalyzerEngine.csproj">
78+
<Project>{f4bde3d0-3eef-4157-8a3e-722df7adef60}</Project>
79+
<Name>ScriptAnalyzerEngine</Name>
80+
</ProjectReference>
81+
<ProjectReference Include="..\..\submodules\PSScriptAnalyzer\Rules\ScriptAnalyzerBuiltinRules.csproj">
82+
<Project>{c33b6b9d-e61c-45a3-9103-895fd82a5c1e}</Project>
83+
<Name>ScriptAnalyzerBuiltinRules</Name>
84+
</ProjectReference>
85+
<ProjectReference Include="..\PowerShellEditorServices.Protocol\PowerShellEditorServices.Protocol.csproj">
86+
<Project>{f8a0946a-5d25-4651-8079-b8d5776916fb}</Project>
87+
<Name>PowerShellEditorServices.Protocol</Name>
88+
</ProjectReference>
89+
<ProjectReference Include="..\PowerShellEditorServices\PowerShellEditorServices.csproj">
90+
<Project>{81e8cbcd-6319-49e7-9662-0475bd0791f4}</Project>
91+
<Name>PowerShellEditorServices</Name>
92+
</ProjectReference>
93+
</ItemGroup>
94+
<ItemGroup />
95+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
96+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
97+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
98+
<PropertyGroup>
99+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
100+
</PropertyGroup>
101+
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
102+
</Target>
103+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
104+
Other similar extension points exist, see Microsoft.Common.targets.
105+
<Target Name="BeforeBuild">
106+
</Target>
107+
<Target Name="AfterBuild">
108+
</Target>
109+
-->
110+
</Project>

‎src/PowerShellEditorServices.Host.x86/PowerShellEditorServices.Host.x86.nuspec

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0"?>
2+
<package>
3+
<metadata>
4+
<id>$id$</id>
5+
<version>$version$</version>
6+
<title>PowerShell Editor Services Host Process (x86)</title>
7+
<authors>$author$</authors>
8+
<owners>$author$</owners>
9+
<licenseUrl>https://raw.githubusercontent.com/PowerShell/PowerShellEditorServices/master/LICENSE</licenseUrl>
10+
<projectUrl>https://github.com/PowerShell/PowerShellEditorServices</projectUrl>
11+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
12+
<description>$description$</description>
13+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
14+
<tags>PowerShell editor development language debugging</tags>
15+
<dependencies>
16+
<group>
17+
<dependency id="Microsoft.PowerShell.EditorServices" version="$version$" />
18+
<dependency id="Microsoft.PowerShell.EditorServices.Protocol" version="$version$" />
19+
</group>
20+
</dependencies>
21+
</metadata>
22+
</package>

‎src/PowerShellEditorServices.Host.x86/Properties/AssemblyInfo.cs

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
//
2+
// Copyright (c) Microsoft. All rights reserved.
3+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
4+
//
5+
6+
using System.Reflection;
7+
using System.Runtime.CompilerServices;
8+
using System.Runtime.InteropServices;
9+
10+
// General Information about an assembly is controlled through the following
11+
// set of attributes. Change these attribute values to modify the information
12+
// associated with an assembly.
13+
[assembly: AssemblyTitle("PowerShell Editor Services Host Process")]
14+
[assembly: AssemblyDescription("Provides a process for hosting the PowerShell Editor Services library exposed by a JSON message protocol.")]
15+
[assembly: AssemblyConfiguration("")]
16+
[assembly: AssemblyCompany("Microsoft")]
17+
[assembly: AssemblyProduct("PowerShell Editor Services")]
18+
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
19+
[assembly: AssemblyTrademark("")]
20+
[assembly: AssemblyCulture("")]
21+
22+
// Setting ComVisible to false makes the types in this assembly not visible
23+
// to COM components. If you need to access a type in this assembly from
24+
// COM, set the ComVisible attribute to true on that type.
25+
[assembly: ComVisible(false)]
26+
27+
// The following GUID is for the ID of the typelib if this project is exposed to COM
28+
[assembly: Guid("22ca7f41-70ac-488f-a98a-30b41327e81d")]
29+
30+
// Version information for an assembly consists of the following four values:
31+
//
32+
// Major Version
33+
// Minor Version
34+
// Build Number
35+
// Revision
36+
//
37+
// You can specify all the values or you can default the Build and Revision Numbers
38+
// by using the '*' as shown below:
39+
// [assembly: AssemblyVersion("1.0.*")]
40+
[assembly: AssemblyVersion("0.0.0.0")]
41+
[assembly: AssemblyFileVersion("0.0.0.0")]
42+
[assembly: AssemblyInformationalVersion("0.0.0.0")]
43+

‎src/PowerShellEditorServices.Host.x86/packages.config

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net45" />
4+
</packages>

‎src/PowerShellEditorServices.Host/PowerShellEditorServices.Host.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<WarningLevel>4</WarningLevel>
2626
<DocumentationFile>
2727
</DocumentationFile>
28+
<Prefer32Bit>false</Prefer32Bit>
2829
</PropertyGroup>
2930
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3031
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,6 +35,7 @@
3435
<DefineConstants>TRACE</DefineConstants>
3536
<ErrorReport>prompt</ErrorReport>
3637
<WarningLevel>4</WarningLevel>
38+
<Prefer32Bit>false</Prefer32Bit>
3739
</PropertyGroup>
3840
<ItemGroup>
3941
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" />

0 commit comments

Comments
 (0)