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

Commit 4a4e587

Browse files
xplicitxplicit
authored
Merge pull request #500 from xplicit/master
Convert to .NET Core 2.0
2 parents 9113e17 + bb91b23 commit 4a4e587

26 files changed

+4892
-4649
lines changed

‎NuGet.Core/ServiceStack.Text.Core/lib/netstandard1.1/ServiceStack.Text.deps.json

Lines changed: 0 additions & 555 deletions
This file was deleted.

‎NuGet.Core/ServiceStack.Text.Core/lib/netstandard1.1/ServiceStack.Text.dll

-329 KB
Binary file not shown.

‎build/build-pcl.proj

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Default"
3+
xmlns='http://schemas.microsoft.com/developer/msbuild/2003' ToolsVersion="4.0">
4+
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
5+
6+
<PropertyGroup>
7+
<MajorVersion Condition="$(MajorVersion) == ''">4</MajorVersion>
8+
<MinorVersion Condition="$(MinorVersion) == ''">5</MinorVersion>
9+
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
10+
</PropertyGroup>
11+
12+
<PropertyGroup>
13+
<BuildSolutionDir>$(MSBuildProjectDirectory)/..</BuildSolutionDir>
14+
<SrcDir>$(BuildSolutionDir)/src</SrcDir>
15+
<Configuration Condition="$(Configuration) == ''">Release</Configuration>
16+
<NuGetPath>$(BuildSolutionDir)/src/.nuget/nuget.exe</NuGetPath>
17+
<NuGetPackageDir>$(BuildSolutionDir)/NuGet/</NuGetPackageDir>
18+
<Version>$(MajorVersion).$(MinorVersion).$(PatchVersion).0</Version>
19+
<PackageVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</PackageVersion>
20+
<EnvVersion>$(MajorVersion).$(MinorVersion)$(PatchVersion)</EnvVersion>
21+
</PropertyGroup>
22+
23+
<ItemGroup>
24+
<NugetPackageFilesToDelete Include="$(NuGetPackageDir)/*.nupkg"/>
25+
</ItemGroup>
26+
27+
<PropertyGroup>
28+
<DoBuildSolutionsDependsOn>
29+
BeforeBuildSolutions;
30+
BuildSolutions
31+
</DoBuildSolutionsDependsOn>
32+
</PropertyGroup>
33+
34+
<Target Name="Default" DependsOnTargets="$(DoBuildSolutionsDependsOn)" />
35+
36+
<Target Name="TeamCityBuild">
37+
<CallTarget Targets="Default" />
38+
</Target>
39+
40+
<Target Name="BeforeBuildSolutions">
41+
<Message Text="*****Before building solution*****" Importance="high"/>
42+
</Target>
43+
44+
<Target Name="BuildSolutions">
45+
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text.sln" Targets="Build"
46+
Properties="Configuration=$(Configuration)" />
47+
</Target>
48+
49+
<Target Name="UpdateVersion">
50+
<!-- Update Version -->
51+
<ItemGroup>
52+
<RegexTransform Include="$(SrcDir)/**/AssemblyInfo.cs">
53+
<Find>\d+\.\d+\.\d+\.\d+</Find>
54+
<ReplaceWith>$(Version)</ReplaceWith>
55+
</RegexTransform>
56+
<RegexTransform Include="$(SrcDir)/ServiceStack.Text/Env.cs">
57+
<Find>ServiceStackVersion = \d+\.\d+m;</Find>
58+
<ReplaceWith>ServiceStackVersion = $(EnvVersion)m;</ReplaceWith>
59+
</RegexTransform>
60+
<RegexTransform Include="$(SrcDir)/ServiceStack.Text/Env.cs">
61+
<Find>new DateTime.*</Find>
62+
<ReplaceWith>new DateTime($([System.DateTime]::Now.ToString(`yyyy,MM,dd`)));</ReplaceWith>
63+
</RegexTransform>
64+
<!--Update Min Dependency Version -->
65+
<RegexTransform Include="$(NuGetPackageDir)/**/*.nuspec">
66+
<Find>version="4\.5[^"]*"</Find>
67+
<ReplaceWith>version="$(PackageVersion)"</ReplaceWith>
68+
</RegexTransform>
69+
</ItemGroup>
70+
71+
<RegexTransform Items="@(RegexTransform)" />
72+
</Target>
73+
74+
<Target Name="NuGetPack">
75+
<CallTarget Targets="UpdateVersion" />
76+
77+
<Delete Files="@(NugetPackageFilesToDelete)" />
78+
79+
<ItemGroup>
80+
<TextFilesPortable Include="$(SrcDir)/ServiceStack.Text/bin/$(Configuration)/portable45-net45+win8/ServiceStack.Text.*"></TextFilesPortable>
81+
</ItemGroup>
82+
83+
<!-- PCL -->
84+
<RemoveDir Directories="$(SrcDir)/ServiceStack.Text/obj" />
85+
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text/ServiceStack.Text.PCL.csproj"
86+
Targets="Restore;Build"
87+
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
88+
89+
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text/lib/portable-net45+win8+monotouch+monoandroid+xamarin.ios10" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text/lib/portable-net45+win8+monotouch+monoandroid+xamarin.ios10')" />
90+
<Copy SourceFiles="%(TextFilesPortable.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text/lib/portable-net45+win8+monotouch+monoandroid+xamarin.ios10" />
91+
92+
93+
<!-- Pack ServiceStack.Text -->
94+
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Text/servicestack.text.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion) -Symbols"
95+
LogStandardErrorAsError="true" />
96+
97+
</Target>
98+
</Project>

