aspnet
/
AspNetWebStack
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Combine System.Web.Http.Owin and System.Web.Http.OwinHost

This commit is contained in:
youssefm 2013-05-14 13:22:50 -07:00
Родитель fc59637a73
Коммит df65fe0f63
32 изменённых файлов: 189 добавлений и 562 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
Runtime.sln
Просмотреть файл

@ -97,9 +97,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiHelpPage.VB.Test", "t
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Facebook.Test", "test\Microsoft.AspNet.Mvc.Facebook.Test\Microsoft.AspNet.Mvc.Facebook.Test.csproj", "{C3BEF382-C7C4-454D-B017-1EAC03E9A82C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Http.OwinHost", "src\System.Web.Http.OwinHost\System.Web.Http.OwinHost.csproj", "{66DD7CD7-C68F-4D0E-9F3D-3B58C49D1467}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Http.Owin", "src\System.Web.Http.Owin\System.Web.Http.Owin.csproj", "{66DD7CD7-C68F-4D0E-9F3D-3B58C49D1467}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Http.OwinHost.Test", "test\System.Web.Http.OwinHost.Test\System.Web.Http.OwinHost.Test.csproj", "{C19267DD-3984-430C-AE18-4034F85DE4E5}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Http.Owin.Test", "test\System.Web.Http.Owin.Test\System.Web.Http.Owin.Test.csproj", "{C19267DD-3984-430C-AE18-4034F85DE4E5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CB34D534-9A09-4EE4-B350-C1C23AFBF5EE}"
ProjectSection(SolutionItems) = preProject
@ -117,10 +117,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Cors.Test", "tes
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Http.Cors.Test", "test\System.Web.Http.Cors.Test\System.Web.Http.Cors.Test.csproj", "{1E89A3E9-0A7F-418F-B4BE-6E38A6315373}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Http.Owin", "src\System.Web.Http.Owin\System.Web.Http.Owin.csproj", "{3A5A6D87-131A-47C0-8427-6C72DD63EFDC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Http.Owin.Test", "test\System.Web.Http.Owin.Test\System.Web.Http.Owin.Test.csproj", "{62D25A4D-2E24-4082-8055-B991BD100FB8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CodeAnalysis|Any CPU = CodeAnalysis|Any CPU
@ -440,18 +436,6 @@ Global
{1E89A3E9-0A7F-418F-B4BE-6E38A6315373}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1E89A3E9-0A7F-418F-B4BE-6E38A6315373}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1E89A3E9-0A7F-418F-B4BE-6E38A6315373}.Release|Any CPU.Build.0 = Release|Any CPU
{3A5A6D87-131A-47C0-8427-6C72DD63EFDC}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
{3A5A6D87-131A-47C0-8427-6C72DD63EFDC}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
{3A5A6D87-131A-47C0-8427-6C72DD63EFDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3A5A6D87-131A-47C0-8427-6C72DD63EFDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3A5A6D87-131A-47C0-8427-6C72DD63EFDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3A5A6D87-131A-47C0-8427-6C72DD63EFDC}.Release|Any CPU.Build.0 = Release|Any CPU
{62D25A4D-2E24-4082-8055-B991BD100FB8}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
{62D25A4D-2E24-4082-8055-B991BD100FB8}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
{62D25A4D-2E24-4082-8055-B991BD100FB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{62D25A4D-2E24-4082-8055-B991BD100FB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62D25A4D-2E24-4082-8055-B991BD100FB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62D25A4D-2E24-4082-8055-B991BD100FB8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -482,7 +466,6 @@ Global
{66DD7CD7-C68F-4D0E-9F3D-3B58C49D1467} = {A9836F9E-6DB3-4D9F-ADCA-CF42D8C8BA93}
{43C1B979-D593-4A32-BB3A-4316F1C66D66} = {A9836F9E-6DB3-4D9F-ADCA-CF42D8C8BA93}
{25DEF6F6-7F99-4EB7-91ED-5181A346AFE1} = {A9836F9E-6DB3-4D9F-ADCA-CF42D8C8BA93}
{3A5A6D87-131A-47C0-8427-6C72DD63EFDC} = {A9836F9E-6DB3-4D9F-ADCA-CF42D8C8BA93}
{0BB62A1D-E6B5-49FA-9E3C-6AF679A66DFE} = {C40883CD-366D-4534-8B58-3EA0D13136DF}
{268DEE9D-F323-4A00-8ED8-3784388C3E3A} = {C40883CD-366D-4534-8B58-3EA0D13136DF}
{0F4870DB-A799-4DBA-99DF-0D74BB52FEC2} = {C40883CD-366D-4534-8B58-3EA0D13136DF}
@ -510,6 +493,5 @@ Global
{C19267DD-3984-430C-AE18-4034F85DE4E5} = {C40883CD-366D-4534-8B58-3EA0D13136DF}
{BF07E947-120D-4E93-93DA-A4BF121753EA} = {C40883CD-366D-4534-8B58-3EA0D13136DF}
{1E89A3E9-0A7F-418F-B4BE-6E38A6315373} = {C40883CD-366D-4534-8B58-3EA0D13136DF}
{62D25A4D-2E24-4082-8055-B991BD100FB8} = {C40883CD-366D-4534-8B58-3EA0D13136DF}
EndGlobalSection
EndGlobal

2
packages/repositories.config
Просмотреть файл

@ -6,7 +6,6 @@
<repository path="..\src\System.Net.Http.Formatting\packages.config" />
<repository path="..\src\System.Web.Http.OData\packages.config" />
<repository path="..\src\System.Web.Http.Owin\packages.config" />
<repository path="..\src\System.Web.Http.OwinHost\packages.config" />
<repository path="..\src\System.Web.Http.SignalR\packages.config" />
<repository path="..\src\System.Web.Http.Tracing\packages.config" />
<repository path="..\src\System.Web.Http.WebHost\packages.config" />
@ -30,7 +29,6 @@
<repository path="..\test\System.Web.Http.Integration.Test\packages.config" />
<repository path="..\test\System.Web.Http.OData.Test\packages.config" />
<repository path="..\test\System.Web.Http.Owin.Test\packages.config" />
<repository path="..\test\System.Web.Http.OwinHost.Test\packages.config" />
<repository path="..\test\System.Web.Http.SelfHost.Test\packages.config" />
<repository path="..\test\System.Web.Http.SignalR.Test\packages.config" />
<repository path="..\test\System.Web.Http.Test\packages.config" />

20
src/System.Web.Http.Owin/GlobalSuppressions.cs
Просмотреть файл

@ -2,18 +2,8 @@
using System.Diagnostics.CodeAnalysis;
[assembly: SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames",
Justification = "The assembly is delay signed")]
[assembly: SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member",
Target = "System.Collections.Generic.DictionaryExtensions.#RemoveFromDictionary`2(System.Collections.Generic.IDictionary`2<!!0,!!1>,System.Func`2<System.Collections.Generic.KeyValuePair`2<!!0,!!1>,System.Boolean>)",
Justification = "The shared source file is used by other assemblies.")]
[assembly: SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member",
Target = "System.Collections.Generic.DictionaryExtensions.#RemoveFromDictionary`3(System.Collections.Generic.IDictionary`2<!!0,!!1>,System.Func`3<System.Collections.Generic.KeyValuePair`2<!!0,!!1>,!!2,System.Boolean>,!!2)",
Justification = "The shared source file is used by other assemblies.")]
[assembly: SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member",
Target = "System.Collections.Generic.DictionaryExtensions.#FindKeysWithPrefix`1(System.Collections.Generic.IDictionary`2<System.String,!!0>,System.String)",
Justification = "The shared source file is used by other assemblies.")]
[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace",
Target = "System.Web.Http", Justification = "More types exist in this namespace within other assemblies.")]
[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace",
Target = "System.Net.Http", Justification = "More types exist in this namespace within other assemblies")]
[assembly: SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames", Justification = "The assembly is delay signed")]
[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "Owin", Justification = "More types exist in this namespace within other assemblies")]
[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "System.Net.Http", Justification = "More types exist in this namespace within other assemblies")]
[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "System.Web.Http", Justification = "More types exist in this namespace within other assemblies.")]
[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "System.Web.Http.Owin")]

