Skip to content

Commit 62b83ad

Browse files
authored
Travis build fix (aalhour#55)
* 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
1 parent c086cc8 commit 62b83ad

File tree

5 files changed

+33
-18
lines changed

5 files changed

+33
-18
lines changed

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
language: csharp
22
solution: C-Sharp-Algorithms.sln
3-
install:
4-
- nuget restore C-Sharp-Algorithms.sln
5-
- nuget install NUnit -Version 2.6.2
6-
- nuget install NUnit.Runners -Version 2.6.4
3+
dotnet: 2.0.3
4+
mono: none
5+
dist: trusty
6+
script:
7+
- dotnet restore

Algorithms/Algorithms.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

C-Sharp-Algorithms.sln

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStructures", "DataStruc
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Algorithms", "Algorithms\Algorithms.csproj", "{7CE43796-3845-4F4D-9A8D-C09B8552F42E}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTest", "UnitTest\UnitTest.csproj", "{2C60C7D1-3FAD-44B7-903B-0B89D84647A2}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTest", "UnitTest\UnitTest.csproj", "{78061D74-A872-4D4B-AF06-92EAC2EDF185}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,20 +23,20 @@ Global
2323
{7CE43796-3845-4F4D-9A8D-C09B8552F42E}.Debug|Any CPU.Build.0 = Debug|Any CPU
2424
{7CE43796-3845-4F4D-9A8D-C09B8552F42E}.Release|Any CPU.ActiveCfg = Release|Any CPU
2525
{7CE43796-3845-4F4D-9A8D-C09B8552F42E}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{2C60C7D1-3FAD-44B7-903B-0B89D84647A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{2C60C7D1-3FAD-44B7-903B-0B89D84647A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{2C60C7D1-3FAD-44B7-903B-0B89D84647A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{2C60C7D1-3FAD-44B7-903B-0B89D84647A2}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{78061D74-A872-4D4B-AF06-92EAC2EDF185}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{78061D74-A872-4D4B-AF06-92EAC2EDF185}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{78061D74-A872-4D4B-AF06-92EAC2EDF185}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{78061D74-A872-4D4B-AF06-92EAC2EDF185}.Release|Any CPU.Build.0 = Release|Any CPU
3030
EndGlobalSection
3131
GlobalSection(SolutionProperties) = preSolution
3232
HideSolutionNode = FALSE
3333
EndGlobalSection
3434
GlobalSection(MonoDevelopProperties) = preSolution
3535
Policies = $0
3636
$0.TextStylePolicy = $1
37-
$1.inheritsSet = VisualStudio
38-
$1.inheritsScope = text/plain
3937
$1.scope = text/x-csharp
38+
$1.FileWidth = 80
39+
$1.TabsToSpaces = True
4040
$0.CSharpFormattingPolicy = $2
4141
$2.IndentSwitchBody = True
4242
$2.IndentBlocksInsideExpressions = True
@@ -62,9 +62,24 @@ Global
6262
$2.BeforeDelegateDeclarationParentheses = False
6363
$2.NewParentheses = False
6464
$2.SpacesBeforeBrackets = False
65-
$2.inheritsSet = Mono
66-
$2.inheritsScope = text/x-csharp
6765
$2.scope = text/x-csharp
66+
$2.IndentSwitchSection = False
67+
$2.NewLinesForBracesInProperties = False
68+
$2.NewLinesForBracesInAccessors = False
69+
$2.NewLinesForBracesInAnonymousMethods = False
70+
$2.NewLinesForBracesInControlBlocks = False
71+
$2.NewLinesForBracesInAnonymousTypes = False
72+
$2.NewLinesForBracesInObjectCollectionArrayInitializers = False
73+
$2.NewLinesForBracesInLambdaExpressionBody = False
74+
$2.NewLineForElse = False
75+
$2.NewLineForCatch = False
76+
$2.NewLineForFinally = False
77+
$2.NewLineForMembersInObjectInit = False
78+
$2.NewLineForMembersInAnonymousTypes = False
79+
$2.NewLineForClausesInQuery = False
80+
$2.SpacingAfterMethodDeclarationName = True
81+
$2.SpaceAfterMethodCallName = True
82+
$2.SpaceBeforeOpenSquareBracket = True
6883
EndGlobalSection
6984
GlobalSection(CodealikeProperties) = postSolution
7085
SolutionGuid = f7178bdb-e6ee-479b-8876-5fd96edf50a4

DataStructures/DataStructures.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp1.1</TargetFramework>
3+
<TargetFramework>netcoreapp2.0</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>

UnitTest/UnitTest.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -12,11 +12,10 @@
1212

1313
<ItemGroup>
1414
<ProjectReference Include="..\Algorithms\Algorithms.csproj" />
15-
<ProjectReference Include="..\DataStructures\DataStructures.csproj" />
15+
<!--<ProjectReference Include="..\DataStructures\DataStructures.csproj" />-->
1616
</ItemGroup>
1717

1818
<ItemGroup>
1919
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
2020
</ItemGroup>
21-
2221
</Project>

0 commit comments

Comments
 (0)