Skip to content

Commit 8cbf78e

Browse files
Bart KoelmanBart Koelman
Bart Koelman
authored and
Bart Koelman
committed
Package updates
1 parent 2c8fb71 commit 8cbf78e

File tree

6 files changed

+38
-46
lines changed

6 files changed

+38
-46
lines changed

‎src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.Test/CSharpGuidelinesAnalyzer.Test.csproj‎

Lines changed: 17 additions & 24 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.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
3+
<Import Project="..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
44
<PropertyGroup>
55
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
66
<Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
@@ -48,17 +48,14 @@
4848
<RunCodeAnalysis>true</RunCodeAnalysis>
4949
</PropertyGroup>
5050
<ItemGroup>
51-
<Reference Include="FluentAssertions, Version=4.19.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
52-
<HintPath>..\..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll</HintPath>
53-
<Private>True</Private>
51+
<Reference Include="FluentAssertions, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.dll</HintPath>
5453
</Reference>
55-
<Reference Include="FluentAssertions.Core, Version=4.19.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll</HintPath>
57-
<Private>True</Private>
54+
<Reference Include="FluentAssertions.Core, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
55+
<HintPath>..\..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.Core.dll</HintPath>
5856
</Reference>
59-
<Reference Include="JetBrains.Annotations, Version=10.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
60-
<HintPath>..\..\packages\JetBrains.Annotations.10.2.1\lib\net\JetBrains.Annotations.dll</HintPath>
61-
<Private>True</Private>
57+
<Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
58+
<HintPath>..\..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
6259
</Reference>
6360
<Reference Include="Microsoft.CodeAnalysis, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6461
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.2.0\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
@@ -122,20 +119,16 @@
122119
<Reference Include="System.Xml.Linq" />
123120
<Reference Include="System.Xml" />
124121
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
125-
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
126-
<Private>True</Private>
122+
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
127123
</Reference>
128-
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
129-
<HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
130-
<Private>True</Private>
124+
<Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
125+
<HintPath>..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
131126
</Reference>
132-
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
133-
<HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
134-
<Private>True</Private>
127+
<Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
128+
<HintPath>..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
135129
</Reference>
136-
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
137-
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
138-
<Private>True</Private>
130+
<Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
131+
<HintPath>..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
139132
</Reference>
140133
</ItemGroup>
141134
<ItemGroup>
@@ -211,15 +204,15 @@
211204
<ItemGroup>
212205
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
213206
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
214-
<Analyzer Include="..\..\packages\ResharperCodeContractNullability.1.0.6\analyzers\dotnet\cs\CodeContractNullability.dll" />
215-
<Analyzer Include="..\..\packages\ResharperCodeContractNullability.1.0.6\analyzers\dotnet\cs\MsgPack.dll" />
207+
<Analyzer Include="..\..\packages\ResharperCodeContractNullability.1.0.7\analyzers\dotnet\cs\CodeContractNullability.dll" />
208+
<Analyzer Include="..\..\packages\ResharperCodeContractNullability.1.0.7\analyzers\dotnet\cs\MsgPack.dll" />
216209
</ItemGroup>
217210
<ItemGroup />
218211
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
219212
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
220213
<PropertyGroup>
221214
<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>
222215
</PropertyGroup>
223-
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
216+
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
224217
</Target>
225218
</Project>

