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

Commit 71719ee

Browse files
xplicitxplicit
committed
Merge branch master into netcore
2 parents 94b83e2 + f5cfc62 commit 71719ee

27 files changed

+65
-37
lines changed

‎NuGet.Signed/ServiceStack.Text.Signed/servicestack.text.signed.nuspec‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>ServiceStack.Text.Signed</id>
55
<title>ServiceStack.Text.Signed</title>
6-
<version>4.0.0</version>
6+
<version>4.5.0</version>
77
<authors>Service Stack</authors>
88
<owners>Service Stack</owners>
99
<summary>.NET's fastest JSON, JSV and CSV Text Serializers</summary>
@@ -24,4 +24,3 @@
2424
<file src="..\..\src\ServiceStack.Text\**\*.cs" target="src" />
2525
</files>
2626
</package>
27-

‎NuGet/ServiceStack.Text/servicestack.text.nuspec‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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</id>
5+
<title>.NET's fastest JSON Serializer by ServiceStack</title>
6+
<version>4.5.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+
</metadata>
22+
<files>
23+
<file src="lib\**\*.*" target="lib" />
24+
<file src="..\..\src\ServiceStack.Text\**\*.cs" target="src" />
25+
</files>
26+
</package>
27+

‎build/build-pcl.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<PropertyGroup>
77
<MajorVersion Condition="$(MajorVersion) == ''">4</MajorVersion>
8-
<MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
8+
<MinorVersion Condition="$(MinorVersion) == ''">5</MinorVersion>
99
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
1010
</PropertyGroup>
1111

@@ -78,7 +78,7 @@
7878

7979
<!--Update Min Dependency Version -->
8080
<RegexTransform Include="$(NuGetPackageDir)/**/*.nuspec">
81-
<Find>version="4\.0[^"]*"</Find>
81+
<Find>version="4\.5[^"]*"</Find>
8282
<ReplaceWith>version="$(PackageVersion)"</ReplaceWith>
8383
</RegexTransform>
8484

‎build/build-sn.proj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<PropertyGroup>
77
<MajorVersion Condition="$(MajorVersion) == ''">4</MajorVersion>
8-
<MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
8+
<MinorVersion Condition="$(MinorVersion) == ''">5</MinorVersion>
99
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
1010
</PropertyGroup>
1111

@@ -75,7 +75,7 @@
7575

7676
<!--Update Min Dependency Version -->
7777
<RegexTransform Include="$(NuGetPackageDir)/**/*.nuspec">
78-
<Find>version="4\.0[^"]*"</Find>
78+
<Find>version="4\.5[^"]*"</Find>
7979
<ReplaceWith>version="$(PackageVersion)"</ReplaceWith>
8080
</RegexTransform>
8181
</ItemGroup>
@@ -96,8 +96,8 @@
9696
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text/ServiceStack.Text.Signed.csproj"
9797
Targets="Build" Properties="Configuration=$(Configuration)" />
9898

99-
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text.Signed/lib/net40" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text.Signed/lib/net40')" />
100-
<Copy SourceFiles="%(TextFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text.Signed/lib/net40" />
99+
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text.Signed/lib/net45')" />
100+
<Copy SourceFiles="%(TextFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text.Signed/lib/net45" />
101101

102102
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Text.Signed/servicestack.text.signed.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion) -Symbols"
103103
LogStandardErrorAsError="true" />

‎build/build.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SET MSBUILD=C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe
22

3-
REM %MSBUILD% build.proj /target:TeamCityBuild;NuGetPack /property:Configuration=Release;RELEASE=true;PatchVersion=0
3+
%MSBUILD% build.proj /target:TeamCityBuild;NuGetPack /property:Configuration=Release;RELEASE=true;PatchVersion=0
44
REM %MSBUILD% build-sn.proj /target:TeamCityBuild;NuGetPack /property:Configuration=Signed;RELEASE=true;PatchVersion=1
5-
%MSBUILD% build-pcl.proj /target:TeamCityBuild;NuGetPack /property:Configuration=Release;RELEASE=true;PatchVersion=0
5+
REM %MSBUILD% build-pcl.proj /target:TeamCityBuild;NuGetPack /property:Configuration=Release;RELEASE=true;PatchVersion=0

‎build/build.proj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<PropertyGroup>
77
<MajorVersion Condition="$(MajorVersion) == ''">4</MajorVersion>
8-
<MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
8+
<MinorVersion Condition="$(MinorVersion) == ''">5</MinorVersion>
99
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
1010
</PropertyGroup>
1111

@@ -84,7 +84,7 @@
8484
</RegexTransform>
8585
<!--Update Min Dependency Version -->
8686
<RegexTransform Include="$(NuGetPackageDir)/**/*.nuspec">
87-
<Find>version="4\.0[^"]*"</Find>
87+
<Find>version="4\.5[^"]*"</Find>
8888
<ReplaceWith>version="$(PackageVersion)"</ReplaceWith>
8989
</RegexTransform>
9090
</ItemGroup>
@@ -106,8 +106,8 @@
106106
Targets="Build"
107107
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
108108

109-
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text/lib/net40" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text/lib/net40')" />
110-
<Copy SourceFiles="%(TextFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text/lib/net40" />
109+
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text/lib/net45')" />
110+
<Copy SourceFiles="%(TextFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text/lib/net45" />
111111

112112
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text/lib/netstandard1.1" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text/lib/netstandard1.1')" />
113113
<Copy SourceFiles="%(NetStandardFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text/lib/netstandard1.1" />

‎lib/ServiceStack.Client.dll‎

512 Bytes
Binary file not shown.

‎lib/ServiceStack.Common.dll‎

0 Bytes
Binary file not shown.

‎lib/ServiceStack.Interfaces.dll‎

0 Bytes
Binary file not shown.

‎lib/tests/ServiceStack.Client.dll‎

512 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)