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

Commit aa89dc2

Browse files
authored
Merge pull request #493 from ServiceStack/netcore
Fix linux build
2 parents 05bb320 + a3c345f commit aa89dc2

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

.vscode/tasks.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@
55
"command": "dotnet",
66
"isShellCommand": true,
77
"args": [],
8+
"options": {
9+
"env": {
10+
"FrameworkPathOverride": "/usr/lib/mono/4.5/"
11+
}
12+
},
813
"tasks": [
914
{
1015
"taskName": "build",
11-
"args": [ "tests/ServiceStack.Text.Tests" ],
16+
"args": [ "src/ServiceStack.Text.sln", "-v", "m" ],
1217
"isBuildCommand": true,
1318
"showOutput": "silent",
1419
"problemMatcher": "$msCompile"

global.json

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

src/ServiceStack.Text.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F7FB50ED
1818
..\NuGet.Signed\ServiceStack.Text.Signed\servicestack.text.signed.nuspec = ..\NuGet.Signed\ServiceStack.Text.Signed\servicestack.text.signed.nuspec
1919
EndProjectSection
2020
EndProject
21-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Text", "ServiceStack.Text\ServiceStack.Text.csproj", "{579B3FDB-CDAD-44E1-8417-885C38E49A0E}"
21+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text", "ServiceStack.Text\ServiceStack.Text.csproj", "{579B3FDB-CDAD-44E1-8417-885C38E49A0E}"
2222
EndProject
2323
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text.Tests", "..\tests\ServiceStack.Text.Tests\ServiceStack.Text.Tests.csproj", "{9770BD40-AA3B-4785-B5E0-F4C470F9F14E}"
2424
EndProject

src/ServiceStack.Text/ServiceStack.Text.csproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netstandard1.1;netstandard1.3;portable45-net45+win8</TargetFrameworks>
4+
<TargetFrameworks>net45;netstandard1.1;netstandard1.3</TargetFrameworks>
5+
</PropertyGroup>
6+
7+
<PropertyGroup Condition=" '$(OS)' != 'Unix' ">
8+
<TargetFrameworks>$(TargetFrameworks);portable45-net45+win8</TargetFrameworks>
9+
</PropertyGroup>
10+
11+
<PropertyGroup>
512
<!--<TargetFrameworks>net45;netstandard1.1;netstandard1.3;portable45-net45+win8;sl5</TargetFrameworks>-->
613
<AssemblyName>ServiceStack.Text</AssemblyName>
714
<PackageId>ServiceStack.Text</PackageId>

0 commit comments

Comments
 (0)