Skip to content

Commit 683e07e

Browse files
hennadiiluhennadiilu
committed
Tests project was upgraded to .NET Core type.
1 parent d9c883e commit 683e07e

5 files changed

Lines changed: 39 additions & 169 deletions

File tree

‎Heleonix.Testing.NUnit.Tests/Heleonix.Testing.NUnit.Tests.csproj‎

Lines changed: 31 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -1,141 +1,43 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Text.Analyzers.2.6.0\build\Text.Analyzers.props" Condition="Exists('..\packages\Text.Analyzers.2.6.0\build\Text.Analyzers.props')" />
4-
<Import Project="..\packages\Microsoft.NetFramework.Analyzers.2.6.0\build\Microsoft.NetFramework.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetFramework.Analyzers.2.6.0\build\Microsoft.NetFramework.Analyzers.props')" />
5-
<Import Project="..\packages\Microsoft.NetCore.Analyzers.2.6.0\build\Microsoft.NetCore.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetCore.Analyzers.2.6.0\build\Microsoft.NetCore.Analyzers.props')" />
6-
<Import Project="..\packages\Microsoft.CodeQuality.Analyzers.2.6.0\build\Microsoft.CodeQuality.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.6.0\build\Microsoft.CodeQuality.Analyzers.props')" />
7-
<Import Project="..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="../SharedProjectInfo.proj" />
3+
84
<PropertyGroup>
9-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
10-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
11-
<ProjectGuid>{D9F8D146-C245-4F6E-8DE2-45738659BA83}</ProjectGuid>
12-
<OutputType>Library</OutputType>
13-
<AppDesignerFolder>Properties</AppDesignerFolder>
14-
<RootNamespace>Heleonix.Testing.NUnit.Tests</RootNamespace>
15-
<AssemblyName>Heleonix.Testing.NUnit.Tests</AssemblyName>
16-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
17-
<FileAlignment>512</FileAlignment>
18-
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
19-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
20-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
21-
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
22-
<IsCodedUITest>False</IsCodedUITest>
23-
<TestProjectType>UnitTest</TestProjectType>
24-
<NuGetPackageImportStamp>
25-
</NuGetPackageImportStamp>
5+
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
7+
<IsPackable>false</IsPackable>
268
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
28-
<DebugSymbols>true</DebugSymbols>
29-
<DebugType>full</DebugType>
30-
<Optimize>false</Optimize>
31-
<OutputPath>bin\Debug\</OutputPath>
32-
<DefineConstants>DEBUG;TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
9+
10+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
3511
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
36-
<DocumentationFile>bin\Debug\Heleonix.Testing.NUnit.Tests.xml</DocumentationFile>
37-
<LangVersion>default</LangVersion>
12+
<WarningsAsErrors />
13+
<DocumentationFile>bin\Debug\netcoreapp2.0\Heleonix.Testing.NUnit.Tests.xml</DocumentationFile>
14+
<LangVersion>latest</LangVersion>
15+
<DebugType>full</DebugType>
16+
<DebugSymbols>true</DebugSymbols>
3817
</PropertyGroup>
39-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
40-
<DebugType>pdbonly</DebugType>
41-
<Optimize>true</Optimize>
42-
<OutputPath>bin\Release\</OutputPath>
43-
<DefineConstants>TRACE</DefineConstants>
44-
<ErrorReport>prompt</ErrorReport>
45-
<WarningLevel>4</WarningLevel>
18+
19+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
4620
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
47-
<DocumentationFile>bin\Release\Heleonix.Testing.NUnit.Tests.xml</DocumentationFile>
48-
<LangVersion>default</LangVersion>
21+
<WarningsAsErrors />
22+
<DocumentationFile>bin\Release\netcoreapp2.0\Heleonix.Testing.NUnit.Tests.xml</DocumentationFile>
23+
<LangVersion>latest</LangVersion>
24+
<DebugType>pdbonly</DebugType>
25+
<DebugSymbols>true</DebugSymbols>
4926
</PropertyGroup>
27+
5028
<ItemGroup>
51-
<Reference Include="System" />
52-
<Reference Include="System.Core" />
53-
</ItemGroup>
54-
<ItemGroup>
55-
<Compile Include="..\SharedAssemblyInfo.cs">
56-
<Link>Properties\SharedAssemblyInfo.cs</Link>
57-
</Compile>
58-
<Compile Include="Aaa\AaaSpecTests.cs" />
59-
<Compile Include="Aaa\Examples\MyComponent.cs" />
60-
<Compile Include="Aaa\Examples\MyComponentTests.cs" />
61-
<Compile Include="Aaa\Internal\AaaTestHostTests.cs" />
62-
<Compile Include="Bdd\BddSpecTests.cs" />
63-
<Compile Include="Bdd\Internal\BddTestHostTests.cs" />
64-
<Compile Include="Internal\TestHostTests.cs" />
65-
<Compile Include="Internal\TestPropertiesTests.cs" />
66-
<Compile Include="Properties\AssemblyInfo.cs" />
67-
</ItemGroup>
68-
<ItemGroup>
69-
<AdditionalFiles Include="..\stylecop.json">
70-
<Link>stylecop.json</Link>
71-
</AdditionalFiles>
72-
</ItemGroup>
73-
<ItemGroup>
74-
<Analyzer Include="..\packages\codecracker.CSharp.1.0.3\analyzers\dotnet\cs\CodeCracker.Common.dll" />
75-
<Analyzer Include="..\packages\codecracker.CSharp.1.0.3\analyzers\dotnet\cs\CodeCracker.CSharp.dll" />
76-
<Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeQuality.Analyzers.dll" />
77-
<Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeQuality.CSharp.Analyzers.dll" />
78-
<Analyzer Include="..\packages\Microsoft.NetCore.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.NetCore.Analyzers.dll" />
79-
<Analyzer Include="..\packages\Microsoft.NetCore.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.NetCore.CSharp.Analyzers.dll" />
80-
<Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.NetFramework.Analyzers.dll" />
81-
<Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.NetFramework.CSharp.Analyzers.dll" />
82-
<Analyzer Include="..\packages\RoslynSecurityGuard.2.3.0.0\analyzers\dotnet\cs\RoslynSecurityGuard.dll" />
83-
<Analyzer Include="..\packages\RoslynSecurityGuard.2.3.0.0\analyzers\dotnet\cs\YamlDotNet.dll" />
84-
<Analyzer Include="..\packages\SonarAnalyzer.CSharp.6.7.1.4347\analyzers\Google.Protobuf.dll" />
85-
<Analyzer Include="..\packages\SonarAnalyzer.CSharp.6.7.1.4347\analyzers\SonarAnalyzer.CSharp.dll" />
86-
<Analyzer Include="..\packages\SonarAnalyzer.CSharp.6.7.1.4347\analyzers\SonarAnalyzer.dll" />
87-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
88-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
89-
<Analyzer Include="..\packages\Text.Analyzers.2.6.0\analyzers\dotnet\cs\Text.Analyzers.dll" />
90-
<Analyzer Include="..\packages\Text.Analyzers.2.6.0\analyzers\dotnet\cs\Text.CSharp.Analyzers.dll" />
29+
<AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />
9130
</ItemGroup>
31+
9232
<ItemGroup>
93-
<ProjectReference Include="..\Heleonix.Testing.NUnit\Heleonix.Testing.NUnit.csproj">
94-
<Project>{36ad64b1-92ad-4bce-931e-fbec6c655e3f}</Project>
95-
<Name>Heleonix.Testing.NUnit</Name>
96-
</ProjectReference>
33+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
34+
<PackageReference Include="Moq" Version="4.8.3" />
35+
<PackageReference Include="NUnit" Version="3.9.0" />
36+
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
9737
</ItemGroup>
38+
9839
<ItemGroup>
99-
<PackageReference Include="codecracker.CSharp">
100-
<Version>1.0.3</Version>
101-
</PackageReference>
102-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
103-
<Version>2.6.0</Version>
104-
</PackageReference>
105-
<PackageReference Include="Microsoft.NET.Test.Sdk">
106-
<Version>15.7.2</Version>
107-
</PackageReference>
108-
<PackageReference Include="moq">
109-
<Version>4.8.2</Version>
110-
</PackageReference>
111-
<PackageReference Include="nunit">
112-
<Version>3.9.0</Version>
113-
</PackageReference>
114-
<PackageReference Include="NUnit3TestAdapter">
115-
<Version>3.10.0</Version>
116-
</PackageReference>
117-
<PackageReference Include="RoslynSecurityGuard">
118-
<Version>2.3.0</Version>
119-
</PackageReference>
120-
<PackageReference Include="SonarAnalyzer.CSharp">
121-
<Version>6.8.2.4717</Version>
122-
</PackageReference>
123-
<PackageReference Include="StyleCop.Analyzers">
124-
<Version>1.0.2</Version>
125-
</PackageReference>
40+
<ProjectReference Include="..\Heleonix.Testing.NUnit\Heleonix.Testing.NUnit.csproj" />
12641
</ItemGroup>
127-
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
128-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
129-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
130-
<PropertyGroup>
131-
<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>
132-
</PropertyGroup>
133-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props'))" />
134-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets'))" />
135-
<Error Condition="!Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.6.0\build\Microsoft.CodeQuality.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeQuality.Analyzers.2.6.0\build\Microsoft.CodeQuality.Analyzers.props'))" />
136-
<Error Condition="!Exists('..\packages\Microsoft.NetCore.Analyzers.2.6.0\build\Microsoft.NetCore.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetCore.Analyzers.2.6.0\build\Microsoft.NetCore.Analyzers.props'))" />
137-
<Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.2.6.0\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.2.6.0\build\Microsoft.NetFramework.Analyzers.props'))" />
138-
<Error Condition="!Exists('..\packages\Text.Analyzers.2.6.0\build\Text.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Text.Analyzers.2.6.0\build\Text.Analyzers.props'))" />
139-
</Target>
140-
<Import Project="..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" />
141-
</Project>
42+
43+
</Project>

