paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes winbuild

Browse Source
This commit is contained in:
Paul Schneider
2018-07-21 16:25:08 +02:00
parent 11b76834bc
commit d6308439c0
6 changed files with 19 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OAuth.AspNet.AuthServer/project.lock.json
View File

@ -822,7 +822,7 @@
} }
} }
}, },
"DNX,Version=v4.5.1/debian.9-x86": { "DNX,Version=v4.5.1/win7-x86": {
"EntityFramework.Core/7.0.0-rc1-final": { "EntityFramework.Core/7.0.0-rc1-final": {
"type": "package", "type": "package",
"dependencies": { "dependencies": {
@ -1642,7 +1642,7 @@
} }
} }
}, },
"DNX,Version=v4.5.1/debian.9-x64": { "DNX,Version=v4.5.1/win7-x64": {
"EntityFramework.Core/7.0.0-rc1-final": { "EntityFramework.Core/7.0.0-rc1-final": {
"type": "package", "type": "package",
"dependencies": { "dependencies": {

6
OAuth.AspNet.Token/project.lock.json
View File

@ -486,7 +486,7 @@
} }
} }
}, },
"DNX,Version=v4.5.1/debian.9-x86": { "DNX,Version=v4.5.1/win7-x86": {
"Microsoft.AspNet.Authentication/1.0.0-rc1-final": { "Microsoft.AspNet.Authentication/1.0.0-rc1-final": {
"type": "package", "type": "package",
"dependencies": { "dependencies": {
@ -970,7 +970,7 @@
} }
} }
}, },
"DNX,Version=v4.5.1/debian.9-x64": { "DNX,Version=v4.5.1/win7-x64": {
"Microsoft.AspNet.Authentication/1.0.0-rc1-final": { "Microsoft.AspNet.Authentication/1.0.0-rc1-final": {
"type": "package", "type": "package",
"dependencies": { "dependencies": {
@ -1695,7 +1695,7 @@
"Microsoft.Extensions.PlatformAbstractions/1.0.0-rc1-final": { "Microsoft.Extensions.PlatformAbstractions/1.0.0-rc1-final": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "0b65CFB9nCxENPDjoOGeNaQBK1jhKfjQVcHg2KTWvPr+GaaBNyqmAo+7H+1ZoH6hmEYYl63aEbB1HXPRD4eQlQ==", "sha512": "26HS4c6MBisN+D7XUr8HObOI/JJvSJQYQR//Bfw/hi9UqhqK3lFpNKjOuYHI+gTxYdXT46HqZiz4D+k7d+ob3A==",
"files": [ "files": [
"lib/dotnet5.4/Microsoft.Extensions.PlatformAbstractions.dll", "lib/dotnet5.4/Microsoft.Extensions.PlatformAbstractions.dll",
"lib/dotnet5.4/Microsoft.Extensions.PlatformAbstractions.xml", "lib/dotnet5.4/Microsoft.Extensions.PlatformAbstractions.xml",

19
Yavsc.Server/Helpers/SimpleJsonPostMethod.cs
View File

@ -23,7 +23,6 @@ using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.Json;
namespace Yavsc.Server.Helpers namespace Yavsc.Server.Helpers
{ {
@ -77,23 +76,7 @@ namespace Yavsc.Server.Helpers
} }
return ans; return ans;
} }
public async Task<JsonValue> InvokeJson(object query)
{
JsonValue jsonDoc=null;
using (Stream streamQuery = request.GetRequestStream()) {
using (StreamWriter writer = new StreamWriter(streamQuery)) {
writer.Write (JsonConvert.SerializeObject(query));
}}
using (WebResponse response = request.GetResponse ()) {
using (Stream stream = response.GetResponseStream ()) {
if (stream.Length>0)
jsonDoc = await Task.Run (() => JsonObject.Load (stream));
}
response.Close();
}
return jsonDoc;
}
} }
} }

5
Yavsc.Server/project.json
View File

@ -72,7 +72,6 @@
"frameworks": { "frameworks": {
"dnx451": { "dnx451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Json": "4.0.0",
"System.ComponentModel.DataAnnotations": "4.0.0", "System.ComponentModel.DataAnnotations": "4.0.0",
"System.Linq": "4.0.0", "System.Linq": "4.0.0",
"System.Net": "4.0.0.0", "System.Net": "4.0.0.0",
@ -83,7 +82,6 @@
"net451": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": "4.0.0", "System.ComponentModel.DataAnnotations": "4.0.0",
"System.Json": "4.0.0",
"System.Net": "4.0.0.0", "System.Net": "4.0.0.0",
"System.Net.Http": "4.0.0", "System.Net.Http": "4.0.0",
"System.Xml": "4.0.0", "System.Xml": "4.0.0",
@ -93,7 +91,6 @@
"net452": { "net452": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": "4.0.0", "System.ComponentModel.DataAnnotations": "4.0.0",
"System.Json": "4.0.0",
"System.Net": "4.0.0.0", "System.Net": "4.0.0.0",
"System.Net.Http": "4.0.0", "System.Net.Http": "4.0.0",
"System.Xml": "4.0.0", "System.Xml": "4.0.0",
@ -103,7 +100,6 @@
"net46": { "net46": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": "4.0.0", "System.ComponentModel.DataAnnotations": "4.0.0",
"System.Json": "4.0.0",
"System.Net": "4.0.0.0", "System.Net": "4.0.0.0",
"System.Net.Http": "4.0.0", "System.Net.Http": "4.0.0",
"System.Xml": "4.0.0", "System.Xml": "4.0.0",
@ -113,7 +109,6 @@
"net461": { "net461": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": "4.0.0", "System.ComponentModel.DataAnnotations": "4.0.0",
"System.Json": "4.0.0",
"System.Net": "4.0.0.0", "System.Net": "4.0.0.0",
"System.Net.Http": "4.0.0", "System.Net.Http": "4.0.0",
"System.Xml": "4.0.0", "System.Xml": "4.0.0",

29
Yavsc.Server/project.lock.json
View File

@ -6026,7 +6026,7 @@
] ]
} }
}, },
"DNX,Version=v4.5.1/debian.9-x86": { "DNX,Version=v4.5.1/win7-x86": {
"BouncyCastle/1.8.1": { "BouncyCastle/1.8.1": {
"type": "package", "type": "package",
"compile": { "compile": {
@ -7246,7 +7246,7 @@
] ]
} }
}, },
"DNX,Version=v4.5.1/debian.9-x64": { "DNX,Version=v4.5.1/win7-x64": {
"BouncyCastle/1.8.1": { "BouncyCastle/1.8.1": {
"type": "package", "type": "package",
"compile": { "compile": {
@ -8466,7 +8466,7 @@
] ]
} }
}, },
".NETFramework,Version=v4.5.1/debian.9-x86": { ".NETFramework,Version=v4.5.1/win7-x86": {
"BouncyCastle/1.8.1": { "BouncyCastle/1.8.1": {
"type": "package", "type": "package",
"compile": { "compile": {
@ -9667,7 +9667,7 @@
] ]
} }
}, },
".NETFramework,Version=v4.5.1/debian.9-x64": { ".NETFramework,Version=v4.5.1/win7-x64": {
"BouncyCastle/1.8.1": { "BouncyCastle/1.8.1": {
"type": "package", "type": "package",
"compile": { "compile": {
@ -10868,7 +10868,7 @@
] ]
} }
}, },
".NETFramework,Version=v4.5.2/debian.9-x86": { ".NETFramework,Version=v4.5.2/win7-x86": {
"BouncyCastle/1.8.1": { "BouncyCastle/1.8.1": {
"type": "package", "type": "package",
"compile": { "compile": {
@ -12069,7 +12069,7 @@
] ]
} }
}, },
".NETFramework,Version=v4.5.2/debian.9-x64": { ".NETFramework,Version=v4.5.2/win7-x64": {
"BouncyCastle/1.8.1": { "BouncyCastle/1.8.1": {
"type": "package", "type": "package",
"compile": { "compile": {
@ -13270,7 +13270,7 @@
] ]
} }
}, },
".NETFramework,Version=v4.6/debian.9-x86": { ".NETFramework,Version=v4.6/win7-x86": {
"BouncyCastle/1.8.1": { "BouncyCastle/1.8.1": {
"type": "package", "type": "package",
"compile": { "compile": {
@ -14471,7 +14471,7 @@
] ]
} }
}, },
".NETFramework,Version=v4.6/debian.9-x64": { ".NETFramework,Version=v4.6/win7-x64": {
"BouncyCastle/1.8.1": { "BouncyCastle/1.8.1": {
"type": "package", "type": "package",
"compile": { "compile": {
@ -15672,7 +15672,7 @@
] ]
} }
}, },
".NETFramework,Version=v4.6.1/debian.9-x86": { ".NETFramework,Version=v4.6.1/win7-x86": {
"BouncyCastle/1.8.1": { "BouncyCastle/1.8.1": {
"type": "package", "type": "package",
"compile": { "compile": {
@ -16873,7 +16873,7 @@
] ]
} }
}, },
".NETFramework,Version=v4.6.1/debian.9-x64": { ".NETFramework,Version=v4.6.1/win7-x64": {
"BouncyCastle/1.8.1": { "BouncyCastle/1.8.1": {
"type": "package", "type": "package",
"compile": { "compile": {
@ -18172,7 +18172,7 @@
}, },
"Gapi.net45/1.0.0": { "Gapi.net45/1.0.0": {
"type": "package", "type": "package",
"sha512": "9CdY4Bpoh5KyKjalhY/KpD31vV4zgLA3ocAJsWr8mGB12f3Ttr+CgyR0m4Z5baMG2d5p7UXT8h6KmRpx5LtMUw==", "sha512": "ZA31xhTPss1akMMgT3PvDNkqI46t9dvkxgyKVnjXKP9OFSNSSxvSomev5Srvq1tXyadCP0cFBM1GkS0qLwTtUg==",
"files": [ "files": [
"Gapi.net45.1.0.0.nupkg", "Gapi.net45.1.0.0.nupkg",
"Gapi.net45.1.0.0.nupkg.sha512", "Gapi.net45.1.0.0.nupkg.sha512",
@ -18815,7 +18815,7 @@
"Microsoft.Extensions.PlatformAbstractions/1.0.0-rc1-final": { "Microsoft.Extensions.PlatformAbstractions/1.0.0-rc1-final": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "0b65CFB9nCxENPDjoOGeNaQBK1jhKfjQVcHg2KTWvPr+GaaBNyqmAo+7H+1ZoH6hmEYYl63aEbB1HXPRD4eQlQ==", "sha512": "26HS4c6MBisN+D7XUr8HObOI/JJvSJQYQR//Bfw/hi9UqhqK3lFpNKjOuYHI+gTxYdXT46HqZiz4D+k7d+ob3A==",
"files": [ "files": [
"lib/dotnet5.4/Microsoft.Extensions.PlatformAbstractions.dll", "lib/dotnet5.4/Microsoft.Extensions.PlatformAbstractions.dll",
"lib/dotnet5.4/Microsoft.Extensions.PlatformAbstractions.xml", "lib/dotnet5.4/Microsoft.Extensions.PlatformAbstractions.xml",
@ -19755,7 +19755,6 @@
"Yavsc.Abstract " "Yavsc.Abstract "
], ],
"DNX,Version=v4.5.1": [ "DNX,Version=v4.5.1": [
"fx/System.Json >= 4.0.0",
"fx/System.ComponentModel.DataAnnotations >= 4.0.0", "fx/System.ComponentModel.DataAnnotations >= 4.0.0",
"fx/System.Linq >= 4.0.0", "fx/System.Linq >= 4.0.0",
"fx/System.Net >= 4.0.0", "fx/System.Net >= 4.0.0",
@ -19764,7 +19763,6 @@
], ],
".NETFramework,Version=v4.5.1": [ ".NETFramework,Version=v4.5.1": [
"fx/System.ComponentModel.DataAnnotations >= 4.0.0", "fx/System.ComponentModel.DataAnnotations >= 4.0.0",
"fx/System.Json >= 4.0.0",
"fx/System.Net >= 4.0.0", "fx/System.Net >= 4.0.0",
"fx/System.Net.Http >= 4.0.0", "fx/System.Net.Http >= 4.0.0",
"fx/System.Xml >= 4.0.0", "fx/System.Xml >= 4.0.0",
@ -19772,7 +19770,6 @@
], ],
".NETFramework,Version=v4.5.2": [ ".NETFramework,Version=v4.5.2": [
"fx/System.ComponentModel.DataAnnotations >= 4.0.0", "fx/System.ComponentModel.DataAnnotations >= 4.0.0",
"fx/System.Json >= 4.0.0",
"fx/System.Net >= 4.0.0", "fx/System.Net >= 4.0.0",
"fx/System.Net.Http >= 4.0.0", "fx/System.Net.Http >= 4.0.0",
"fx/System.Xml >= 4.0.0", "fx/System.Xml >= 4.0.0",
@ -19780,7 +19777,6 @@
], ],
".NETFramework,Version=v4.6": [ ".NETFramework,Version=v4.6": [
"fx/System.ComponentModel.DataAnnotations >= 4.0.0", "fx/System.ComponentModel.DataAnnotations >= 4.0.0",
"fx/System.Json >= 4.0.0",
"fx/System.Net >= 4.0.0", "fx/System.Net >= 4.0.0",
"fx/System.Net.Http >= 4.0.0", "fx/System.Net.Http >= 4.0.0",
"fx/System.Xml >= 4.0.0", "fx/System.Xml >= 4.0.0",
@ -19788,7 +19784,6 @@
], ],
".NETFramework,Version=v4.6.1": [ ".NETFramework,Version=v4.6.1": [
"fx/System.ComponentModel.DataAnnotations >= 4.0.0", "fx/System.ComponentModel.DataAnnotations >= 4.0.0",
"fx/System.Json >= 4.0.0",
"fx/System.Net >= 4.0.0", "fx/System.Net >= 4.0.0",
"fx/System.Net.Http >= 4.0.0", "fx/System.Net.Http >= 4.0.0",
"fx/System.Xml >= 4.0.0", "fx/System.Xml >= 4.0.0",

3
test/src/YavscWorkInProgress.cs
View File

@ -22,7 +22,7 @@ using Yavsc.Models;
namespace test namespace test
{ {
[Collection("Yavsc Work In Progress")] [Collection("Yavsc Work In Progress")]
public class YavscWorkInProgress : BaseTestContext public class YavscWorkInProgress : BaseTestContext, IClassFixture<ServerSideFixture>
{ {
ServerSideFixture _serverFixture; ServerSideFixture _serverFixture;
@ -39,7 +39,6 @@ namespace test
var dbc = _serverFixture._app.Services.GetService(typeof(ApplicationDbContext)) as ApplicationDbContext; var dbc = _serverFixture._app.Services.GetService(typeof(ApplicationDbContext)) as ApplicationDbContext;
var firstProject = dbc.Projects.FirstOrDefault(); var firstProject = dbc.Projects.FirstOrDefault();
Assert.NotNull (firstProject); Assert.NotNull (firstProject);