switch to netcore

laedit · Oct 18, 2020 · 2bee1be · 2bee1be
1 parent d34de99
commit 2bee1be
Show file tree

Hide file tree

Showing 38 changed files with 123 additions and 536 deletions.
diff --git a/src/NVika.Tests/BuildServers/LocalBuildServerTest.cs b/src/NVika.Tests/BuildServers/LocalBuildServerTest.cs
@@ -1,4 +1,4 @@
-using NVika.BuildServers;
+using NVika.BuildServers;
 using NVika.Parsers;
 using Serilog;
 using System;

diff --git a/src/NVika.Tests/Mocks/MockBuildServer.cs b/src/NVika.Tests/Mocks/MockBuildServer.cs
@@ -1,4 +1,4 @@
-using NVika.BuildServers;
+using NVika.BuildServers;
 using NVika.Parsers;
 using System;
 

diff --git a/src/NVika.Tests/Mocks/MockHttpClientFactory.cs b/src/NVika.Tests/Mocks/MockHttpClientFactory.cs
@@ -1,4 +1,4 @@
-using NVika.Abstractions;
+using NVika.Abstractions;
 using System;
 using System.Collections.Generic;
 using System.Net;

diff --git a/src/NVika.Tests/NVika.Tests.csproj b/src/NVika.Tests/NVika.Tests.csproj
@@ -1,179 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{782180B2-8004-4B2A-AE2A-2F0A1B42080D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NVika.Tests</RootNamespace>
-    <AssemblyName>NVika.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.4.2.0\lib\net45\Castle.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="ManyConsole, Version=1.0.0.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ManyConsole.1.0.0.4\lib\ManyConsole.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Mono.Options, Version=5.3.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Mono.Options.5.3.0.1\lib\net4-client\Mono.Options.dll</HintPath>
-    </Reference>
-    <Reference Include="NSubstitute, Version=3.1.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
-      <HintPath>..\packages\NSubstitute.3.1.0\lib\net45\NSubstitute.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.2.7.1\lib\net45\Serilog.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog.Sinks.TextWriter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Sinks.TextWriter.2.1.0\lib\net45\Serilog.Sinks.TextWriter.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.IO.Abstractions, Version=3.0.0.0, Culture=neutral, PublicKeyToken=96bf224d23c43e59, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.3.0.2\lib\net40\System.IO.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.Abstractions.TestingHelpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=96bf224d23c43e59, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.TestingHelpers.3.0.2\lib\net40\System.IO.Abstractions.TestingHelpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
-    </Reference>
-    <Reference Include="System.XML" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Parsers\GendarmeParserTest.cs" />
-    <Compile Include="Parsers\FxCopParserTest.cs" />
-    <Compile Include="TestUtilities.cs" />
     <EmbeddedResource Include="Data\AppVeyor.txt" />
-    <Compile Include="ParseReportCommandTest.cs" />
-    <Compile Include="BuildServers\AppVeyorTest.cs" />
-    <Compile Include="Mocks\MockHttpClientFactory.cs" />
-    <Compile Include="Mocks\MockBuildServer.cs" />
-    <Compile Include="Parsers\InspectCodeParserTest.cs" />
-    <Compile Include="BuildServers\LocalBuildServerTest.cs" />
-    <Compile Include="Parsers\SarifParserTest.cs" />
-    <Compile Include="ProgramTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="Data\BuildServerBase.txt" />
+    <EmbeddedResource Include="Data\CodeAnalysisLog.xml" />
     <EmbeddedResource Include="Data\CommandBase.txt" />
+    <EmbeddedResource Include="Data\GendarmeReport.xml" />
     <EmbeddedResource Include="Data\InspectCodeParser.txt" />
+    <EmbeddedResource Include="Data\inspectcodereport.xml" />
+    <EmbeddedResource Include="Data\inspectcodereport_2016.2.xml" />
     <EmbeddedResource Include="Data\LocalBuildServer.txt" />
     <EmbeddedResource Include="Data\Logger.txt" />
     <EmbeddedResource Include="Data\ParseReportCommand.txt" />
     <EmbeddedResource Include="Data\Program.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
-    <EmbeddedResource Include="Data\static-analysis.sarif.json" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\inspectcodereport.xml">
-      <SubType>Designer</SubType>
+    <EmbeddedResource Include="Data\static-analysis.sarif.json">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NVika\NVika.csproj">
-      <Project>{70d378fe-426f-4854-a7e5-98eed3070eb6}</Project>
-      <Name>NVika</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\inspectcodereport_2016.2.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\CodeAnalysisLog.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\GendarmeReport.xml" />
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Data\WrongReport.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="NSubstitute" Version="4.2.2" />
+    <PackageReference Include="Serilog.Sinks.TextWriter" Version="2.1.0" />
+    <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="12.2.7" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <ItemGroup>
-    <Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
+    <ProjectReference Include="..\NVika\NVika.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <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>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
-    <Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
-    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+</Project>
diff --git a/src/NVika.Tests/ParseReportCommandTest.cs b/src/NVika.Tests/ParseReportCommandTest.cs
@@ -1,4 +1,4 @@
-using NSubstitute;
+using NSubstitute;
 using NVika.BuildServers;
 using NVika.Parsers;
 using Serilog;
@@ -192,7 +192,7 @@ public void Execute_ParserCanParse_WithDebug_ShouldWriteMessageFromIssuesAndWrit
             var buildServers = new List<IBuildServer> { localBuildServer, mockBuildServer };
             var parsers = new List<IReportParser> { GetMockReportParser(true) };
             var buildServerCommand = new ParseReportCommand(logger, fileSystem, buildServers, localBuildServer, parsers);
-            var remainingArgs = buildServerCommand.GetActualOptions().Parse(new[] { "report.xml"});
+            var remainingArgs = buildServerCommand.GetActualOptions().Parse(new[] { "report.xml" });
 
             // act
             var exitCode = buildServerCommand.Run(remainingArgs.ToArray());
@@ -270,7 +270,7 @@ public void Execute_MultipleReports_ShouldWriteMessageFromIssues()
             var buildServers = new List<IBuildServer> { localBuildServer, mockBuildServer };
             var parsers = new List<IReportParser> { GetMockReportParser(true, true, true) };
             var buildServerCommand = new ParseReportCommand(logger, fileSystem, buildServers, localBuildServer, parsers);
-            var remainingArgs = buildServerCommand.GetActualOptions().Parse(new[] { "report.xml", "report2.xml"});
+            var remainingArgs = buildServerCommand.GetActualOptions().Parse(new[] { "report.xml", "report2.xml" });
 
             // act
             var exitCode = buildServerCommand.Run(remainingArgs.ToArray());

diff --git a/src/NVika.Tests/Parsers/FxCopParserTest.cs b/src/NVika.Tests/Parsers/FxCopParserTest.cs
@@ -1,4 +1,4 @@
-using NVika.Parsers;
+using NVika.Parsers;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Abstractions.TestingHelpers;

diff --git a/src/NVika.Tests/Parsers/GendarmeParserTest.cs b/src/NVika.Tests/Parsers/GendarmeParserTest.cs
@@ -1,4 +1,4 @@
-using NVika.Parsers;
+using NVika.Parsers;
 using System.Collections.Generic;
 using System.IO.Abstractions.TestingHelpers;
 using System.Linq;

diff --git a/src/NVika.Tests/Parsers/InspectCodeParserTest.cs b/src/NVika.Tests/Parsers/InspectCodeParserTest.cs
@@ -1,4 +1,4 @@
-using NVika.Parsers;
+using NVika.Parsers;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Abstractions.TestingHelpers;

diff --git a/src/NVika.Tests/Properties/AssemblyInfo.cs b/src/NVika.Tests/Properties/AssemblyInfo.cs
diff --git a/src/NVika.Tests/TestUtilities.cs b/src/NVika.Tests/TestUtilities.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Reflection;
 
 namespace NVika.Tests

diff --git a/src/NVika.Tests/app.config b/src/NVika.Tests/app.config