Skip to content
This repository was archived by the owner on Nov 7, 2019. It is now read-only.

Commit 01b67c0

Browse files
richardjhardingstajs
authored andcommitted
Convert to cs proj (#43)
* migrate from xproj and project.json to csproj * convert sample projects from xproj to csproj * infer test framework from new csproj file * update tool version * change name to better reflect move to csproj
1 parent caa66a4 commit 01b67c0

20 files changed

+248
-308
lines changed
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>Sample.Website.Tests Class Library</Description>
5+
<Authors>stajs</Authors>
6+
<TargetFramework>net461</TargetFramework>
7+
<AssemblyName>Sample.Website.Tests.MSTest</AssemblyName>
8+
<PackageId>Sample.Website.Tests.MSTest</PackageId>
9+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
10+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
11+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
12+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
13+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
14+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
15+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
16+
</PropertyGroup>
17+
18+
<ItemGroup>
19+
<ProjectReference Include="..\Sample.Website\Sample.Website.csproj" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
24+
<PackageReference Include="MSTest.TestAdapter" Version="1.1.8-rc" />
25+
<PackageReference Include="SpecFlow" Version="2.1.0" />
26+
<PackageReference Include="MSTest.TestFramework" Version="1.0.8-rc" />
27+
</ItemGroup>
28+
29+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
30+
<Reference Include="System" />
31+
<Reference Include="Microsoft.CSharp" />
32+
</ItemGroup>
33+
34+
<Target Name="PrecompileScript" BeforeTargets="BeforeBuild">
35+
<Exec Command="dotnet SpecFlow.NetCore" />
36+
</Target>
37+
38+
<ItemGroup>
39+
<DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.0.0-rc7" />
40+
</ItemGroup>
41+
42+
</Project>

samples/VS2015/SpecFlow 2.1.0/net461/Sample.Website.Tests.MsTest/Sample.Website.Tests.MsTest.xproj

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

samples/VS2015/SpecFlow 2.1.0/net461/Sample.Website.Tests.MsTest/project.json

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>Sample.Website.Tests Class Library</Description>
5+
<Authors>stajs</Authors>
6+
<TargetFramework>net461</TargetFramework>
7+
<AssemblyName>Sample.Website.Tests.NUnit</AssemblyName>
8+
<PackageId>Sample.Website.Tests.NUnit</PackageId>
9+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
10+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
11+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
12+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
13+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
14+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
15+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
16+
</PropertyGroup>
17+
18+
<ItemGroup>
19+
<ProjectReference Include="..\Sample.Website\Sample.Website.csproj" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
24+
<PackageReference Include="SpecFlow" Version="2.1.0" />
25+
<PackageReference Include="NUnit" Version="3.4.1" />
26+
<PackageReference Include="dotnet-test-nunit" Version="3.4.0-beta-2" />
27+
</ItemGroup>
28+
29+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
30+
<Reference Include="System" />
31+
<Reference Include="Microsoft.CSharp" />
32+
</ItemGroup>
33+
34+
<Target Name="PrecompileScript" BeforeTargets="BeforeBuild">
35+
<Exec Command="dotnet SpecFlow.NetCore" />
36+
</Target>
37+
38+
<ItemGroup>
39+
<DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.0.0-rc7" />
40+
</ItemGroup>
41+
42+
</Project>

samples/VS2015/SpecFlow 2.1.0/net461/Sample.Website.Tests.NUnit/Sample.Website.Tests.NUnit.xproj

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

samples/VS2015/SpecFlow 2.1.0/net461/Sample.Website.Tests.NUnit/project.json

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>Sample.Website.Tests Class Library</Description>
5+
<Authors>stajs</Authors>
6+
<TargetFramework>net461</TargetFramework>
7+
<AssemblyName>Sample.Website.Tests.XUnit</AssemblyName>
8+
<PackageId>Sample.Website.Tests.XUnit</PackageId>
9+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
10+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
11+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
12+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
13+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
14+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
15+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
16+
</PropertyGroup>
17+
18+
<ItemGroup>
19+
<ProjectReference Include="..\Sample.Website\Sample.Website.csproj" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
24+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
25+
<PackageReference Include="SpecFlow" Version="2.1.0" />
26+
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
27+
</ItemGroup>
28+
29+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
30+
<Reference Include="System" />
31+
<Reference Include="Microsoft.CSharp" />
32+
</ItemGroup>
33+
34+
<Target Name="PrecompileScript" BeforeTargets="BeforeBuild">
35+
<Exec Command="dotnet SpecFlow.NetCore" />
36+
</Target>
37+
38+
<ItemGroup>
39+
<DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.0.0-rc7" />
40+
</ItemGroup>
41+
42+
</Project>

samples/VS2015/SpecFlow 2.1.0/net461/Sample.Website.Tests.XUnit/Sample.Website.Tests.XUnit.xproj

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

samples/VS2015/SpecFlow 2.1.0/net461/Sample.Website.Tests.XUnit/project.json

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

samples/VS2015/SpecFlow 2.1.0/net461/Sample.Website.sln

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26206.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Sample.Website", "Sample.Website\Sample.Website.xproj", "{D0D56730-C846-442A-ACE7-1059240B4109}"
7-
EndProject
86
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{004FCD9D-539C-4CCA-9780-EC56517946C5}"
9-
ProjectSection(SolutionItems) = preProject
10-
global.json = global.json
11-
EndProjectSection
127
EndProject
13-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Sample.Website.Tests.NUnit", "Sample.Website.Tests.NUnit\Sample.Website.Tests.NUnit.xproj", "{1182F5AF-9ABF-4D9C-AF8B-9331AD376E87}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Website", "Sample.Website\Sample.Website.csproj", "{D0D56730-C846-442A-ACE7-1059240B4109}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Website.Tests.NUnit", "Sample.Website.Tests.NUnit\Sample.Website.Tests.NUnit.csproj", "{1182F5AF-9ABF-4D9C-AF8B-9331AD376E87}"
1411
EndProject
15-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Sample.Website.Tests.MSTest", "Sample.Website.Tests.MSTest\Sample.Website.Tests.MSTest.xproj", "{B26DC82D-DF30-4774-ABE6-E17B18FEDFFA}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Website.Tests.MSTest", "Sample.Website.Tests.MSTest\Sample.Website.Tests.MSTest.csproj", "{B26DC82D-DF30-4774-ABE6-E17B18FEDFFA}"
1613
EndProject
17-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Sample.Website.Tests.XUnit", "Sample.Website.Tests.XUnit\Sample.Website.Tests.XUnit.xproj", "{785BC4A8-774E-45EC-B99B-E8F9BDA0AE19}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Website.Tests.XUnit", "Sample.Website.Tests.XUnit\Sample.Website.Tests.XUnit.csproj", "{785BC4A8-774E-45EC-B99B-E8F9BDA0AE19}"
1815
EndProject
1916
Global
2017
GlobalSection(SolutionConfigurationPlatforms) = preSolution

0 commit comments

Comments
 (0)