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

Switch packages to use generation TFMs

This commit is contained in:
Pranav K 2015-10-22 12:34:25 -07:00
parent f36faf2a72
commit 6c467b0475
34 changed files with 144 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Microsoft.AspNet.Server.WebListener/project.json
View File

@ -10,11 +10,17 @@
"allowUnsafe": true "allowUnsafe": true
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": {},
"net451": { },
"dnxcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Security.Claims": "4.0.1-beta-*" "System.Security.Claims": "4.0.1-beta-*"
} }
},
"dotnet5.4": {
"dependencies": {
"System.Security.Claims": "4.0.1-beta-*"
}
} }
} }
} }

4
src/Microsoft.Net.Http.Server/NativeInterop/ComNetOS.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -32,7 +32,7 @@ namespace Microsoft.Net.Http.Server
static ComNetOS() static ComNetOS()
{ {
#if DNXCORE50 #if DOTNET5_4
// TODO: SkipIOCPCallbackOnSuccess doesn't work on Win7. Need a way to detect Win7 vs 8+. // TODO: SkipIOCPCallbackOnSuccess doesn't work on Win7. Need a way to detect Win7 vs 8+.
IsWin8orLater = false; IsWin8orLater = false;
#else #else

8
src/Microsoft.Net.Http.Server/NativeInterop/HttpSysSettings.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -26,7 +26,7 @@ using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Security; using System.Security;
#if !DNXCORE50 #if !DOTNET5_4
using Microsoft.Win32; using Microsoft.Win32;
#endif #endif
@ -34,7 +34,7 @@ namespace Microsoft.Net.Http.Server
{ {
internal static class HttpSysSettings internal static class HttpSysSettings
{ {
#if !DNXCORE50 #if !DOTNET5_4
private const string HttpSysParametersKey = @"System\CurrentControlSet\Services\HTTP\Parameters"; private const string HttpSysParametersKey = @"System\CurrentControlSet\Services\HTTP\Parameters";
#endif #endif
private const bool EnableNonUtf8Default = true; private const bool EnableNonUtf8Default = true;
@ -61,7 +61,7 @@ namespace Microsoft.Net.Http.Server
} }
private static void ReadHttpSysRegistrySettings() private static void ReadHttpSysRegistrySettings()
#if DNXCORE50 #if DOTNET5_4
{ {
} }
#else #else

4
src/Microsoft.Net.Http.Server/NativeInterop/NclUtilities.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -32,7 +32,7 @@ namespace Microsoft.Net.Http.Server
get get
{ {
return Environment.HasShutdownStarted return Environment.HasShutdownStarted
#if !DNXCORE50 #if !DOTNET5_4
|| AppDomain.CurrentDomain.IsFinalizingForUnload() || AppDomain.CurrentDomain.IsFinalizingForUnload()
#endif #endif
; ;

28
src/Microsoft.Net.Http.Server/NativeInterop/UnsafeNativeMethods.cs
View File

@ -33,7 +33,7 @@ namespace Microsoft.Net.Http.Server
{ {
private const string HTTPAPI = "httpapi.dll"; private const string HTTPAPI = "httpapi.dll";
#if DNXCORE50 #if DOTNET5_4
private const string sspicli_LIB = "sspicli.dll"; private const string sspicli_LIB = "sspicli.dll";
private const string api_ms_win_core_processthreads_LIB = "api-ms-win-core-processthreads-l1-1-1.dll"; private const string api_ms_win_core_processthreads_LIB = "api-ms-win-core-processthreads-l1-1-1.dll";
private const string api_ms_win_core_io_LIB = "api-ms-win-core-io-l1-1-1.dll"; private const string api_ms_win_core_io_LIB = "api-ms-win-core-io-l1-1-1.dll";
@ -63,21 +63,21 @@ namespace Microsoft.Net.Http.Server
internal const uint ERROR_CONNECTION_INVALID = 1229; internal const uint ERROR_CONNECTION_INVALID = 1229;
} }
#if DNXCORE50 #if DOTNET5_4
[DllImport(api_ms_win_core_processthreads_LIB, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)] [DllImport(api_ms_win_core_processthreads_LIB, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)]
#else #else
[DllImport(KERNEL32, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)] [DllImport(KERNEL32, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)]
#endif #endif
internal static extern uint GetCurrentThreadId(); internal static extern uint GetCurrentThreadId();
#if DNXCORE50 #if DOTNET5_4
[DllImport(api_ms_win_core_io_LIB, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)] [DllImport(api_ms_win_core_io_LIB, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)]
#else #else
[DllImport(KERNEL32, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)] [DllImport(KERNEL32, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)]
#endif #endif
internal static unsafe extern uint CancelIoEx(SafeHandle handle, SafeNativeOverlapped overlapped); internal static unsafe extern uint CancelIoEx(SafeHandle handle, SafeNativeOverlapped overlapped);
#if DNXCORE50 #if DOTNET5_4
[DllImport(api_ms_win_core_kernel32_legacy_LIB, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)] [DllImport(api_ms_win_core_kernel32_legacy_LIB, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)]
#else #else
[DllImport(KERNEL32, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)] [DllImport(KERNEL32, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)]
@ -102,7 +102,7 @@ namespace Microsoft.Net.Http.Server
[Out] out HeapAllocHandle resultList); [Out] out HeapAllocHandle resultList);
// http://msdn.microsoft.com/en-us/library/windows/desktop/aa366569(v=vs.85).aspx // http://msdn.microsoft.com/en-us/library/windows/desktop/aa366569(v=vs.85).aspx
#if DNXCORE50 #if DOTNET5_4
[DllImport(api_ms_win_core_heap_LIB, CallingConvention = CallingConvention.Winapi, SetLastError = true)] [DllImport(api_ms_win_core_heap_LIB, CallingConvention = CallingConvention.Winapi, SetLastError = true)]
#else #else
[DllImport(KERNEL32, CallingConvention = CallingConvention.Winapi, SetLastError = true)] [DllImport(KERNEL32, CallingConvention = CallingConvention.Winapi, SetLastError = true)]
@ -110,7 +110,7 @@ namespace Microsoft.Net.Http.Server
internal static extern IntPtr GetProcessHeap(); internal static extern IntPtr GetProcessHeap();
// http://msdn.microsoft.com/en-us/library/windows/desktop/aa366701(v=vs.85).aspx // http://msdn.microsoft.com/en-us/library/windows/desktop/aa366701(v=vs.85).aspx
#if DNXCORE50 #if DOTNET5_4
[DllImport(api_ms_win_core_heap_LIB, CallingConvention = CallingConvention.Winapi, SetLastError = true)] [DllImport(api_ms_win_core_heap_LIB, CallingConvention = CallingConvention.Winapi, SetLastError = true)]
#else #else
[DllImport(KERNEL32, CallingConvention = CallingConvention.Winapi, SetLastError = true)] [DllImport(KERNEL32, CallingConvention = CallingConvention.Winapi, SetLastError = true)]
@ -122,7 +122,7 @@ namespace Microsoft.Net.Http.Server
internal static class SafeNetHandles internal static class SafeNetHandles
{ {
#if DNXCORE50 #if DOTNET5_4
[DllImport(sspicli_LIB, ExactSpelling = true, SetLastError = true)] [DllImport(sspicli_LIB, ExactSpelling = true, SetLastError = true)]
#else #else
[DllImport(SECUR32, ExactSpelling = true, SetLastError = true)] [DllImport(SECUR32, ExactSpelling = true, SetLastError = true)]
@ -130,7 +130,7 @@ namespace Microsoft.Net.Http.Server
internal static extern int FreeContextBuffer( internal static extern int FreeContextBuffer(
[In] IntPtr contextBuffer); [In] IntPtr contextBuffer);
#if DNXCORE50 #if DOTNET5_4
[DllImport(sspicli_LIB, ExactSpelling = true, SetLastError = true)] [DllImport(sspicli_LIB, ExactSpelling = true, SetLastError = true)]
#else #else
[DllImport(SECUR32, ExactSpelling = true, SetLastError = true)] [DllImport(SECUR32, ExactSpelling = true, SetLastError = true)]
@ -147,21 +147,21 @@ namespace Microsoft.Net.Http.Server
[DllImport(HTTPAPI, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)] [DllImport(HTTPAPI, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)]
internal static extern unsafe uint HttpCloseRequestQueue(IntPtr pReqQueueHandle); internal static extern unsafe uint HttpCloseRequestQueue(IntPtr pReqQueueHandle);
#if DNXCORE50 #if DOTNET5_4
[DllImport(api_ms_win_core_handle_LIB, ExactSpelling = true, SetLastError = true)] [DllImport(api_ms_win_core_handle_LIB, ExactSpelling = true, SetLastError = true)]
#else #else
[DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)] [DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)]
#endif #endif
internal static extern bool CloseHandle(IntPtr handle); internal static extern bool CloseHandle(IntPtr handle);
#if DNXCORE50 #if DOTNET5_4
[DllImport(api_ms_win_core_heap_obsolete_LIB, ExactSpelling = true, SetLastError = true)] [DllImport(api_ms_win_core_heap_obsolete_LIB, ExactSpelling = true, SetLastError = true)]
#else #else
[DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)] [DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)]
#endif #endif
internal static extern SafeLocalFree LocalAlloc(int uFlags, UIntPtr sizetdwBytes); internal static extern SafeLocalFree LocalAlloc(int uFlags, UIntPtr sizetdwBytes);
#if DNXCORE50 #if DOTNET5_4
[DllImport(api_ms_win_core_heap_obsolete_LIB, EntryPoint = "LocalAlloc", SetLastError = true)] [DllImport(api_ms_win_core_heap_obsolete_LIB, EntryPoint = "LocalAlloc", SetLastError = true)]
#else #else
[DllImport(KERNEL32, EntryPoint = "LocalAlloc", SetLastError = true)] [DllImport(KERNEL32, EntryPoint = "LocalAlloc", SetLastError = true)]
@ -169,21 +169,21 @@ namespace Microsoft.Net.Http.Server
internal static extern SafeLocalFreeChannelBinding LocalAllocChannelBinding(int uFlags, UIntPtr sizetdwBytes); internal static extern SafeLocalFreeChannelBinding LocalAllocChannelBinding(int uFlags, UIntPtr sizetdwBytes);
#if DNXCORE50 #if DOTNET5_4
[DllImport(api_ms_win_core_heap_obsolete_LIB, ExactSpelling = true, SetLastError = true)] [DllImport(api_ms_win_core_heap_obsolete_LIB, ExactSpelling = true, SetLastError = true)]
#else #else
[DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)] [DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)]
#endif #endif
internal static extern IntPtr LocalFree(IntPtr handle); internal static extern IntPtr LocalFree(IntPtr handle);
#if DNXCORE50 #if DOTNET5_4
[DllImport(api_ms_win_core_libraryloader_LIB, ExactSpelling = true, CharSet = CharSet.Unicode, SetLastError = true)] [DllImport(api_ms_win_core_libraryloader_LIB, ExactSpelling = true, CharSet = CharSet.Unicode, SetLastError = true)]
#else #else
[DllImport(KERNEL32, ExactSpelling = true, CharSet = CharSet.Unicode, SetLastError = true)] [DllImport(KERNEL32, ExactSpelling = true, CharSet = CharSet.Unicode, SetLastError = true)]
#endif #endif
internal static extern unsafe SafeLoadLibrary LoadLibraryExW([In] string lpwLibFileName, [In] void* hFile, [In] uint dwFlags); internal static extern unsafe SafeLoadLibrary LoadLibraryExW([In] string lpwLibFileName, [In] void* hFile, [In] uint dwFlags);
#if DNXCORE50 #if DOTNET5_4
[DllImport(api_ms_win_core_libraryloader_LIB, ExactSpelling = true, SetLastError = true)] [DllImport(api_ms_win_core_libraryloader_LIB, ExactSpelling = true, SetLastError = true)]
#else #else
[DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)] [DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)]

