Skip to content

Update projects and build script to .NET SDK 1.0.0-rc3 #360

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 2 commits into from
Jan 31, 2017
Merged

Update projects and build script to .NET SDK 1.0.0-rc3 #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ae546d
Update projects and build script to .NET SDK 1.0.0-rc3
daviwil Jan 31, 2017
d002a2d
Add AppVeyor environment vars to speed up CI builds
daviwil Jan 31, 2017
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
4 changes: 1 addition & 3 deletions PowerShellEditorServices.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />

<Project>
<PropertyGroup>
<VersionPrefix>0.9.0</VersionPrefix>
<VersionSuffix>beta</VersionSuffix>
Expand Down
10 changes: 2 additions & 8 deletions PowerShellEditorServices.build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,7 @@ if ($PSVersionTable.PSEdition -ne "Core") {
task SetupDotNet -Before Restore, Clean, Build, BuildHost, Test, TestPowerShellApi, PackageNuGet {

# Fetch the SDK version from global.json
$globalJson = Get-Content $PSScriptRoot/global.json | ConvertFrom-Json
$requiredSdkVersion = $globalJson.sdk.version

# Alternative versions:
# "version": "1.0.0-rc4-004598"
# "version": "1.0.0-rc3-004517"
# "version": "1.0.0-preview4-004233"
$requiredSdkVersion = "1.0.0-rc3-004530"

$needsInstall = $true
$dotnetPath = "$PSScriptRoot/.dotnet"
Expand Down Expand Up @@ -62,7 +56,7 @@ task SetupDotNet -Before Restore, Clean, Build, BuildHost, Test, TestPowerShellA

# Download the official installation script and run it
$installScriptPath = "$([System.IO.Path]::GetTempPath())dotnet-install.$installScriptExt"
Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview4/scripts/obtain/dotnet-install.$installScriptExt" -OutFile $installScriptPath
Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-rc3/scripts/obtain/dotnet-install.$installScriptExt" -OutFile $installScriptPath
$env:DOTNET_INSTALL_DIR = "$PSScriptRoot/.dotnet"

if (!$script:IsUnix) {
Expand Down
32 changes: 1 addition & 31 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 15
VisualStudioVersion = 15.0.25928.0
VisualStudioVersion = 15.0.26127.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F594E7FD-1E72-4E51-A496-B019C2BA3180}"
EndProject
Expand All @@ -26,10 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Pr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Test.Protocol", "test\PowerShellEditorServices.Test.Protocol\PowerShellEditorServices.Test.Protocol.csproj", "{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Channel.WebSocket", "src\PowerShellEditorServices.Channel.WebSocket\PowerShellEditorServices.Channel.WebSocket.csproj", "{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Test.Channel.WebSocket", "test\PowerShellEditorServices.Test.Channel.WebSocket\PowerShellEditorServices.Test.Channel.WebSocket.csproj", "{9D98120C-9601-4678-AD50-EF2808DABAC9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -124,30 +120,6 @@ Global
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Release|x64.Build.0 = Release|Any CPU
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Release|x86.ActiveCfg = Release|Any CPU
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Release|x86.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}.Debug|x64.ActiveCfg = Debug|Any CPU
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|x64.Build.0 = Debug|Any CPU
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|x86.ActiveCfg = Debug|Any CPU
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|x86.Build.0 = Debug|Any CPU
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|Any CPU.Build.0 = Release|Any CPU
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|x64.ActiveCfg = Release|Any CPU
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|x64.Build.0 = Release|Any CPU
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|x86.ActiveCfg = Release|Any CPU
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|x86.Build.0 = Release|Any CPU
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|x64.ActiveCfg = Debug|Any CPU
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|x64.Build.0 = Debug|Any CPU
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|x86.ActiveCfg = Debug|Any CPU
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|x86.Build.0 = Debug|Any CPU
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|Any CPU.Build.0 = Release|Any CPU
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|x64.ActiveCfg = Release|Any CPU
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|x64.Build.0 = Release|Any CPU
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|x86.ActiveCfg = Release|Any CPU
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -160,7 +132,5 @@ 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}
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
{9D98120C-9601-4678-AD50-EF2808DABAC9} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
EndGlobalSection
EndGlobal
4 changes: 4 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ branches:
- master
- develop

environment:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Don't download unneeded packages
DOTNET_CLI_TELEMETRY_OPTOUT: true # Don't send telemetry

install:
- ps: |
Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null
Expand Down
5 changes: 0 additions & 5 deletions global.json
View file
Open in desktop

This file was deleted.

20 changes: 2 additions & 18 deletions ...erShellEditorServices.Channel.WebSocket/PowerShellEditorServices.Channel.WebSocket.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />

<PropertyGroup>
<AssemblyTitle>PowerShell Editor Services WebSocket Protocol Channel</AssemblyTitle>
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
<TargetFramework>net451</TargetFramework>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So how does this compile for .NET Core now? Via the PackageTargetFallback property below?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't even compiling for netstandard1.6 before, I used a condition to take out the list of compiled files for that TargetFramework. That trick didn't seem to work for the new csproj changes so I decided to take the WebSocket projects out of the solution for now. The NuGet dependencies that it uses aren't supported yet on .NET Core unfortunately.

Based on some feedback from some other folks, I think we're going to switch to an HTTP long-polling model instead of WebSockets for a web-based transport.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting, thanks. BTW what issues did folks have with WebSockets?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We want to use it in Azure to provide a better PowerShell editing experience, due to the complexity of Azure Resource Manager's architecture, there's no way to maintain a persistent WebSocket connection between a browser and a backend server. Others have been using long-polling for "connected" sessions so I figured it might be better to make that the primary approach.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One other issue is that AFAIK there is no WebSockets implementation for CoreCLR yet, but maybe that's changing soon.

Copy link
Contributor

@rkeithhill rkeithhill Feb 1, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I thought David Fowler and crew were working on a SignalR implementation for ASP.NET Core due late this year. https://speakerdeck.com/davidfowl/introducing-asp-dot-net-core-sockets

Also this site claims WebSockets is already in CoreFX:
https://apisof.net/catalog/System.Net.WebSockets

<AssemblyName>Microsoft.PowerShell.EditorServices.Channel.WebSocket</AssemblyName>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
</PropertyGroup>

<!-- This project currently doesn't work on netstandard1.6 so don't compile its source -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ProjectReference Include="..\PowerShellEditorServices\PowerShellEditorServices.csproj" />
<ProjectReference Include="..\PowerShellEditorServices.Protocol\PowerShellEditorServices.Protocol.csproj" />
Expand All @@ -24,13 +17,6 @@
<PackageReference Include="Newtonsoft.Json">
<Version>9.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.NET.Sdk">
<Version>1.0.0-alpha-20161104-2</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="NETStandard.Library">
<Version>1.6.1</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
Expand All @@ -48,6 +34,4 @@
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
40 changes: 3 additions & 37 deletions src/PowerShellEditorServices.Host/PowerShellEditorServices.Host.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />

<PropertyGroup>
<AssemblyTitle>PowerShell Editor Services Host Process</AssemblyTitle>
<Description>Provides a process for hosting the PowerShell Editor Services library exposed by a JSON message protocol.</Description>
Expand All @@ -9,12 +9,6 @@
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\PowerShellEditorServices\PowerShellEditorServices.csproj" />
<ProjectReference Include="..\PowerShellEditorServices.Protocol\PowerShellEditorServices.Protocol.csproj" />
Expand All @@ -24,13 +18,6 @@
<PackageReference Include="Newtonsoft.Json">
<Version>9.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.NET.Sdk">
<Version>1.0.0-alpha-20161104-2</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="NETStandard.Library">
<Version>1.6.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.PowerShell.SDK">
<Version>6.0.0-alpha13</Version>
</PackageReference>
Expand All @@ -44,25 +31,4 @@
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<!--<PropertyGroup>
<PostBuildEvent>
if not exist "$(SolutionDir)module\PowerShellEditorServices\bin" (
mkdir "$(SolutionDir)module\PowerShellEditorServices\bin"
)
if not exist "$(SolutionDir)module\PowerShellEditorServices\bin\Desktop" (
mkdir "$(SolutionDir)module\PowerShellEditorServices\bin\Desktop"
)

echo(
echo Copying files to module path: $(SolutionDir)module\PowerShellEditorServices\bin\Desktop
copy /y /v "$(ProjectDir)bin\$(Configuration)\Newtonsoft.Json.dll" "$(SolutionDir)module\PowerShellEditorServices\bin\Desktop"
copy /y /v "$(ProjectDir)bin\$(Configuration)\Microsoft.PowerShell.EditorServices.dll" "$(SolutionDir)module\PowerShellEditorServices\bin\Desktop"
copy /y /v "$(ProjectDir)bin\$(Configuration)\Microsoft.PowerShell.EditorServices.Protocol.dll" "$(SolutionDir)module\PowerShellEditorServices\bin\Desktop"
copy /y /v "$(ProjectDir)bin\$(Configuration)\Microsoft.PowerShell.EditorServices.Host.dll" "$(SolutionDir)module\PowerShellEditorServices\bin\Desktop"
echo(
</PostBuildEvent>
</PropertyGroup>-->

<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
21 changes: 3 additions & 18 deletions src/PowerShellEditorServices.Protocol/PowerShellEditorServices.Protocol.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />

<PropertyGroup>
<AssemblyTitle>PowerShell Editor Services Host Protocol Library</AssemblyTitle>
<Description>Provides message types and client/server APIs for the PowerShell Editor Services JSON protocol.</Description>
Expand All @@ -9,12 +9,6 @@
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\PowerShellEditorServices\PowerShellEditorServices.csproj" />
</ItemGroup>
Expand All @@ -23,13 +17,6 @@
<PackageReference Include="Newtonsoft.Json">
<Version>9.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.NET.Sdk">
<Version>1.0.0-alpha-20161104-2</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="NETStandard.Library">
<Version>1.6.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.PowerShell.SDK">
<Version>6.0.0-alpha13</Version>
</PackageReference>
Expand All @@ -43,6 +30,4 @@
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
18 changes: 1 addition & 17 deletions src/PowerShellEditorServices/PowerShellEditorServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />

<PropertyGroup>
<AssemblyTitle>PowerShell Editor Services</AssemblyTitle>
<Description>Provides common PowerShell editor capabilities as a .NET library.</Description>
Expand All @@ -10,9 +9,6 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
<EmbeddedResource Include="Extensions\CmdletInterface.ps1">
<LogicalName>Microsoft.PowerShell.EditorServices.Extensions.CmdletInterface.ps1</LogicalName>
</EmbeddedResource>
Expand All @@ -38,16 +34,6 @@
<DocumentationFile>bin\$(TargetFramework)\$(Configuration)\Microsoft.PowerShell.EditorServices.xml</DocumentationFile>
</PropertyGroup>-->

<ItemGroup>
<PackageReference Include="Microsoft.NET.Sdk">
<Version>1.0.0-alpha-20161104-2</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="NETStandard.Library">
<Version>1.6.1</Version>
</PackageReference>
</ItemGroup>

<Target Name="PowerShellVersionOutput" BeforeTargets="Compile">
<Message
Condition=" '$(TargetFramework)' == 'net451' And '$(PowerShellVersion)' != '' "
Expand Down Expand Up @@ -90,6 +76,4 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>

<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
28 changes: 4 additions & 24 deletions ...torServices.Test.Channel.WebSocket/PowerShellEditorServices.Test.Channel.WebSocket.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />

<PropertyGroup>
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
<TargetFrameworks>net451</TargetFrameworks>
<AssemblyName>Microsoft.PowerShell.EditorServices.Test.Channel.WebSocket</AssemblyName>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
</PropertyGroup>

<!-- This project currently doesn't work on netstandard1.6 so don't compile its source -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\PowerShellEditorServices\PowerShellEditorServices.csproj" />
<ProjectReference Include="..\..\src\PowerShellEditorServices.Channel.WebSocket\PowerShellEditorServices.Channel.WebSocket.csproj" />
Expand All @@ -23,21 +16,10 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
<PackageReference Include="Microsoft.TestPlatform.TestHost">
<Version>15.0.0-*</Version>
</PackageReference>
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="15.0.0-*" />
<PackageReference Include="xunit" Version="2.2.0-*" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
<PackageReference Include="Microsoft.NET.Sdk">
<Version>1.0.0-alpha-20161104-2</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="NETStandard.Library">
<Version>1.6.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.PowerShell.SDK">
<Version>6.0.0-alpha13</Version>
</PackageReference>
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.0.0-alpha13" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
Expand All @@ -58,6 +40,4 @@
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
14 changes: 1 addition & 13 deletions test/PowerShellEditorServices.Test.Host/PowerShellEditorServices.Test.Host.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />

<PropertyGroup>
Expand All @@ -8,9 +8,6 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
<None Include="TestFiles\**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand All @@ -29,13 +26,6 @@
</PackageReference>
<PackageReference Include="xunit" Version="2.2.0-*" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
<PackageReference Include="Microsoft.NET.Sdk">
<Version>1.0.0-alpha-20161104-2</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="NETStandard.Library">
<Version>1.6.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.PowerShell.SDK">
<Version>6.0.0-alpha13</Version>
</PackageReference>
Expand All @@ -49,6 +39,4 @@
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Loading