Skip to content

Commit

Permalink
Split solution in test project and regular project
Browse files Browse the repository at this point in the history
  • Loading branch information
mroloux committed Mar 21, 2018
1 parent 2a2c263 commit e1f34f7
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ install:

script:
- dotnet build
- dotnet test -f netcoreapp2.0
- dotnet test SeatsioDotNet.Test
13 changes: 13 additions & 0 deletions SeatsioDotNet.Test/SeatsioDotNet.Test.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\SeatsioDotNet\SeatsioDotNet.csproj" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="RestSharp" Version="106.2.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
</Project>
8 changes: 1 addition & 7 deletions seatsio-dotnet.csproj → SeatsioDotNet/SeatsioDotNet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,11 @@
<Version>5</Version>
<TargetFrameworks>netcoreapp2.0;netstandard2.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
<PackageReference Include="RestSharp" Version="106.2.1" />
</ItemGroup>
</Project>
</Project>
5 changes: 3 additions & 2 deletions deploy.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
How to deploy:

1) increase version number in seatsio-dotnet.csproj
1) cd SeatsioDotNet
1) increase version number in SeatsioDotNet.csproj
2) dotnet pack
3) dotnet nuget push bin/Debug/seatsio-dotnet.<version>.nupkg -s nuget.org -k <nuget API key>
3) dotnet nuget push bin/Debug/seatsio-dotnet.<version>.nupkg -s nuget.org -k <nuget API key>
8 changes: 7 additions & 1 deletion seatsio-dotnet.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "seatsio-dotnet", "seatsio-dotnet.csproj", "{42CB17AA-1703-4F2B-B194-895EF0EB5DD3}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SeatsioDotNet", "SeatsioDotNet/SeatsioDotNet.csproj", "{42CB17AA-1703-4F2B-B194-895EF0EB5DD3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SeatsioDotNet.Test", "SeatsioDotNet.Test/SeatsioDotNet.Test.csproj", "{4F99CB9F-5F3A-4A92-89BA-7C4AF5C93E91}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -12,5 +14,9 @@ Global
{42CB17AA-1703-4F2B-B194-895EF0EB5DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{42CB17AA-1703-4F2B-B194-895EF0EB5DD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{42CB17AA-1703-4F2B-B194-895EF0EB5DD3}.Release|Any CPU.Build.0 = Release|Any CPU
{4F99CB9F-5F3A-4A92-89BA-7C4AF5C93E91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4F99CB9F-5F3A-4A92-89BA-7C4AF5C93E91}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4F99CB9F-5F3A-4A92-89BA-7C4AF5C93E91}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4F99CB9F-5F3A-4A92-89BA-7C4AF5C93E91}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal

0 comments on commit e1f34f7

Please sign in to comment.