‎src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.Test/packages.config‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="FluentAssertions" version="4.19.0" targetFramework="net46" />
4-
<package id="JetBrains.Annotations" version="10.2.1" targetFramework="net46" />
3+
<package id="FluentAssertions" version="4.19.2" targetFramework="net46" />
4+
<package id="JetBrains.Annotations" version="10.4.0" targetFramework="net46" />
55
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net46" />
66
<package id="Microsoft.CodeAnalysis.Common" version="1.2.0" targetFramework="net46" />
77
<package id="Microsoft.CodeAnalysis.CSharp" version="1.2.0" targetFramework="net46" />
@@ -11,8 +11,8 @@
1111
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.2.0" targetFramework="net46" />
1212
<package id="Microsoft.Composition" version="1.0.27" targetFramework="net46" />
1313
<package id="OpenCover" version="4.6.519" targetFramework="net46" />
14-
<package id="ReportGenerator" version="2.5.2" targetFramework="net46" />
15-
<package id="ResharperCodeContractNullability" version="1.0.6" targetFramework="net46" />
14+
<package id="ReportGenerator" version="2.5.6" targetFramework="net46" />
15+
<package id="ResharperCodeContractNullability" version="1.0.7" targetFramework="net46" developmentDependency="true" />
1616
<package id="System.Collections" version="4.0.0" targetFramework="net46" />
1717
<package id="System.Collections.Immutable" version="1.1.37" targetFramework="net46" />
1818
<package id="System.Diagnostics.Debug" version="4.0.0" targetFramework="net46" />
@@ -23,12 +23,12 @@
2323
<package id="System.Runtime" version="4.1.0" targetFramework="net46" />
2424
<package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net46" />
2525
<package id="System.Threading" version="4.0.0" targetFramework="net46" />
26-
<package id="xunit" version="2.1.0" targetFramework="net46" />
27-
<package id="xunit.abstractions" version="2.0.0" targetFramework="net46" />
28-
<package id="xunit.assert" version="2.1.0" targetFramework="net46" />
29-
<package id="xunit.core" version="2.1.0" targetFramework="net46" />
30-
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net46" />
31-
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net46" />
32-
<package id="xunit.runner.console" version="2.1.0" targetFramework="net46" />
33-
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net46" />
26+
<package id="xunit" version="2.2.0" targetFramework="net46" />
27+
<package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
28+
<package id="xunit.assert" version="2.2.0" targetFramework="net46" />
29+
<package id="xunit.core" version="2.2.0" targetFramework="net46" />
30+
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net46" />
31+
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net46" />
32+
<package id="xunit.runner.console" version="2.2.0" targetFramework="net46" developmentDependency="true" />
33+
<package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net46" developmentDependency="true" />
3434
</packages>

‎src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.Vsix/CSharpGuidelinesAnalyzer.Vsix.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<VsixSourceItem Remove="$(SolutionDir)CSharpGuidelinesAnalyzer\CSharpGuidelinesAnalyzer\tools\install.ps1" />
8787
<VsixSourceItem Remove="$(SolutionDir)CSharpGuidelinesAnalyzer\CSharpGuidelinesAnalyzer\tools\uninstall.ps1" />
8888
<VsixSourceItem Remove="$(SolutionDir)CSharpGuidelinesAnalyzer\CSharpGuidelinesAnalyzer\CSharpGuidelinesAnalyzer.nuspec" />
89-
<VsixSourceItem Remove="$(SolutionDir)packages\JetBrains.Annotations.10.1.5\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\JetBrains.Annotations.PCL328.dll" />
89+
<VsixSourceItem Remove="$(SolutionDir)packages\JetBrains.Annotations.10.4.0\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\JetBrains.Annotations.dll" />
9090
</ItemGroup>
9191
<!--
9292
<Message Text="VsixSourceItem collection now contains: @(VsixSourceItem)" Importance="High" />

‎src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,12 @@
118118
<ItemGroup>
119119
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
120120
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
121-
<Analyzer Include="..\..\packages\ResharperCodeContractNullability.1.0.6\analyzers\dotnet\cs\CodeContractNullability.dll" />
122-
<Analyzer Include="..\..\packages\ResharperCodeContractNullability.1.0.6\analyzers\dotnet\cs\MsgPack.dll" />
121+
<Analyzer Include="..\..\packages\ResharperCodeContractNullability.1.0.7\analyzers\dotnet\cs\CodeContractNullability.dll" />
122+
<Analyzer Include="..\..\packages\ResharperCodeContractNullability.1.0.7\analyzers\dotnet\cs\MsgPack.dll" />
123123
</ItemGroup>
124124
<ItemGroup>
125-
<Reference Include="JetBrains.Annotations.PCL328, Version=10.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
126-
<HintPath>..\..\packages\JetBrains.Annotations.10.2.1\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\JetBrains.Annotations.PCL328.dll</HintPath>
127-
<Private>True</Private>
125+
<Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
126+
<HintPath>..\..\packages\JetBrains.Annotations.10.4.0\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\JetBrains.Annotations.dll</HintPath>
128127
</Reference>
129128
<Reference Include="Microsoft.CodeAnalysis, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130129
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.2.0\lib\portable-net45+win8\Microsoft.CodeAnalysis.dll</HintPath>

