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

Commit 1caebff

Browse files
committed
Revert back build.proj because netcore build is splitted from .NET build
1 parent fcd87ec commit 1caebff

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

build/build.proj

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
<PropertyGroup>
3131
<DoBuildSolutionsDependsOn>
3232
BeforeBuildSolutions;
33-
BuildSolutions;
34-
BuildNetStandard;
33+
BuildSolutions
3534
</DoBuildSolutionsDependsOn>
3635
</PropertyGroup>
3736

@@ -50,19 +49,13 @@
5049
<Target Name="UnitTests" DependsOnTargets="$(DoBuildSolutionsDependsOn)">
5150
<Exec Command="$(BuildSolutionDir)/lib/tests/nunit-console/nunit-console-x86.exe $(BuildSolutionDir)/tests/ServiceStack.Text.Tests/bin/$(Configuration)/ServiceStack.Text.Tests.dll"/>
5251
<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"/>
5452
</Target>
5553

5654
<Target Name="BuildSolutions">
5755
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text.sln" Targets="Build"
5856
Properties="Configuration=$(Configuration)" />
5957
</Target>
6058

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-
6659
<Target Name="UpdateVersion">
6760
<!-- Update Version -->
6861
<ItemGroup>
@@ -99,7 +92,6 @@
9992

10093
<ItemGroup>
10194
<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>
10395
</ItemGroup>
10496

10597
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text/ServiceStack.Text.csproj"
@@ -109,9 +101,6 @@
109101
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text/lib/net45')" />
110102
<Copy SourceFiles="%(TextFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text/lib/net45" />
111103

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-
115104
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Text/servicestack.text.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion) -Symbols"
116105
LogStandardErrorAsError="true" />
117106

0 commit comments

Comments
 (0)