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

Commit 193120e

Browse files
authored
Merge pull request #477 from ServiceStack/netcore
.NETStandard 1.1 support in ServiceStack.Text
2 parents c6ec206 + 006cab9 commit 193120e

File tree

79 files changed

+2963
-321
lines changed

Some content is hidden

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

79 files changed

+2963
-321
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ App_Data/
4343
*.suo
4444
*.user
4545
.vs/
46+
.vscode/
47+
*.lock.json
4648

4749
NuGet/
4850
NuGet.Pcl/
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0"?>
2+
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
4+
<id>ServiceStack.Text.Core</id>
5+
<title>ServiceStack.Text.Core</title>
6+
<version>1.0.0</version>
7+
<authors>Service Stack</authors>
8+
<owners>Service Stack</owners>
9+
<summary>.NET's fastest JSON, JSV and CSV Text Serializers</summary>
10+
<description>
11+
.NET's fastest JSON, JSV and CSV Text Serializers. Fast, Light, Resilient.
12+
Contains ServiceStack's high-performance text-processing powers, for more info see: https://servicestack.net/text
13+
</description>
14+
<projectUrl>https://github.com/ServiceStack/ServiceStack.Text</projectUrl>
15+
<licenseUrl>https://servicestack.net/terms</licenseUrl>
16+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
17+
<iconUrl>https://servicestack.net/img/logo-32.png</iconUrl>
18+
<tags>JSON Text Serializer CSV JSV Dump PrettyPrint Fast</tags>
19+
<language>en-US</language>
20+
<copyright>ServiceStack 2016 and contributors</copyright>
21+
<dependencies>
22+
<group targetFramework=".NETStandard1.1">
23+
<dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
24+
<dependency id="System.Runtime.Serialization.Xml" version="[4.1.1, )" />
25+
<dependency id="System.Net.Requests" version="[4.0.11, )" />
26+
<dependency id="System.Dynamic.Runtime" version="[4.0.11, )" />
27+
<dependency id="Microsoft.CSharp" version="[4.0.1, )" />
28+
<dependency id="System.Reflection.Emit" version="[4.0.1, )" />
29+
<dependency id="NETStandard.Library" version="[1.6.0, )" />
30+
</group>
31+
</dependencies>
32+
</metadata>
33+
<files>
34+
<file src="lib/**/*.*" target="lib" />
35+
<file src="../../src/ServiceStack.Text/**/*.cs" target="src" />
36+
</files>
37+
</package>
38+

NuGet.Core/nuget.exe

3.77 MB
Binary file not shown.

build/build-core.sh

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#!/bin/sh
2+
3+
if [ -z "$MajorVersion" ]; then
4+
MajorVersion=1
5+
fi
6+
if [ -z "$MinorVersion" ]; then
7+
MinorVersion=0
8+
fi
9+
if [ -z "$PatchVersion" ]; then
10+
PatchVersion=$BUILD_NUMBER
11+
fi
12+
if [ -z "$RELEASE" ]; then
13+
UnstableTag="-unstable"
14+
fi
15+
16+
Version=$MajorVersion.$MinorVersion.$PatchVersion.0
17+
EnvVersion=$MajorVersion.$MinorVersion$PatchVersion
18+
PackageVersion=$MajorVersion.$MinorVersion.$PatchVersion$UnstableTag
19+
20+
echo replace AssemblyVersion
21+
find ./src -type f -name "AssemblyInfo.cs" -exec sed -i "s/AssemblyVersion(\"[^\"]\+\")/AssemblyVersion(\"1.0.0.0\")/g" {} +
22+
echo replace AssemblyFileVersion
23+
find ./src -type f -name "AssemblyInfo.cs" -exec sed -i "s/AssemblyFileVersion(\"[^\"]\+\")/AssemblyFileVersion(\"${Version}\")/g" {} +
24+
25+
echo replace Env
26+
27+
sed -i "s/ServiceStackVersion = [[:digit:]]\+.[[:digit:]]\+m/ServiceStackVersion = ${EnvVersion}m/g" ./src/ServiceStack.Text/Env.cs
28+
29+
echo replace project.json
30+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Text.NetCore/ServiceStack.Text/project.json
31+
32+
echo replace package
33+
sed -i "s/<version>[^<]\+/<version>${PackageVersion}/g" ./NuGet.Core/ServiceStack.Text.Core/servicestack.text.core.nuspec
34+
35+
36+
#restore packages
37+
#(cd ./src/ServiceStack.Text.NetCore && dotnet restore)
38+
#(cd ./tests/ServiceStack.Text.Tests.NetCore && dotnet restore)
39+
40+
#execute tests
41+
#(cd ./tests/ServiceStack.Text.Tests.Nectore/ServiceStack.Text.Tests && dotnet run -c Release)
42+
43+
#nuget pack
44+
#(cd ./NuGet.Core && ./nuget.exe pack ServiceStack.Text.Core/servicestack.text.core.nuspec -symbols)
1.36 MB
Binary file not shown.
206 KB
Binary file not shown.

0 commit comments

Comments
 (0)