Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 1be24ba

Browse files
authored
Merge pull request #228 from ServiceStack/netcore
Move project.json to /src and /tests folder
2 parents 2b833b6 + a41216e commit 1be24ba

Some content is hidden

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

45 files changed

+5380
-904
lines changed

.vscode/launch.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": ".NET Core Launch (console)",
6+
"type": "coreclr",
7+
"request": "launch",
8+
"preLaunchTask": "build",
9+
"program": "${workspaceRoot}/tests/ServiceStack.Redis.Tests/bin/Debug/netcoreapp1.0/ServiceStack.Redis.Tests.dll",
10+
"args": [],
11+
"cwd": "${workspaceRoot}",
12+
"stopAtEntry": false,
13+
"externalConsole": false
14+
}
15+
]
16+
}

.vscode/tasks.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "0.1.0",
5+
"command": "dotnet",
6+
"isShellCommand": true,
7+
"args": [],
8+
"tasks": [
9+
{
10+
"taskName": "build",
11+
"args": [ "tests/ServiceStack.Redis.Tests"],
12+
"isBuildCommand": true,
13+
"showOutput": "silent",
14+
"problemMatcher": "$msCompile"
15+
}
16+
]
17+
}

build/build-core.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ echo replace AssemblyFileVersion
2323
find ./src -type f -name "AssemblyInfo.cs" -exec sed -i "s/AssemblyFileVersion(\"[^\"]\+\")/AssemblyFileVersion(\"${Version}\")/g" {} +
2424

2525
echo replace project.json
26-
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Redis.NetCore/ServiceStack.Text/project.json
27-
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Redis.NetCore/ServiceStack.Redis/project.json
28-
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Redis.NetCore/ServiceStack.Interfaces/project.json
29-
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Redis.NetCore/ServiceStack.Common/project.json
26+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Text/project.json
27+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Redis/project.json
28+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Interfaces/project.json
29+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Common/project.json
3030

3131
echo replace package
3232
find ./NuGet.Core -type f -name "*.nuspec" -exec sed -i "s/<version>[^<]\+/<version>${PackageVersion}/g" {} +
@@ -36,7 +36,7 @@ find ./NuGet.Core -type f -name "*.nuspec" -exec sed -i "s/\"ServiceStack.Common
3636

3737

3838
#restore packages
39-
#(cd ./src/ServiceStack.Redis.NetCore && dotnet restore)
39+
#(cd ./src && dotnet restore)
4040
#(cd ./tests/ServiceStack.Redis.Tests.NetCore/ServiceStack.Redis.Tests && dotnet restore)
4141

4242
#execute tests

global.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"projects": [
3+
"src",
4+
"tests"
5+
]
6+
}

lib/netcore/ServiceStack.Client.dll

-173 KB
Binary file not shown.

lib/netcore/ServiceStack.Client.pdb

-66.3 KB
Binary file not shown.

lib/netcore/ServiceStack.Common.dll

-189 KB
Binary file not shown.

lib/netcore/ServiceStack.Common.pdb

-348 KB
Binary file not shown.

0 commit comments

Comments
 (0)