‎build/build-sl5.proj

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Default"
3+
xmlns='http://schemas.microsoft.com/developer/msbuild/2003' ToolsVersion="4.0">
4+
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
5+
6+
<PropertyGroup>
7+
<MajorVersion Condition="$(MajorVersion) == ''">4</MajorVersion>
8+
<MinorVersion Condition="$(MinorVersion) == ''">5</MinorVersion>
9+
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
10+
</PropertyGroup>
11+
12+
<PropertyGroup>
13+
<BuildSolutionDir>$(MSBuildProjectDirectory)/..</BuildSolutionDir>
14+
<SrcDir>$(BuildSolutionDir)/src</SrcDir>
15+
<Configuration Condition="$(Configuration) == ''">Release</Configuration>
16+
<NuGetPath>$(BuildSolutionDir)/src/.nuget/nuget.exe</NuGetPath>
17+
<NuGetPackageDir>$(BuildSolutionDir)/NuGet/</NuGetPackageDir>
18+
<Version>$(MajorVersion).$(MinorVersion).$(PatchVersion).0</Version>
19+
<PackageVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</PackageVersion>
20+
<EnvVersion>$(MajorVersion).$(MinorVersion)$(PatchVersion)</EnvVersion>
21+
</PropertyGroup>
22+
23+
<ItemGroup>
24+
<NugetPackageFilesToDelete Include="$(NuGetPackageDir)/*.nupkg"/>
25+
</ItemGroup>
26+
27+
<PropertyGroup>
28+
<DoBuildSolutionsDependsOn>
29+
BeforeBuildSolutions;
30+
BuildSolutions
31+
</DoBuildSolutionsDependsOn>
32+
</PropertyGroup>
33+
34+
<Target Name="Default" DependsOnTargets="$(DoBuildSolutionsDependsOn)" />
35+
36+
<Target Name="TeamCityBuild">
37+
<CallTarget Targets="Default" />
38+
</Target>
39+
40+
<Target Name="BeforeBuildSolutions">
41+
<Message Text="*****Before building solution*****" Importance="high"/>
42+
</Target>
43+
44+
<Target Name="BuildSolutions">
45+
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text.sln" Targets="Build"
46+
Properties="Configuration=$(Configuration)" />
47+
</Target>
48+
49+
<Target Name="UpdateVersion">
50+
<!-- Update Version -->
51+
<ItemGroup>
52+
<RegexTransform Include="$(SrcDir)/**/AssemblyInfo.cs">
53+
<Find>\d+\.\d+\.\d+\.\d+</Find>
54+
<ReplaceWith>$(Version)</ReplaceWith>
55+
</RegexTransform>
56+
<RegexTransform Include="$(SrcDir)/ServiceStack.Text/Env.cs">
57+
<Find>ServiceStackVersion = \d+\.\d+m;</Find>
58+
<ReplaceWith>ServiceStackVersion = $(EnvVersion)m;</ReplaceWith>
59+
</RegexTransform>
60+
<RegexTransform Include="$(SrcDir)/ServiceStack.Text/Env.cs">
61+
<Find>new DateTime.*</Find>
62+
<ReplaceWith>new DateTime($([System.DateTime]::Now.ToString(`yyyy,MM,dd`)));</ReplaceWith>
63+
</RegexTransform>
64+
<!--Update Min Dependency Version -->
65+
<RegexTransform Include="$(NuGetPackageDir)/**/*.nuspec">
66+
<Find>version="4\.5[^"]*"</Find>
67+
<ReplaceWith>version="$(PackageVersion)"</ReplaceWith>
68+
</RegexTransform>
69+
</ItemGroup>
70+
71+
<RegexTransform Items="@(RegexTransform)" />
72+
</Target>
73+
74+
<Target Name="NuGetPack">
75+
<CallTarget Targets="UpdateVersion" />
76+
77+
<Delete Files="@(NugetPackageFilesToDelete)" />
78+
79+
<ItemGroup>
80+
<TextSl5Files Include="$(SrcDir)/ServiceStack.Text/bin/SL5/ServiceStack.Text.*"></TextSl5Files>
81+
</ItemGroup>
82+
83+
<!-- Silverlight -->
84+
<RemoveDir Directories="$(SrcDir)/ServiceStack.Text/obj" />
85+
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text/ServiceStack.Text.SL5.csproj"
86+
Targets="Restore;Build"
87+
Properties="Version=$(PackageVersion);Configuration=$(Configuration);Optimize=True;DebugSymbols=True;DefineConstants=SL5;NO_DYNAMIC;Platform=Any CPU;OutputPath=bin/SL5;DocumentationFile=bin/SL5/ServiceStack.Text.xml" />
88+
89+
<MakeDir Directories="$(BuildSolutionDir)/NuGet/ServiceStack.Text/lib/sl5" Condition="!Exists('$(BuildSolutionDir)/NuGet/ServiceStack.Text/lib/sl5')" />
90+
<Copy SourceFiles="%(TextSl5Files.Identity)" DestinationFolder="$(BuildSolutionDir)/NuGet/ServiceStack.Text/lib/sl5" />
91+
92+
<!-- Pack ServiceStack.Text -->
93+
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Text/servicestack.text.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion) -Symbols"
94+
LogStandardErrorAsError="true" />
95+
96+
</Target>
97+
</Project>