2
src/Microsoft.Net.Http.Server/Overlapped/DeferredDisposableLifetime.cs
View File

@ -1,4 +1,4 @@
#if !DNXCORE50 // TODO: Temp copy. Remove once we target net46. #if !DOTNET5_4 // TODO: Temp copy. Remove once we target net46.
using System; using System;
namespace System.Threading namespace System.Threading
{ {

2
src/Microsoft.Net.Http.Server/Overlapped/IDeferredDisposable.cs
View File

@ -1,4 +1,4 @@
#if !DNXCORE50 // TODO: Temp copy. Remove once we target net46. #if !DOTNET5_4 // TODO: Temp copy. Remove once we target net46.
using System; using System;
namespace System.Threading namespace System.Threading
{ {

2
src/Microsoft.Net.Http.Server/Overlapped/PreAllocatedOverlapped.cs
View File

@ -1,4 +1,4 @@
#if !DNXCORE50 // TODO: Temp copy. Remove once we target net46. #if !DOTNET5_4 // TODO: Temp copy. Remove once we target net46.
using System; using System;
namespace System.Threading namespace System.Threading
{ {

2
src/Microsoft.Net.Http.Server/Overlapped/ThreadPoolBoundHandle.cs
View File

@ -1,4 +1,4 @@
#if !DNXCORE50 // TODO: Temp copy. Remove once we target net46. #if !DOTNET5_4 // TODO: Temp copy. Remove once we target net46.
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace System.Threading namespace System.Threading

2
src/Microsoft.Net.Http.Server/Overlapped/ThreadPoolBoundHandleOverlapped.cs
View File

@ -1,4 +1,4 @@
#if !DNXCORE50 // TODO: Temp copy. Remove once we target net46. #if !DOTNET5_4 // TODO: Temp copy. Remove once we target net46.
using System; using System;
namespace System.Threading namespace System.Threading
{ {

6
src/Microsoft.Net.Http.Server/RequestProcessing/OpaqueStream.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -109,7 +109,7 @@ namespace Microsoft.Net.Http.Server
{ {
return _requestStream.ReadByte(); return _requestStream.ReadByte();
} }
#if !DNXCORE50 #if !DOTNET5_4
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{ {
return _requestStream.BeginRead(buffer, offset, count, callback, state); return _requestStream.BeginRead(buffer, offset, count, callback, state);
@ -143,7 +143,7 @@ namespace Microsoft.Net.Http.Server
{ {
_responseStream.WriteByte(value); _responseStream.WriteByte(value);
} }
#if !DNXCORE50 #if !DOTNET5_4
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{ {
return _responseStream.BeginWrite(buffer, offset, count, callback, state); return _responseStream.BeginWrite(buffer, offset, count, callback, state);

10
src/Microsoft.Net.Http.Server/RequestProcessing/RequestStream.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -203,7 +203,7 @@ namespace Microsoft.Net.Http.Server
} }
} }
#if DNXCORE50 #if DOTNET5_4
public unsafe IAsyncResult BeginRead(byte[] buffer, int offset, int size, AsyncCallback callback, object state) public unsafe IAsyncResult BeginRead(byte[] buffer, int offset, int size, AsyncCallback callback, object state)
#else #else
public override unsafe IAsyncResult BeginRead(byte[] buffer, int offset, int size, AsyncCallback callback, object state) public override unsafe IAsyncResult BeginRead(byte[] buffer, int offset, int size, AsyncCallback callback, object state)
@ -293,7 +293,7 @@ namespace Microsoft.Net.Http.Server
return asyncResult; return asyncResult;
} }
#if DNXCORE50 #if DOTNET5_4
public int EndRead(IAsyncResult asyncResult) public int EndRead(IAsyncResult asyncResult)
#else #else
public override int EndRead(IAsyncResult asyncResult) public override int EndRead(IAsyncResult asyncResult)
@ -428,7 +428,7 @@ namespace Microsoft.Net.Http.Server
throw new InvalidOperationException(Resources.Exception_ReadOnlyStream); throw new InvalidOperationException(Resources.Exception_ReadOnlyStream);
} }
#if DNXCORE50 #if DOTNET5_4
public IAsyncResult BeginWrite(byte[] buffer, int offset, int size, AsyncCallback callback, object state) public IAsyncResult BeginWrite(byte[] buffer, int offset, int size, AsyncCallback callback, object state)
#else #else
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int size, AsyncCallback callback, object state) public override IAsyncResult BeginWrite(byte[] buffer, int offset, int size, AsyncCallback callback, object state)
@ -437,7 +437,7 @@ namespace Microsoft.Net.Http.Server
throw new InvalidOperationException(Resources.Exception_ReadOnlyStream); throw new InvalidOperationException(Resources.Exception_ReadOnlyStream);
} }
#if DNXCORE50 #if DOTNET5_4
public void EndWrite(IAsyncResult asyncResult) public void EndWrite(IAsyncResult asyncResult)
#else #else
public override void EndWrite(IAsyncResult asyncResult) public override void EndWrite(IAsyncResult asyncResult)

4
src/Microsoft.Net.Http.Server/RequestProcessing/RequestUriBuilder.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -70,7 +70,7 @@ namespace Microsoft.Net.Http.Server
// TODO: False triggers more detailed/correct parsing, but it's rather slow. // TODO: False triggers more detailed/correct parsing, but it's rather slow.
UseCookedRequestUrl = true; // SettingsSectionInternal.Section.HttpListenerUnescapeRequestUrl; UseCookedRequestUrl = true; // SettingsSectionInternal.Section.HttpListenerUnescapeRequestUrl;
Utf8Encoding = new UTF8Encoding(false, true); Utf8Encoding = new UTF8Encoding(false, true);
#if DNXCORE50 #if DOTNET5_4
AnsiEncoding = Utf8Encoding; AnsiEncoding = Utf8Encoding;
#else #else
AnsiEncoding = Encoding.GetEncoding(0, new EncoderExceptionFallback(), new DecoderExceptionFallback()); AnsiEncoding = Encoding.GetEncoding(0, new EncoderExceptionFallback(), new DecoderExceptionFallback());

8
src/Microsoft.Net.Http.Server/RequestProcessing/ResponseStream.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -379,7 +379,7 @@ namespace Microsoft.Net.Http.Server
throw new InvalidOperationException(Resources.Exception_WriteOnlyStream); throw new InvalidOperationException(Resources.Exception_WriteOnlyStream);
} }
#if !DNXCORE50 #if !DOTNET5_4
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{ {
throw new InvalidOperationException(Resources.Exception_WriteOnlyStream); throw new InvalidOperationException(Resources.Exception_WriteOnlyStream);
@ -468,7 +468,7 @@ namespace Microsoft.Net.Http.Server
} }
} }
#if DNXCORE50 #if DOTNET5_4
public unsafe IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) public unsafe IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
#else #else
public override unsafe IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) public override unsafe IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
@ -476,7 +476,7 @@ namespace Microsoft.Net.Http.Server
{ {
return WriteAsync(buffer, offset, count).ToIAsyncResult(callback, state); return WriteAsync(buffer, offset, count).ToIAsyncResult(callback, state);
} }
#if DNXCORE50 #if DOTNET5_4
public void EndWrite(IAsyncResult asyncResult) public void EndWrite(IAsyncResult asyncResult)
#else #else
public override void EndWrite(IAsyncResult asyncResult) public override void EndWrite(IAsyncResult asyncResult)

