Skip to content

Commit e3c4d4a

Browse files
justcoding121justcoding121
authored
Merge pull request #21 from justcoding121/master
Beta
2 parents 1bc53b3 + 6603595 commit e3c4d4a

File tree

289 files changed

+969
-298
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+969
-298
lines changed

‎.build/build.ps1‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ $PSake.use_exit_on_error = $true
22

33
$Here = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
44

5-
$SolutionRoot = (Split-Path -parent $Here)
5+
$RepoRoot = $(Split-Path -parent $Here)
6+
$SolutionRoot = "$RepoRoot\src"
67

78
$ProjectName = "Advanced.Algorithms"
89
$GitHubProjectName = "Advanced-Algorithms"
@@ -26,7 +27,7 @@ if(!$Branch) { $Branch = "local" }
2627

2728
if($Branch -eq "beta" ) { $Version = "$Version-beta" }
2829

29-
$NuGet = Join-Path $SolutionRoot ".nuget\nuget.exe"
30+
$NuGet = Join-Path $RepoRoot ".nuget\nuget.exe"
3031

3132
$MSBuild = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
3233
$MSBuild -replace ' ', '` '
@@ -65,12 +66,13 @@ Task Document -depends Build {
6566

6667
if($Branch -eq "master")
6768
{
69+
6870
#use docfx to generate API documentation from source metadata
6971
docfx docfx.json
7072

7173
#patch index.json so that it is always sorted
7274
#otherwise git will think file was changed
73-
$IndexJsonFile = "$SolutionRoot\docs\index.json"
75+
$IndexJsonFile = "$RepoRoot\docs\index.json"
7476
$unsorted = Get-Content $IndexJsonFile | Out-String
7577
[Reflection.Assembly]::LoadFile("$Here\lib\Newtonsoft.Json.dll")
7678
[System.Reflection.Assembly]::LoadWithPartialName("System")
@@ -79,7 +81,7 @@ Task Document -depends Build {
7981
Set-Content -Path $IndexJsonFile -Value $obj
8082

8183
#setup clone directory
82-
$TEMP_REPO_DIR =(Split-Path -parent $SolutionRoot) + "\temp-repo-clone"
84+
$TEMP_REPO_DIR =(Split-Path -parent $RepoRoot) + "\temp-repo-clone"
8385

8486
If(test-path $TEMP_REPO_DIR)
8587
{
@@ -101,7 +103,7 @@ Task Document -depends Build {
101103
cd "$TEMP_REPO_DIR\docs"
102104

103105
#copy docs to clone directory\docs
104-
Copy-Item -Path "$SolutionRoot\docs\*" -Destination "$TEMP_REPO_DIR\docs" -Recurse -Force
106+
Copy-Item -Path "$RepoRoot\docs\*" -Destination "$TEMP_REPO_DIR\docs" -Recurse -Force
105107

106108
#push changes to master
107109
git config --global credential.helper store
@@ -119,5 +121,5 @@ Task Document -depends Build {
119121

120122
#package nuget files
121123
Task Package -depends Document {
122-
exec { . $NuGet pack "$SolutionRoot\$ProjectName\$ProjectName.nuspec" -Properties Configuration=$Configuration -OutputDirectory "$SolutionRoot" -Version "$Version" }
123-
}
124+
exec { . $NuGet pack "$SolutionRoot\$ProjectName\$ProjectName.nuspec" -Properties Configuration=$Configuration -OutputDirectory "$RepoRoot" -Version "$Version" }
125+
}

‎.build/setup.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ param (
66

77
function Install-Chocolatey()
88
{
9-
if(-not $env:ChocolateyInstall -or -not (Test-Path "$env:ChocolateyInstall"))
9+
if(-not $env:ChocolateyInstall -or -not (Test-Path "$env:ChocolateyInstall\*"))
1010
{
1111
Write-Output "Chocolatey Not Found, Installing..."
1212
iex ((new-object net.webclient).DownloadString('http://chocolatey.org/install.ps1'))

‎.vscode/settings.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
// The following will hide the js and map files in the editor
3+
"files.exclude": {
4+
"**/.build": true,
5+
"**/.nuget": true,
6+
"**/.vs": true,
7+
"**/docs": true,
8+
"**/packages": true,
9+
"**/bin": true,
10+
"**/obj": true,
11+
"**/*.DotSettings": true,
12+
"**/*.sln": true,
13+
"**/*.Mono.csproj": true,
14+
"**/*.Docs.csproj": true,
15+
"**/*.Algorithms.csproj": true,
16+
"**/*.Tests.csproj": true
17+
},
18+
"search.exclude": {
19+
"**/.build": true,
20+
"**/.nuget": true,
21+
"**/.vs": true,
22+
"**/docs": true,
23+
"**/packages": true,
24+
"**/bin": true,
25+
"**/obj": true,
26+
"**/*.DotSettings": true,
27+
"**/*.sln": true,
28+
"**/*.Mono.csproj": true,
29+
"**/*.Docs.csproj": true,
30+
"**/*.Algorithms.csproj": true,
31+
"**/*.Tests.csproj": true
32+
}
33+
}

‎.vscode/tasks.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build",
6+
"type": "process",
7+
"command": "dotnet",
8+
"args": ["build","${workspaceFolder}/src/Advanced.Algorithms.NetCore.sln"],
9+
"problemMatcher": "$msCompile",
10+
"group": {
11+
"kind": "build",
12+
"isDefault": true
13+
}
14+
}
15+
]
16+
}

‎README.md‎

Lines changed: 162 additions & 143 deletions

‎appveyor.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ skip_tags: true
4141

4242
skip_commits:
4343
author: buildbot121
44-
44+
files:
45+
- docs/*
46+
- README.md
47+
- LICENSE
48+
4549
#---------------------------------#
4650
# artifacts configuration #
4751
#---------------------------------#

‎omnisharp.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"fileOptions": {
3+
"excludeSearchPatterns": [
4+
"**/*.Docs.csproj",
5+
"**/*.DotSettings",
6+
"**/*.sln",
7+
"**/*.Mono.csproj",
8+
"**/*.Docs.csproj",
9+
"**/*.Algorithms.csproj",
10+
"**/*.Tests.csproj"
11+
]
12+
}
13+
}

‎Advanced.Algorithms.Docs.sln‎ renamed to ‎src/Advanced.Algorithms.Docs.sln‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ VisualStudioVersion = 15.0.27428.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6FD3B84B-9283-4E9C-8C43-A234E9AA3EAA}"
77
ProjectSection(SolutionItems) = preProject
8-
.nuget\NuGet.Config = .nuget\NuGet.Config
9-
.nuget\NuGet.exe = .nuget\NuGet.exe
10-
.nuget\NuGet.targets = .nuget\NuGet.targets
8+
..\.nuget\NuGet.Config = ..\.nuget\NuGet.Config
9+
..\.nuget\NuGet.exe = ..\.nuget\NuGet.exe
10+
..\.nuget\NuGet.targets = ..\.nuget\NuGet.targets
1111
EndProjectSection
1212
EndProject
1313
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Advanced.Algorithms.Docs", "Advanced.Algorithms\Advanced.Algorithms.Docs.csproj", "{EBF2EA46-EA00-4350-BE1D-D86AFD699DB3}"

