Skip to content

Commit 459cd5e

Browse files
merblamerbla
committed
Removed 4.5 target as is failing.
1 parent 90623ad commit 459cd5e

File tree

4 files changed

+13
-132
lines changed

4 files changed

+13
-132
lines changed

‎global.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
2+
"projects": [ "src", "test" ],
23
"sdk": {
3-
"version": "1.0.0-rc1-update1"
4+
"version": "1.0.0-preview1-002702"
45
}
56
}

‎src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.xproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<PropertyGroup Label="Globals">
99
<ProjectGuid>32cf915c-3ecd-496c-8fdb-1214581274a6</ProjectGuid>
1010
<RootNamespace>Serilog</RootNamespace>
11-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
12-
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
13-
</PropertyGroup>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
13+
</PropertyGroup>
1414
<PropertyGroup>
1515
<SchemaVersion>2.0</SchemaVersion>
1616
</PropertyGroup>

‎src/Serilog.Sinks.Splunk/project.json

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,18 @@
1616
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
1717
"iconUrl": "http://serilog.net/images/serilog-sink-nuget.png"
1818
},
19+
"buildOptions": {
20+
"keyFile": "../../assets/Serilog.snk",
21+
"xmlDoc": true
22+
},
1923
"dependencies": {
2024
"Serilog": "2.0.0-rc-556"
2125
},
22-
"frameworks": {
23-
"net45": {
24-
"buildOptions": {
25-
"define": [
26-
"TCP",
27-
"UDP"
28-
]
29-
},
30-
"dependencies": {
31-
"System.Net.Http": "2.0.20710",
32-
"Newtonsoft.Json": "8.0.2",
33-
"Splunk.Logging.Common": "1.5.0"
34-
}
35-
},
26+
"frameworks": {
3627
"netstandard1.1": {
37-
"dependencies": {
38-
"System.Collections": "4.0.11-rc2-24027",
39-
"System.Collections.Concurrent":"4.0.12-rc2-24027",
28+
"dependencies": {
29+
"System.Collections": "4.0.11-rc2-24027",
30+
"System.Collections.Concurrent": "4.0.12-rc2-24027",
4031
"System.Runtime": "4.1.0-rc2-24027",
4132
"System.Threading": "4.0.11-rc2-24027",
4233
"System.Net.Http": "4.0.1-rc2-24027"

‎src/Serilog.Sinks.Splunk/project.lock.json

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,6 @@
22
"locked": false,
33
"version": 2,
44
"targets": {
5-
".NETFramework,Version=v4.5": {
6-
"Microsoft.Net.Http/2.0.20710": {
7-
"type": "package",
8-
"frameworkAssemblies": [
9-
"System.Net.Http",
10-
"System.Net.Http.WebRequest"
11-
],
12-
"compile": {
13-
"lib/net45/_._": {}
14-
},
15-
"runtime": {
16-
"lib/net45/_._": {}
17-
}
18-
},
19-
"Newtonsoft.Json/8.0.2": {
20-
"type": "package",
21-
"compile": {
22-
"lib/net45/Newtonsoft.Json.dll": {}
23-
},
24-
"runtime": {
25-
"lib/net45/Newtonsoft.Json.dll": {}
26-
}
27-
},
28-
"Serilog/2.0.0-rc-556": {
29-
"type": "package",
30-
"compile": {
31-
"lib/net45/Serilog.dll": {}
32-
},
33-
"runtime": {
34-
"lib/net45/Serilog.dll": {}
35-
}
36-
},
37-
"Splunk.Logging.Common/1.5.0": {
38-
"type": "package",
39-
"dependencies": {
40-
"Newtonsoft.Json": "6.0.8"
41-
},
42-
"compile": {
43-
"lib/net45/Splunk.Logging.Common.dll": {}
44-
},
45-
"runtime": {
46-
"lib/net45/Splunk.Logging.Common.dll": {}
47-
}
48-
},
49-
"System.Net.Http/2.0.20710": {
50-
"type": "package",
51-
"dependencies": {
52-
"Microsoft.Net.Http": "[2.0.20710, 2.1.0)"
53-
}
54-
}
55-
},
565
".NETStandard,Version=v1.1": {
576
"Microsoft.CSharp/4.0.1-rc2-24027": {
587
"type": "package",
@@ -342,42 +291,6 @@
342291
"ref/xamarinwatchos10/_._"
343292
]
344293
},
345-
"Microsoft.Net.Http/2.0.20710": {
346-
"sha512": "OsB/5QO9tYJRLYIgBOhRl4Tssh3pw7+UAO9tMGMBg63f98GfjsniVIwLWRC0vcRr/F6HLP/NvRlHyGBhtD7Bmw==",
347-
"type": "package",
348-
"files": [
349-
"Microsoft.Net.Http.2.0.20710.nupkg",
350-
"Microsoft.Net.Http.2.0.20710.nupkg.sha512",
351-
"Microsoft.Net.Http.nuspec",
352-
"lib/net40/System.Net.Http.WebRequest.dll",
353-
"lib/net40/System.Net.Http.WebRequest.xml",
354-
"lib/net40/System.Net.Http.dll",
355-
"lib/net40/System.Net.Http.xml",
356-
"lib/net45/_._"
357-
]
358-
},
359-
"Newtonsoft.Json/8.0.2": {
360-
"sha512": "e5yWmEfu68rmtG431zl9N/7PlNKQDIuiDW5MHlEFAZcecakcxrIGnKqrPAtWNILzK2oNanRB5cD150MYhECK3g==",
361-
"type": "package",
362-
"files": [
363-
"Newtonsoft.Json.8.0.2.nupkg",
364-
"Newtonsoft.Json.8.0.2.nupkg.sha512",
365-
"Newtonsoft.Json.nuspec",
366-
"lib/net20/Newtonsoft.Json.dll",
367-
"lib/net20/Newtonsoft.Json.xml",
368-
"lib/net35/Newtonsoft.Json.dll",
369-
"lib/net35/Newtonsoft.Json.xml",
370-
"lib/net40/Newtonsoft.Json.dll",
371-
"lib/net40/Newtonsoft.Json.xml",
372-
"lib/net45/Newtonsoft.Json.dll",
373-
"lib/net45/Newtonsoft.Json.xml",
374-
"lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll",
375-
"lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml",
376-
"lib/portable-net45+wp80+win8+wpa81+dnxcore50/Newtonsoft.Json.dll",
377-
"lib/portable-net45+wp80+win8+wpa81+dnxcore50/Newtonsoft.Json.xml",
378-
"tools/install.ps1"
379-
]
380-
},
381294
"runtime.native.System/4.0.0-rc2-24027": {
382295
"sha512": "bC0GLcJTry9N+ra9qb+zYSQHnBpy4ZMVJXRRSuu7aD/cQoZPQtySql110ec9REOKsE6tf2ZoolczpCOmzwKW8g==",
383296
"type": "package",
@@ -422,16 +335,6 @@
422335
"lib/netstandard1.3/Serilog.xml"
423336
]
424337
},
425-
"Splunk.Logging.Common/1.5.0": {
426-
"sha512": "vhnYeJWlAvoG7+VYYal9E1J1fmfJ6RRFQycGaokY7NcUIounXYJ2KDFlX/ygpf31HqKNnOqpbtq5qreyiHJIyA==",
427-
"type": "package",
428-
"files": [
429-
"Splunk.Logging.Common.1.5.0.nupkg",
430-
"Splunk.Logging.Common.1.5.0.nupkg.sha512",
431-
"Splunk.Logging.Common.nuspec",
432-
"lib/net45/Splunk.Logging.Common.dll"
433-
]
434-
},
435338
"System.Collections/4.0.11-rc2-24027": {
436339
"sha512": "wi4oT2B06Ev7vDPeJki7HVJ3qPYJIilzf+p81JuNaBD9L2wi9Y2L5BsQ6ToncW+lYZafuMea/hiK1xX1Ge1VWQ==",
437340
"type": "package",
@@ -910,15 +813,6 @@
910813
"runtimes/aot/lib/netcore50/System.Linq.Expressions.dll"
911814
]
912815
},
913-
"System.Net.Http/2.0.20710": {
914-
"sha512": "z422hv7gmZnShP1raVV0dHD+0a3+Num2yOUmHjyp/fCkppykIp4uA+gQx6dagRxmpDuCquBivN+lMaVe8Z/gLw==",
915-
"type": "package",
916-
"files": [
917-
"System.Net.Http.2.0.20710.nupkg",
918-
"System.Net.Http.2.0.20710.nupkg.sha512",
919-
"System.Net.Http.nuspec"
920-
]
921-
},
922816
"System.Net.Http/4.0.1-rc2-24027": {
923817
"sha512": "5CK9SN0sEFUk7xHiV/8tqTiWuTlO7CkeqGmrfMsKIqcS/XFvRkMDKm2z8+IkLfzV77k6xnYse7n3Y3F9JqXaGw==",
924818
"type": "package",
@@ -1743,11 +1637,6 @@
17431637
"": [
17441638
"Serilog >= 2.0.0-rc-556"
17451639
],
1746-
".NETFramework,Version=v4.5": [
1747-
"Newtonsoft.Json >= 8.0.2",
1748-
"Splunk.Logging.Common >= 1.5.0",
1749-
"System.Net.Http >= 2.0.20710"
1750-
],
17511640
".NETStandard,Version=v1.1": [
17521641
"System.Collections >= 4.0.11-rc2-24027",
17531642
"System.Collections.Concurrent >= 4.0.12-rc2-24027",

0 commit comments

Comments
 (0)