Skip to content

Commit

Permalink
Travis build fix (#55)
Browse files Browse the repository at this point in the history
* Fixed typo in restore command.

* Try to update after restore in travis yaml install

* Added nuget restore for all projects.

* Used VS2017 to convert the solution format to 2017 from 2012.

* Removed the installation of xunit from .travis.yml file.

* Resolved the circular dependency between projects.

* Changed travis to use .NET Core to build the project.

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml
  • Loading branch information
aalhour authored Dec 13, 2017
1 parent c086cc8 commit 62b83ad
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 18 deletions.
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: csharp
solution: C-Sharp-Algorithms.sln
install:
- nuget restore C-Sharp-Algorithms.sln
- nuget install NUnit -Version 2.6.2
- nuget install NUnit.Runners -Version 2.6.4
dotnet: 2.0.3
mono: none
dist: trusty
script:
- dotnet restore
2 changes: 1 addition & 1 deletion Algorithms/Algorithms.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
33 changes: 24 additions & 9 deletions C-Sharp-Algorithms.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStructures", "DataStruc
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Algorithms", "Algorithms\Algorithms.csproj", "{7CE43796-3845-4F4D-9A8D-C09B8552F42E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTest", "UnitTest\UnitTest.csproj", "{2C60C7D1-3FAD-44B7-903B-0B89D84647A2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTest", "UnitTest\UnitTest.csproj", "{78061D74-A872-4D4B-AF06-92EAC2EDF185}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -23,20 +23,20 @@ Global
{7CE43796-3845-4F4D-9A8D-C09B8552F42E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7CE43796-3845-4F4D-9A8D-C09B8552F42E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7CE43796-3845-4F4D-9A8D-C09B8552F42E}.Release|Any CPU.Build.0 = Release|Any CPU
{2C60C7D1-3FAD-44B7-903B-0B89D84647A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2C60C7D1-3FAD-44B7-903B-0B89D84647A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C60C7D1-3FAD-44B7-903B-0B89D84647A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C60C7D1-3FAD-44B7-903B-0B89D84647A2}.Release|Any CPU.Build.0 = Release|Any CPU
{78061D74-A872-4D4B-AF06-92EAC2EDF185}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{78061D74-A872-4D4B-AF06-92EAC2EDF185}.Debug|Any CPU.Build.0 = Debug|Any CPU
{78061D74-A872-4D4B-AF06-92EAC2EDF185}.Release|Any CPU.ActiveCfg = Release|Any CPU
{78061D74-A872-4D4B-AF06-92EAC2EDF185}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
$0.TextStylePolicy = $1
$1.inheritsSet = VisualStudio
$1.inheritsScope = text/plain
$1.scope = text/x-csharp
$1.FileWidth = 80
$1.TabsToSpaces = True
$0.CSharpFormattingPolicy = $2
$2.IndentSwitchBody = True
$2.IndentBlocksInsideExpressions = True
Expand All @@ -62,9 +62,24 @@ Global
$2.BeforeDelegateDeclarationParentheses = False
$2.NewParentheses = False
$2.SpacesBeforeBrackets = False
$2.inheritsSet = Mono
$2.inheritsScope = text/x-csharp
$2.scope = text/x-csharp
$2.IndentSwitchSection = False
$2.NewLinesForBracesInProperties = False
$2.NewLinesForBracesInAccessors = False
$2.NewLinesForBracesInAnonymousMethods = False
$2.NewLinesForBracesInControlBlocks = False
$2.NewLinesForBracesInAnonymousTypes = False
$2.NewLinesForBracesInObjectCollectionArrayInitializers = False
$2.NewLinesForBracesInLambdaExpressionBody = False
$2.NewLineForElse = False
$2.NewLineForCatch = False
$2.NewLineForFinally = False
$2.NewLineForMembersInObjectInit = False
$2.NewLineForMembersInAnonymousTypes = False
$2.NewLineForClausesInQuery = False
$2.SpacingAfterMethodDeclarationName = True
$2.SpaceAfterMethodCallName = True
$2.SpaceBeforeOpenSquareBracket = True
EndGlobalSection
GlobalSection(CodealikeProperties) = postSolution
SolutionGuid = f7178bdb-e6ee-479b-8876-5fd96edf50a4
Expand Down
2 changes: 1 addition & 1 deletion DataStructures/DataStructures.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions UnitTest/UnitTest.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -12,11 +12,10 @@

<ItemGroup>
<ProjectReference Include="..\Algorithms\Algorithms.csproj" />
<ProjectReference Include="..\DataStructures\DataStructures.csproj" />
<!--<ProjectReference Include="..\DataStructures\DataStructures.csproj" />-->
</ItemGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>

</Project>

0 comments on commit 62b83ad

Please sign in to comment.