Skip to content

Commit e591ffe

Browse files
phil-harmoniqphil-harmoniq
committed
Use new project structure
1 parent 5c584d2 commit e591ffe

11 files changed

Lines changed: 59 additions & 8 deletions

File tree

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,5 @@ FakesAssemblies/
216216
**/*.Server/ModelManifest.xml
217217
_Pvt_Extensions
218218

219-
# VS Code meta
220-
.vscode/
221-
222219
# Rider
223220
.idea/

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ script:
1313
deploy:
1414
skip_cleanup: true
1515
provider: script
16-
script: dotnet pack src -c Release && dotnet nuget push src/bin/Release/Shell.NET.*.nupkg -k $NUGET_API_KEY -s https://api.nuget.org/v3/index.json
16+
script: dotnet pack Shell.NET -c Release && dotnet nuget push .vscode/build/Shell.NET/bin/Shell.NET.*.nupkg -k $NUGET_API_KEY -s https://api.nuget.org/v3/index.json
1717
on:
1818
branch: master

‎.vscode/launch.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
// Use IntelliSense to find out which attributes exist for C# debugging
3+
// Use hover for the description of the existing attributes
4+
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "Debug Unit Tests",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "Build Solution",
12+
// If you have changed target frameworks, make sure to update the program path.
13+
"program": "dotnet",
14+
"args": ["vstest", "${workspaceRoot}/.vscode/build/Shell.NET.Tests/bin/netcoreapp2.0/Shell.NET.Tests.dll"],
15+
// For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
16+
"console": "internalConsole",
17+
"stopAtEntry": false,
18+
"internalConsoleOptions": "openOnSessionStart"
19+
}
20+
]
21+
}

‎.vscode/tasks.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"type": "shell",
3+
"version": "2.0.0",
4+
"tasks": [
5+
{
6+
"label": "Build Solution",
7+
"command": "dotnet",
8+
"args": ["build"],
9+
"problemMatcher": "$msCompile",
10+
"group": "build"
11+
},
12+
{
13+
"label": "Restore Nuget Packages",
14+
"command": "dotnet",
15+
"args": ["restore"],
16+
"problemMatcher": "$msCompile",
17+
"group": "build"
18+
},
19+
{
20+
"label": "Run All Unit Tests",
21+
"command": "dotnet",
22+
"args": ["test", "${workspaceRoot}/Shell.NET.Tests"],
23+
"problemMatcher": "$msCompile",
24+
"group": "build"
25+
}
26+
]
27+
}

‎Directory.Build.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<PropertyGroup>
3+
<BaseIntermediateOutputPath>../.vscode/build/$(MSBuildProjectName)/obj</BaseIntermediateOutputPath>
4+
<OutputPath>../.vscode/build/$(MSBuildProjectName)/bin</OutputPath>
5+
</PropertyGroup>
6+
</Project>

test/Shell.NET.Test.cs renamed to Shell.NET.Tests/Shell.NET.Tests.cs

File renamed without changes.

test/Shell.NET.Test.csproj renamed to Shell.NET.Tests/Shell.NET.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170517-02"/>
1111
<PackageReference Include="xunit" Version="2.2.0"/>
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0"/>
13-
<ProjectReference Include="../src/Shell.NET.csproj"/>
13+
<ProjectReference Include="../Shell.NET/Shell.NET.csproj"/>
1414
</ItemGroup>
1515

1616
</Project>

‎Shell.NET.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.26124.0
55
MinimumVisualStudioVersion = 15.0.26124.0
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shell.NET", "src\Shell.NET.csproj", "{6E0FF9E8-461F-40B6-B2CF-2A4A88B257A5}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shell.NET", "Shell.NET\Shell.NET.csproj", "{6E0FF9E8-461F-40B6-B2CF-2A4A88B257A5}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shell.NET.Test", "test\Shell.NET.Test.csproj", "{EA690C06-DC4A-4082-A6C4-2BCF1104A459}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shell.NET.Tests", "Shell.NET.Tests\Shell.NET.Tests.csproj", "{EA690C06-DC4A-4082-A6C4-2BCF1104A459}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Bash.cs renamed to Shell.NET/Bash.cs

File renamed without changes.

src/Shell.NET.csproj renamed to Shell.NET/Shell.NET.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Title>Shell.NET</Title>
66
<Authors>ph-hawkins</Authors>
77
<TargetFramework>netstandard2.0</TargetFramework>
8-
<VersionPrefix>0.2.1</VersionPrefix>
8+
<VersionPrefix>0.2.2</VersionPrefix>
99
<Description>Utilize Bash shell directly in C#/.NET Core</Description>
1010
<Copyright>MIT</Copyright>
1111
<PackageProjectUrl>https://github.com/phil-harmoniq/Shell.NET</PackageProjectUrl>

0 commit comments

Comments
 (0)