Skip to content

Commit a066d2f

Browse files
daviwildaviwil
committed
Update xunit package references to fix Visual Studio test runner
1 parent 604b1f9 commit a066d2f

File tree

6 files changed

+33
-21
lines changed

6 files changed

+33
-21
lines changed

‎PowerShellEditorServices.build.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ task Build {
146146

147147
function UploadTestLogs {
148148
if ($script:IsCIBuild) {
149-
$testLogsPath = "$PSScriptRoot/test/PowerShellEditorServices.Test.Host/bin/$Configuration/net451/logs"
149+
$testLogsPath = "$PSScriptRoot/test/PowerShellEditorServices.Test.Host/bin/$Configuration/net452/logs"
150150
$testLogsZipPath = "$PSScriptRoot/TestLogs.zip"
151151

152152
if (Test-Path $testLogsPath) {
@@ -163,9 +163,9 @@ function UploadTestLogs {
163163
}
164164

165165
task Test -If { !$script:IsUnix } {
166-
exec { & $script:dotnetExe test -c $Configuration -f net451 .\test\PowerShellEditorServices.Test\PowerShellEditorServices.Test.csproj }
167-
exec { & $script:dotnetExe test -c $Configuration -f net451 .\test\PowerShellEditorServices.Test.Protocol\PowerShellEditorServices.Test.Protocol.csproj }
168-
exec { & $script:dotnetExe test -c $Configuration -f net451 .\test\PowerShellEditorServices.Test.Host\PowerShellEditorServices.Test.Host.csproj }
166+
exec { & $script:dotnetExe test -c $Configuration -f net452 .\test\PowerShellEditorServices.Test\PowerShellEditorServices.Test.csproj }
167+
exec { & $script:dotnetExe test -c $Configuration -f net452 .\test\PowerShellEditorServices.Test.Protocol\PowerShellEditorServices.Test.Protocol.csproj }
168+
exec { & $script:dotnetExe test -c $Configuration -f net452 .\test\PowerShellEditorServices.Test.Host\PowerShellEditorServices.Test.Host.csproj }
169169
}
170170

171171
task CITest (job Test -Safe), {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net451</TargetFrameworks>
5+
<TargetFrameworks>net452</TargetFrameworks>
66
<AssemblyName>Microsoft.PowerShell.EditorServices.Test.Channel.WebSocket</AssemblyName>
77
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
88
</PropertyGroup>
@@ -22,7 +22,7 @@
2222
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.0.0-alpha13" />
2323
</ItemGroup>
2424

25-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
25+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
2626
<PackageReference Include="CommonServiceLocator" Version="1.3" />
2727
<PackageReference Include="Microsoft.Owin" Version="3.0.0" />
2828
<PackageReference Include="Owin" Version="1.0" />
@@ -36,7 +36,7 @@
3636
<DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
3737
</PropertyGroup>
3838

39-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
39+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
4040
<Reference Include="System" />
4141
<Reference Include="Microsoft.CSharp" />
4242
</ItemGroup>

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
5+
<TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
66
<AssemblyName>Microsoft.PowerShell.EditorServices.Test.Host</AssemblyName>
77
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
88
</PropertyGroup>
@@ -24,8 +24,8 @@
2424
<PackageReference Include="Microsoft.TestPlatform.TestHost">
2525
<Version>15.0.0-*</Version>
2626
</PackageReference>
27-
<PackageReference Include="xunit" Version="2.2.0-*" />
28-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
27+
<PackageReference Include="xunit" Version="2.2.0" />
28+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
2929
<PackageReference Include="Microsoft.PowerShell.SDK">
3030
<Version>6.0.0-alpha13</Version>
3131
</PackageReference>
@@ -35,8 +35,12 @@
3535
<DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
3636
</PropertyGroup>
3737

38-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
38+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
3939
<Reference Include="System" />
4040
<Reference Include="Microsoft.CSharp" />
4141
</ItemGroup>
42+
43+
<ItemGroup>
44+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
45+
</ItemGroup>
4246
</Project>

‎test/PowerShellEditorServices.Test.Protocol/PowerShellEditorServices.Test.Protocol.csproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
5+
<TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
66
<AssemblyName>Microsoft.PowerShell.EditorServices.Test.Protocol</AssemblyName>
77
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
88
</PropertyGroup>
@@ -17,8 +17,8 @@
1717
<PackageReference Include="Microsoft.TestPlatform.TestHost">
1818
<Version>15.0.0-*</Version>
1919
</PackageReference>
20-
<PackageReference Include="xunit" Version="2.2.0-*" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
20+
<PackageReference Include="xunit" Version="2.2.0" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
2222
<PackageReference Include="Microsoft.PowerShell.SDK">
2323
<Version>6.0.0-alpha13</Version>
2424
</PackageReference>
@@ -28,8 +28,12 @@
2828
<DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
2929
</PropertyGroup>
3030

31-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
3232
<Reference Include="System" />
3333
<Reference Include="Microsoft.CSharp" />
3434
</ItemGroup>
35+
36+
<ItemGroup>
37+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
38+
</ItemGroup>
3539
</Project>

‎test/PowerShellEditorServices.Test.Shared/PowerShellEditorServices.Test.Shared.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<VersionPrefix>0.9.0-beta</VersionPrefix>
6-
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
6+
<TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
77
<AssemblyName>Microsoft.PowerShell.EditorServices.Test.Shared</AssemblyName>
88
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
99
</PropertyGroup>
@@ -16,7 +16,7 @@
1616
<DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
1717
</PropertyGroup>
1818

19-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
19+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
2020
<Reference Include="System" />
2121
<Reference Include="Microsoft.CSharp" />
2222
</ItemGroup>

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
5+
<TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
66
<AssemblyName>Microsoft.PowerShell.EditorServices.Test</AssemblyName>
77
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
88
</PropertyGroup>
@@ -17,8 +17,8 @@
1717
<PackageReference Include="Microsoft.TestPlatform.TestHost">
1818
<Version>15.0.0-*</Version>
1919
</PackageReference>
20-
<PackageReference Include="xunit" Version="2.2.0-*" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
20+
<PackageReference Include="xunit" Version="2.2.0" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
2222
<PackageReference Include="Microsoft.PowerShell.SDK">
2323
<Version>6.0.0-alpha13</Version>
2424
</PackageReference>
@@ -28,10 +28,14 @@
2828
<DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
2929
</PropertyGroup>
3030

31-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
3232
<Reference Include="System" />
3333
<Reference Include="System.Xml" />
3434
<Reference Include="System.Xml.Linq" />
3535
<Reference Include="Microsoft.CSharp" />
3636
</ItemGroup>
37+
38+
<ItemGroup>
39+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
40+
</ItemGroup>
3741
</Project>

0 commit comments

Comments
 (0)