Skip to content

Commit 5ae546d

Browse files
daviwildaviwil
committed
Update projects and build script to .NET SDK 1.0.0-rc3
1 parent ddfb66b commit 5ae546d

File tree

13 files changed

+21
-230
lines changed

13 files changed

+21
-230
lines changed

‎PowerShellEditorServices.Common.props

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
3-
1+
<Project>
42
<PropertyGroup>
53
<VersionPrefix>0.9.0</VersionPrefix>
64
<VersionSuffix>beta</VersionSuffix>

‎PowerShellEditorServices.build.ps1

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,7 @@ if ($PSVersionTable.PSEdition -ne "Core") {
2121
task SetupDotNet -Before Restore, Clean, Build, BuildHost, Test, TestPowerShellApi, PackageNuGet {
2222

2323
# Fetch the SDK version from global.json
24-
$globalJson = Get-Content $PSScriptRoot/global.json | ConvertFrom-Json
25-
$requiredSdkVersion = $globalJson.sdk.version
26-
27-
# Alternative versions:
28-
# "version": "1.0.0-rc4-004598"
29-
# "version": "1.0.0-rc3-004517"
30-
# "version": "1.0.0-preview4-004233"
24+
$requiredSdkVersion = "1.0.0-rc3-004530"
3125

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

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

6862
if (!$script:IsUnix) {

‎PowerShellEditorServices.sln

Lines changed: 1 addition & 31 deletions
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 15
4-
VisualStudioVersion = 15.0.25928.0
4+
VisualStudioVersion = 15.0.26127.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F594E7FD-1E72-4E51-A496-B019C2BA3180}"
77
EndProject
@@ -26,10 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Pr
2626
EndProject
2727
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Test.Protocol", "test\PowerShellEditorServices.Test.Protocol\PowerShellEditorServices.Test.Protocol.csproj", "{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}"
2828
EndProject
29-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Channel.WebSocket", "src\PowerShellEditorServices.Channel.WebSocket\PowerShellEditorServices.Channel.WebSocket.csproj", "{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}"
30-
EndProject
31-
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}"
32-
EndProject
3329
Global
3430
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3531
Debug|Any CPU = Debug|Any CPU
@@ -124,30 +120,6 @@ Global
124120
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Release|x64.Build.0 = Release|Any CPU
125121
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Release|x86.ActiveCfg = Release|Any CPU
126122
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Release|x86.Build.0 = Release|Any CPU
127-
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
128-
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|Any CPU.Build.0 = Debug|Any CPU
129-
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|x64.ActiveCfg = Debug|Any CPU
130-
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|x64.Build.0 = Debug|Any CPU
131-
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|x86.ActiveCfg = Debug|Any CPU
132-
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|x86.Build.0 = Debug|Any CPU
133-
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|Any CPU.ActiveCfg = Release|Any CPU
134-
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|Any CPU.Build.0 = Release|Any CPU
135-
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|x64.ActiveCfg = Release|Any CPU
136-
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|x64.Build.0 = Release|Any CPU
137-
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|x86.ActiveCfg = Release|Any CPU
138-
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|x86.Build.0 = Release|Any CPU
139-
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
140-
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
141-
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|x64.ActiveCfg = Debug|Any CPU
142-
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|x64.Build.0 = Debug|Any CPU
143-
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|x86.ActiveCfg = Debug|Any CPU
144-
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|x86.Build.0 = Debug|Any CPU
145-
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
146-
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|Any CPU.Build.0 = Release|Any CPU
147-
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|x64.ActiveCfg = Release|Any CPU
148-
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|x64.Build.0 = Release|Any CPU
149-
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|x86.ActiveCfg = Release|Any CPU
150-
{9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|x86.Build.0 = Release|Any CPU
151123
EndGlobalSection
152124
GlobalSection(SolutionProperties) = preSolution
153125
HideSolutionNode = FALSE
@@ -160,7 +132,5 @@ Global
160132
{6A20B9E9-DE66-456E-B4F5-ACFD1A95C3CA} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
161133
{F8A0946A-5D25-4651-8079-B8D5776916FB} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
162134
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
163-
{A6663F64-3C3D-461F-8A05-0CC4CA7A9945} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
164-
{9D98120C-9601-4678-AD50-EF2808DABAC9} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
165135
EndGlobalSection
166136
EndGlobal

‎global.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/PowerShellEditorServices.Channel.WebSocket/PowerShellEditorServices.Channel.WebSocket.csproj

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
1-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
33

44
<PropertyGroup>
55
<AssemblyTitle>PowerShell Editor Services WebSocket Protocol Channel</AssemblyTitle>
6-
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
6+
<TargetFramework>net451</TargetFramework>
77
<AssemblyName>Microsoft.PowerShell.EditorServices.Channel.WebSocket</AssemblyName>
88
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
99
</PropertyGroup>
1010

11-
<!-- This project currently doesn't work on netstandard1.6 so don't compile its source -->
12-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
13-
<Compile Include="**\*.cs" />
14-
<EmbeddedResource Include="**\*.resx" />
15-
<EmbeddedResource Include="compiler\resources\**\*" />
16-
</ItemGroup>
17-
1811
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
1912
<ProjectReference Include="..\PowerShellEditorServices\PowerShellEditorServices.csproj" />
2013
<ProjectReference Include="..\PowerShellEditorServices.Protocol\PowerShellEditorServices.Protocol.csproj" />
@@ -24,13 +17,6 @@
2417
<PackageReference Include="Newtonsoft.Json">
2518
<Version>9.0.1</Version>
2619
</PackageReference>
27-
<PackageReference Include="Microsoft.NET.Sdk">
28-
<Version>1.0.0-alpha-20161104-2</Version>
29-
<PrivateAssets>All</PrivateAssets>
30-
</PackageReference>
31-
<PackageReference Include="NETStandard.Library">
32-
<Version>1.6.1</Version>
33-
</PackageReference>
3420
</ItemGroup>
3521

3622
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
@@ -48,6 +34,4 @@
4834
<Reference Include="System" />
4935
<Reference Include="Microsoft.CSharp" />
5036
</ItemGroup>
51-
52-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5337
</Project>

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

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
3-
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
3+
44
<PropertyGroup>
55
<AssemblyTitle>PowerShell Editor Services Host Process</AssemblyTitle>
66
<Description>Provides a process for hosting the PowerShell Editor Services library exposed by a JSON message protocol.</Description>
@@ -9,12 +9,6 @@
99
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
1010
</PropertyGroup>
1111

12-
<ItemGroup>
13-
<Compile Include="**\*.cs" />
14-
<EmbeddedResource Include="**\*.resx" />
15-
<EmbeddedResource Include="compiler\resources\**\*" />
16-
</ItemGroup>
17-
1812
<ItemGroup>
1913
<ProjectReference Include="..\PowerShellEditorServices\PowerShellEditorServices.csproj" />
2014
<ProjectReference Include="..\PowerShellEditorServices.Protocol\PowerShellEditorServices.Protocol.csproj" />
@@ -24,13 +18,6 @@
2418
<PackageReference Include="Newtonsoft.Json">
2519
<Version>9.0.1</Version>
2620
</PackageReference>
27-
<PackageReference Include="Microsoft.NET.Sdk">
28-
<Version>1.0.0-alpha-20161104-2</Version>
29-
<PrivateAssets>All</PrivateAssets>
30-
</PackageReference>
31-
<PackageReference Include="NETStandard.Library">
32-
<Version>1.6.1</Version>
33-
</PackageReference>
3421
<PackageReference Include="Microsoft.PowerShell.SDK">
3522
<Version>6.0.0-alpha13</Version>
3623
</PackageReference>
@@ -44,25 +31,4 @@
4431
<Reference Include="System" />
4532
<Reference Include="Microsoft.CSharp" />
4633
</ItemGroup>
47-
48-
<!--<PropertyGroup>
49-
<PostBuildEvent>
50-
if not exist "$(SolutionDir)module\PowerShellEditorServices\bin" (
51-
mkdir "$(SolutionDir)module\PowerShellEditorServices\bin"
52-
)
53-
if not exist "$(SolutionDir)module\PowerShellEditorServices\bin\Desktop" (
54-
mkdir "$(SolutionDir)module\PowerShellEditorServices\bin\Desktop"
55-
)
56-
57-
echo(
58-
echo Copying files to module path: $(SolutionDir)module\PowerShellEditorServices\bin\Desktop
59-
copy /y /v "$(ProjectDir)bin\$(Configuration)\Newtonsoft.Json.dll" "$(SolutionDir)module\PowerShellEditorServices\bin\Desktop"
60-
copy /y /v "$(ProjectDir)bin\$(Configuration)\Microsoft.PowerShell.EditorServices.dll" "$(SolutionDir)module\PowerShellEditorServices\bin\Desktop"
61-
copy /y /v "$(ProjectDir)bin\$(Configuration)\Microsoft.PowerShell.EditorServices.Protocol.dll" "$(SolutionDir)module\PowerShellEditorServices\bin\Desktop"
62-
copy /y /v "$(ProjectDir)bin\$(Configuration)\Microsoft.PowerShell.EditorServices.Host.dll" "$(SolutionDir)module\PowerShellEditorServices\bin\Desktop"
63-
echo(
64-
</PostBuildEvent>
65-
</PropertyGroup>-->
66-
67-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6834
</Project>

‎src/PowerShellEditorServices.Protocol/PowerShellEditorServices.Protocol.csproj

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
3-
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
3+
44
<PropertyGroup>
55
<AssemblyTitle>PowerShell Editor Services Host Protocol Library</AssemblyTitle>
66
<Description>Provides message types and client/server APIs for the PowerShell Editor Services JSON protocol.</Description>
@@ -9,12 +9,6 @@
99
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
1010
</PropertyGroup>
1111

12-
<ItemGroup>
13-
<Compile Include="**\*.cs" />
14-
<EmbeddedResource Include="**\*.resx" />
15-
<EmbeddedResource Include="compiler\resources\**\*" />
16-
</ItemGroup>
17-
1812
<ItemGroup>
1913
<ProjectReference Include="..\PowerShellEditorServices\PowerShellEditorServices.csproj" />
2014
</ItemGroup>
@@ -23,13 +17,6 @@
2317
<PackageReference Include="Newtonsoft.Json">
2418
<Version>9.0.1</Version>
2519
</PackageReference>
26-
<PackageReference Include="Microsoft.NET.Sdk">
27-
<Version>1.0.0-alpha-20161104-2</Version>
28-
<PrivateAssets>All</PrivateAssets>
29-
</PackageReference>
30-
<PackageReference Include="NETStandard.Library">
31-
<Version>1.6.1</Version>
32-
</PackageReference>
3320
<PackageReference Include="Microsoft.PowerShell.SDK">
3421
<Version>6.0.0-alpha13</Version>
3522
</PackageReference>
@@ -43,6 +30,4 @@
4330
<Reference Include="System" />
4431
<Reference Include="Microsoft.CSharp" />
4532
</ItemGroup>
46-
47-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
4833
</Project>

‎src/PowerShellEditorServices/PowerShellEditorServices.csproj

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
3-
43
<PropertyGroup>
54
<AssemblyTitle>PowerShell Editor Services</AssemblyTitle>
65
<Description>Provides common PowerShell editor capabilities as a .NET library.</Description>
@@ -10,9 +9,6 @@
109
</PropertyGroup>
1110

1211
<ItemGroup>
13-
<Compile Include="**\*.cs" />
14-
<EmbeddedResource Include="**\*.resx" />
15-
<EmbeddedResource Include="compiler\resources\**\*" />
1612
<EmbeddedResource Include="Extensions\CmdletInterface.ps1">
1713
<LogicalName>Microsoft.PowerShell.EditorServices.Extensions.CmdletInterface.ps1</LogicalName>
1814
</EmbeddedResource>
@@ -38,16 +34,6 @@
3834
<DocumentationFile>bin\$(TargetFramework)\$(Configuration)\Microsoft.PowerShell.EditorServices.xml</DocumentationFile>
3935
</PropertyGroup>-->
4036

41-
<ItemGroup>
42-
<PackageReference Include="Microsoft.NET.Sdk">
43-
<Version>1.0.0-alpha-20161104-2</Version>
44-
<PrivateAssets>All</PrivateAssets>
45-
</PackageReference>
46-
<PackageReference Include="NETStandard.Library">
47-
<Version>1.6.1</Version>
48-
</PackageReference>
49-
</ItemGroup>
50-
5137
<Target Name="PowerShellVersionOutput" BeforeTargets="Compile">
5238
<Message
5339
Condition=" '$(TargetFramework)' == 'net451' And '$(PowerShellVersion)' != '' "
@@ -90,6 +76,4 @@
9076
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
9177
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
9278
</PropertyGroup>
93-
94-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9579
</Project>

‎test/PowerShellEditorServices.Test.Channel.WebSocket/PowerShellEditorServices.Test.Channel.WebSocket.csproj

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
1-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
33

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

10-
<!-- This project currently doesn't work on netstandard1.6 so don't compile its source -->
11-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
12-
<Compile Include="**\*.cs" />
13-
<EmbeddedResource Include="**\*.resx" />
14-
<EmbeddedResource Include="compiler\resources\**\*" />
15-
</ItemGroup>
16-
1710
<ItemGroup>
1811
<ProjectReference Include="..\..\src\PowerShellEditorServices\PowerShellEditorServices.csproj" />
1912
<ProjectReference Include="..\..\src\PowerShellEditorServices.Channel.WebSocket\PowerShellEditorServices.Channel.WebSocket.csproj" />
@@ -23,21 +16,10 @@
2316

2417
<ItemGroup>
2518
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
26-
<PackageReference Include="Microsoft.TestPlatform.TestHost">
27-
<Version>15.0.0-*</Version>
28-
</PackageReference>
19+
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="15.0.0-*" />
2920
<PackageReference Include="xunit" Version="2.2.0-*" />
3021
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
31-
<PackageReference Include="Microsoft.NET.Sdk">
32-
<Version>1.0.0-alpha-20161104-2</Version>
33-
<PrivateAssets>All</PrivateAssets>
34-
</PackageReference>
35-
<PackageReference Include="NETStandard.Library">
36-
<Version>1.6.1</Version>
37-
</PackageReference>
38-
<PackageReference Include="Microsoft.PowerShell.SDK">
39-
<Version>6.0.0-alpha13</Version>
40-
</PackageReference>
22+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.0.0-alpha13" />
4123
</ItemGroup>
4224

4325
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
@@ -58,6 +40,4 @@
5840
<Reference Include="System" />
5941
<Reference Include="Microsoft.CSharp" />
6042
</ItemGroup>
61-
62-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6343
</Project>

‎test/PowerShellEditorServices.Test.Host/PowerShellEditorServices.Test.Host.csproj

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
33

44
<PropertyGroup>
@@ -8,9 +8,6 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<Compile Include="**\*.cs" />
12-
<EmbeddedResource Include="**\*.resx" />
13-
<EmbeddedResource Include="compiler\resources\**\*" />
1411
<None Include="TestFiles\**">
1512
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1613
</None>
@@ -29,13 +26,6 @@
2926
</PackageReference>
3027
<PackageReference Include="xunit" Version="2.2.0-*" />
3128
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
32-
<PackageReference Include="Microsoft.NET.Sdk">
33-
<Version>1.0.0-alpha-20161104-2</Version>
34-
<PrivateAssets>All</PrivateAssets>
35-
</PackageReference>
36-
<PackageReference Include="NETStandard.Library">
37-
<Version>1.6.1</Version>
38-
</PackageReference>
3929
<PackageReference Include="Microsoft.PowerShell.SDK">
4030
<Version>6.0.0-alpha13</Version>
4131
</PackageReference>
@@ -49,6 +39,4 @@
4939
<Reference Include="System" />
5040
<Reference Include="Microsoft.CSharp" />
5141
</ItemGroup>
52-
53-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5442
</Project>

0 commit comments

Comments
 (0)