Skip to content

Commit 862a4e8

Browse files
authored
Merge pull request #6 from adamchester/preview3-magic-numbers
Allow build on preview3
2 parents 3272b14 + 979d5db commit 862a4e8

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"projects": [ "src", "test" ],
33
"sdk": {
4-
"version": "1.0.0-preview1-002702"
4+
"version": "1.0.0-preview3-003161"
55
}
66
}

test/Serilog.Formatting.Compact.Tests/Benchmarks.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Serilog.Formatting.Compact.Tests
55
{
66
public class Benchmarks
77
{
8-
[Fact]
8+
[Fact(Skip = "Not supported on CLI 1.0.0-preview3")]
99
public void Benchmark()
1010
{
1111
BenchmarkRunner.Run<FormattingBenchmarks>();

test/Serilog.Formatting.Compact.Tests/Serilog.Formatting.Compact.Tests.xproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
<PropertyGroup>
1515
<SchemaVersion>2.0</SchemaVersion>
1616
</PropertyGroup>
17+
<ItemGroup>
18+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
19+
</ItemGroup>
1720
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
1821
</Project>

test/Serilog.Formatting.Compact.Tests/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
"dependencies": {
44
"Serilog.Formatting.Compact": { "target": "project" },
55
"xunit": "2.1.0",
6-
"dotnet-test-xunit": "1.0.0-rc2-build10015",
6+
"dotnet-test-xunit": "1.0.0-rc2-build10025",
77
"Newtonsoft.Json": "8.0.3",
88
"BenchmarkDotNet": "0.9.7-beta"
99
},
1010
"buildOptions": {
1111
"keyFile": "../../assets/Serilog.snk"
1212
},
1313
"frameworks": {
14-
"net4.5.2": { },
14+
"net4.5.2": {},
1515
"netcoreapp1.0": {
1616
"dependencies": {
1717
"Microsoft.NETCore.App": {
1818
"type": "platform",
19-
"version": "1.0.0-preview3-003161"
19+
"version": "1.0.0"
2020
}
2121
},
2222
"imports": [

0 commit comments

Comments
 (0)