From c9b7abbd031af702c236e82b9a56de608811756f Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Wed, 18 Jan 2017 12:37:22 -0800 Subject: Clean up depprojs Remove depprojs that were being used for old references/API-compat For any project mentioning depproj, remove reference and clean up any Configurations we don't expect to build --- .../ref/4.0.0/System.AppContext.depproj | 13 ------ src/System.AppContext/src/System.AppContext.csproj | 1 - .../ref/4.0.0/System.Console.depproj | 14 ------ .../src/System.IO.Compression.csproj | 12 ++--- .../DeflateManaged/DeflateManagedStream.cs | 2 +- .../IO/Compression/DeflateZLib/DeflateStream.cs | 4 +- .../src/System/IO/Compression/GZipStream.cs | 4 +- .../ref/4.0.1/System.IO.FileSystem.depproj | 14 ------ .../src/System.IO.FileSystem.csproj | 5 -- .../ref/4.1.0/System.Linq.Expressions.depproj | 14 ------ .../src/System.Linq.Expressions.csproj | 2 - .../src/System.Net.Sockets.csproj | 1 - .../src/System.Reflection.Extensions.csproj | 2 - .../ref/4.1.0/System.Runtime.Extensions.depproj | 14 ------ .../System.Runtime.Serialization.Primitives.csproj | 14 ------ .../Serialization/OnDeserializedAttribute.cs | 11 ----- .../Serialization/OnDeserializingAttribute.cs | 11 ----- .../Runtime/Serialization/OnSerializedAttribute.cs | 11 ----- .../Serialization/OnSerializingAttribute.cs | 11 ----- .../Serialization/SerializationException.cs | 23 ---------- .../Runtime/Serialization/StreamingContext.cs | 53 ---------------------- .../ref/4.1.0/System.Runtime.depproj | 13 ------ src/System.Runtime/src/Configurations.props | 1 - src/System.Runtime/src/System.Runtime.csproj | 10 ++-- 24 files changed, 13 insertions(+), 247 deletions(-) delete mode 100644 src/System.AppContext/ref/4.0.0/System.AppContext.depproj delete mode 100644 src/System.Console/ref/4.0.0/System.Console.depproj delete mode 100644 src/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj delete mode 100644 src/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj delete mode 100644 src/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj delete mode 100644 src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializedAttribute.cs delete mode 100644 src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializingAttribute.cs delete mode 100644 src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializedAttribute.cs delete mode 100644 src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializingAttribute.cs delete mode 100644 src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/SerializationException.cs delete mode 100644 src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs delete mode 100644 src/System.Runtime/ref/4.1.0/System.Runtime.depproj diff --git a/src/System.AppContext/ref/4.0.0/System.AppContext.depproj b/src/System.AppContext/ref/4.0.0/System.AppContext.depproj deleted file mode 100644 index 4a6bfcac64..0000000000 --- a/src/System.AppContext/ref/4.0.0/System.AppContext.depproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - - 4.0.0.0 - Library - .NETStandard,Version=v1.3 - - - - - - \ No newline at end of file diff --git a/src/System.AppContext/src/System.AppContext.csproj b/src/System.AppContext/src/System.AppContext.csproj index 3b8d4c7fca..d3cd65531d 100644 --- a/src/System.AppContext/src/System.AppContext.csproj +++ b/src/System.AppContext/src/System.AppContext.csproj @@ -6,7 +6,6 @@ {5522BAFC-E2FF-4896-993A-401DDEDFD85F} true true - ..\ref\4.0.0\System.AppContext.depproj Microsoft.TargetingPack.NETFramework.v4.6.2 true diff --git a/src/System.Console/ref/4.0.0/System.Console.depproj b/src/System.Console/ref/4.0.0/System.Console.depproj deleted file mode 100644 index 2e7ae1ef78..0000000000 --- a/src/System.Console/ref/4.0.0/System.Console.depproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - 4.0.0.0 - Library - netstandard1.3 - .NETStandard,Version=v1.3 - - - - - - \ No newline at end of file diff --git a/src/System.IO.Compression/src/System.IO.Compression.csproj b/src/System.IO.Compression/src/System.IO.Compression.csproj index e77d4c9555..4638562157 100644 --- a/src/System.IO.Compression/src/System.IO.Compression.csproj +++ b/src/System.IO.Compression/src/System.IO.Compression.csproj @@ -3,23 +3,21 @@ System.IO.Compression - 4.1.2.0 - ../ref/4.1.0/System.IO.Compression.depproj Library {5471BFE8-8071-466F-838E-5ADAA779E742} true true $(DefineConstants);FEATURE_ZLIB - $(DefineConstants);netstandard17 - true + $(DefineConstants);netstandard20 + true - - + + @@ -103,7 +101,7 @@ - + diff --git a/src/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs b/src/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs index 7ea497f5f3..775948314e 100644 --- a/src/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs +++ b/src/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs @@ -292,7 +292,7 @@ namespace System.IO.Compression throw new InvalidOperationException(SR.CannotWriteToDeflateStream); } -#if netstandard17 +#if netstandard20 public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState) => TaskToApm.Begin(ReadAsync(buffer, offset, count, CancellationToken.None), asyncCallback, asyncState); diff --git a/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs b/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs index f67bf43352..22c1352bf0 100644 --- a/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs +++ b/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs @@ -328,7 +328,7 @@ namespace System.IO.Compression throw new InvalidOperationException(SR.CannotWriteToDeflateStream); } -#if netstandard17 +#if netstandard20 public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState) => TaskToApm.Begin(ReadAsync(buffer, offset, count, CancellationToken.None), asyncCallback, asyncState); @@ -585,7 +585,7 @@ namespace System.IO.Compression } } -#if netstandard17 +#if netstandard20 public override IAsyncResult BeginWrite(byte[] array, int offset, int count, AsyncCallback asyncCallback, object asyncState) => TaskToApm.Begin(WriteAsync(array, offset, count, CancellationToken.None), asyncCallback, asyncState); diff --git a/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs b/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs index e0e3252af7..e97331499f 100644 --- a/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs +++ b/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs @@ -72,7 +72,7 @@ namespace System.IO.Compression return _deflateStream.ReadByte(); } -#if netstandard17 +#if netstandard20 public override IAsyncResult BeginRead(byte[] array, int offset, int count, AsyncCallback asyncCallback, object asyncState) => TaskToApm.Begin(WriteAsync(array, offset, count, CancellationToken.None), asyncCallback, asyncState); @@ -86,7 +86,7 @@ namespace System.IO.Compression return _deflateStream.Read(array, offset, count); } -#if netstandard17 +#if netstandard20 public override IAsyncResult BeginWrite(byte[] array, int offset, int count, AsyncCallback asyncCallback, object asyncState) => TaskToApm.Begin(WriteAsync(array, offset, count, CancellationToken.None), asyncCallback, asyncState); diff --git a/src/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj b/src/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj deleted file mode 100644 index 36b93c3576..0000000000 --- a/src/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - 4.0.1.0 - Library - netstandard1.3 - .NETStandard,Version=v1.3 - - - - - - \ No newline at end of file diff --git a/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj index 10065d65e7..d48e83c160 100644 --- a/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj +++ b/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj @@ -4,11 +4,6 @@ {879C23DC-D828-4DFB-8E92-ABBC11B71035} System.IO.FileSystem - - false true true None diff --git a/src/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj b/src/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj deleted file mode 100644 index eb9b218fc4..0000000000 --- a/src/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - 4.1.0.0 - Library - netstandard1.6 - .NETStandard,Version=v1.6 - - - - - - \ No newline at end of file diff --git a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj index 089a5d869d..a7aaf933a5 100644 --- a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj +++ b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj @@ -9,8 +9,6 @@ {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787} System.Linq.Expressions System.Linq.Expressions - 4.1.1.0 - ../ref/4.1.0/System.Linq.Expressions.depproj true $(DefineConstants);FEATURE_COMPILE $(DefineConstants);FEATURE_INTERPRET diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/System.Net.Sockets/src/System.Net.Sockets.csproj index a0eb2cc415..24710db79c 100644 --- a/src/System.Net.Sockets/src/System.Net.Sockets.csproj +++ b/src/System.Net.Sockets/src/System.Net.Sockets.csproj @@ -9,7 +9,6 @@ true 4.1.1.0 $(DefineConstants);netcore50 - ../ref/4.1.0/System.Net.Sockets.depproj diff --git a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj b/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj index 014415b68a..7dfd8ac83c 100644 --- a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj +++ b/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj @@ -3,8 +3,6 @@ System.Reflection.Extensions - 4.0.2.0 - ..\ref\4.0.0\System.Reflection.Extensions.depproj true true diff --git a/src/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj b/src/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj deleted file mode 100644 index 1ff7ec1f85..0000000000 --- a/src/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - 4.1.0.0 - Library - netstandard1.5 - .NETStandard,Version=v1.5 - - - - - - \ No newline at end of file diff --git a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj index 7c64b6494b..892d452bd0 100644 --- a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj +++ b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj @@ -3,8 +3,6 @@ System.Runtime.Serialization.Primitives - 4.1.1.0 - ../ref/4.1.1/System.Runtime.Serialization.Primitives.depproj System.Runtime.Serialization.Primitives $(NoWarn);1634;1691;649 true @@ -14,12 +12,8 @@ true - - - - @@ -35,14 +29,6 @@ - - - - - - - - diff --git a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializedAttribute.cs b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializedAttribute.cs deleted file mode 100644 index 408a55ccf9..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializedAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace System.Runtime.Serialization -{ - [AttributeUsage(AttributeTargets.Method, Inherited = false)] - public sealed class OnDeserializedAttribute : Attribute - { - } -} diff --git a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializingAttribute.cs b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializingAttribute.cs deleted file mode 100644 index 162857e8d3..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializingAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace System.Runtime.Serialization -{ - [AttributeUsage(AttributeTargets.Method, Inherited = false)] - public sealed class OnDeserializingAttribute : Attribute - { - } -} diff --git a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializedAttribute.cs b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializedAttribute.cs deleted file mode 100644 index 020dd0257c..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializedAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace System.Runtime.Serialization -{ - [AttributeUsage(AttributeTargets.Method, Inherited = false)] - public sealed class OnSerializedAttribute : Attribute - { - } -} diff --git a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializingAttribute.cs b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializingAttribute.cs deleted file mode 100644 index 8dc8af3f23..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializingAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace System.Runtime.Serialization -{ - [AttributeUsage(AttributeTargets.Method, Inherited = false)] - public sealed class OnSerializingAttribute : Attribute - { - } -} diff --git a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/SerializationException.cs b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/SerializationException.cs deleted file mode 100644 index d03fac6793..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/SerializationException.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace System.Runtime.Serialization -{ - public class SerializationException : Exception - { - private static string s_nullMessage = "Serialization error."; // TODO: SR.SerializationException; - - public SerializationException() : base(s_nullMessage) - { - } - - public SerializationException(string message) : base(message) - { - } - - public SerializationException(string message, Exception innerException) : base(message, innerException) - { - } - } -} diff --git a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs deleted file mode 100644 index 98a622fc68..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs +++ /dev/null @@ -1,53 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace System.Runtime.Serialization -{ - public struct StreamingContext - { - private readonly object _additionalContext; - private readonly StreamingContextStates _state; - - public StreamingContext(StreamingContextStates state) : this(state, null) - { - } - - public StreamingContext(StreamingContextStates state, object additional) - { - _state = state; - _additionalContext = additional; - } - - public override bool Equals(object obj) - { - if (!(obj is StreamingContext)) - { - return false; - } - StreamingContext ctx = (StreamingContext)obj; - return ctx._additionalContext == _additionalContext && ctx._state == _state; - } - - public override int GetHashCode() => (int)_state; - - public StreamingContextStates State => _state; - - public object Context => _additionalContext; - } - - // Keep these in sync with the version in vm\runtimehandles.h - [Flags] - public enum StreamingContextStates - { - CrossProcess = 0x01, - CrossMachine = 0x02, - File = 0x04, - Persistence = 0x08, - Remoting = 0x10, - Other = 0x20, - Clone = 0x40, - CrossAppDomain = 0x80, - All = 0xFF, - } -} diff --git a/src/System.Runtime/ref/4.1.0/System.Runtime.depproj b/src/System.Runtime/ref/4.1.0/System.Runtime.depproj deleted file mode 100644 index e3932a41e6..0000000000 --- a/src/System.Runtime/ref/4.1.0/System.Runtime.depproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - - 4.1.0.0 - Library - .NETStandard,Version=v1.5 - - - - - - \ No newline at end of file diff --git a/src/System.Runtime/src/Configurations.props b/src/System.Runtime/src/Configurations.props index f71bd28c11..d3acc59a8a 100644 --- a/src/System.Runtime/src/Configurations.props +++ b/src/System.Runtime/src/Configurations.props @@ -2,7 +2,6 @@ - netstandard1.5; net461-Windows_NT; uap101aot-Windows_NT; netcoreapp1.2corert-Windows_NT; diff --git a/src/System.Runtime/src/System.Runtime.csproj b/src/System.Runtime/src/System.Runtime.csproj index 8749c28b00..32b3ec4116 100644 --- a/src/System.Runtime/src/System.Runtime.csproj +++ b/src/System.Runtime/src/System.Runtime.csproj @@ -4,14 +4,10 @@ {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} System.Runtime - 4.1.1.0 - ../ref/4.1.0/System.Runtime.depproj true $(GenFacadesArgs) -ignoreMissingTypes - - @@ -38,18 +34,18 @@ - + - + - + -- cgit v1.2.3