Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Travis build fix #55

Merged
merged 10 commits into from
Dec 13, 2017
Merged

Travis build fix #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
76202a7
Fixed typo in restore command.
aalhour Dec 11, 2017
23df253
Try to update after restore in travis yaml install
aalhour Dec 11, 2017
2e83ef3
Added nuget restore for all projects.
aalhour Dec 11, 2017
5e65373
Used VS2017 to convert the solution format to 2017 from 2012.
aalhour Dec 11, 2017
c8e9957
Removed the installation of xunit from .travis.yml file.
aalhour Dec 11, 2017
b9c8f13
Resolved the circular dependency between projects.
aalhour Dec 13, 2017
adf576b
Changed travis to use .NET Core to build the project.
aalhour Dec 13, 2017
35167bc
Update .travis.yml
aalhour Dec 13, 2017
91b5b4e
Update .travis.yml
aalhour Dec 13, 2017
29061b9
Update .travis.yml
aalhour Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .travis.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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>