‎src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="JetBrains.Annotations" version="10.2.1" targetFramework="portable45-net45+win8" />
3+
<package id="JetBrains.Annotations" version="10.4.0" targetFramework="portable45-net45+win8" />
44
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="portable45-net45+win8" />
55
<package id="Microsoft.CodeAnalysis.Common" version="1.2.0" targetFramework="portable45-net45+win8" />
66
<package id="Microsoft.CodeAnalysis.CSharp" version="1.2.0" targetFramework="portable45-net45+win8" />
77
<package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.2.0" targetFramework="portable45-net45+win8" />
88
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.2.0" targetFramework="portable45-net45+win8" />
99
<package id="Microsoft.Composition" version="1.0.27" targetFramework="portable45-net45+win8" />
1010
<package id="NuGet.CommandLine" version="3.5.0" targetFramework="portable45-net45+win8" developmentDependency="true" />
11-
<package id="ResharperCodeContractNullability" version="1.0.6" targetFramework="portable45-net45+win8" />
11+
<package id="ResharperCodeContractNullability" version="1.0.7" targetFramework="portable45-net45+win8" developmentDependency="true" />
1212
<package id="System.Collections.Immutable" version="1.1.37" targetFramework="portable45-net45+win8" />
1313
<package id="System.Reflection.Metadata" version="1.2.0" targetFramework="portable45-net45+win8" />
1414
<package id="System.Runtime" version="4.1.0" targetFramework="portable45-net45+win8" />

‎src/coverage.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@echo off
22
rd /s /q coverage 2>nul
33
md coverage
4-
.\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:".\packages\xunit.runner.console.2.1.0\tools\xunit.console.x86.exe" -targetargs:".\CSharpGuidelinesAnalyzer\CSharpGuidelinesAnalyzer.Test\bin\Debug\CSharpGuidelinesAnalyzer.Test.dll -noshadow" -filter:"+[CSharpGuidelinesAnalyzer]* -[CSharpGuidelinesAnalyzer]CSharpGuidelinesAnalyzer.Properties.*" -excludebyattribute:*.ExcludeFromCodeCoverage* -hideskipped:All -output:.\coverage\CSharpGuidelinesAnalyzerCoverage.xml
5-
.\packages\ReportGenerator.2.5.2\tools\ReportGenerator.exe -targetdir:.\coverage -reports:.\coverage\CSharpGuidelinesAnalyzerCoverage.xml
4+
.\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:".\packages\xunit.runner.console.2.2.0\tools\xunit.console.x86.exe" -targetargs:".\CSharpGuidelinesAnalyzer\CSharpGuidelinesAnalyzer.Test\bin\Debug\CSharpGuidelinesAnalyzer.Test.dll -noshadow" -filter:"+[CSharpGuidelinesAnalyzer]* -[CSharpGuidelinesAnalyzer]CSharpGuidelinesAnalyzer.Properties.*" -excludebyattribute:*.ExcludeFromCodeCoverage* -hideskipped:All -output:.\coverage\CSharpGuidelinesAnalyzerCoverage.xml
5+
.\packages\ReportGenerator.2.5.6\tools\ReportGenerator.exe -targetdir:.\coverage -reports:.\coverage\CSharpGuidelinesAnalyzerCoverage.xml

0 commit comments

Comments
 (0)