4
src/Microsoft.Net.Http.Server/RequestProcessing/ResponseStreamAsyncResult.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -120,7 +120,7 @@ namespace Microsoft.Net.Http.Server
var boundHandle = responseStream.RequestContext.Server.BoundHandle; var boundHandle = responseStream.RequestContext.Server.BoundHandle;
int bufferSize = 1024 * 64; // TODO: Validate buffer size choice. int bufferSize = 1024 * 64; // TODO: Validate buffer size choice.
#if DNXCORE50 #if DOTNET5_4
_fileStream = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, bufferSize /*, useAsync: true*/); // Extremely expensive. _fileStream = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, bufferSize /*, useAsync: true*/); // Extremely expensive.
#else #else
// It's too expensive to validate anything before opening the file. Open the file and then check the lengths. // It's too expensive to validate anything before opening the file. Open the file and then check the lengths.

4
src/Microsoft.Net.Http.Server/WebListenerException.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -45,7 +45,7 @@ namespace Microsoft.Net.Http.Server
: base(errorCode, message) : base(errorCode, message)
{ {
} }
#if DNXCORE50 #if DOTNET5_4
public int ErrorCode public int ErrorCode
#else #else
// the base class returns the HResult with this property // the base class returns the HResult with this property

4
src/Microsoft.Net.Http.Server/fx/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -21,7 +21,7 @@
// //
// ==--== // ==--==
#if DNXCORE50 #if DOTNET5_4
namespace Microsoft.Win32.SafeHandles namespace Microsoft.Win32.SafeHandles
{ {

4
src/Microsoft.Net.Http.Server/fx/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -21,7 +21,7 @@
// //
// ==--== // ==--==
#if DNXCORE50 #if DOTNET5_4
namespace Microsoft.Win32.SafeHandles namespace Microsoft.Win32.SafeHandles
{ {

4
src/Microsoft.Net.Http.Server/fx/System/Diagnostics/TraceEventType.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -21,7 +21,7 @@
// </copyright> // </copyright>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#if DNXCORE50 #if DOTNET5_4
using System; using System;
using System.ComponentModel; using System.ComponentModel;

4
src/Microsoft.Net.Http.Server/fx/System/ExternDll.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -21,7 +21,7 @@
// </copyright> // </copyright>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#if DNXCORE50 #if DOTNET5_4
namespace System namespace System
{ {

4
src/Microsoft.Net.Http.Server/fx/System/Runtime/InteropServices/ExternalException.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -31,7 +31,7 @@
** **
=============================================================================*/ =============================================================================*/
#if DNXCORE50 #if DOTNET5_4
namespace System.Runtime.InteropServices namespace System.Runtime.InteropServices
{ {

4
src/Microsoft.Net.Http.Server/fx/System/SafeNativeMethods.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -21,7 +21,7 @@
// </copyright> // </copyright>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#if DNXCORE50 #if DOTNET5_4
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;

49
src/Microsoft.Net.Http.Server/project.json
View File

@ -1,27 +1,26 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "Implementation of WebListener, a successor to HttpListener. It is used in the WebListener server package.", "description": "Implementation of WebListener, a successor to HttpListener. It is used in the WebListener server package.",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
"Microsoft.Extensions.Primitives": "1.0.0-*", "Microsoft.Extensions.Primitives": "1.0.0-*",
"Microsoft.Net.WebSockets": "1.0.0-*" "Microsoft.Net.WebSockets": "1.0.0-*"
}, },
"compilationOptions": { "compilationOptions": {
"allowUnsafe": true "allowUnsafe": true
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"dnx451": { }, "dotnet5.4": {
"dnxcore50": { "dependencies": {
"dependencies": { "Microsoft.Win32.Primitives": "4.0.1-beta-*",
"Microsoft.Win32.Primitives": "4.0.1-beta-*", "System.Diagnostics.Debug": "4.0.11-beta-*",
"System.Diagnostics.Debug": "4.0.11-beta-*", "System.IO.FileSystem": "4.0.1-beta-*",
"System.IO.FileSystem": "4.0.1-beta-*", "System.Security.Claims": "4.0.1-beta-*",
"System.Security.Claims": "4.0.1-beta-*", "System.Security.Cryptography.X509Certificates": "4.0.0-beta-*",
"System.Security.Cryptography.X509Certificates": "4.0.0-beta-*", "System.Security.Principal.Windows": "4.0.0-beta-*",
"System.Security.Principal.Windows": "4.0.0-beta-*", "System.Threading.Overlapped": "4.0.0-beta-*"
"System.Threading.Overlapped": "4.0.0" }
}
}
} }
} }
}

10
src/Microsoft.Net.WebSockets/NativeInterop/UnsafeNativeMethods.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -31,7 +31,7 @@ namespace Microsoft.Net.WebSockets
{ {
internal static class UnsafeNativeMethods internal static class UnsafeNativeMethods
{ {
#if DNXCORE50 #if DOTNET5_4
private const string api_ms_win_core_libraryloader_LIB = "api-ms-win-core-libraryloader-l1-1-0.dll"; private const string api_ms_win_core_libraryloader_LIB = "api-ms-win-core-libraryloader-l1-1-0.dll";
#else #else
private const string KERNEL32 = "kernel32.dll"; private const string KERNEL32 = "kernel32.dll";
@ -40,14 +40,14 @@ namespace Microsoft.Net.WebSockets
internal static class SafeNetHandles internal static class SafeNetHandles
{ {
#if DNXCORE50 #if DOTNET5_4
[DllImport(api_ms_win_core_libraryloader_LIB, ExactSpelling = true, CharSet = CharSet.Unicode, SetLastError = true)] [DllImport(api_ms_win_core_libraryloader_LIB, ExactSpelling = true, CharSet = CharSet.Unicode, SetLastError = true)]
#else #else
[DllImport(KERNEL32, ExactSpelling = true, CharSet=CharSet.Unicode, SetLastError = true)] [DllImport(KERNEL32, ExactSpelling = true, CharSet=CharSet.Unicode, SetLastError = true)]
#endif #endif
internal static extern unsafe SafeLoadLibrary LoadLibraryExW([In] string lpwLibFileName, [In] void* hFile, [In] uint dwFlags); internal static extern unsafe SafeLoadLibrary LoadLibraryExW([In] string lpwLibFileName, [In] void* hFile, [In] uint dwFlags);
#if DNXCORE50 #if DOTNET5_4
[DllImport(api_ms_win_core_libraryloader_LIB, ExactSpelling = true, SetLastError = true)] [DllImport(api_ms_win_core_libraryloader_LIB, ExactSpelling = true, SetLastError = true)]
#else #else
[DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)] [DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)]
@ -173,7 +173,7 @@ namespace Microsoft.Net.WebSockets
static WebSocketProtocolComponent() static WebSocketProtocolComponent()
{ {
#if DNXCORE50 #if DOTNET5_4
DllFileName = Path.Combine(Environment.GetEnvironmentVariable("SYSTEMROOT"), "System32", WEBSOCKET); DllFileName = Path.Combine(Environment.GetEnvironmentVariable("SYSTEMROOT"), "System32", WEBSOCKET);
#else #else
DllFileName = Path.Combine(Environment.SystemDirectory, WEBSOCKET); DllFileName = Path.Combine(Environment.SystemDirectory, WEBSOCKET);

12
src/Microsoft.Net.WebSockets/WebSocketBase.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -482,7 +482,7 @@ namespace Microsoft.Net.WebSockets
_state = WebSocketState.Aborted; _state = WebSocketState.Aborted;
#if DEBUG && NET45 #if DEBUG && NET451
string stackTrace = new StackTrace().ToString(); string stackTrace = new StackTrace().ToString();
if (_closeStack == null) if (_closeStack == null)
{ {
@ -715,7 +715,7 @@ namespace Microsoft.Net.WebSockets
_state = WebSocketState.Closed; _state = WebSocketState.Closed;
#if DEBUG && NET45 #if DEBUG && NET451
if (_closeStack == null) if (_closeStack == null)
{ {
_closeStack = new StackTrace().ToString(); _closeStack = new StackTrace().ToString();
@ -1103,7 +1103,7 @@ namespace Microsoft.Net.WebSockets
if (thisLockTaken || sessionHandleLockTaken) if (thisLockTaken || sessionHandleLockTaken)
{ {
#if !DNXCORE50 #if !DOTNET5_4
RuntimeHelpers.PrepareConstrainedRegions(); RuntimeHelpers.PrepareConstrainedRegions();
#endif #endif
try try
@ -1189,7 +1189,7 @@ namespace Microsoft.Net.WebSockets
Contract.Assert(lockObject != null, "'lockObject' MUST NOT be NULL."); Contract.Assert(lockObject != null, "'lockObject' MUST NOT be NULL.");
if (lockTaken) if (lockTaken)
{ {
#if !DNXCORE50 #if !DOTNET5_4
RuntimeHelpers.PrepareConstrainedRegions(); RuntimeHelpers.PrepareConstrainedRegions();
#endif #endif
try try
@ -2253,7 +2253,7 @@ namespace Microsoft.Net.WebSockets
"'webSocket.m_KeepAliveTracker' MUST NOT be NULL at this point."); "'webSocket.m_KeepAliveTracker' MUST NOT be NULL at this point.");
int keepAliveIntervalMilliseconds = (int)_keepAliveInterval.TotalMilliseconds; int keepAliveIntervalMilliseconds = (int)_keepAliveInterval.TotalMilliseconds;
Contract.Assert(keepAliveIntervalMilliseconds > 0, "'keepAliveIntervalMilliseconds' MUST be POSITIVE."); Contract.Assert(keepAliveIntervalMilliseconds > 0, "'keepAliveIntervalMilliseconds' MUST be POSITIVE.");
#if DNXCORE50 #if DOTNET5_4
_keepAliveTimer = new Timer(_keepAliveTimerElapsedCallback, webSocket, keepAliveIntervalMilliseconds, Timeout.Infinite); _keepAliveTimer = new Timer(_keepAliveTimerElapsedCallback, webSocket, keepAliveIntervalMilliseconds, Timeout.Infinite);
#else #else
if (ExecutionContext.IsFlowSuppressed()) if (ExecutionContext.IsFlowSuppressed())

4
src/Microsoft.Net.WebSockets/WebSocketException.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -28,7 +28,7 @@ using System.Runtime.InteropServices;
namespace Microsoft.Net.WebSockets namespace Microsoft.Net.WebSockets
{ {
#if !DNXCORE50 #if !DOTNET5_4
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2237:MarkISerializableTypesWithSerializable")] [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2237:MarkISerializableTypesWithSerializable")]
#endif #endif
internal sealed class WebSocketException : Win32Exception internal sealed class WebSocketException : Win32Exception

4
src/Microsoft.Net.WebSockets/fx/Microsoft/Win32/SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -21,7 +21,7 @@
// //
// ==--== // ==--==
#if DNXCORE50 #if DOTNET5_4
namespace Microsoft.Win32.SafeHandles namespace Microsoft.Win32.SafeHandles
{ {

4
src/Microsoft.Net.WebSockets/fx/System/AccessViolationException.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -15,7 +15,7 @@
// See the Apache 2 License for the specific language governing // See the Apache 2 License for the specific language governing
// permissions and limitations under the License. // permissions and limitations under the License.
#if DNXCORE50 #if DOTNET5_4
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

4
src/Microsoft.Net.WebSockets/fx/System/ComponentModel/Win32Exception.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -21,7 +21,7 @@
// </copyright> // </copyright>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#if DNXCORE50 #if DOTNET5_4
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;

4
src/Microsoft.Net.WebSockets/fx/System/ExternDll.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -21,7 +21,7 @@
// </copyright> // </copyright>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#if DNXCORE50 #if DOTNET5_4
namespace System namespace System
{ {

4
src/Microsoft.Net.WebSockets/fx/System/Runtime/InteropServices/ExternalException.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -31,7 +31,7 @@
** **
=============================================================================*/ =============================================================================*/
#if DNXCORE50 #if DOTNET5_4
namespace System.Runtime.InteropServices namespace System.Runtime.InteropServices
{ {

4
src/Microsoft.Net.WebSockets/fx/System/SafeNativeMethods.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -21,7 +21,7 @@
// </copyright> // </copyright>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#if DNXCORE50 #if DOTNET5_4
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;

4
src/Microsoft.Net.WebSockets/fx/System/SystemException.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. // Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved // All Rights Reserved
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -15,7 +15,7 @@
// See the Apache 2 License for the specific language governing // See the Apache 2 License for the specific language governing
// permissions and limitations under the License. // permissions and limitations under the License.
#if DNXCORE50 #if DOTNET5_4
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

56
src/Microsoft.Net.WebSockets/project.json
View File

@ -1,30 +1,30 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "Implementation of WebSocket abstract base class. Used by WebListener.", "description": "Implementation of WebSocket abstract base class. Used by WebListener.",
"dependencies": { "dependencies": {},
}, "compilationOptions": {
"compilationOptions": { "allowUnsafe": true }, "allowUnsafe": true
"frameworks": { },
"net451": { }, "frameworks": {
"dnx451": { }, "net451": {},
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.11-beta-*", "System.Collections": "4.0.11-beta-*",
"System.Diagnostics.Contracts": "4.0.1-beta-*", "System.Diagnostics.Contracts": "4.0.1-beta-*",
"System.Diagnostics.Tools": "4.0.1-beta-*", "System.Diagnostics.Tools": "4.0.1-beta-*",
"System.IO": "4.0.11-beta-*", "System.IO": "4.0.11-beta-*",
"System.Linq": "4.0.1-beta-*", "System.Linq": "4.0.1-beta-*",
"System.Net.Primitives": "4.0.11-beta-*", "System.Net.Primitives": "4.0.11-beta-*",
"System.Net.WebSockets": "4.0.0-beta-*", "System.Net.WebSockets": "4.0.0-beta-*",
"System.Resources.ResourceManager": "4.0.1-beta-*", "System.Resources.ResourceManager": "4.0.1-beta-*",
"System.Runtime.Extensions": "4.0.11-beta-*", "System.Runtime.Extensions": "4.0.11-beta-*",
"System.Security.Cryptography.Algorithms": "4.0.0-beta-*", "System.Security.Cryptography.Algorithms": "4.0.0-beta-*",
"System.Text.Encoding.Extensions": "4.0.11-beta-*", "System.Text.Encoding.Extensions": "4.0.11-beta-*",
"System.Threading": "4.0.11-beta-*", "System.Threading": "4.0.11-beta-*",
"System.Threading.Tasks": "4.0.11-beta-*", "System.Threading.Tasks": "4.0.11-beta-*",
"System.Threading.Timer": "4.0.1-beta-*", "System.Threading.Timer": "4.0.1-beta-*",
"System.Threading.ThreadPool": "4.0.10-beta-*" "System.Threading.ThreadPool": "4.0.10-beta-*"
} }
}
} }
} }
}