Skip to content

Commit

Permalink
Merges branch 'netcore-2.1'
Browse files Browse the repository at this point in the history
Merging the .NET Core version into master is the first step
in unifying the two code bases into a single cross-platform one.

From this point on there will be only one canonical version of Linker
and that's the one built on ASP.NET Core.
  • Loading branch information
ecampidoglio committed Apr 18, 2019
2 parents bdde1a4 + 83bc63d commit 08a80e5
Show file tree
Hide file tree
Showing 41 changed files with 1,112 additions and 318 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
root = true

[*]
end_of_line = crlf
end_of_line = lf
indent_style = space
indent_size = 4
insert_final_newline = true
Expand Down
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
dist: trusty
language: csharp
install: true
mono: latest
dotnet: 1.0.4
mono: none
dotnet: 2.1.500
sudo: required
branches:
only:
- netcore
- master
script:
- ./build.sh -t Deploy
- ./build.sh --target=Deploy
env:
- DeployTo="https://linker-demo.scm.azurewebsites.net/api/zip/site/wwwroot/Linker"
- DeployTo="https://linker-demo.scm.azurewebsites.net/api/zipdeploy"
7 changes: 7 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"recommendations": [
"ms-vscode.csharp",
"cake-build.cake-vscode",
"humao.rest-client"
]
}
23 changes: 23 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceRoot}/src/Linker/bin/Debug/netcoreapp1.0/Linker.dll",
"args": [],
"cwd": "${workspaceRoot}",
"externalConsole": false,
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command.pickProcess}"
}
]
}
24 changes: 24 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"version": "0.1.0",
"command": "dotnet",
"isShellCommand": true,
"args": [],
"tasks": [
{
"taskName": "build",
"args": [
"src/Linker/Linker.csproj"
],
"isBuildCommand": true,
"problemMatcher": "$msCompile"
},
{
"taskName": "test",
"args": [
"test/Linker.Tests/Linker.Tests.csproj"
],
"isTestCommand": true,
"problemMatcher": "$msCompile"
}
]
}
55 changes: 55 additions & 0 deletions Linker.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6AF842E6-59EE-4942-88EC-845292B06D17}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linker", "src\Linker\Linker.csproj", "{1029B774-6D12-450F-8835-90BBDFE97074}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{43935B06-12F3-4E46-BF6D-F1392269E747}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linker.Tests", "test\Linker.Tests\Linker.Tests.csproj", "{34BA46AE-8759-4F3C-B158-DA39FBD8234C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1029B774-6D12-450F-8835-90BBDFE97074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1029B774-6D12-450F-8835-90BBDFE97074}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1029B774-6D12-450F-8835-90BBDFE97074}.Debug|x64.ActiveCfg = Debug|x64
{1029B774-6D12-450F-8835-90BBDFE97074}.Debug|x64.Build.0 = Debug|x64
{1029B774-6D12-450F-8835-90BBDFE97074}.Debug|x86.ActiveCfg = Debug|x86
{1029B774-6D12-450F-8835-90BBDFE97074}.Debug|x86.Build.0 = Debug|x86
{1029B774-6D12-450F-8835-90BBDFE97074}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1029B774-6D12-450F-8835-90BBDFE97074}.Release|Any CPU.Build.0 = Release|Any CPU
{1029B774-6D12-450F-8835-90BBDFE97074}.Release|x64.ActiveCfg = Release|x64
{1029B774-6D12-450F-8835-90BBDFE97074}.Release|x64.Build.0 = Release|x64
{1029B774-6D12-450F-8835-90BBDFE97074}.Release|x86.ActiveCfg = Release|x86
{1029B774-6D12-450F-8835-90BBDFE97074}.Release|x86.Build.0 = Release|x86
{34BA46AE-8759-4F3C-B158-DA39FBD8234C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{34BA46AE-8759-4F3C-B158-DA39FBD8234C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{34BA46AE-8759-4F3C-B158-DA39FBD8234C}.Debug|x64.ActiveCfg = Debug|x64
{34BA46AE-8759-4F3C-B158-DA39FBD8234C}.Debug|x64.Build.0 = Debug|x64
{34BA46AE-8759-4F3C-B158-DA39FBD8234C}.Debug|x86.ActiveCfg = Debug|x86
{34BA46AE-8759-4F3C-B158-DA39FBD8234C}.Debug|x86.Build.0 = Debug|x86
{34BA46AE-8759-4F3C-B158-DA39FBD8234C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{34BA46AE-8759-4F3C-B158-DA39FBD8234C}.Release|Any CPU.Build.0 = Release|Any CPU
{34BA46AE-8759-4F3C-B158-DA39FBD8234C}.Release|x64.ActiveCfg = Release|x64
{34BA46AE-8759-4F3C-B158-DA39FBD8234C}.Release|x64.Build.0 = Release|x64
{34BA46AE-8759-4F3C-B158-DA39FBD8234C}.Release|x86.ActiveCfg = Release|x86
{34BA46AE-8759-4F3C-B158-DA39FBD8234C}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{1029B774-6D12-450F-8835-90BBDFE97074} = {6AF842E6-59EE-4942-88EC-845292B06D17}
{34BA46AE-8759-4F3C-B158-DA39FBD8234C} = {43935B06-12F3-4E46-BF6D-F1392269E747}
EndGlobalSection
EndGlobal
Loading

0 comments on commit 08a80e5

Please sign in to comment.