Skip to content

Use corflags.exe to generate x86 host process #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 10, 2016
Merged

Use corflags.exe to generate x86 host process #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions PowerShellEditorServices.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F594E7FD-1E72-4E51-A496-B019C2BA3180}"
EndProject
Expand Down Expand Up @@ -39,8 +39,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices.Pr
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices.Test.Protocol", "test\PowerShellEditorServices.Test.Protocol\PowerShellEditorServices.Test.Protocol.csproj", "{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices.Host.x86", "src\PowerShellEditorServices.Host.x86\PowerShellEditorServices.Host.x86.csproj", "{0E720BF8-84E3-4C56-BCEA-7D6FD34D8948}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices.Channel.WebSocket", "src\PowerShellEditorServices.Channel.WebSocket\PowerShellEditorServices.Channel.WebSocket.csproj", "{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices.Test.Channel.WebSocket", "test\PowerShellEditorServices.Test.Channel.WebSocket\PowerShellEditorServices.Test.Channel.WebSocket.csproj", "{9D98120C-9601-4678-AD50-EF2808DABAC9}"
Expand Down Expand Up @@ -87,10 +85,6 @@ Global
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Release|Any CPU.Build.0 = Release|Any CPU
{0E720BF8-84E3-4C56-BCEA-7D6FD34D8948}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E720BF8-84E3-4C56-BCEA-7D6FD34D8948}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E720BF8-84E3-4C56-BCEA-7D6FD34D8948}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0E720BF8-84E3-4C56-BCEA-7D6FD34D8948}.Release|Any CPU.Build.0 = Release|Any CPU
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -113,7 +107,6 @@ Global
{6A20B9E9-DE66-456E-B4F5-ACFD1A95C3CA} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
{F8A0946A-5D25-4651-8079-B8D5776916FB} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
{0E720BF8-84E3-4C56-BCEA-7D6FD34D8948} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
{9D98120C-9601-4678-AD50-EF2808DABAC9} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
EndGlobalSection
Expand Down
94 changes: 0 additions & 94 deletions src/PowerShellEditorServices.Host.x86/PowerShellEditorServices.Host.x86.csproj
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions src/PowerShellEditorServices.Host.x86/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions src/PowerShellEditorServices.Host/PowerShellEditorServices.Host.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<PropertyGroup>
<PostBuildEvent>
copy /y "$(ProjectDir)bin\$(Configuration)\Microsoft.PowerShell.EditorServices.Host.exe" "$(ProjectDir)bin\$(Configuration)\Microsoft.PowerShell.EditorServices.Host.x86.exe"
copy /y "$(ProjectDir)bin\$(Configuration)\Microsoft.PowerShell.EditorServices.Host.exe.config" "$(ProjectDir)bin\$(Configuration)\Microsoft.PowerShell.EditorServices.Host.x86.exe.config"
"$(TargetFrameworkSDKToolsDirectory)\corflags.exe" "$(ProjectDir)bin\$(Configuration)\Microsoft.PowerShell.EditorServices.Host.x86.exe" /32BIT+ /Force
</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.
<Target Name="BeforeBuild">
Expand Down
4 changes: 2 additions & 2 deletions src/PowerShellEditorServices.Host/PowerShellEditorServices.Host.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<package>
<metadata>
<id>$id$</id>
Expand All @@ -21,6 +21,6 @@
</metadata>
<files>
<file src="bin\$configuration$\$id$.exe" target="lib\net45\" />
<file src="..\PowerShellEditorServices.Host.x86\bin\$configuration$\$id$.x86.exe" target="lib\net45\" />
<file src="bin\$configuration$\$id$.x86.exe" target="lib\net45\" />
</files>
</package>