|
30 | 30 | <PropertyGroup> |
31 | 31 | <DoBuildSolutionsDependsOn> |
32 | 32 | BeforeBuildSolutions; |
33 | | - BuildSolutions; |
34 | | - BuildNetStandard; |
| 33 | + BuildSolutions |
35 | 34 | </DoBuildSolutionsDependsOn> |
36 | 35 | </PropertyGroup> |
37 | 36 |
|
|
50 | 49 | <Target Name="UnitTests" DependsOnTargets="$(DoBuildSolutionsDependsOn)"> |
51 | 50 | <Exec Command="$(BuildSolutionDir)/lib/tests/nunit-console/nunit-console-x86.exe $(BuildSolutionDir)/tests/ServiceStack.Text.Tests/bin/$(Configuration)/ServiceStack.Text.Tests.dll"/> |
52 | 51 | <Exec Command="$(BuildSolutionDir)/lib/tests/nunit-console/nunit-console-x86.exe /framework=4.0 $(BuildSolutionDir)/tests/ServiceStack.Text.Net40.Tests/bin/$(Configuration)/ServiceStack.Text.Tests.dll"/> |
53 | | - <Exec Command="dotnet run -p $(BuildSolutionDir)/tests/ServiceStack.Text.Tests.NetCore/ServiceStack.Text.Tests"/> |
54 | 52 | </Target> |
55 | 53 |
|
56 | 54 | <Target Name="BuildSolutions"> |
57 | 55 | <MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text.sln" Targets="Build" |
58 | 56 | Properties="Configuration=$(Configuration)" /> |
59 | 57 | </Target> |
60 | 58 |
|
61 | | - <Target Name="BuildNetStandard"> |
62 | | - <Exec Command="dotnet restore $(BuildSolutionDir)/tests/ServiceStack.Text.Tests.NetCore" /> |
63 | | - <Exec Command="dotnet build -c $(Configuration) $(BuildSolutionDir)/tests/ServiceStack.Text.Tests.NetCore/ServiceStack.Text.Tests" /> |
64 | | - </Target> |
65 | | - |
66 | 59 | <Target Name="UpdateVersion"> |
67 | 60 | <!-- Update Version --> |
68 | 61 | <ItemGroup> |
|
99 | 92 |
|
100 | 93 | <ItemGroup> |
101 | 94 | <TextFiles Include="$(SrcDir)/ServiceStack.Text/bin/$(Configuration)/ServiceStack.Text.*"></TextFiles> |
102 | | - <NetStandardFiles Include="$(SrcDir)/../tests/ServiceStack.Text.Tests.NetCore/ServiceStack.Text/bin/$(Configuration)/netstandard1.1/ServiceStack.Text.*"></NetStandardFiles> |
103 | 95 | </ItemGroup> |
104 | 96 |
|
105 | 97 | <MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text/ServiceStack.Text.csproj" |
|
109 | 101 | <MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text/lib/net45')" /> |
110 | 102 | <Copy SourceFiles="%(TextFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text/lib/net45" /> |
111 | 103 |
|
112 | | - <MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text/lib/netstandard1.1" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text/lib/netstandard1.1')" /> |
113 | | - <Copy SourceFiles="%(NetStandardFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text/lib/netstandard1.1" /> |
114 | | - |
115 | 104 | <Exec Command=""$(NuGetPath)" pack "$(NuGetPackageDir)/ServiceStack.Text/servicestack.text.nuspec" -OutputDirectory "$(NuGetPackageDir)" -Version $(PackageVersion) -Symbols" |
116 | 105 | LogStandardErrorAsError="true" /> |
117 | 106 |
|
|
0 commit comments