‎src/Advanced.Algorithms.Mono.sln‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26730.16
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6FD3B84B-9283-4E9C-8C43-A234E9AA3EAA}"
7+
ProjectSection(SolutionItems) = preProject
8+
..\.nuget\NuGet.Config = ..\.nuget\NuGet.Config
9+
..\.nuget\NuGet.exe = ..\.nuget\NuGet.exe
10+
..\.nuget\NuGet.targets = ..\.nuget\NuGet.targets
11+
EndProjectSection
12+
EndProject
13+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{38EA62D0-D2CB-465D-AF4F-407C5B4D4A1E}"
14+
ProjectSection(SolutionItems) = preProject
15+
..\LICENSE = ..\LICENSE
16+
..\README.md = ..\README.md
17+
EndProjectSection
18+
EndProject
19+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{AC9AE37A-3059-4FDB-9A5C-363AD86F2EEF}"
20+
ProjectSection(SolutionItems) = preProject
21+
..\.build\build.ps1 = ..\.build\build.ps1
22+
..\.build\docfx.json = ..\.build\docfx.json
23+
..\.build\setup.ps1 = ..\.build\setup.ps1
24+
EndProjectSection
25+
EndProject
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Advanced.Algorithms.Mono", "Advanced.Algorithms\Advanced.Algorithms.Mono.csproj", "{32E22D53-CECD-4E2D-ADAD-85DD79A8549F}"
27+
EndProject
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Advanced.Algorithms.Tests.Mono", "..\tests\Advanced.Algorithms.Tests\Advanced.Algorithms.Tests.Mono.csproj", "{556705BD-1E64-426D-A9CA-08390156FB85}"
29+
EndProject
30+
Global
31+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
32+
Debug|Any CPU = Debug|Any CPU
33+
Release|Any CPU = Release|Any CPU
34+
EndGlobalSection
35+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
36+
{32E22D53-CECD-4E2D-ADAD-85DD79A8549F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{32E22D53-CECD-4E2D-ADAD-85DD79A8549F}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{32E22D53-CECD-4E2D-ADAD-85DD79A8549F}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{32E22D53-CECD-4E2D-ADAD-85DD79A8549F}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{556705BD-1E64-426D-A9CA-08390156FB85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{556705BD-1E64-426D-A9CA-08390156FB85}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{556705BD-1E64-426D-A9CA-08390156FB85}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{556705BD-1E64-426D-A9CA-08390156FB85}.Release|Any CPU.Build.0 = Release|Any CPU
44+
EndGlobalSection
45+
GlobalSection(SolutionProperties) = preSolution
46+
HideSolutionNode = FALSE
47+
EndGlobalSection
48+
GlobalSection(ExtensibilityGlobals) = postSolution
49+
EnterpriseLibraryConfigurationToolBinariesPath = .1.505.2\lib\NET35
50+
SolutionGuid = {625C1EB5-44CF-47DE-A85A-B4C8C40ED90A}
51+
EndGlobalSection
52+
EndGlobal

‎src/Advanced.Algorithms.NetCore.sln‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26730.16
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6FD3B84B-9283-4E9C-8C43-A234E9AA3EAA}"
7+
ProjectSection(SolutionItems) = preProject
8+
..\.nuget\NuGet.Config = ..\.nuget\NuGet.Config
9+
..\.nuget\NuGet.exe = ..\.nuget\NuGet.exe
10+
..\.nuget\NuGet.targets = ..\.nuget\NuGet.targets
11+
EndProjectSection
12+
EndProject
13+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{38EA62D0-D2CB-465D-AF4F-407C5B4D4A1E}"
14+
ProjectSection(SolutionItems) = preProject
15+
..\LICENSE = ..\LICENSE
16+
..\README.md = ..\README.md
17+
EndProjectSection
18+
EndProject
19+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{AC9AE37A-3059-4FDB-9A5C-363AD86F2EEF}"
20+
ProjectSection(SolutionItems) = preProject
21+
..\.build\build.ps1 = ..\.build\build.ps1
22+
..\.build\docfx.json = ..\.build\docfx.json
23+
..\.build\setup.ps1 = ..\.build\setup.ps1
24+
EndProjectSection
25+
EndProject
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Advanced.Algorithms", "Advanced.Algorithms\Advanced.Algorithms.NetCore.csproj", "{32E22D53-CECD-4E2D-ADAD-85DD79A8549F}"
27+
EndProject
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Advanced.Algorithms.Tests", "..\tests\Advanced.Algorithms.Tests\Advanced.Algorithms.Tests.NetCore.csproj", "{556705BD-1E64-426D-A9CA-08390156FB85}"
29+
EndProject
30+
Global
31+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
32+
Debug|Any CPU = Debug|Any CPU
33+
Release|Any CPU = Release|Any CPU
34+
EndGlobalSection
35+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
36+
{32E22D53-CECD-4E2D-ADAD-85DD79A8549F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{32E22D53-CECD-4E2D-ADAD-85DD79A8549F}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{32E22D53-CECD-4E2D-ADAD-85DD79A8549F}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{32E22D53-CECD-4E2D-ADAD-85DD79A8549F}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{556705BD-1E64-426D-A9CA-08390156FB85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{556705BD-1E64-426D-A9CA-08390156FB85}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{556705BD-1E64-426D-A9CA-08390156FB85}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{556705BD-1E64-426D-A9CA-08390156FB85}.Release|Any CPU.Build.0 = Release|Any CPU
44+
EndGlobalSection
45+
GlobalSection(SolutionProperties) = preSolution
46+
HideSolutionNode = FALSE
47+
EndGlobalSection
48+
GlobalSection(ExtensibilityGlobals) = postSolution
49+
EnterpriseLibraryConfigurationToolBinariesPath = .1.505.2\lib\NET35
50+
SolutionGuid = {625C1EB5-44CF-47DE-A85A-B4C8C40ED90A}
51+
EndGlobalSection
52+
EndGlobal

0 commit comments

Comments
 (0)