From 98f14182b190d9dfff78f5332a4792b34ee9cfc5 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Tue, 6 May 2014 12:17:35 -0700 Subject: [PATCH] Remove AssemblyInfo files. Remove direct OWIN references. --- .../SelfHostServer/Properties/AssemblyInfo.cs | 59 ------------------ samples/SelfHostServer/SelfHostServer.kproj | 1 - .../project.json | 1 - .../Microsoft.AspNet.WebSockets.kproj | 1 - .../Properties/AssemblyInfo.cs | 53 ---------------- .../WebSocketExtensions.cs | 5 +- .../WebSocketMiddleware.cs | 3 +- src/Microsoft.AspNet.WebSockets/project.json | 2 - .../Microsoft.Net.Server.kproj | 1 - .../Properties/AssemblyInfo.cs | 61 ------------------- src/Microsoft.Net.Server/WebListener.cs | 2 +- .../Properties/AssemblyInfo.cs | 43 ------------- 12 files changed, 6 insertions(+), 226 deletions(-) delete mode 100644 samples/SelfHostServer/Properties/AssemblyInfo.cs delete mode 100644 src/Microsoft.AspNet.WebSockets/Properties/AssemblyInfo.cs delete mode 100644 src/Microsoft.Net.Server/Properties/AssemblyInfo.cs diff --git a/samples/SelfHostServer/Properties/AssemblyInfo.cs b/samples/SelfHostServer/Properties/AssemblyInfo.cs deleted file mode 100644 index a7dc06e2e0..0000000000 --- a/samples/SelfHostServer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) Microsoft Open Technologies, Inc. -// All Rights Reserved -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING -// WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF -// TITLE, FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR -// NON-INFRINGEMENT. -// See the Apache 2 License for the specific language governing -// permissions and limitations under the License. - -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- - -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("SelfHostServer")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SelfHostServer")] -[assembly: AssemblyCopyright("Copyright © 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("ec50ddb4-9ec6-4cbd-96ac-15de948247cc")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("0.5")] -[assembly: AssemblyVersion("0.5")] -[assembly: AssemblyFileVersion("0.5.40117.0")] diff --git a/samples/SelfHostServer/SelfHostServer.kproj b/samples/SelfHostServer/SelfHostServer.kproj index 199bbb5a01..2da6845307 100644 --- a/samples/SelfHostServer/SelfHostServer.kproj +++ b/samples/SelfHostServer/SelfHostServer.kproj @@ -22,7 +22,6 @@ - diff --git a/src/Microsoft.AspNet.Security.Windows/project.json b/src/Microsoft.AspNet.Security.Windows/project.json index 3fe6a340df..599c58c415 100644 --- a/src/Microsoft.AspNet.Security.Windows/project.json +++ b/src/Microsoft.AspNet.Security.Windows/project.json @@ -7,7 +7,6 @@ { "net45" : { "dependencies": { - "Owin": "1.0" } } } diff --git a/src/Microsoft.AspNet.WebSockets/Microsoft.AspNet.WebSockets.kproj b/src/Microsoft.AspNet.WebSockets/Microsoft.AspNet.WebSockets.kproj index 94229fc81d..f584e250bb 100644 --- a/src/Microsoft.AspNet.WebSockets/Microsoft.AspNet.WebSockets.kproj +++ b/src/Microsoft.AspNet.WebSockets/Microsoft.AspNet.WebSockets.kproj @@ -40,7 +40,6 @@ - diff --git a/src/Microsoft.AspNet.WebSockets/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.WebSockets/Properties/AssemblyInfo.cs deleted file mode 100644 index 41718ca34d..0000000000 --- a/src/Microsoft.AspNet.WebSockets/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) Microsoft Open Technologies, Inc. -// All Rights Reserved -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING -// WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF -// TITLE, FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR -// NON-INFRINGEMENT. -// See the Apache 2 License for the specific language governing -// permissions and limitations under the License. - -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("Microsoft.AspNet.WebSockets")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Microsoft.AspNet.WebSockets")] -[assembly: AssemblyCopyright("Copyright © 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("1f471909-581f-4060-a147-430891e9c3c1")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("0.5")] -[assembly: AssemblyVersion("0.5")] -[assembly: AssemblyFileVersion("0.5.40117.0")] diff --git a/src/Microsoft.AspNet.WebSockets/WebSocketExtensions.cs b/src/Microsoft.AspNet.WebSockets/WebSocketExtensions.cs index f21108192c..ccacef2231 100644 --- a/src/Microsoft.AspNet.WebSockets/WebSocketExtensions.cs +++ b/src/Microsoft.AspNet.WebSockets/WebSocketExtensions.cs @@ -14,7 +14,7 @@ // NON-INFRINGEMENT. // See the Apache 2 License for the specific language governing // permissions and limitations under the License. - +/* #if NET45 using Microsoft.AspNet.WebSockets; @@ -28,4 +28,5 @@ namespace Owin } } } -#endif \ No newline at end of file +#endif +*/ \ No newline at end of file diff --git a/src/Microsoft.AspNet.WebSockets/WebSocketMiddleware.cs b/src/Microsoft.AspNet.WebSockets/WebSocketMiddleware.cs index 33dfbc97b8..8ed52f1ba7 100644 --- a/src/Microsoft.AspNet.WebSockets/WebSocketMiddleware.cs +++ b/src/Microsoft.AspNet.WebSockets/WebSocketMiddleware.cs @@ -14,7 +14,7 @@ // NON-INFRINGEMENT. // See the Apache 2 License for the specific language governing // permissions and limitations under the License. - +/* using System; using System.Collections.Generic; using System.IO; @@ -182,3 +182,4 @@ namespace Microsoft.AspNet.WebSockets } } } +*/ \ No newline at end of file diff --git a/src/Microsoft.AspNet.WebSockets/project.json b/src/Microsoft.AspNet.WebSockets/project.json index fa2484fec2..da531b3e9e 100644 --- a/src/Microsoft.AspNet.WebSockets/project.json +++ b/src/Microsoft.AspNet.WebSockets/project.json @@ -8,8 +8,6 @@ "configurations": { "net45" : { "dependencies": { - "Owin": "1.0", - "Microsoft.Owin": "2.1.0" } } } diff --git a/src/Microsoft.Net.Server/Microsoft.Net.Server.kproj b/src/Microsoft.Net.Server/Microsoft.Net.Server.kproj index 1599915ded..93c2bc3c87 100644 --- a/src/Microsoft.Net.Server/Microsoft.Net.Server.kproj +++ b/src/Microsoft.Net.Server/Microsoft.Net.Server.kproj @@ -54,7 +54,6 @@ - diff --git a/src/Microsoft.Net.Server/Properties/AssemblyInfo.cs b/src/Microsoft.Net.Server/Properties/AssemblyInfo.cs deleted file mode 100644 index 04fd65a965..0000000000 --- a/src/Microsoft.Net.Server/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) Microsoft Open Technologies, Inc. -// All Rights Reserved -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING -// WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF -// TITLE, FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR -// NON-INFRINGEMENT. -// See the Apache 2 License for the specific language governing -// permissions and limitations under the License. - -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- - -using System; -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("Microsoft.Net.Server")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Microsoft.Net.Server")] -[assembly: AssemblyCopyright("Copyright © 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("1f471909-581f-4060-a147-430891e9c3c1")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("0.5")] -[assembly: AssemblyVersion("0.5")] -[assembly: AssemblyFileVersion("0.5.40117.0")] -[assembly: CLSCompliant(true)] diff --git a/src/Microsoft.Net.Server/WebListener.cs b/src/Microsoft.Net.Server/WebListener.cs index 6fc5ce742e..ba54332fde 100644 --- a/src/Microsoft.Net.Server/WebListener.cs +++ b/src/Microsoft.Net.Server/WebListener.cs @@ -39,7 +39,7 @@ namespace Microsoft.Net.Server using AppFunc = Func; /// - /// An HTTP server wrapping the Http.Sys APIs that accepts requests and passes them on to the given OWIN application. + /// An HTTP server wrapping the Http.Sys APIs that accepts requests. /// public sealed class WebListener : IDisposable { diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Properties/AssemblyInfo.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Properties/AssemblyInfo.cs index ea69d41e45..a462d9475f 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Properties/AssemblyInfo.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Properties/AssemblyInfo.cs @@ -15,48 +15,5 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -// ----------------------------------------------------------------------- -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ----------------------------------------------------------------------- - -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("Microsoft.AspNet.Server.WebListener.FunctionalTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Microsoft.AspNet.Server.WebListener.FunctionalTests")] -[assembly: AssemblyCopyright("Copyright © 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("a265fcd6-3542-4f59-a1dd-ad423d40ddde")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("0.5")] -[assembly: AssemblyVersion("0.5")] -[assembly: AssemblyFileVersion("0.5.40117.0")] - // These tests can't run in parallel because they all use the same port. [assembly: Xunit.CollectionBehaviorAttribute(Xunit.CollectionBehavior.CollectionPerAssembly, DisableTestParallelization = true)]