‎build/build.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
SET MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe"
1+
SET MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\Preview\Community\MSBuild\15.0\Bin\MSBuild.exe"
22

33
REM %MSBUILD% build-sn.proj /target:NuGetPack /property:Configuration=Signed;RELEASE=true;PatchVersion=9
44
%MSBUILD% build-core.proj /target:NuGetPack /property:Configuration=Release;PatchVersion=41
55
%MSBUILD% build.proj /target:NuGetPack /property:Configuration=Release;PatchVersion=9
6+
%MSBUILD% build-pcl.proj /target:NuGetPack /property:Configuration=Release;PatchVersion=9
7+
%MSBUILD% build-sl5.proj /target:NuGetPack /property:Configuration=Release;PatchVersion=9
68

‎build/build.proj

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -78,33 +78,16 @@
7878

7979
<ItemGroup>
8080
<TextFiles Include="$(SrcDir)/ServiceStack.Text/bin/$(Configuration)/net45/ServiceStack.Text.*"></TextFiles>
81-
<TextFilesPortable Include="$(SrcDir)/ServiceStack.Text/bin/$(Configuration)/portable45-net45+win8/ServiceStack.Text.*"></TextFilesPortable>
82-
<TextSl5Files Include="$(SrcDir)/ServiceStack.Text/bin/SL5/ServiceStack.Text.*"></TextSl5Files>
8381
</ItemGroup>
8482

83+
<RemoveDir Directories="$(SrcDir)/ServiceStack.Text/obj" />
8584
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text/ServiceStack.Text.csproj"
86-
Targets="Build"
85+
Targets="Restore;Build"
8786
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
8887

8988
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text/lib/net45')" />
9089
<Copy SourceFiles="%(TextFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text/lib/net45" />
9190

92-
<!-- PCL -->
93-
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text/ServiceStack.Text.PCL.csproj"
94-
Targets="Build"
95-
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
96-
97-
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text/lib/portable-net45+win8+monotouch+monoandroid+xamarin.ios10" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text/lib/portable-net45+win8+monotouch+monoandroid+xamarin.ios10')" />
98-
<Copy SourceFiles="%(TextFilesPortable.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text/lib/portable-net45+win8+monotouch+monoandroid+xamarin.ios10" />
99-
100-
<!-- Silverlight -->
101-
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text/ServiceStack.Text.SL5.csproj"
102-
Targets="Build"
103-
Properties="Version=$(PackageVersion);Configuration=$(Configuration);Optimize=True;DebugSymbols=True;DefineConstants=SL5;NO_DYNAMIC;Platform=Any CPU;OutputPath=bin/SL5;DocumentationFile=bin/SL5/ServiceStack.Text.xml" />
104-
105-
<MakeDir Directories="$(BuildSolutionDir)/NuGet/ServiceStack.Text/lib/sl5" Condition="!Exists('$(BuildSolutionDir)/NuGet/ServiceStack.Text/lib/sl5')" />
106-
<Copy SourceFiles="%(TextSl5Files.Identity)" DestinationFolder="$(BuildSolutionDir)/NuGet/ServiceStack.Text/lib/sl5" />
107-
10891
<!-- Pack ServiceStack.Text -->
10992
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Text/servicestack.text.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion) -Symbols"
11093
LogStandardErrorAsError="true" />

0 commit comments

Comments
 (0)