‎Heleonix.Testing.NUnit.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Heleonix.Testing.sln‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1010
.gitignore = .gitignore
1111
LICENSE = LICENSE
1212
README.md = README.md
13-
SharedAssemblyInfo.cs = SharedAssemblyInfo.cs
1413
SharedProjectInfo.proj = SharedProjectInfo.proj
1514
stylecop.json = stylecop.json
1615
EndProjectSection
@@ -19,8 +18,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sources", "Sources", "{4AEA
1918
EndProject
2019
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{783E9705-9D30-414A-956F-DBDCB06F3ACA}"
2120
EndProject
22-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Heleonix.Testing.NUnit.Tests", "Heleonix.Testing.NUnit.Tests\Heleonix.Testing.NUnit.Tests.csproj", "{D9F8D146-C245-4F6E-8DE2-45738659BA83}"
23-
EndProject
2421
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{5334635D-74B4-48B3-AEB7-EF04B0887CAB}"
2522
EndProject
2623
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{E4223876-529E-4757-98A2-97D488BD32B3}"
@@ -29,6 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{E42238
2926
Docs\images\BDD.png = Docs\images\BDD.png
3027
EndProjectSection
3128
EndProject
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Heleonix.Testing.NUnit.Tests", "Heleonix.Testing.NUnit.Tests\Heleonix.Testing.NUnit.Tests.csproj", "{8821B8D3-CC9E-4402-ABF5-0F4F99E82A8C}"
30+
EndProject
3231
Global
3332
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3433
Debug|Any CPU = Debug|Any CPU
@@ -39,18 +38,18 @@ Global
3938
{36AD64B1-92AD-4BCE-931E-FBEC6C655E3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
4039
{36AD64B1-92AD-4BCE-931E-FBEC6C655E3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
4140
{36AD64B1-92AD-4BCE-931E-FBEC6C655E3F}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{D9F8D146-C245-4F6E-8DE2-45738659BA83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43-
{D9F8D146-C245-4F6E-8DE2-45738659BA83}.Debug|Any CPU.Build.0 = Debug|Any CPU
44-
{D9F8D146-C245-4F6E-8DE2-45738659BA83}.Release|Any CPU.ActiveCfg = Release|Any CPU
45-
{D9F8D146-C245-4F6E-8DE2-45738659BA83}.Release|Any CPU.Build.0 = Release|Any CPU
41+
{8821B8D3-CC9E-4402-ABF5-0F4F99E82A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42+
{8821B8D3-CC9E-4402-ABF5-0F4F99E82A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
43+
{8821B8D3-CC9E-4402-ABF5-0F4F99E82A8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{8821B8D3-CC9E-4402-ABF5-0F4F99E82A8C}.Release|Any CPU.Build.0 = Release|Any CPU
4645
EndGlobalSection
4746
GlobalSection(SolutionProperties) = preSolution
4847
HideSolutionNode = FALSE
4948
EndGlobalSection
5049
GlobalSection(NestedProjects) = preSolution
5150
{36AD64B1-92AD-4BCE-931E-FBEC6C655E3F} = {4AEAF240-3ED0-49D3-B054-27402285220A}
52-
{D9F8D146-C245-4F6E-8DE2-45738659BA83} = {783E9705-9D30-414A-956F-DBDCB06F3ACA}
5351
{E4223876-529E-4757-98A2-97D488BD32B3} = {5334635D-74B4-48B3-AEB7-EF04B0887CAB}
52+
{8821B8D3-CC9E-4402-ABF5-0F4F99E82A8C} = {783E9705-9D30-414A-956F-DBDCB06F3ACA}
5453
EndGlobalSection
5554
GlobalSection(ExtensibilityGlobals) = postSolution
5655
SolutionGuid = {710E8CFD-309B-4054-9763-4649C9D5E58C}

‎SharedAssemblyInfo.cs‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎SharedProjectInfo.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>1.2.0</Version>
3+
<Version>1.3.0</Version>
44
<PackageReleaseNotes>Added support of sequential When in AAA spec</PackageReleaseNotes>
55

66
<Description>The library for writing tests in BDD and AAA styles</Description>

0 commit comments

Comments
 (0)