Skip to content

Commit d93e0ff

Browse files
sharwellsharwell
authored
Merge pull request #2221 from sharwell/update-xunit
Update to the latest xUnit pre-release
2 parents 0298ccf + 42662c6 commit d93e0ff

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/ReadabilityRules/SA1139CodeFixProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ internal class SA1139CodeFixProvider : CodeFixProvider
3030
{ SyntaxKind.LongKeyword, "L" },
3131
{ SyntaxKind.ULongKeyword, "UL" },
3232
{ SyntaxKind.UIntKeyword, "U" },
33-
{ SyntaxKind.FloatKeyword, "F"},
33+
{ SyntaxKind.FloatKeyword, "F" },
3434
{ SyntaxKind.DoubleKeyword, "D" },
3535
{ SyntaxKind.DecimalKeyword, "M" }
3636
};

‎StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\xunit.runner.visualstudio.2.2.0-beta1-build1144\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.2.0-beta1-build1144\build\net20\xunit.runner.visualstudio.props')" />
3+
<Import Project="..\..\packages\xunit.runner.visualstudio.2.2.0-beta4-build1194\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.2.0-beta4-build1194\build\net20\xunit.runner.visualstudio.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -99,19 +99,19 @@
9999
<Reference Include="System.Data" />
100100
<Reference Include="System.Xml" />
101101
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
102-
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
102+
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
103103
<Private>True</Private>
104104
</Reference>
105-
<Reference Include="xunit.assert, Version=2.2.0.3239, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
106-
<HintPath>..\..\packages\xunit.assert.2.2.0-beta1-build3239\lib\dotnet\xunit.assert.dll</HintPath>
105+
<Reference Include="xunit.assert, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
106+
<HintPath>..\..\packages\xunit.assert.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.assert.dll</HintPath>
107107
<Private>True</Private>
108108
</Reference>
109-
<Reference Include="xunit.core, Version=2.2.0.3239, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
110-
<HintPath>..\..\packages\xunit.extensibility.core.2.2.0-beta1-build3239\lib\dotnet\xunit.core.dll</HintPath>
109+
<Reference Include="xunit.core, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
110+
<HintPath>..\..\packages\xunit.extensibility.core.2.2.0-beta4-build3444\lib\net45\xunit.core.dll</HintPath>
111111
<Private>True</Private>
112112
</Reference>
113-
<Reference Include="xunit.execution.desktop, Version=2.2.0.3239, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
114-
<HintPath>..\..\packages\xunit.extensibility.execution.2.2.0-beta1-build3239\lib\net45\xunit.execution.desktop.dll</HintPath>
113+
<Reference Include="xunit.execution.desktop, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
114+
<HintPath>..\..\packages\xunit.extensibility.execution.2.2.0-beta4-build3444\lib\net45\xunit.execution.desktop.dll</HintPath>
115115
<Private>True</Private>
116116
</Reference>
117117
</ItemGroup>
@@ -413,7 +413,7 @@
413413
<PropertyGroup>
414414
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
415415
</PropertyGroup>
416-
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.2.0-beta1-build1144\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.2.0-beta1-build1144\build\net20\xunit.runner.visualstudio.props'))" />
416+
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.2.0-beta4-build1194\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.2.0-beta4-build1194\build\net20\xunit.runner.visualstudio.props'))" />
417417
</Target>
418418
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
419419
Other similar extension points exist, see Microsoft.Common.targets.

‎StyleCop.Analyzers/StyleCop.Analyzers.Test/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
<package id="System.Runtime" version="4.0.0" targetFramework="net452" />
2020
<package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net452" />
2121
<package id="System.Threading" version="4.0.0" targetFramework="net452" />
22-
<package id="xunit" version="2.2.0-beta1-build3239" targetFramework="net452" />
23-
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
24-
<package id="xunit.assert" version="2.2.0-beta1-build3239" targetFramework="net452" />
25-
<package id="xunit.core" version="2.2.0-beta1-build3239" targetFramework="net452" />
26-
<package id="xunit.extensibility.core" version="2.2.0-beta1-build3239" targetFramework="net452" />
27-
<package id="xunit.extensibility.execution" version="2.2.0-beta1-build3239" targetFramework="net452" />
28-
<package id="xunit.runner.visualstudio" version="2.2.0-beta1-build1144" targetFramework="net452" developmentDependency="true" />
22+
<package id="xunit" version="2.2.0-beta4-build3444" targetFramework="net452" />
23+
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
24+
<package id="xunit.assert" version="2.2.0-beta4-build3444" targetFramework="net452" />
25+
<package id="xunit.core" version="2.2.0-beta4-build3444" targetFramework="net452" />
26+
<package id="xunit.extensibility.core" version="2.2.0-beta4-build3444" targetFramework="net452" />
27+
<package id="xunit.extensibility.execution" version="2.2.0-beta4-build3444" targetFramework="net452" />
28+
<package id="xunit.runner.visualstudio" version="2.2.0-beta4-build1194" targetFramework="net452" developmentDependency="true" />
2929
</packages>

0 commit comments

Comments
 (0)