huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Depend on separate libuv package

This commit is contained in:
Stephen Halter 2016-04-05 16:40:39 -07:00
parent 29a8d5b7c5
commit 7d4fcfeb23
11 changed files with 5 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
content/thirdpartynotices.txt
View File

@ -1,32 +0,0 @@
This file is based on or incorporates material from the projects listed below
(Third Party IP). The original copyright notice and the license under which
Microsoft received such Third Party IP, are set forth below. Such licenses and
notices are provided for informational purposes only. Microsoft licenses the
Third Party IP to you under the licensing terms for the Microsoft product.
Microsoft reserves all other rights not expressly granted under this agreement,
whether by implication, estoppel or otherwise.
libuv v. 1.7.3
Copyright Joyent, Inc. and other Node contributors. All rights reserved.
Provided for Informational Purposes Only
MIT License
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the Software), to deal in the
Software without restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

5
global.json
View File

@ -1,6 +1,3 @@
{
"projects": [
"src",
"tools"
]
"projects": ["src"]
}

1
makefile.shade
View File

@ -9,4 +9,3 @@ custom-goals
#initialize if='Directory.Exists("src")'
exec program='dotnet' commandline='run -p ../../tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode Http/FrameHeaders.Generated.cs Http/Frame.Generated.cs' workingdir='${kestrelSrcDir}'
exec program='dotnet' commandline='run -p ../../tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier' workingdir='${kestrelSrcDir}'

12
samples/LargeResponseApp/project.json
View File

@ -1,18 +1,6 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.AspNetCore.Internal.libuv-Darwin": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Internal.libuv-Linux": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Internal.libuv-Windows": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
},

12
samples/SampleApp/project.json
View File

@ -1,18 +1,6 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.AspNetCore.Internal.libuv-Darwin": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Internal.libuv-Linux": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Internal.libuv-Windows": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel.Https": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*",

24
src/Microsoft.AspNetCore.Server.Kestrel/project.json
View File

@ -9,21 +9,10 @@
"System.Buffers": "4.0.0-*",
"System.Numerics.Vectors": "4.1.1-*",
"System.Threading.Tasks.Extensions": "4.0.0-*",
"Libuv": "1.9.0-*",
"Microsoft.AspNetCore.Hosting": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
"Microsoft.AspNetCore.Internal.libuv-Darwin": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Internal.libuv-Linux": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Internal.libuv-Windows": {
"version": "1.0.0-*",
"type": "build"
}
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*"
},
"frameworks": {
"net451": {
@ -65,14 +54,5 @@
"CS1591"
],
"xmlDoc": true
},
"packInclude": {
"/": "../../content/thirdpartynotices.txt",
"runtimes/win7-x64/native/": "runtimes/win7-x64/native/*",
"runtimes/win7-x86/native/": "runtimes/win7-x86/native/*",
"runtimes/win7-arm/native/": "runtimes/win7-arm/native/*",
"runtimes/osx/native/": "runtimes/osx/native/*",
"runtimes/rhel-x64/native/": "runtimes/rhel-x64/native/*",
"runtimes/debian-x64/native/": "runtimes/debian-x64/native/*"
}
}

14
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json
View File

@ -5,19 +5,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"xunit": "2.1.0",
"Microsoft.AspNetCore.Internal.libuv-Darwin": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Internal.libuv-Linux": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Internal.libuv-Windows": {
"version": "1.0.0-*",
"type": "build"
}
"xunit": "2.1.0"
},
"frameworks": {
"netstandardapp1.5": {

14
test/Microsoft.AspNetCore.Server.KestrelTests/project.json
View File

@ -5,19 +5,7 @@
"Microsoft.AspNetCore.Server.Kestrel.Https": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"xunit": "2.1.0",
"Microsoft.AspNetCore.Internal.libuv-Darwin": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Internal.libuv-Linux": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Internal.libuv-Windows": {
"version": "1.0.0-*",
"type": "build"
}
"xunit": "2.1.0"
},
"frameworks": {
"netstandardapp1.5": {

17
tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier.xproj
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>8cba6fe3-3cc9-4420-8aa3-123e983734c2</ProjectGuid>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

72
tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Program.cs
View File

@ -1,72 +0,0 @@
using System;
using System.IO;
using System.Linq;
using Microsoft.Extensions.PlatformAbstractions;
using Newtonsoft.Json.Linq;
namespace Microsoft.AspNetCore.Server.Kestrel.LibuvCopier
{
public class Program
{
public static void Main(string[] args)
{
try
{
var packagesFolder = Environment.GetEnvironmentVariable("NUGET_PACKAGES");
if (string.IsNullOrEmpty(packagesFolder))
{
packagesFolder = Path.Combine(GetHome(), ".nuget", "packages");
}
packagesFolder = Environment.ExpandEnvironmentVariables(packagesFolder);
var lockJson = JObject.Parse(File.ReadAllText("project.lock.json"));
foreach (var libuvLib in lockJson["libraries"].OfType<JProperty>().Where(
p => p.Name.StartsWith("Microsoft.AspNetCore.Internal.libuv", StringComparison.Ordinal)))
{
foreach (var filePath in libuvLib.Value["files"].Select(v => v.Value<string>()))
{
if (filePath.ToString().StartsWith("runtimes/", StringComparison.Ordinal))
{
Directory.CreateDirectory(Path.GetDirectoryName(filePath));
File.Copy(Path.Combine(packagesFolder, libuvLib.Name, filePath), filePath, overwrite: true);
}
}
}
}
catch (Exception ex)
{
Console.WriteLine(ex);
throw;
}
}
// Copied from DNX's DnuEnvironment.cs
private static string GetHome()
{
#if DNX451
return Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
#else
var runtimeEnv = PlatformServices.Default.Runtime;
if (runtimeEnv.OperatingSystem == "Windows")
{
return Environment.GetEnvironmentVariable("USERPROFILE") ??
Environment.GetEnvironmentVariable("HOMEDRIVE") + Environment.GetEnvironmentVariable("HOMEPATH");
}
else
{
var home = Environment.GetEnvironmentVariable("HOME");
if (string.IsNullOrEmpty(home))
{
throw new Exception("Home directory not found. The HOME environment variable is not set.");
}
return home;
}
#endif
}
}
}

22
tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/project.json
View File

@ -1,22 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
"Newtonsoft.Json": "8.0.3"
},
"frameworks": {
"netstandardapp1.5": {
"dependencies": {
"NETStandard.Library": "1.5.0-*",
"System.Dynamic.Runtime": "4.0.11-*"
},
"imports": [
"dnxcore50"
]
},
"net451": {}
}
}