From 00405f0accd330cc18f6e2162dcc5d60fabd435f Mon Sep 17 00:00:00 2001
From: Dmitry Turin <turin.dmytro@gmail.com>
Date: Thu, 3 Dec 2015 18:46:48 +0200
Subject: [PATCH 1/2] Switch to codecov

---
 README.md                  |  2 +-
 appveyor.yml               |  9 +++++----
 run-tests-and-coverage.ps1 | 24 ------------------------
 3 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 run-tests-and-coverage.ps1

diff --git a/README.md b/README.md
index 3241be7..f4d4a49 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ NModbus4
 |           |Build Status|Code Coverage|
 |-----------|:----------:|:-----------:|
 |**Mono**|[![Build Status](https://travis-ci.org/NModbus4/NModbus4.svg?branch=portable-3.0)](https://travis-ci.org/NModbus4/NModbus4)||
-|**MS .NET**|[![Build status](https://ci.appveyor.com/api/projects/status/9irkluk69cr0f5ed?svg=true)](https://ci.appveyor.com/project/Maxwe11/nmodbus4-ss8e4)|[![Coverage Status](https://coveralls.io/repos/NModbus4/NModbus4/badge.svg?branch=portable-3.0&service=github)](https://coveralls.io/github/NModbus4/NModbus4?branch=portable-3.0)|
+|**MS .NET**|[![Build status](https://ci.appveyor.com/api/projects/status/9irkluk69cr0f5ed?svg=true)](https://ci.appveyor.com/project/Maxwe11/nmodbus4-ss8e4)|[![codecov.io](https://codecov.io/github/NModbus4/NModbus4/coverage.svg?branch=portable-3.0)](https://codecov.io/github/NModbus4/NModbus4?branch=portable-3.0)|
 
 [![Join the chat at https://gitter.im/NModbus4/NModbus4](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/NModbus4/NModbus4?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
diff --git a/appveyor.yml b/appveyor.yml
index 0e52d6c..99aa171 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,9 +12,10 @@ before_build:
 build:
   project: NModbus4.sln
   verbosity: minimal
+test_script:
+- .\packages\OpenCover.4.6.166\tools\OpenCover.Console.exe -register:user -target:"./packages/xunit.runner.console.2.0.0/tools/xunit.console.exe" -targetargs:"./NModbus4.UnitTests/bin/Debug/NModbus4.UnitTests.dll -noshadow -appveyor" -returntargetcode -filter:"+[NModbus4]*" -excludebyattribute:*.ExcludeFromCodeCoverage* -hideskipped:All -output:./opencover_report.xml
+- "SET PATH=C:/Python34;C:/Python34/Scripts;%PATH%"
+- pip install codecov
+- codecov -f "./opencover_report.xml"
 cache:
 - packages -> **\packages.config
-test_script:
-- ps: "./run-tests-and-coverage.ps1"
-artifacts:
-- path: ./codecoverage
diff --git a/run-tests-and-coverage.ps1 b/run-tests-and-coverage.ps1
deleted file mode 100644
index 7703be7..0000000
--- a/run-tests-and-coverage.ps1
+++ /dev/null
@@ -1,24 +0,0 @@
-$isPullRequest = $env:APPVEYOR_PULL_REQUEST_NUMBER -ne $null
-$packagesDir = "./packages"
-$coverageDir = "./codecoverage"
-$xunitConsoleExe = "$packagesDir/xunit.runner.console.2.0.0/tools/xunit.console.exe"
-$openCoverExe = "$packagesDir/OpenCover.4.6.166/tools/OpenCover.Console.exe"
-$reportGeneratorExe = "$packagesDir/ReportGenerator.2.2.0.0/tools/ReportGenerator.exe"
-$testDir = "*Tests/bin/*"
-$tests = @("$testDir/*Tests.dll")
-$targetArgs = Get-ChildItem $tests -Recurse
-$openCoverXml = "opencover_report.xml"
-$xunitXml = "xunit_report.xml"
-$converallsNetExe = "$packagesDir/coveralls.io.1.3.4/tools/coveralls.net.exe"
-$openCoverArgs = @('-register:user', "`"-target:$xunitConsoleExe`"", "`"-targetargs:$targetArgs -appveyor -noshadow -nologo -quiet`"", "`"-filter:+[NModbus4]*`"", "`"-output:$openCoverXml`"", '-coverbytest:*Tests.dll', '-log:All', '-returntargetcode')
-& $xunitConsoleExe $targetArgs -xml $xunitXml
-$testsFailed = Select-String $xunitXml -pattern "<failure .*>" -Quiet
-if (!$testsFailed)
-{
-    & $openCoverExe $openCoverArgs
-    & $reportGeneratorExe -verbosity:Info "`"-reports:$openCoverXml`"" "`"-targetdir:$coverageDir`""
-    if (!$isPullRequest)
-    {
-        & $converallsNetExe --opencover $openCoverXml --full-sources --repo-token gSRzaRcGVrNfpOrbaEwGCEej4KypnMnK1        
-    }
-}

From 7ea77d74a488f3689e38702c30fc31b380fbfff4 Mon Sep 17 00:00:00 2001
From: Dmitry Turin <turin.dmytro@gmail.com>
Date: Sun, 6 Dec 2015 15:06:51 +0200
Subject: [PATCH 2/2] Update nuget packages

---
 .../NModbus4.IntegrationTests.csproj          | 13 ++++++++-----
 NModbus4.IntegrationTests/packages.config     | 13 ++++++-------
 NModbus4.UnitTests/NModbus4.UnitTests.csproj  | 19 +++++++++++--------
 NModbus4.UnitTests/packages.config            | 17 ++++++++---------
 Samples/Samples.csproj                        |  6 +++---
 Samples/packages.config                       |  2 +-
 appveyor.yml                                  |  2 +-
 7 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/NModbus4.IntegrationTests/NModbus4.IntegrationTests.csproj b/NModbus4.IntegrationTests/NModbus4.IntegrationTests.csproj
index 6ee265e..ff45981 100644
--- a/NModbus4.IntegrationTests/NModbus4.IntegrationTests.csproj
+++ b/NModbus4.IntegrationTests/NModbus4.IntegrationTests.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
-  <Import Project="..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -41,12 +40,16 @@
       <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/NModbus4.IntegrationTests/packages.config b/NModbus4.IntegrationTests/packages.config
index 3596fd3..4514dc3 100644
--- a/NModbus4.IntegrationTests/packages.config
+++ b/NModbus4.IntegrationTests/packages.config
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="coveralls.io" version="1.3.4" targetFramework="net45" />
   <package id="OpenCover" version="4.6.166" targetFramework="net45" />
-  <package id="ReportGenerator" version="2.2.0.0" targetFramework="net45" />
   <package id="StyleCop.Analyzers" version="1.0.0-beta005" targetFramework="net45" developmentDependency="true" />
-  <package id="xunit" version="2.0.0" targetFramework="net45" />
+  <package id="xunit" version="2.1.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.runner.console" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.runner.console" version="2.1.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/NModbus4.UnitTests/NModbus4.UnitTests.csproj b/NModbus4.UnitTests/NModbus4.UnitTests.csproj
index 175e63e..9a6075a 100644
--- a/NModbus4.UnitTests/NModbus4.UnitTests.csproj
+++ b/NModbus4.UnitTests/NModbus4.UnitTests.csproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
-  <Import Project="..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
+  <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')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -36,8 +35,8 @@
     <CodeAnalysisRuleSet>NModbus4.UnitTests.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -48,12 +47,16 @@
       <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/NModbus4.UnitTests/packages.config b/NModbus4.UnitTests/packages.config
index 771e972..565bfc1 100644
--- a/NModbus4.UnitTests/packages.config
+++ b/NModbus4.UnitTests/packages.config
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="coveralls.io" version="1.3.4" targetFramework="net45" />
-  <package id="Moq" version="4.2.1507.0118" targetFramework="net45" />
+  <package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
   <package id="OpenCover" version="4.6.166" targetFramework="net45" />
-  <package id="ReportGenerator" version="2.2.0.0" targetFramework="net45" />
   <package id="StyleCop.Analyzers" version="1.0.0-beta005" targetFramework="net45" developmentDependency="true" />
-  <package id="xunit" version="2.0.0" targetFramework="net45" />
+  <package id="xunit" version="2.1.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.runner.console" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.0.1" targetFramework="net45" />
+  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.runner.console" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Samples/Samples.csproj b/Samples/Samples.csproj
index 5f2f135..748f07e 100644
--- a/Samples/Samples.csproj
+++ b/Samples/Samples.csproj
@@ -33,9 +33,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.4\lib\net45-full\log4net.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="NModbus4, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\NModbus4.2.1.0\lib\net40\NModbus4.dll</HintPath>
diff --git a/Samples/packages.config b/Samples/packages.config
index 5508b8d..0d56747 100644
--- a/Samples/packages.config
+++ b/Samples/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.3" targetFramework="net4" />
+  <package id="log4net" version="2.0.4" targetFramework="net45" />
   <package id="NModbus4" version="2.1.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 99aa171..244da0d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,7 +13,7 @@ build:
   project: NModbus4.sln
   verbosity: minimal
 test_script:
-- .\packages\OpenCover.4.6.166\tools\OpenCover.Console.exe -register:user -target:"./packages/xunit.runner.console.2.0.0/tools/xunit.console.exe" -targetargs:"./NModbus4.UnitTests/bin/Debug/NModbus4.UnitTests.dll -noshadow -appveyor" -returntargetcode -filter:"+[NModbus4]*" -excludebyattribute:*.ExcludeFromCodeCoverage* -hideskipped:All -output:./opencover_report.xml
+- .\packages\OpenCover.4.6.166\tools\OpenCover.Console.exe -register:user -target:"./packages/xunit.runner.console.2.1.0/tools/xunit.console.exe" -targetargs:"./NModbus4.UnitTests/bin/Debug/NModbus4.UnitTests.dll -noshadow -appveyor" -returntargetcode -filter:"+[NModbus4]*" -excludebyattribute:*.ExcludeFromCodeCoverage* -hideskipped:All -output:./opencover_report.xml
 - "SET PATH=C:/Python34;C:/Python34/Scripts;%PATH%"
 - pip install codecov
 - codecov -f "./opencover_report.xml"