1
src/System.Web.Http.Owin/HostAuthenticationFilter.cs
Просмотреть файл

@ -8,6 +8,7 @@ using System.Threading.Tasks;
using System.Web.Http.Controllers;
using System.Web.Http.Filters;
using System.Web.Http.Owin;
using System.Web.Http.Owin.Properties;
using Microsoft.Owin;
namespace System.Web.Http

8
src/System.Web.Http.OwinHost/HttpMessageHandlerAdapter.cs → src/System.Web.Http.Owin/HttpMessageHandlerAdapter.cs
Просмотреть файл

@ -13,10 +13,10 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Web.Http.Hosting;
using System.Web.Http.OwinHost.Properties;
using System.Web.Http.Owin.Properties;
using AppFunc = System.Func<System.Collections.Generic.IDictionary<string, object>, System.Threading.Tasks.Task>;
namespace System.Web.Http.OwinHost
namespace System.Web.Http.Owin
{
/// <summary>
/// Represents an OWIN component that submits requests to an <see cref="HttpMessageHandler"/> when invoked.
@ -87,7 +87,7 @@ namespace System.Web.Http.OwinHost
// Handle null responses
if (response == null)
{
throw Error.InvalidOperation(SRResources.SendAsync_ReturnedNull);
throw Error.InvalidOperation(OwinResources.SendAsync_ReturnedNull);
}
// Handle soft 404s where no route matched - call the next component
@ -174,7 +174,7 @@ namespace System.Web.Http.OwinHost
}
else
{
throw Error.InvalidOperation(SRResources.CreateRequestURI_MissingHostHeader);
throw Error.InvalidOperation(OwinResources.CreateRequestURI_MissingHostHeader);
}
// Append request path

2
src/System.Web.Http.OwinHost/OwinBufferPolicySelector.cs → src/System.Web.Http.Owin/OwinBufferPolicySelector.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System.Net.Http;
using System.Web.Http.Hosting;
namespace System.Web.Http.OwinHost
namespace System.Web.Http.Owin
{
/// <summary>
/// Provides the default implementation of <see cref="IHostBufferPolicySelector"/> used by the OWIN Web API adapter.

2
src/System.Web.Http.OwinHost/OwinConstants.cs → src/System.Web.Http.Owin/OwinConstants.cs
Просмотреть файл

@ -1,6 +1,6 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
namespace System.Web.Http.OwinHost
namespace System.Web.Http.Owin
{
/// <summary>
/// Standard keys and values for use within the OWIN interfaces.

8
src/System.Web.Http.OwinHost/OwinEnvironmentExtensions.cs → src/System.Web.Http.Owin/OwinEnvironmentExtensions.cs
Просмотреть файл

@ -3,9 +3,9 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics.Contracts;
using System.Web.Http.OwinHost.Properties;
using System.Web.Http.Owin.Properties;
namespace System.Web.Http.OwinHost
namespace System.Web.Http.Owin
{
[EditorBrowsable(EditorBrowsableState.Never)]
internal static class OwinEnvironmentExtensions
@ -22,9 +22,9 @@ namespace System.Web.Http.OwinHost
{
return (T)value;
}
throw Error.InvalidOperation(SRResources.GetOwinValue_IncorrectType, key, typeof(T).Name);
throw Error.InvalidOperation(OwinResources.GetOwinValue_IncorrectType, key, typeof(T).Name);
}
throw Error.InvalidOperation(SRResources.GetOwinValue_MissingRequiredValue, key);
throw Error.InvalidOperation(OwinResources.GetOwinValue_MissingRequiredValue, key);
}
}
}

1
src/System.Web.Http.Owin/OwinHttpRequestMessageExtensions.cs
Просмотреть файл

@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Web.Http.Owin;
using System.Web.Http.Owin.Properties;
using Microsoft.Owin;
namespace System.Net.Http

8
src/System.Web.Http.Owin/Properties/AssemblyInfo.cs
Просмотреть файл

@ -1,12 +1,10 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("System.Web.Http.Owin")]
[assembly: AssemblyDescription("")]
[assembly: Guid("a06b75fb-852c-4e31-8caa-d456fc415ab1")]
[assembly: Guid("41f9da53-4a52-4cd7-af85-77a214c5b13b")]
[assembly: InternalsVisibleTo("System.Web.Http.Owin.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

42
src/System.Web.Http.Owin/Properties/OwinResources.Designer.cs сгенерированный
Просмотреть файл

@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18033
// Runtime Version:4.0.30319.18010
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace System.Web.Http.Owin {
namespace System.Web.Http.Owin.Properties {
using System;
@ -39,7 +39,7 @@ namespace System.Web.Http.Owin {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("System.Web.Http.Properties.OwinResources", typeof(OwinResources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("System.Web.Http.Owin.Properties.OwinResources", typeof(OwinResources).Assembly);
resourceMan = temp;
}
return resourceMan;
@ -60,6 +60,33 @@ namespace System.Web.Http.Owin {
}
}
/// <summary>
/// Looks up a localized string similar to The OWIN environment does not contain a value for the required &apos;Host&apos; header..
/// </summary>
internal static string CreateRequestURI_MissingHostHeader {
get {
return ResourceManager.GetString("CreateRequestURI_MissingHostHeader", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The value for key &apos;{0}&apos; in the OWIN environment is not of the expected type &apos;{1}&apos;..
/// </summary>
internal static string GetOwinValue_IncorrectType {
get {
return ResourceManager.GetString("GetOwinValue_IncorrectType", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The OWIN environment does not contain a value for the required key &apos;{0}&apos;..
/// </summary>
internal static string GetOwinValue_MissingRequiredValue {
get {
return ResourceManager.GetString("GetOwinValue_MissingRequiredValue", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to HttpAuthenticationContext.Request must not be null..
/// </summary>
@ -77,5 +104,14 @@ namespace System.Web.Http.Owin {
return ResourceManager.GetString("OwinEnvironmentNotAvailable", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The message handler did not return a response message..
/// </summary>
internal static string SendAsync_ReturnedNull {
get {
return ResourceManager.GetString("SendAsync_ReturnedNull", resourceCulture);
}
}
}
}

12
src/System.Web.Http.Owin/Properties/OwinResources.resx
Просмотреть файл

@ -117,10 +117,22 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="CreateRequestURI_MissingHostHeader" xml:space="preserve">
<value>The OWIN environment does not contain a value for the required 'Host' header.</value>
</data>
<data name="GetOwinValue_IncorrectType" xml:space="preserve">
<value>The value for key '{0}' in the OWIN environment is not of the expected type '{1}'.</value>
</data>
<data name="GetOwinValue_MissingRequiredValue" xml:space="preserve">
<value>The OWIN environment does not contain a value for the required key '{0}'.</value>
</data>
<data name="HttpAuthenticationContext_RequestMustNotBeNull" xml:space="preserve">
<value>HttpAuthenticationContext.Request must not be null.</value>
</data>
<data name="OwinEnvironmentNotAvailable" xml:space="preserve">
<value>No OWIN environment is available for the request.</value>
</data>
<data name="SendAsync_ReturnedNull" xml:space="preserve">
<value>The message handler did not return a response message.</value>
</data>
</root>

89
src/System.Web.Http.Owin/System.Web.Http.Owin.csproj
Просмотреть файл

@ -2,10 +2,10 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Runtime.sln))\tools\WebStack.settings.targets" />
<PropertyGroup>
<ProjectGuid>{3A5A6D87-131A-47C0-8427-6C72DD63EFDC}</ProjectGuid>
<ProjectGuid>{66DD7CD7-C68F-4D0E-9F3D-3B58C49D1467}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>System.Web.Http</RootNamespace>
<RootNamespace>System.Web.Http.Owin</RootNamespace>
<AssemblyName>System.Web.Http.Owin</AssemblyName>
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
@ -18,13 +18,63 @@
<Reference Include="Microsoft.Owin">
<HintPath>..\..\packages\Microsoft.Owin.1.1.0-beta1-20502-275\lib\net45\Microsoft.Owin.dll</HintPath>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="Owin">
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Net.Http" />
<Reference Include="System.XML" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\Common\DictionaryExtensions.cs">
<Link>Common\DictionaryExtensions.cs</Link>
</Compile>
<Compile Include="..\Common\Error.cs">
<Link>Common\Error.cs</Link>
</Compile>
<Compile Include="..\Common\TaskHelpers.cs">
<Link>Common\TaskHelpers.cs</Link>
</Compile>
<Compile Include="..\Common\TaskHelpersExtensions.cs">
<Link>Common\TaskHelpersExtensions.cs</Link>
</Compile>
<Compile Include="HostAuthenticationFilter.cs" />
<Compile Include="OwinBufferPolicySelector.cs" />
<Compile Include="OwinEnvironmentExtensions.cs" />
<Compile Include="OwinConstants.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="HttpMessageHandlerAdapter.cs" />
<Compile Include="OwinHttpRequestMessageExtensions.cs" />
<Compile Include="OwinRequestExtensions.cs" />
<Compile Include="WebApiAppBuilderExtensions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\OwinResources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>OwinResources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\CommonWebApiResources.Designer.cs">
<Link>Properties\CommonWebApiResources.Designer.cs</Link>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>CommonWebApiResources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\Common\CommonWebApiResources.resx">
<Link>Properties\CommonWebApiResources.resx</Link>
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>CommonWebApiResources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Properties\OwinResources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>OwinResources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\System.Net.Http.Formatting\System.Net.Http.Formatting.csproj">
@ -36,36 +86,13 @@
<Name>System.Web.Http</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\DictionaryExtensions.cs">
<Link>Common\DictionaryExtensions.cs</Link>
</Compile>
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="HostAuthenticationFilter.cs" />
<Compile Include="OwinHttpRequestMessageExtensions.cs" />
<Compile Include="OwinRequestExtensions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Properties\OwinResources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>OwinResources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\OwinResources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>OwinResources.Designer.cs</LastGenOutput>
<CustomToolNamespace>System.Web.Http.Owin</CustomToolNamespace>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<CodeAnalysisDictionary Include="..\CodeAnalysisDictionary.xml" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />

2
src/System.Web.Http.OwinHost/WebApiAppBuilderExtensions.cs → src/System.Web.Http.Owin/WebApiAppBuilderExtensions.cs
Просмотреть файл

@ -5,7 +5,7 @@ using System.Diagnostics.CodeAnalysis;
using System.Net.Http;
using System.Web.Http;
using System.Web.Http.Hosting;
using System.Web.Http.OwinHost;
using System.Web.Http.Owin;
namespace Owin
{

8
src/System.Web.Http.OwinHost/GlobalSuppressions.cs
Просмотреть файл

@ -1,8 +0,0 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
using System.Diagnostics.CodeAnalysis;
[assembly: SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames", Justification = "The assembly is delay signed")]
[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "Owin", Justification = "More types exist in this namespace within other assemblies")]
[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "System.Net.Http", Justification = "More types exist in this namespace within other assemblies")]
[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "System.Web.Http.OwinHost")]

20
src/System.Web.Http.OwinHost/HttpRequestMessageExtensions.cs
Просмотреть файл

@ -1,20 +0,0 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
using System.Collections.Generic;
using System.Diagnostics.Contracts;
namespace System.Net.Http
{
internal static class HttpRequestMessageExtensions
{
private const string OwinEnvironmentKey = "MS_OwinEnvironment";
public static void SetOwinEnvironment(this HttpRequestMessage request, IDictionary<string, object> environment)
{
Contract.Assert(request != null);
Contract.Assert(environment != null);
request.Properties[OwinEnvironmentKey] = environment;
}
}
}

10
src/System.Web.Http.OwinHost/Properties/AssemblyInfo.cs
Просмотреть файл

@ -1,10 +0,0 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
[assembly: AssemblyTitle("System.Web.Http.OwinHost")]
[assembly: AssemblyDescription("")]
[assembly: Guid("41f9da53-4a52-4cd7-af85-77a214c5b13b")]
[assembly: InternalsVisibleTo("System.Web.Http.OwinHost.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

99
src/System.Web.Http.OwinHost/Properties/SRResources.Designer.cs сгенерированный
Просмотреть файл

@ -1,99 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18010
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace System.Web.Http.OwinHost.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class SRResources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal SRResources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("System.Web.Http.OwinHost.Properties.SRResources", typeof(SRResources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
/// <summary>
/// Looks up a localized string similar to The OWIN environment does not contain a value for the required &apos;Host&apos; header..
/// </summary>
internal static string CreateRequestURI_MissingHostHeader {
get {
return ResourceManager.GetString("CreateRequestURI_MissingHostHeader", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The value for key &apos;{0}&apos; in the OWIN environment is not of the expected type &apos;{1}&apos;..
/// </summary>
internal static string GetOwinValue_IncorrectType {
get {
return ResourceManager.GetString("GetOwinValue_IncorrectType", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The OWIN environment does not contain a value for the required key &apos;{0}&apos;..
/// </summary>
internal static string GetOwinValue_MissingRequiredValue {
get {
return ResourceManager.GetString("GetOwinValue_MissingRequiredValue", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The message handler did not return a response message..
/// </summary>
internal static string SendAsync_ReturnedNull {
get {
return ResourceManager.GetString("SendAsync_ReturnedNull", resourceCulture);
}
}
}
}

132
src/System.Web.Http.OwinHost/Properties/SRResources.resx
Просмотреть файл

@ -1,132 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="CreateRequestURI_MissingHostHeader" xml:space="preserve">
<value>The OWIN environment does not contain a value for the required 'Host' header.</value>
</data>
<data name="GetOwinValue_IncorrectType" xml:space="preserve">
<value>The value for key '{0}' in the OWIN environment is not of the expected type '{1}'.</value>
</data>
<data name="GetOwinValue_MissingRequiredValue" xml:space="preserve">
<value>The OWIN environment does not contain a value for the required key '{0}'.</value>
</data>
<data name="SendAsync_ReturnedNull" xml:space="preserve">
<value>The message handler did not return a response message.</value>
</data>
</root>

94
src/System.Web.Http.OwinHost/System.Web.Http.OwinHost.csproj
Просмотреть файл

@ -1,94 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Runtime.sln))\tools\WebStack.settings.targets" />
<PropertyGroup>
<ProjectGuid>{66DD7CD7-C68F-4D0E-9F3D-3B58C49D1467}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>System.Web.Http.OwinHost</RootNamespace>
<AssemblyName>System.Web.Http.OwinHost</AssemblyName>
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<RunCodeAnalysis>$(CodeAnalysis)</RunCodeAnalysis>
<CodeAnalysisRuleSet>..\Strict.ruleset</CodeAnalysisRuleSet>
<DefineConstants>$(DefineConstants);ASPNETMVC</DefineConstants>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
</PropertyGroup>
<ItemGroup>
<Reference Include="Owin">
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\Common\DictionaryExtensions.cs">
<Link>Common\DictionaryExtensions.cs</Link>
</Compile>
<Compile Include="..\Common\Error.cs">
<Link>Common\Error.cs</Link>
</Compile>
<Compile Include="..\Common\TaskHelpers.cs">
<Link>Common\TaskHelpers.cs</Link>
</Compile>
<Compile Include="..\Common\TaskHelpersExtensions.cs">
<Link>Common\TaskHelpersExtensions.cs</Link>
</Compile>
<Compile Include="OwinBufferPolicySelector.cs" />
<Compile Include="OwinEnvironmentExtensions.cs" />
<Compile Include="HttpRequestMessageExtensions.cs" />
<Compile Include="OwinConstants.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="HttpMessageHandlerAdapter.cs" />
<Compile Include="WebApiAppBuilderExtensions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\SRResources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>SRResources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\CommonWebApiResources.Designer.cs">
<Link>Properties\CommonWebApiResources.Designer.cs</Link>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>CommonWebApiResources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\Common\CommonWebApiResources.resx">
<Link>Properties\CommonWebApiResources.resx</Link>
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>CommonWebApiResources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Properties\SRResources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>SRResources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\System.Net.Http.Formatting\System.Net.Http.Formatting.csproj">
<Project>{668e9021-ce84-49d9-98fb-df125a9fcdb0}</Project>
<Name>System.Net.Http.Formatting</Name>
</ProjectReference>
<ProjectReference Include="..\System.Web.Http\System.Web.Http.csproj">
<Project>{ddc1ce0c-486e-4e35-bb3b-eab61f8f9440}</Project>
<Name>System.Web.Http</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<CodeAnalysisDictionary Include="..\CodeAnalysisDictionary.xml" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
</Project>

4
src/System.Web.Http.OwinHost/packages.config
Просмотреть файл

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Owin" version="1.0" targetFramework="net45" />
</packages>

2
test/System.Web.Http.OwinHost.Test/HttpMessageHandlerAdapterTest.cs → test/System.Web.Http.Owin.Test/HttpMessageHandlerAdapterTest.cs
Просмотреть файл

@ -15,7 +15,7 @@ using System.Web.Http.Hosting;
using Microsoft.TestCommon;
using Moq;
namespace System.Web.Http.OwinHost
namespace System.Web.Http.Owin
{
public class HttpMessageHandlerAdapterTest
{

2
test/System.Web.Http.OwinHost.Test/OwinBufferPolicySelectorTest.cs → test/System.Web.Http.Owin.Test/OwinBufferPolicySelectorTest.cs
Просмотреть файл

@ -6,7 +6,7 @@ using System.Net.Http.Formatting;
using System.Threading;
using Microsoft.TestCommon;
namespace System.Web.Http.OwinHost
namespace System.Web.Http.Owin
{
public class OwinBufferPolicySelectorTest
{

2
test/System.Web.Http.OwinHost.Test/OwinEnvironmentExtensionsTest.cs → test/System.Web.Http.Owin.Test/OwinEnvironmentExtensionsTest.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System.Collections.Generic;
using Microsoft.TestCommon;
namespace System.Web.Http.OwinHost
namespace System.Web.Http.Owin
{
public class OwinEnvironmentExtensionsTest
{

10
test/System.Web.Http.OwinHost.Test/IntegrationTest.cs → test/System.Web.Http.Owin.Test/OwinHostIntegrationTest.cs
Просмотреть файл

@ -8,14 +8,14 @@ using Microsoft.TestCommon;
using Newtonsoft.Json.Linq;
using Owin;
namespace System.Web.Http.OwinHost
namespace System.Web.Http.Owin
{
public class IntegrationTest
public class OwinHostIntegrationTest
{
[Fact]
public void SimpleGet_Works()
{
using (WebApplication.Start<IntegrationTest>(url: "http://localhost:50232/vroot"))
using (WebApplication.Start<OwinHostIntegrationTest>(url: "http://localhost:50232/vroot"))
{
HttpClient client = new HttpClient();
@ -30,7 +30,7 @@ namespace System.Web.Http.OwinHost
[Fact]
public void SimplePost_Works()
{
using (WebApplication.Start<IntegrationTest>(url: "http://localhost:50232/vroot"))
using (WebApplication.Start<OwinHostIntegrationTest>(url: "http://localhost:50232/vroot"))
{
HttpClient client = new HttpClient();
var content = new StringContent("\"Echo this\"", Encoding.UTF8, "application/json");
@ -46,7 +46,7 @@ namespace System.Web.Http.OwinHost
[Fact]
public void GetThatThrowsDuringSerializations_RespondsWith500()
{
using (WebApplication.Start<IntegrationTest>(url: "http://localhost:50232/vroot"))
using (WebApplication.Start<OwinHostIntegrationTest>(url: "http://localhost:50232/vroot"))
{
HttpClient client = new HttpClient();

50
test/System.Web.Http.Owin.Test/System.Web.Http.Owin.Test.csproj
Просмотреть файл

@ -2,41 +2,75 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Runtime.sln))\tools\WebStack.settings.targets" />
<PropertyGroup>
<ProjectGuid>{62D25A4D-2E24-4082-8055-B991BD100FB8}</ProjectGuid>
<ProjectGuid>{C19267DD-3984-430C-AE18-4034F85DE4E5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>System.Web.Http.Owin</RootNamespace>
<AssemblyName>System.Web.Http.Owin.Test</AssemblyName>
<OutputPath>..\..\bin\$(Configuration)\Test\</OutputPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Owin">
<Reference Include="Microsoft.Owin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Owin.1.1.0-beta1-20502-275\lib\net45\Microsoft.Owin.dll</HintPath>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=0.21.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.0.21.0-pre\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Hosting, Version=0.21.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Owin.Hosting.0.21.0-pre\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Net.Http" />
<Reference Include="xunit, Version=1.9.1.1600, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\xunit.1.9.1\lib\net20\xunit.dll</HintPath>
<Aliases>unused</Aliases>
</Reference>
<Reference Include="xunit.extensions, Version=1.9.1.1600, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\xunit.extensions.1.9.1\lib\net20\xunit.extensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="OwinHttpRequestMessageExtensionsTest.cs" />
<Compile Include="WebApiAppBuilderExtensionsTest.cs" />
<Compile Include="OwinBufferPolicySelectorTest.cs" />
<Compile Include="HttpMessageHandlerAdapterTest.cs" />
<Compile Include="OwinEnvironmentExtensionsTest.cs" />
<Compile Include="OwinHostIntegrationTest.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\System.Net.Http.Formatting\System.Net.Http.Formatting.csproj">
<Project>{668e9021-ce84-49d9-98fb-df125a9fcdb0}</Project>
<Name>System.Net.Http.Formatting</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\System.Web.Http.Owin\System.Web.Http.Owin.csproj">
<Project>{3a5a6d87-131a-47c0-8427-6c72dd63efdc}</Project>
<Project>{66dd7cd7-c68f-4d0e-9f3d-3b58c49d1467}</Project>
<Name>System.Web.Http.Owin</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\System.Web.Http\System.Web.Http.csproj">
<Project>{ddc1ce0c-486e-4e35-bb3b-eab61f8f9440}</Project>
<Name>System.Web.Http</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.TestCommon\Microsoft.TestCommon.csproj">
<Project>{fccc4cb7-baf7-4a57-9f89-e5766fe536c0}</Project>
<Name>Microsoft.TestCommon</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="OwinHttpRequestMessageExtensionsTest.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>

2
test/System.Web.Http.OwinHost.Test/WebApiAppBuilderExtensionsTest.cs → test/System.Web.Http.Owin.Test/WebApiAppBuilderExtensionsTest.cs
Просмотреть файл

@ -6,7 +6,7 @@ using Microsoft.TestCommon;
using Moq;
using Owin;
namespace System.Web.Http.OwinHost
namespace System.Web.Http.Owin
{
public class WebApiAppBuilderExtensionsTest
{

5
test/System.Web.Http.Owin.Test/packages.config
Просмотреть файл

@ -1,6 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Owin" version="1.1.0-beta1-20502-275" targetFramework="net45" />
<package id="Microsoft.Owin.Host.HttpListener" version="0.21.0-pre" targetFramework="net45" />
<package id="Microsoft.Owin.Hosting" version="0.21.0-pre" targetFramework="net45" />
<package id="Moq" version="4.0.10827" targetFramework="net45" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="xunit" version="1.9.1" targetFramework="net45" />
<package id="xunit.extensions" version="1.9.1" targetFramework="net45" />
</packages>

78
test/System.Web.Http.OwinHost.Test/System.Web.Http.OwinHost.Test.csproj
Просмотреть файл

@ -1,78 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Runtime.sln))\tools\WebStack.settings.targets" />
<PropertyGroup>
<ProjectGuid>{C19267DD-3984-430C-AE18-4034F85DE4E5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>System.Web.Http.OwinHost</RootNamespace>
<AssemblyName>System.Web.Http.OwinHost.Test</AssemblyName>
<OutputPath>..\..\bin\$(Configuration)\Test\</OutputPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=0.21.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.0.21.0-pre\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Hosting, Version=0.21.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Owin.Hosting.0.21.0-pre\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Net.Http" />
<Reference Include="xunit, Version=1.9.1.1600, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\xunit.1.9.1\lib\net20\xunit.dll</HintPath>
</Reference>
<Reference Include="xunit.extensions, Version=1.9.1.1600, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\xunit.extensions.1.9.1\lib\net20\xunit.extensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="WebApiAppBuilderExtensionsTest.cs" />
<Compile Include="OwinBufferPolicySelectorTest.cs" />
<Compile Include="HttpMessageHandlerAdapterTest.cs" />
<Compile Include="OwinEnvironmentExtensionsTest.cs" />
<Compile Include="IntegrationTest.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\System.Net.Http.Formatting\System.Net.Http.Formatting.csproj">
<Project>{668e9021-ce84-49d9-98fb-df125a9fcdb0}</Project>
<Name>System.Net.Http.Formatting</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\System.Web.Http.OwinHost\System.Web.Http.OwinHost.csproj">
<Project>{66dd7cd7-c68f-4d0e-9f3d-3b58c49d1467}</Project>
<Name>System.Web.Http.OwinHost</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\System.Web.Http.Owin\System.Web.Http.Owin.csproj">
<Project>{3a5a6d87-131a-47c0-8427-6c72dd63efdc}</Project>
<Name>System.Web.Http.Owin</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\System.Web.Http\System.Web.Http.csproj">
<Project>{ddc1ce0c-486e-4e35-bb3b-eab61f8f9440}</Project>
<Name>System.Web.Http</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.TestCommon\Microsoft.TestCommon.csproj">
<Project>{fccc4cb7-baf7-4a57-9f89-e5766fe536c0}</Project>
<Name>Microsoft.TestCommon</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
</Project>

10
test/System.Web.Http.OwinHost.Test/packages.config
Просмотреть файл

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Owin.Host.HttpListener" version="0.21.0-pre" targetFramework="net45" />
<package id="Microsoft.Owin.Hosting" version="0.21.0-pre" targetFramework="net45" />
<package id="Moq" version="4.0.10827" targetFramework="net45" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="xunit" version="1.9.1" targetFramework="net45" />
<package id="xunit.extensions" version="1.9.1" targetFramework="net45" />
</packages>

2
test/System.Web.Http.WebHost.Test/System.Web.Http.WebHost.Test.csproj
Просмотреть файл

@ -57,7 +57,7 @@
<Name>System.Net.Http.Formatting</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\System.Web.Http.Owin\System.Web.Http.Owin.csproj">
<Project>{3a5a6d87-131a-47c0-8427-6c72dd63efdc}</Project>
<Project>{66dd7cd7-c68f-4d0e-9f3d-3b58c49d1467}</Project>
<Name>System.Web.Http.Owin</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\System.Web.Http.WebHost\System.Web.Http.WebHost.csproj">

2
tools/SkipStrongNames.xml
Просмотреть файл

@ -15,7 +15,6 @@
<assembly name="System.Web.Http.Common"/>
<assembly name="System.Web.Http.Cors"/>
<assembly name="System.Web.Http.OData"/>
<assembly name="System.Web.Http.OwinHost"/>
<assembly name="System.Web.Http.Owin"/>
<assembly name="System.Web.Http.SelfHost"/>
<assembly name="System.Web.Http.SignalR"/>
@ -49,7 +48,6 @@
<assembly name="System.Web.Http.Cors.Test"/>
<assembly name="System.Web.Http.Integration.Test"/>
<assembly name="System.Web.Http.OData.Test"/>
<assembly name="System.Web.Http.OwinHost.Test"/>
<assembly name="System.Web.Http.Owin.Test"/>
<assembly name="System.Web.Http.SelfHost.Test"/>
<assembly name="System.Web.Http.SignalR.Test"/>