From b420f4ddcd044bef7c29e71d6e0c8517e015b061 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Thu, 9 Jul 2020 16:32:36 -0700 Subject: [PATCH 1/9] Porting new netfx configurations for packages --- .../Microsoft.XmlSerializer.Generator.csproj | 8 ++++- .../ref/System.Collections.Immutable.cs | 4 +-- .../ref/System.Collections.Immutable.csproj | 11 ++++-- .../src/System.Collections.Immutable.csproj | 10 +++++- .../Immutable/ImmutableHashSet_1.cs | 2 +- .../Immutable/ImmutableSortedSet_1.cs | 2 +- .../System.ComponentModel.Composition.csproj | 2 +- .../System.Composition.AttributedModel.csproj | 6 +++- .../src/System.Composition.Convention.csproj | 7 +++- .../src/System.Composition.Hosting.csproj | 9 ++++- .../src/System.Composition.Runtime.csproj | 8 ++++- .../src/System.Composition.TypedParts.csproj | 7 +++- ...ion.Demos.ExtendedCollectionImports.csproj | 2 +- .../tests/TestLibrary/TestLibrary.csproj | 2 +- .../ref/System.IO.Pipelines.csproj | 7 +++- .../src/System.IO.Pipelines.csproj | 11 ++++-- .../src/System/IO/Pipelines/PipeAwaitable.cs | 8 ++--- .../System/IO/Pipelines/PipeReaderStream.cs | 2 +- .../System/IO/Pipelines/PipeWriterStream.cs | 2 +- .../System/IO/Pipelines/StreamPipeWriter.cs | 4 +-- ...m.Net.WebSockets.WebSocketProtocol.pkgproj | 3 +- ...em.Net.WebSockets.WebSocketProtocol.csproj | 7 +++- ...em.Net.WebSockets.WebSocketProtocol.csproj | 9 +++-- .../ref/System.Numerics.Tensors.csproj | 7 +++- .../src/System.Numerics.Tensors.csproj | 8 ++++- .../src/System/IO/PinnedBufferMemoryStream.cs | 2 +- .../System/Resources/RuntimeResourceSet.cs | 6 +++- .../ref/System.Reflection.Metadata.csproj | 7 +++- .../src/System.Reflection.Metadata.csproj | 12 +++++-- ...tem.Reflection.MetadataLoadContext.pkgproj | 3 +- ...stem.Reflection.MetadataLoadContext.csproj | 6 +++- ...stem.Reflection.MetadataLoadContext.csproj | 12 +++++-- .../pkg/System.Resources.Extensions.pkgproj | 3 +- .../ref/System.Resources.Extensions.csproj | 6 +++- .../src/System.Resources.Extensions.csproj | 7 +++- ...tem.Runtime.CompilerServices.Unsafe.csproj | 6 +++- .../System.Security.Cryptography.OpenSsl.cs | 21 ----------- ...ystem.Security.Cryptography.OpenSsl.csproj | 15 +++++++- ...ecurity.Cryptography.OpenSsl.netcoreapp.cs | 36 +++++++++++++++++++ ...ystem.Security.Cryptography.OpenSsl.csproj | 15 ++++++-- .../ref/System.Text.Encoding.CodePages.csproj | 6 +++- .../src/System.Text.Encoding.CodePages.csproj | 13 +++---- .../ref/System.Text.Encodings.Web.csproj | 10 ++++-- .../src/System.Text.Encodings.Web.csproj | 7 +++- .../ref/System.Threading.Channels.csproj | 12 +++++-- .../src/System.Threading.Channels.csproj | 17 +++++---- .../System.Threading.Tasks.Dataflow.csproj | 10 ++++-- src/libraries/pkg/baseline/packageIndex.json | 19 ++++++---- src/libraries/pkg/test/packageTest.targets | 7 ++++ 49 files changed, 301 insertions(+), 105 deletions(-) create mode 100644 src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.netcoreapp.cs diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj b/src/libraries/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj index a560c12aaf67cb..146a82abf3d02c 100644 --- a/src/libraries/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj +++ b/src/libraries/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj @@ -5,10 +5,16 @@ ..\..\System.Private.Xml\src\Resources\Strings.resx FxResources.$(AssemblyName.Replace('-', '_')).SR Exe - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true + + + + + \ No newline at end of file diff --git a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs index 403bbf8aff654e..bd650bdc3235ed 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs @@ -413,7 +413,7 @@ public static partial class ImmutableHashSet public static System.Collections.Immutable.ImmutableHashSet ToImmutableHashSet(this System.Collections.Immutable.ImmutableHashSet.Builder builder) { throw null; } } - #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 + #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 && !NETFRAMEWORK public sealed partial class ImmutableHashSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.ISet, System.Collections.Generic.IReadOnlySet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.Immutable.IImmutableSet #else public sealed partial class ImmutableHashSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.ISet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.Immutable.IImmutableSet @@ -916,7 +916,7 @@ public static partial class ImmutableSortedSet public static System.Collections.Immutable.ImmutableSortedSet ToImmutableSortedSet(this System.Collections.Immutable.ImmutableSortedSet.Builder builder) { throw null; } } - #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 + #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 && !NETFRAMEWORK public sealed partial class ImmutableSortedSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.Generic.ISet, System.Collections.Generic.IReadOnlySet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Collections.Immutable.IImmutableSet #else public sealed partial class ImmutableSortedSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.Generic.ISet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Collections.Immutable.IImmutableSet diff --git a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj index 48e1f0bde560bd..258824eb36b981 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj @@ -1,6 +1,7 @@ - $(NetCoreAppCurrent);netstandard1.0;netstandard1.3;netstandard2.0 + $(NetCoreAppCurrent);netstandard1.0;netstandard1.3;netstandard2.0;net461;$(NetFrameworkCurrent) + true true enable @@ -21,7 +22,13 @@ - + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj index 09ff1a3d15361e..f2fc64f714f3ea 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard1.0;netstandard1.3;netstandard2.0 + $(NetCoreAppCurrent);netstandard1.0;netstandard1.3;netstandard2.0;net461;$(NetFrameworkCurrent) true + true enable @@ -114,4 +115,11 @@ + + + + + + + diff --git a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableHashSet_1.cs b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableHashSet_1.cs index 542a7a09e5d318..411c38a4ea3dfe 100644 --- a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableHashSet_1.cs +++ b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableHashSet_1.cs @@ -14,7 +14,7 @@ namespace System.Collections.Immutable /// The type of elements in the set. [DebuggerDisplay("Count = {Count}")] [DebuggerTypeProxy(typeof(ImmutableEnumerableDebuggerProxy<>))] - #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 + #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 && !NETFRAMEWORK public sealed partial class ImmutableHashSet : IImmutableSet, IHashKeyCollection, IReadOnlyCollection, ICollection, ISet, IReadOnlySet, ICollection, IStrongEnumerable.Enumerator> #else public sealed partial class ImmutableHashSet : IImmutableSet, IHashKeyCollection, IReadOnlyCollection, ICollection, ISet, ICollection, IStrongEnumerable.Enumerator> diff --git a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableSortedSet_1.cs b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableSortedSet_1.cs index 57e5aebb91a754..c6b8a281f98a4e 100644 --- a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableSortedSet_1.cs +++ b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableSortedSet_1.cs @@ -19,7 +19,7 @@ namespace System.Collections.Immutable /// [DebuggerDisplay("Count = {Count}")] [DebuggerTypeProxy(typeof(ImmutableEnumerableDebuggerProxy<>))] - #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 + #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 && !NETFRAMEWORK public sealed partial class ImmutableSortedSet : IImmutableSet, ISortKeyCollection, IReadOnlySet, IReadOnlyList, IList, ISet, IList, IStrongEnumerable.Enumerator> #else public sealed partial class ImmutableSortedSet : IImmutableSet, ISortKeyCollection, IReadOnlyList, IList, ISet, IList, IStrongEnumerable.Enumerator> diff --git a/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj index 953373a8bc097f..cbf8732c35c4d0 100644 --- a/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj +++ b/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj @@ -1,6 +1,6 @@ - netstandard2.0;_$(NetFrameworkCurrent) + netstandard2.0;_net461 enable diff --git a/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj b/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj index 1afd59f2f93448..a39f3494bb05c7 100644 --- a/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj +++ b/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj @@ -1,7 +1,8 @@ System.Composition.AttributedModel - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true @@ -18,4 +19,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj b/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj index 635f6a2b2fcb39..eed8dbc7d09ca0 100644 --- a/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj +++ b/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj @@ -4,7 +4,8 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true @@ -27,4 +28,8 @@ + + + + \ No newline at end of file diff --git a/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj b/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj index c3482ad94dfd3b..23a9f0f487696d 100644 --- a/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj +++ b/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj @@ -4,7 +4,8 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true @@ -37,4 +38,10 @@ + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj b/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj index 854ed1be6a4d53..25aab756fed343 100644 --- a/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj +++ b/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj @@ -2,7 +2,8 @@ System.Composition System.Composition.Runtime - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true @@ -13,4 +14,9 @@ + + + + + \ No newline at end of file diff --git a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj index 0171ea482a7c22..2d6a799248f5d3 100644 --- a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj +++ b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj @@ -2,7 +2,8 @@ System.Composition System.Composition.TypedParts - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true @@ -34,4 +35,8 @@ + + + + \ No newline at end of file diff --git a/src/libraries/System.Composition/tests/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj b/src/libraries/System.Composition/tests/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj index 7d5ce36f12aeeb..83405db2622453 100644 --- a/src/libraries/System.Composition/tests/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj +++ b/src/libraries/System.Composition/tests/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj @@ -1,7 +1,7 @@ Microsoft.Composition.Demos.ExtendedCollectionImports - netstandard2.0 + netstandard2.0;$(NetFrameworkCurrent) diff --git a/src/libraries/System.Composition/tests/TestLibrary/TestLibrary.csproj b/src/libraries/System.Composition/tests/TestLibrary/TestLibrary.csproj index 6d6060c2a287be..dd2b89535774b6 100644 --- a/src/libraries/System.Composition/tests/TestLibrary/TestLibrary.csproj +++ b/src/libraries/System.Composition/tests/TestLibrary/TestLibrary.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + netstandard2.0;$(NetFrameworkCurrent) diff --git a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj index 2af41b5283fb69..8fd1f466627330 100644 --- a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj @@ -4,11 +4,16 @@ enable - netcoreapp2.0 + netcoreapp2.0;net461;$(NetFrameworkCurrent) + true + + + + diff --git a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj index 804d66203782d4..545a857a9515fc 100644 --- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj @@ -1,6 +1,7 @@ - $(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0 + $(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461;$(NetFrameworkCurrent) + true true enable @@ -37,14 +38,18 @@ - + - + + + + + diff --git a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeAwaitable.cs b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeAwaitable.cs index 8e67f9705816e7..e7dbad63111440 100644 --- a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeAwaitable.cs +++ b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeAwaitable.cs @@ -18,7 +18,7 @@ internal struct PipeAwaitable private SynchronizationContext? _synchronizationContext; private ExecutionContext? _executionContext; -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) private CancellationToken CancellationToken => _cancellationTokenRegistration.Token; #else private CancellationToken _cancellationToken; @@ -34,7 +34,7 @@ public PipeAwaitable(bool completed, bool useSynchronizationContext) _cancellationTokenRegistration = default; _synchronizationContext = null; _executionContext = null; -#if NETSTANDARD2_0 +#if (NETSTANDARD2_0 || NETFRAMEWORK) _cancellationToken = CancellationToken.None; #endif } @@ -53,7 +53,7 @@ public void BeginOperation(CancellationToken cancellationToken, Action // Don't register if already completed, we would immediately unregistered in ObserveCancellation if (cancellationToken.CanBeCanceled && !IsCompleted) { -#if NETSTANDARD2_0 +#if (NETSTANDARD2_0 || NETFRAMEWORK) _cancellationToken = cancellationToken; #endif _cancellationTokenRegistration = cancellationToken.UnsafeRegister(callback, state); @@ -165,7 +165,7 @@ public CancellationTokenRegistration ReleaseCancellationTokenRegistration(out Ca cancellationToken = CancellationToken; CancellationTokenRegistration cancellationTokenRegistration = _cancellationTokenRegistration; -#if NETSTANDARD2_0 +#if (NETSTANDARD2_0 || NETFRAMEWORK) _cancellationToken = default; #endif _cancellationTokenRegistration = default; diff --git a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeReaderStream.cs b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeReaderStream.cs index f7e65cc6bbae00..e654113a6fecda 100644 --- a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeReaderStream.cs +++ b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeReaderStream.cs @@ -67,7 +67,7 @@ public override Task ReadAsync(byte[] buffer, int offset, int count, Cancel return ReadAsyncInternal(new Memory(buffer, offset, count), cancellationToken).AsTask(); } -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) { return ReadAsyncInternal(buffer, cancellationToken); diff --git a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeWriterStream.cs b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeWriterStream.cs index 0a6dd86cb97c50..915927f264c11b 100644 --- a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeWriterStream.cs +++ b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeWriterStream.cs @@ -68,7 +68,7 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati return GetFlushResultAsTask(valueTask); } -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default) { ValueTask valueTask = _pipeWriter.WriteAsync(buffer, cancellationToken); diff --git a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/StreamPipeWriter.cs b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/StreamPipeWriter.cs index 096f5ed8425d18..0588b1c810f444 100644 --- a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/StreamPipeWriter.cs +++ b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/StreamPipeWriter.cs @@ -236,7 +236,7 @@ public override async ValueTask CompleteAsync(Exception? exception = null) if (!_leaveOpen) { -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) await InnerStream.DisposeAsync().ConfigureAwait(false); #else InnerStream.Dispose(); @@ -355,7 +355,7 @@ private void FlushInternal(bool writeToStream) if (returnSegment.Length > 0 && writeToStream) { -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) InnerStream.Write(returnSegment.Memory.Span); #else InnerStream.Write(returnSegment.Memory); diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/pkg/System.Net.WebSockets.WebSocketProtocol.pkgproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/pkg/System.Net.WebSockets.WebSocketProtocol.pkgproj index 286b2f50ed4d41..e5902d27282209 100644 --- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/pkg/System.Net.WebSockets.WebSocketProtocol.pkgproj +++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/pkg/System.Net.WebSockets.WebSocketProtocol.pkgproj @@ -1,10 +1,9 @@  - + uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks) - \ No newline at end of file diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj index 4c1d519edd7c3c..b7d413efb087c2 100644 --- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj +++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj @@ -1,6 +1,7 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true enable @@ -9,4 +10,8 @@ + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj index c82981f0138e10..189e51596d37ec 100644 --- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj +++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj @@ -2,7 +2,8 @@ System.Net.WebSockets.WebSocketProtocol True - $(NetCoreAppCurrent);netstandard2.0;netcoreapp2.1 + $(NetCoreAppCurrent);netstandard2.0;netcoreapp2.1;net461;$(NetFrameworkCurrent) + true true enable @@ -18,7 +19,7 @@ - + @@ -39,4 +40,8 @@ + + + + diff --git a/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj b/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj index 3bffad18351b10..f11f751bc7a35d 100644 --- a/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj +++ b/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj @@ -1,6 +1,7 @@ - netstandard2.0;netstandard1.1 + netstandard2.0;netstandard1.1;net461;$(NetFrameworkCurrent) + true enable @@ -19,4 +20,8 @@ + + + + \ No newline at end of file diff --git a/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj b/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj index f7f536629855e3..b9e1821c6d4f55 100644 --- a/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj +++ b/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj @@ -1,7 +1,8 @@ true - netstandard2.0;netstandard1.1 + netstandard2.0;netstandard1.1;net461;$(NetFrameworkCurrent) + true enable @@ -27,4 +28,9 @@ + + + + + \ No newline at end of file diff --git a/src/libraries/System.Private.CoreLib/src/System/IO/PinnedBufferMemoryStream.cs b/src/libraries/System.Private.CoreLib/src/System/IO/PinnedBufferMemoryStream.cs index a0ba6392a1f73d..6adab80d3efac2 100644 --- a/src/libraries/System.Private.CoreLib/src/System/IO/PinnedBufferMemoryStream.cs +++ b/src/libraries/System.Private.CoreLib/src/System/IO/PinnedBufferMemoryStream.cs @@ -36,7 +36,7 @@ internal PinnedBufferMemoryStream(byte[] array) Initialize(ptr, len, len, FileAccess.Read); } -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) public override int Read(Span buffer) => ReadCore(buffer); public override void Write(ReadOnlySpan buffer) => WriteCore(buffer); diff --git a/src/libraries/System.Private.CoreLib/src/System/Resources/RuntimeResourceSet.cs b/src/libraries/System.Private.CoreLib/src/System/Resources/RuntimeResourceSet.cs index 703c4e81b50832..c00ebb2b04a457 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Resources/RuntimeResourceSet.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Resources/RuntimeResourceSet.cs @@ -209,7 +209,11 @@ internal RuntimeResourceSet(Stream stream, bool permitDeserialization = false) : Reader = _defaultReader; } #else - private IResourceReader Reader => _defaultReader!; + private +#if NETFRAMEWORK + new +#endif + IResourceReader Reader => _defaultReader!; internal RuntimeResourceSet(IResourceReader reader) : // explicitly do not call IResourceReader constructor since it caches all resources diff --git a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj index 33546830d98fc0..84d845b9f4062e 100644 --- a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj @@ -2,7 +2,8 @@ true false - $(NetCoreAppCurrent);netstandard1.1;netstandard2.0 + $(NetCoreAppCurrent);netstandard1.1;netstandard2.0;net461;$(NetFrameworkCurrent) + true true enable @@ -23,4 +24,8 @@ + + + + \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj index a60521d62461b0..bb96d4ba71e6be 100644 --- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -3,7 +3,8 @@ true en-US false - $(NetCoreAppCurrent);netstandard1.1;netstandard2.0 + $(NetCoreAppCurrent);netstandard1.1;netstandard2.0;net461;$(NetFrameworkCurrent) + true true enable @@ -98,14 +99,14 @@ - + - + @@ -266,4 +267,9 @@ + + + + + diff --git a/src/libraries/System.Reflection.MetadataLoadContext/pkg/System.Reflection.MetadataLoadContext.pkgproj b/src/libraries/System.Reflection.MetadataLoadContext/pkg/System.Reflection.MetadataLoadContext.pkgproj index d7bcbbdc45ee04..7838bccd43db08 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/pkg/System.Reflection.MetadataLoadContext.pkgproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/pkg/System.Reflection.MetadataLoadContext.pkgproj @@ -1,10 +1,9 @@  - + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - diff --git a/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj index aceadd0d97dda0..76edfff97ad828 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj @@ -1,9 +1,13 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true enable + + + \ No newline at end of file diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj index 3a90ef79c94d3f..b1f6f31cb00be9 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj @@ -3,7 +3,8 @@ System.Reflection true - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0 + $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461;$(NetFrameworkCurrent) + true true enable @@ -77,8 +78,8 @@ - - + + @@ -155,4 +156,9 @@ + + + + + diff --git a/src/libraries/System.Resources.Extensions/pkg/System.Resources.Extensions.pkgproj b/src/libraries/System.Resources.Extensions/pkg/System.Resources.Extensions.pkgproj index d7fc3d112136b3..3ac0955a841c2f 100644 --- a/src/libraries/System.Resources.Extensions/pkg/System.Resources.Extensions.pkgproj +++ b/src/libraries/System.Resources.Extensions/pkg/System.Resources.Extensions.pkgproj @@ -1,10 +1,9 @@  - + uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks) - \ No newline at end of file diff --git a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj index 7b32ba82d118b4..9f3eb7697db0cf 100644 --- a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj +++ b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj @@ -1,10 +1,14 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true + + + \ No newline at end of file diff --git a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj index 100a496b86af78..6957aa7d02ec21 100644 --- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj +++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj @@ -1,7 +1,8 @@ true - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true $(DefineConstants);RESOURCES_EXTENSIONS annotations @@ -32,4 +33,8 @@ + + + + diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj index 5985f51fda7bbd..a0fa82e4ab51e7 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj @@ -3,10 +3,14 @@ true false enable - netstandard2.0;netstandard1.0;netstandard2.1 + netstandard2.0;netstandard1.0;netstandard2.1;net461;$(NetFrameworkCurrent) + true + + + \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.cs b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.cs index adaf1e6363a72e..bf0df9296b4f77 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.cs +++ b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.cs @@ -19,29 +19,9 @@ public override int KeySize { set { } } protected override void Dispose(bool disposing) { } public System.Security.Cryptography.SafeEvpPKeyHandle DuplicateKeyHandle() { throw null; } public override System.Security.Cryptography.DSAParameters ExportParameters(bool includePrivateParameters) { throw null; } - protected override byte[] HashData(byte[] data, int offset, int count, System.Security.Cryptography.HashAlgorithmName hashAlgorithm) { throw null; } - protected override byte[] HashData(System.IO.Stream data, System.Security.Cryptography.HashAlgorithmName hashAlgorithm) { throw null; } public override void ImportParameters(System.Security.Cryptography.DSAParameters parameters) { } public override bool VerifySignature(byte[] rgbHash, byte[] rgbSignature) { throw null; } } - public sealed partial class ECDiffieHellmanOpenSsl : System.Security.Cryptography.ECDiffieHellman - { - public ECDiffieHellmanOpenSsl() { } - public ECDiffieHellmanOpenSsl(int keySize) { } - public ECDiffieHellmanOpenSsl(System.IntPtr handle) { } - public ECDiffieHellmanOpenSsl(System.Security.Cryptography.ECCurve curve) { } - public ECDiffieHellmanOpenSsl(System.Security.Cryptography.SafeEvpPKeyHandle pkeyHandle) { } - public override System.Security.Cryptography.ECDiffieHellmanPublicKey PublicKey { get { throw null; } } - public override byte[] DeriveKeyFromHash(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, byte[]? secretPrepend, byte[]? secretAppend) { throw null; } - public override byte[] DeriveKeyFromHmac(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, byte[]? hmacKey, byte[]? secretPrepend, byte[]? secretAppend) { throw null; } - public override byte[] DeriveKeyMaterial(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey) { throw null; } - public override byte[] DeriveKeyTls(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, byte[] prfLabel, byte[] prfSeed) { throw null; } - public System.Security.Cryptography.SafeEvpPKeyHandle DuplicateKeyHandle() { throw null; } - public override System.Security.Cryptography.ECParameters ExportExplicitParameters(bool includePrivateParameters) { throw null; } - public override System.Security.Cryptography.ECParameters ExportParameters(bool includePrivateParameters) { throw null; } - public override void GenerateKey(System.Security.Cryptography.ECCurve curve) { } - public override void ImportParameters(System.Security.Cryptography.ECParameters parameters) { } - } public sealed partial class ECDsaOpenSsl : System.Security.Cryptography.ECDsa { public ECDsaOpenSsl() { } @@ -86,7 +66,6 @@ public sealed partial class SafeEvpPKeyHandle : System.Runtime.InteropServices.S { public SafeEvpPKeyHandle(System.IntPtr handle, bool ownsHandle) : base (default(System.IntPtr), default(bool)) { } public override bool IsInvalid { get { throw null; } } - public static long OpenSslVersion { get { throw null; } } public System.Security.Cryptography.SafeEvpPKeyHandle DuplicateHandle() { throw null; } protected override bool ReleaseHandle() { throw null; } } diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj index cc4944963eddde..2c895046911ced 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj +++ b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj @@ -1,11 +1,20 @@ - $(NetCoreAppCurrent);netcoreapp3.0 + $(NetCoreAppCurrent);netcoreapp3.0;net47;$(NetFrameworkCurrent) + true true enable + + 4.1.0.0 + + net461 + + + @@ -19,4 +28,8 @@ + + + + diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.netcoreapp.cs b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.netcoreapp.cs new file mode 100644 index 00000000000000..e8a0b899af6466 --- /dev/null +++ b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.netcoreapp.cs @@ -0,0 +1,36 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ + +namespace System.Security.Cryptography +{ + public sealed partial class DSAOpenSsl : System.Security.Cryptography.DSA + { + protected override byte[] HashData(byte[] data, int offset, int count, System.Security.Cryptography.HashAlgorithmName hashAlgorithm) { throw null; } + protected override byte[] HashData(System.IO.Stream data, System.Security.Cryptography.HashAlgorithmName hashAlgorithm) { throw null; } + } + public sealed partial class ECDiffieHellmanOpenSsl : System.Security.Cryptography.ECDiffieHellman + { + public ECDiffieHellmanOpenSsl() { } + public ECDiffieHellmanOpenSsl(int keySize) { } + public ECDiffieHellmanOpenSsl(System.IntPtr handle) { } + public ECDiffieHellmanOpenSsl(System.Security.Cryptography.ECCurve curve) { } + public ECDiffieHellmanOpenSsl(System.Security.Cryptography.SafeEvpPKeyHandle pkeyHandle) { } + public override System.Security.Cryptography.ECDiffieHellmanPublicKey PublicKey { get { throw null; } } + public override byte[] DeriveKeyFromHash(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, byte[]? secretPrepend, byte[]? secretAppend) { throw null; } + public override byte[] DeriveKeyFromHmac(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, byte[]? hmacKey, byte[]? secretPrepend, byte[]? secretAppend) { throw null; } + public override byte[] DeriveKeyMaterial(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey) { throw null; } + public override byte[] DeriveKeyTls(System.Security.Cryptography.ECDiffieHellmanPublicKey otherPartyPublicKey, byte[] prfLabel, byte[] prfSeed) { throw null; } + public System.Security.Cryptography.SafeEvpPKeyHandle DuplicateKeyHandle() { throw null; } + public override System.Security.Cryptography.ECParameters ExportExplicitParameters(bool includePrivateParameters) { throw null; } + public override System.Security.Cryptography.ECParameters ExportParameters(bool includePrivateParameters) { throw null; } + public override void GenerateKey(System.Security.Cryptography.ECCurve curve) { } + public override void ImportParameters(System.Security.Cryptography.ECParameters parameters) { } + } + public sealed partial class SafeEvpPKeyHandle : System.Runtime.InteropServices.SafeHandle + { + public static long OpenSslVersion { get { throw null; } } + } +} diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj index a616892525e424..1edf80722b5e55 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj +++ b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj @@ -1,13 +1,17 @@ true - $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent);netcoreapp3.0-Unix;netcoreapp3.0;netstandard2.0 + $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent);netcoreapp3.0-Unix;netcoreapp3.0;netstandard2.0;net47;$(NetFrameworkCurrent) + true true enable - 4.1.0.0 + 4.1.0.0 + + net461 SR.PlatformNotSupported_CryptographyOpenSSL @@ -104,7 +108,7 @@ - + @@ -123,4 +127,9 @@ + + + + + diff --git a/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj index c29c17eb07596c..ff67cc8cca7de9 100644 --- a/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj @@ -1,7 +1,8 @@ enable - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true @@ -10,4 +11,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj index 88407f0f334d26..3ca2e7453ec8a9 100644 --- a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj @@ -2,14 +2,10 @@ true enable - $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;netstandard2.0-Windows_NT + $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;netstandard2.0-Windows_NT;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + true true - - - - netstandard2.0;net461 - @@ -73,6 +69,11 @@ + + + + + @@ -15,7 +16,12 @@ - + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj index ba3ad6048c5564..14019ca947c624 100644 --- a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj +++ b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj @@ -1,7 +1,8 @@ true - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;netstandard2.0 + $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;netstandard2.0;net461;$(NetFrameworkCurrent) + true true enable @@ -39,6 +40,10 @@ + + + + diff --git a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj index 4aace39265e88b..81300fb3e914f2 100644 --- a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj @@ -1,16 +1,17 @@ - $(NetCoreAppCurrent);netcoreapp3.0;netstandard1.3;netstandard2.0;netstandard2.1 + $(NetCoreAppCurrent);netcoreapp3.0;netstandard1.3;netstandard2.0;netstandard2.1;net461;$(NetFrameworkCurrent) + true true enable - + - + @@ -23,4 +24,9 @@ + + + + + \ No newline at end of file diff --git a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj index f3adbd227e09db..b52a5869a938de 100644 --- a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj @@ -1,6 +1,7 @@ - $(NetCoreAppCurrent);netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0 + $(NetCoreAppCurrent);netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;net461;$(NetFrameworkCurrent) + true true enable @@ -8,16 +9,16 @@ - - + + - + - + @@ -39,8 +40,12 @@ - + + + + + diff --git a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj index 2af9d7adad7f4a..9aefb2928ff4e4 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj @@ -1,11 +1,12 @@ - netstandard2.0;netstandard1.0;netstandard1.1 + netstandard2.0;netstandard1.0;netstandard1.1;net461;$(NetFrameworkCurrent) + true enable - $(DefineConstants);FEATURE_TRACING + $(DefineConstants);FEATURE_TRACING $(DefineConstants);USE_INTERNAL_CONCURRENT_COLLECTIONS $(DefineConstants);USE_INTERNAL_THREADING netstandard1.1;portable-net45+win8+wpa81 @@ -78,4 +79,9 @@ + + + + + diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json index f818cab0e7f947..e14e5f878d3207 100644 --- a/src/libraries/pkg/baseline/packageIndex.json +++ b/src/libraries/pkg/baseline/packageIndex.json @@ -1567,9 +1567,10 @@ "4.0.0", "4.3.0", "4.4.0", - "4.5.0" + "4.5.0", + "4.5.1" ], - "BaselineVersion": "4.5.0", + "BaselineVersion": "4.5.1", "InboxOn": { "netcoreapp2.0": "4.0.2.0", "netcoreapp2.1": "4.0.3.0", @@ -1689,7 +1690,9 @@ "1.3.2", "1.4.0", "1.5.0", - "1.6.0" + "1.6.0", + "1.7.0", + "1.7.1" ], "BaselineVersion": "5.0.0", "InboxOn": { @@ -3642,9 +3645,10 @@ "4.5.0", "4.5.1", "4.5.2", - "4.5.3" + "4.5.3", + "4.5.4" ], - "BaselineVersion": "4.5.3", + "BaselineVersion": "4.5.4", "InboxOn": { "netcoreapp2.1": "4.1.0.0", "netcoreapp3.0": "4.2.0.0", @@ -6510,9 +6514,10 @@ "4.5.0", "4.5.1", "4.5.2", - "4.5.3" + "4.5.3", + "4.5.4" ], - "BaselineVersion": "4.5.2", + "BaselineVersion": "4.5.4", "InboxOn": { "netcoreapp2.0": "4.1.1.0", "netcoreapp2.1": "4.3.0.0", diff --git a/src/libraries/pkg/test/packageTest.targets b/src/libraries/pkg/test/packageTest.targets index 2196f4a0d49645..78c086a3f20ce4 100644 --- a/src/libraries/pkg/test/packageTest.targets +++ b/src/libraries/pkg/test/packageTest.targets @@ -99,9 +99,16 @@ IgnoredTypes="@(IgnoredTypes)" /> + + + + <_testDependsOn> LogBeginTest; + VerifyNotDependsOnNetStandard; VerifyReferenceClosure; VerifyReferenceTypes; VerifyRuntimeClosure; From 2d625ae3b3dc8406f23d94f439c1b7cfe03b7470 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Fri, 10 Jul 2020 13:23:15 -0700 Subject: [PATCH 2/9] Add Netfx configurations to Microsoft.Extensions and missing System packages --- ...osoft.Extensions.Caching.Abstractions.csproj | 6 +++++- .../Microsoft.Extensions.Caching.Memory.csproj | 8 +++++++- ...Extensions.Configuration.Abstractions.csproj | 10 +++++++++- ...osoft.Extensions.Configuration.Binder.csproj | 9 ++++++++- ....Extensions.Configuration.CommandLine.csproj | 7 ++++++- ...ns.Configuration.EnvironmentVariables.csproj | 8 +++++++- ...tensions.Configuration.FileExtensions.csproj | 7 ++++++- ...icrosoft.Extensions.Configuration.Ini.csproj | 7 ++++++- ...crosoft.Extensions.Configuration.Json.csproj | 9 ++++++++- ....Extensions.Configuration.UserSecrets.csproj | 6 +++++- ...icrosoft.Extensions.Configuration.Xml.csproj | 11 ++++++++++- .../Microsoft.Extensions.Configuration.csproj | 8 +++++++- ...ions.DependencyInjection.Abstractions.csproj | 9 ++++++++- ...Extensions.FileProviders.Abstractions.csproj | 8 +++++++- ...ft.Extensions.FileProviders.Composite.csproj | 8 +++++++- ...oft.Extensions.FileProviders.Physical.csproj | 10 +++++++++- ...crosoft.Extensions.FileSystemGlobbing.csproj | 9 ++++++++- ...osoft.Extensions.Hosting.Abstractions.csproj | 9 +++++++-- .../src/Microsoft.Extensions.Hosting.csproj | 11 +++++++++-- .../src/Microsoft.Extensions.Http.csproj | 10 +++++++++- ...osoft.Extensions.Logging.Abstractions.csproj | 8 +++++++- ...soft.Extensions.Logging.Configuration.csproj | 7 ++++++- .../Microsoft.Extensions.Logging.Console.csproj | 10 +++++++++- .../Microsoft.Extensions.Logging.Debug.csproj | 7 ++++++- ...Microsoft.Extensions.Logging.EventLog.csproj | 1 + ...rosoft.Extensions.Logging.EventSource.csproj | 10 ++++++++-- ...rosoft.Extensions.Logging.TraceSource.csproj | 8 +++++++- .../src/Microsoft.Extensions.Logging.csproj | 12 ++++++++++-- ...sions.Options.ConfigurationExtensions.csproj | 7 ++++++- ...ft.Extensions.Options.DataAnnotations.csproj | 8 +++++++- .../src/Microsoft.Extensions.Options.csproj | 10 ++++++++-- .../src/Microsoft.Extensions.Primitives.csproj | 11 ++++++++--- .../src/StringSegment.cs | 2 +- .../src/System.Formats.Asn1.csproj | 9 ++++++++- .../ref/System.IO.Pipelines.csproj | 8 ++++++-- .../pkg/System.Net.Http.Json.pkgproj | 3 +-- .../ref/System.Net.Http.Json.csproj | 8 +++++++- .../src/System.Net.Http.Json.csproj | 10 ++++++++-- .../System.Private.CoreLib/src/System/Index.cs | 2 +- .../System.Private.CoreLib/src/System/Range.cs | 6 +++--- .../src/System/Text/Rune.cs | 2 +- .../src/System/Text/Unicode/Utf8Utility.cs | 4 ++-- .../src/System/Text/Utf8Span.Comparison.cs | 4 ++-- .../src/System/Text/Utf8Span.cs | 4 ++-- .../src/System/Utf8String.Comparison.cs | 4 ++-- .../src/System/Utf8String.Construction.cs | 2 +- .../src/System/Utf8String.cs | 2 +- .../pkg/System.Utf8String.Experimental.pkgproj | 3 +-- .../System.Utf8String.Experimental.Forwards.cs | 2 +- .../ref/System.Utf8String.Experimental.cs | 6 +++--- .../ref/System.Utf8String.Experimental.csproj | 15 ++++++++++++--- .../src/System.Utf8String.Experimental.csproj | 17 +++++++++++++---- .../src/System/IO/Utf8StringStream.cs | 8 ++++---- .../src/System/Net/Http/Utf8StringContent.cs | 2 +- src/libraries/pkg/test/testPackages.proj | 2 +- 55 files changed, 313 insertions(+), 81 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj index 236c28690464c0..3ba2a9af6d414e 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj @@ -1,12 +1,16 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true true + + + diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj index 6ffc70073433b8..bb10223118146c 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -13,4 +14,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj index 7bbd535f36ab0f..1bc83e66b5ce5c 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true @@ -12,4 +13,11 @@ + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj index 0a40aca7a50947..2a1759b0d0c659 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -10,4 +11,10 @@ + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj index 779f84028323ef..980c31e3b203b6 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj @@ -1,7 +1,8 @@ - netstandard2.0;$(DefaultNetCoreTargetFramework) + netstandard2.0;$(DefaultNetCoreTargetFramework);net461;$(NetFrameworkCurrent) + true true @@ -10,4 +11,8 @@ + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj index 0a40aca7a50947..7debc9c3c30e37 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -10,4 +11,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj index 798c6584af88c1..9c7df603e5197d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -13,4 +14,8 @@ + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj index bcf7dc105d4de4..88f10cc47d332d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -12,4 +13,8 @@ + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj index f26210a6e991bb..d313804efd7d80 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true true true @@ -21,4 +22,10 @@ + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj index 654d0f9f53be65..5df32c91033784 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -25,5 +26,8 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj index 33d909eeb98384..9260eb9ec9d09d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -20,4 +21,12 @@ + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj index 4a83026e0d99fe..0c4d78a16ea3a7 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -10,4 +11,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj index 17654fa1889d07..0d3119d83d6b5e 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true $(DefineConstants);ActivatorUtilities_In_DependencyInjection true enable @@ -18,4 +19,10 @@ Link="Common\src\Extensions\ActivatorUtilities\ObjectFactory.cs" /> + + + + + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj index c165dfa6e216ef..8c16ef3ce824e5 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj @@ -2,7 +2,8 @@ Microsoft.Extensions.FileProviders - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -16,4 +17,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj index b9d2299128c3cb..898fe2fbd58c3e 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj @@ -2,7 +2,8 @@ Microsoft.Extensions.FileProviders - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -11,4 +12,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj index 865c7a92183e88..31312157917893 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj @@ -2,7 +2,8 @@ Microsoft.Extensions.FileProviders - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true true true @@ -20,4 +21,11 @@ + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj index 4bb4e62e3d3337..ab4b23464b4d31 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -10,4 +11,10 @@ Link="Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs" /> + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj index 04ca6e349f2e2c..3de7d53d9c9e11 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true Microsoft.Extensions.Hosting true @@ -15,9 +16,13 @@ - + + + + + diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj index 86257a71d216da..f165a9170f77c6 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0;netstandard2.1 + $(NetCoreAppCurrent);netstandard2.0;netstandard2.1;net461;$(NetFrameworkCurrent) + true true @@ -40,9 +41,15 @@ - + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj index 5fb5c618016baa..ad80df0b6bcb53 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -21,4 +22,11 @@ + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj index 5896926dec8de1..1462166794f388 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -14,4 +15,9 @@ Link="Common\src\Extensions\Logging\NullScope.cs" /> + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index d45b23a82569a9..31d6673acd765f 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -26,4 +27,8 @@ + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index 0096f071166004..cfdcaecc6472b5 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -28,4 +29,11 @@ + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj index 048869e72d2f4e..d1d2c4274e5b2f 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) true @@ -22,4 +22,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj index 159cbede9d372e..fca2aa1bcf1a92 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj @@ -2,6 +2,7 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent);net461;netstandard2.0;netstandard2.1 + true true diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj index ac39c247584386..d55f53f867f642 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true true true @@ -30,8 +31,13 @@ - + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj index cfdb67e93d308e..ca883dd4c7dd0c 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -18,4 +19,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj index 6c22af6efd167a..5d4787254c6b8b 100644 --- a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -29,7 +30,7 @@ - + @@ -37,4 +38,11 @@ + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj index 9feb20a52838a4..3d9e3c322e9697 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -18,4 +19,8 @@ + + + + diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj index 8dadd0c88af192..9adaadcc69d57e 100644 --- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -20,4 +21,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj index fcc42385829ffe..eda46678ac443f 100644 --- a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true true @@ -19,8 +20,13 @@ - + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj index b5de2b4e6f39d4..bd8c31c27a1398 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -1,6 +1,7 @@ - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0 + $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461;$(NetFrameworkCurrent) + true true true @@ -19,7 +20,7 @@ - + @@ -30,8 +31,12 @@ - + + + + + diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs b/src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs index 509aaf776a7f14..288b0e773b3172 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs +++ b/src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs @@ -247,7 +247,7 @@ public override int GetHashCode() { #if NETCOREAPP || NETSTANDARD2_1 return string.GetHashCode(AsSpan()); -#elif NETSTANDARD2_0 +#elif (NETSTANDARD2_0 || NETFRAMEWORK) // This GetHashCode is expensive since it allocates on every call. // However this is required to ensure we retain any behavior (such as hash code randomization) that // string.GetHashCode has. diff --git a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj index ddd7a52c3e5f41..501a4f5ad368d3 100644 --- a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj @@ -2,7 +2,8 @@ true enable - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true @@ -50,4 +51,10 @@ + + + + + + diff --git a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj index 8fd1f466627330..1baa75b7d7f547 100644 --- a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj @@ -1,10 +1,11 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true enable - netcoreapp2.0;net461;$(NetFrameworkCurrent) + netcoreapp2.0 true @@ -19,4 +20,7 @@ + + + diff --git a/src/libraries/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj b/src/libraries/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj index eba4cc39e9f90b..8661c2b34181f4 100644 --- a/src/libraries/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj +++ b/src/libraries/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj @@ -1,10 +1,9 @@ - + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - \ No newline at end of file diff --git a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj index af8add8a69fa8f..9e4ed4fab5ccff 100644 --- a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj @@ -1,6 +1,7 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + true enable @@ -15,4 +16,9 @@ + + + + + diff --git a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj index bb01bd45dbb169..5c6b14fbb66e16 100644 --- a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj @@ -1,6 +1,7 @@ - netstandard2.0;$(NetCoreAppCurrent) + netstandard2.0;$(NetCoreAppCurrent);net461;$(NetFrameworkCurrent) + true enable @@ -17,7 +18,7 @@ - + @@ -28,4 +29,9 @@ + + + + + diff --git a/src/libraries/System.Private.CoreLib/src/System/Index.cs b/src/libraries/System.Private.CoreLib/src/System/Index.cs index 9e47365ab77580..bb03c56c40ac5a 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Index.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Index.cs @@ -139,7 +139,7 @@ public override string ToString() private string ToStringFromEnd() { -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) Span span = stackalloc char[11]; // 1 for ^ and 10 for longest possible uint value bool formatted = ((uint)Value).TryFormat(span.Slice(1), out int charsWritten); Debug.Assert(formatted); diff --git a/src/libraries/System.Private.CoreLib/src/System/Range.cs b/src/libraries/System.Private.CoreLib/src/System/Range.cs index 75b2712b3a165b..0d6996da35c912 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Range.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Range.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; -#if NETSTANDARD2_0 +#if NETSTANDARD2_0 || NETFRAMEWORK using System.Numerics.Hashing; #endif @@ -50,7 +50,7 @@ value is Range r && /// Returns the hash code for this instance. public override int GetHashCode() { -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) return HashCode.Combine(Start.GetHashCode(), End.GetHashCode()); #else return HashHelpers.Combine(Start.GetHashCode(), End.GetHashCode()); @@ -60,7 +60,7 @@ public override int GetHashCode() /// Converts the value of the current Range object to its equivalent string representation. public override string ToString() { -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) Span span = stackalloc char[2 + (2 * 11)]; // 2 for "..", then for each index 1 for '^' and 10 for longest possible uint int pos = 0; diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/Rune.cs b/src/libraries/System.Private.CoreLib/src/System/Text/Rune.cs index c4b3d6733fc6d6..f7dfd4c2c595d6 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/Rune.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/Rune.cs @@ -1169,7 +1169,7 @@ public static UnicodeCategory GetUnicodeCategory(Rune value) private static UnicodeCategory GetUnicodeCategoryNonAscii(Rune value) { Debug.Assert(!value.IsAscii, "Shouldn't use this non-optimized code path for ASCII characters."); -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) return CharUnicodeInfo.GetUnicodeCategory(value.Value); #else if (value.IsBmp) diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.cs b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.cs index 7b6e0ff496429a..2ecb58c3782b28 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.cs @@ -24,7 +24,7 @@ internal static partial class Utf8Utility /// /// The UTF-8 representation of . /// -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) private static ReadOnlySpan ReplacementCharSequence => new byte[] { 0xEF, 0xBF, 0xBD }; #else private static readonly byte[] ReplacementCharSequence = new byte[] { 0xEF, 0xBF, 0xBD }; @@ -89,7 +89,7 @@ public static Utf8String ValidateAndFixupUtf8String(Utf8String value) // (The faster implementation is in the dev/utf8string_bak branch currently.) MemoryStream memStream = new MemoryStream(); -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) memStream.Write(valueAsBytes.Slice(0, idxOfFirstInvalidData)); valueAsBytes = valueAsBytes.Slice(idxOfFirstInvalidData); diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/Utf8Span.Comparison.cs b/src/libraries/System.Private.CoreLib/src/System/Text/Utf8Span.Comparison.cs index ab24c9dc06e31d..ed42f474ee8a46 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/Utf8Span.Comparison.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/Utf8Span.Comparison.cs @@ -67,7 +67,7 @@ public bool Contains(Rune value, StringComparison comparison) { // TODO_UTF8STRING: Optimize me to avoid allocations. -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) return this.ToString().Contains(value.ToString(), comparison); #else return this.ToString().IndexOf(value.ToString(), comparison) >= 0; @@ -91,7 +91,7 @@ public bool Contains(Utf8Span value, StringComparison comparison) { // TODO_UTF8STRING: Optimize me to avoid allocations. -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) return this.ToString().Contains(value.ToString(), comparison); #else return this.ToString().IndexOf(value.ToString(), comparison) >= 0; diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/Utf8Span.cs b/src/libraries/System.Private.CoreLib/src/System/Text/Utf8Span.cs index f0019e99480a63..83beddeff2e362 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/Utf8Span.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/Utf8Span.cs @@ -230,7 +230,7 @@ public override string ToString() // TODO_UTF8STRING: Since we know the underlying data is immutable, well-formed UTF-8, // we can perform transcoding using an optimized code path that skips all safety checks. -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) return Encoding.UTF8.GetString(Bytes); #else if (IsEmpty) @@ -273,7 +273,7 @@ internal unsafe string ToStringNoReplacement() int utf16CharCount = Length + utf16CodeUnitCountAdjustment; Debug.Assert(utf16CharCount <= Length && utf16CharCount >= 0); -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) // TODO_UTF8STRING: Can we call string.FastAllocate directly? return string.Create(utf16CharCount, (pbData: (IntPtr)pData, cbData: Length), (chars, state) => { diff --git a/src/libraries/System.Private.CoreLib/src/System/Utf8String.Comparison.cs b/src/libraries/System.Private.CoreLib/src/System/Utf8String.Comparison.cs index 09e2697e711b43..df4f9fb32a0be2 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Utf8String.Comparison.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Utf8String.Comparison.cs @@ -189,7 +189,7 @@ public bool Contains(Rune value, StringComparison comparison) { // TODO_UTF8STRING: Optimize me to avoid allocations. -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) return ToString().Contains(value.ToString(), comparison); #else return ToString().IndexOf(value.ToString(), comparison) >= 0; @@ -223,7 +223,7 @@ public bool Contains(Utf8String value, StringComparison comparison) // TODO_UTF8STRING: Optimize me to avoid allocations. -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) return ToString().Contains(value.ToString(), comparison); #else return ToString().IndexOf(value.ToString(), comparison) >= 0; diff --git a/src/libraries/System.Private.CoreLib/src/System/Utf8String.Construction.cs b/src/libraries/System.Private.CoreLib/src/System/Utf8String.Construction.cs index 2d6f329161ab74..7508458d73bada 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Utf8String.Construction.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Utf8String.Construction.cs @@ -352,7 +352,7 @@ internal static Utf8String CreateFromRune(Rune value) } #endif // !SYSTEM_PRIVATE_CORELIB -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) /// /// Creates a new instance, allowing the provided delegate to populate the /// instance data of the returned object. diff --git a/src/libraries/System.Private.CoreLib/src/System/Utf8String.cs b/src/libraries/System.Private.CoreLib/src/System/Utf8String.cs index aba4a5d548f0c5..30b4cbd93dc6d6 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Utf8String.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Utf8String.cs @@ -259,7 +259,7 @@ public override string ToString() { // TODO_UTF8STRING: Optimize the call below, potentially by avoiding the two-pass. -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) return Encoding.UTF8.GetString(this.AsBytesSkipNullCheck()); #else if (Length == 0) diff --git a/src/libraries/System.Utf8String.Experimental/pkg/System.Utf8String.Experimental.pkgproj b/src/libraries/System.Utf8String.Experimental/pkg/System.Utf8String.Experimental.pkgproj index 1577c85ef1902f..5de0422cf63b37 100644 --- a/src/libraries/System.Utf8String.Experimental/pkg/System.Utf8String.Experimental.pkgproj +++ b/src/libraries/System.Utf8String.Experimental/pkg/System.Utf8String.Experimental.pkgproj @@ -2,10 +2,9 @@ - + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - diff --git a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.Forwards.cs b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.Forwards.cs index 04a0cc861ba1f3..eba8f2669482f7 100644 --- a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.Forwards.cs +++ b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.Forwards.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Index))] [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Range))] diff --git a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.cs b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.cs index b37545e6f47a5e..d964a59bd4e661 100644 --- a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.cs +++ b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.cs @@ -90,12 +90,12 @@ public Utf8String(string value) { } public bool Contains(System.Text.Rune value, System.StringComparison comparison) { throw null; } public bool Contains(System.Utf8String value) { throw null; } public bool Contains(System.Utf8String value, System.StringComparison comparison) { throw null; } -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) public static System.Utf8String Create(int length, TState state, System.Buffers.SpanAction action) { throw null; } #endif public static System.Utf8String CreateFromRelaxed(System.ReadOnlySpan buffer) { throw null; } public static System.Utf8String CreateFromRelaxed(System.ReadOnlySpan buffer) { throw null; } -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) public static System.Utf8String CreateRelaxed(int length, TState state, System.Buffers.SpanAction action) { throw null; } #endif public bool EndsWith(char value) { throw null; } @@ -168,7 +168,7 @@ public Utf8String(string value) { } public bool TryFindLast(System.Utf8String value, out System.Range range) { throw null; } public bool TryFindLast(System.Utf8String value, System.StringComparison comparisonType, out System.Range range) { throw null; } public static System.Utf8String UnsafeCreateWithoutValidation(System.ReadOnlySpan utf8Contents) { throw null; } -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) public static System.Utf8String UnsafeCreateWithoutValidation(int length, TState state, System.Buffers.SpanAction action) { throw null; } #endif public readonly partial struct ByteEnumerable : System.Collections.Generic.IEnumerable diff --git a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj index 4ef79b71fc4671..3c2135e3797a50 100644 --- a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj +++ b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj @@ -3,14 +3,15 @@ true $(NoWarn);0809;0618 - netstandard2.0;netstandard2.1;netcoreapp3.0;$(NetCoreAppCurrent) + netstandard2.0;netstandard2.1;netcoreapp3.0;$(NetCoreAppCurrent);net461;$(NetFrameworkCurrent) + true enable - + @@ -20,7 +21,7 @@ - + @@ -36,4 +37,12 @@ + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj index 5b84d79c116d26..efe0b6194f9d37 100644 --- a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj +++ b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj @@ -1,7 +1,8 @@ true - $(NetCoreAppCurrent);netstandard2.0;netstandard2.1;netcoreapp3.0 + $(NetCoreAppCurrent);netstandard2.0;netstandard2.1;netcoreapp3.0;net461;$(NetFrameworkCurrent) + true enable $(DefineContants);FEATURE_UTF8STRING @@ -10,13 +11,13 @@ $(NoWarn);CS3019;CS0162 - true + true - + - + @@ -142,4 +143,12 @@ + + + + + + + + diff --git a/src/libraries/System.Utf8String.Experimental/src/System/IO/Utf8StringStream.cs b/src/libraries/System.Utf8String.Experimental/src/System/IO/Utf8StringStream.cs index 02e854d474726f..d448a7cc1b9091 100644 --- a/src/libraries/System.Utf8String.Experimental/src/System/IO/Utf8StringStream.cs +++ b/src/libraries/System.Utf8String.Experimental/src/System/IO/Utf8StringStream.cs @@ -57,7 +57,7 @@ public override int Read(byte[] buffer, int offset, int count) } public -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) override #endif int Read(Span buffer) @@ -79,7 +79,7 @@ public override Task ReadAsync(byte[] buffer, int offset, int count, Cancel return Task.FromResult(Read(new Span(buffer, offset, count))); } -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) { return new ValueTask(Read(buffer.Span)); @@ -127,13 +127,13 @@ public override long Seek(long offset, SeekOrigin origin) public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException(); -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) public override void Write(ReadOnlySpan buffer) => throw new NotSupportedException(); #endif public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) => throw new NotSupportedException(); -#if !NETSTANDARD2_0 +#if (!NETSTANDARD2_0 && !NETFRAMEWORK) public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default) => throw new NotSupportedException(); #endif public override void WriteByte(byte value) => throw new NotSupportedException(); diff --git a/src/libraries/System.Utf8String.Experimental/src/System/Net/Http/Utf8StringContent.cs b/src/libraries/System.Utf8String.Experimental/src/System/Net/Http/Utf8StringContent.cs index 3efd25fa24023b..f5fc6a1f843b4c 100644 --- a/src/libraries/System.Utf8String.Experimental/src/System/Net/Http/Utf8StringContent.cs +++ b/src/libraries/System.Utf8String.Experimental/src/System/Net/Http/Utf8StringContent.cs @@ -41,7 +41,7 @@ public Utf8StringContent(Utf8String content, string? mediaType) protected override Task CreateContentReadStreamAsync() => Task.FromResult(new Utf8StringStream(_content)); -#if NETSTANDARD2_0 +#if (NETSTANDARD2_0 || NETFRAMEWORK) protected override async Task SerializeToStreamAsync(Stream stream, TransportContext? context) { ReadOnlyMemory buffer = _content.AsMemoryBytes(); diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index ea3cb98e3a7d9a..26383a0767bf72 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -180,7 +180,7 @@ "$(TestDotNetPath)" $(TestRestoreCommand) restore $(TestRestoreCommand) --packages "$(TestPackageDir)" - $(TestRestoreCommand) /p:LocalPackagesPath=$(PackageOutputPath) + $(TestRestoreCommand) /p:LocalPackagesPath=$(ArtifactsPackagesDir) $(TestRestoreCommand) /nr:false $(TestRestoreCommand) /warnaserror $(TestRestoreCommand) /p:TestPackages=$(TestPackages) From 2a95558efb831dc548051f02423e0be21901ff3c Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Fri, 10 Jul 2020 16:19:27 -0700 Subject: [PATCH 3/9] Making sure net461 configurations build against targeting pack assembly versions --- ...icrosoft.Extensions.DependencyModel.csproj | 4 ++ ...t.Extensions.FileProviders.Physical.csproj | 5 ++ .../src/Microsoft.Extensions.Hosting.csproj | 4 ++ .../src/Microsoft.Extensions.Http.csproj | 4 ++ ...icrosoft.Extensions.Logging.Console.csproj | 4 ++ .../ref/System.Net.Http.Json.csproj | 4 ++ .../src/System.Net.Http.Json.csproj | 4 ++ .../ref/System.Net.Http.WinHttpHandler.csproj | 12 +++- .../src/System.Net.Http.WinHttpHandler.csproj | 3 + .../frameworkSettings/net/settings.targets | 70 ++++++++++++++++++- src/libraries/pkg/test/packageTest.targets | 2 +- 11 files changed, 112 insertions(+), 4 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj index a164401909d9c2..0ac0a1727abcfa 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj @@ -4,6 +4,10 @@ true true + + + $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) + true + + + $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) + + diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj index f165a9170f77c6..68f31623add69b 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -5,6 +5,10 @@ true true + + + $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) + diff --git a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj index ad80df0b6bcb53..47eeebc131c9fd 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj @@ -5,6 +5,10 @@ true true + + + $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) + true true + + + $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) + diff --git a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj index 9e4ed4fab5ccff..e8d828b57704af 100644 --- a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj @@ -4,6 +4,10 @@ true enable + + + $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) + diff --git a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj index 5c6b14fbb66e16..3440bd8ce2ef3b 100644 --- a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj @@ -4,6 +4,10 @@ true enable + + + $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) + diff --git a/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj index 8eb4ef7cd0edf8..69bfc2c5a79bc5 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj @@ -1,9 +1,19 @@ - netstandard2.0 + netstandard2.0;net461;$(NetFrameworkCurrent) + true enable + + + $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj index b302859635ba4a..8c06bc26a682f8 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj @@ -11,6 +11,8 @@ SR.PlatformNotSupported_WinHttpHandler + + $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) + diff --git a/src/libraries/pkg/test/frameworkSettings/net/settings.targets b/src/libraries/pkg/test/frameworkSettings/net/settings.targets index 7c3d7c543e835a..e4e8ff23d6855f 100644 --- a/src/libraries/pkg/test/frameworkSettings/net/settings.targets +++ b/src/libraries/pkg/test/frameworkSettings/net/settings.targets @@ -1,8 +1,8 @@ - - + true true + true @@ -16,6 +16,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/pkg/test/packageTest.targets b/src/libraries/pkg/test/packageTest.targets index 78c086a3f20ce4..4aa0b3ee83d30e 100644 --- a/src/libraries/pkg/test/packageTest.targets +++ b/src/libraries/pkg/test/packageTest.targets @@ -69,7 +69,7 @@ + Condition="'$(ShouldVerifyClosure)' == 'true' and '$(RuntimeIdentifier)' != '' and '$(SkipVerifyClosureForRuntime)' != 'true'"> <_runClosureFileNames Include="@(ReferenceCopyLocalPaths->'%(FileName)')"> %(Identity) From 93e85012e9f4dca94c2f5486823675ed31383f12 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Fri, 10 Jul 2020 16:43:45 -0700 Subject: [PATCH 4/9] Undo changes to add netfx configurations on reference projects that don't ship in their package --- .../ref/System.Collections.Immutable.cs | 4 ++-- .../ref/System.Collections.Immutable.csproj | 11 ++--------- .../ref/System.IO.Pipelines.csproj | 13 ++----------- .../ref/System.Net.Http.Json.csproj | 12 +----------- ...System.Net.WebSockets.WebSocketProtocol.csproj | 7 +------ .../ref/System.Numerics.Tensors.csproj | 7 +------ .../ref/System.Reflection.Metadata.csproj | 7 +------ .../System.Reflection.MetadataLoadContext.csproj | 6 +----- .../ref/System.Resources.Extensions.csproj | 6 +----- .../ref/System.Threading.Channels.csproj | 12 +++--------- .../System.Utf8String.Experimental.Forwards.cs | 2 +- .../ref/System.Utf8String.Experimental.cs | 6 +++--- .../ref/System.Utf8String.Experimental.csproj | 15 +++------------ 13 files changed, 22 insertions(+), 86 deletions(-) diff --git a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs index bd650bdc3235ed..403bbf8aff654e 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs @@ -413,7 +413,7 @@ public static partial class ImmutableHashSet public static System.Collections.Immutable.ImmutableHashSet ToImmutableHashSet(this System.Collections.Immutable.ImmutableHashSet.Builder builder) { throw null; } } - #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 && !NETFRAMEWORK + #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 public sealed partial class ImmutableHashSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.ISet, System.Collections.Generic.IReadOnlySet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.Immutable.IImmutableSet #else public sealed partial class ImmutableHashSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.ISet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.Immutable.IImmutableSet @@ -916,7 +916,7 @@ public static partial class ImmutableSortedSet public static System.Collections.Immutable.ImmutableSortedSet ToImmutableSortedSet(this System.Collections.Immutable.ImmutableSortedSet.Builder builder) { throw null; } } - #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 && !NETFRAMEWORK + #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 public sealed partial class ImmutableSortedSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.Generic.ISet, System.Collections.Generic.IReadOnlySet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Collections.Immutable.IImmutableSet #else public sealed partial class ImmutableSortedSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.Generic.ISet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Collections.Immutable.IImmutableSet diff --git a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj index 258824eb36b981..48e1f0bde560bd 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj @@ -1,7 +1,6 @@ - $(NetCoreAppCurrent);netstandard1.0;netstandard1.3;netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard1.0;netstandard1.3;netstandard2.0 true enable @@ -22,13 +21,7 @@ - + - - - - - - \ No newline at end of file diff --git a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj index 1baa75b7d7f547..2af41b5283fb69 100644 --- a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj @@ -1,26 +1,17 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0 enable - netcoreapp2.0 - true + netcoreapp2.0 - - - - - - - diff --git a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj index e8d828b57704af..af8add8a69fa8f 100644 --- a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj @@ -1,13 +1,8 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0 enable - - - $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) - @@ -20,9 +15,4 @@ - - - - - diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj index b7d413efb087c2..4c1d519edd7c3c 100644 --- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj +++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj @@ -1,7 +1,6 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0 enable @@ -10,8 +9,4 @@ - - - - \ No newline at end of file diff --git a/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj b/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj index f11f751bc7a35d..3bffad18351b10 100644 --- a/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj +++ b/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj @@ -1,7 +1,6 @@ - netstandard2.0;netstandard1.1;net461;$(NetFrameworkCurrent) - true + netstandard2.0;netstandard1.1 enable @@ -20,8 +19,4 @@ - - - - \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj index 84d845b9f4062e..33546830d98fc0 100644 --- a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj @@ -2,8 +2,7 @@ true false - $(NetCoreAppCurrent);netstandard1.1;netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard1.1;netstandard2.0 true enable @@ -24,8 +23,4 @@ - - - - \ No newline at end of file diff --git a/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj index 76edfff97ad828..aceadd0d97dda0 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj @@ -1,13 +1,9 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0 enable - - - \ No newline at end of file diff --git a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj index 9f3eb7697db0cf..7b32ba82d118b4 100644 --- a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj +++ b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj @@ -1,14 +1,10 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0 - - - \ No newline at end of file diff --git a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj index 81300fb3e914f2..4aace39265e88b 100644 --- a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj @@ -1,17 +1,16 @@ - $(NetCoreAppCurrent);netcoreapp3.0;netstandard1.3;netstandard2.0;netstandard2.1;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netcoreapp3.0;netstandard1.3;netstandard2.0;netstandard2.1 true enable - + - + @@ -24,9 +23,4 @@ - - - - - \ No newline at end of file diff --git a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.Forwards.cs b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.Forwards.cs index eba8f2669482f7..04a0cc861ba1f3 100644 --- a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.Forwards.cs +++ b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.Forwards.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#if (!NETSTANDARD2_0 && !NETFRAMEWORK) +#if !NETSTANDARD2_0 [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Index))] [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Range))] diff --git a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.cs b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.cs index d964a59bd4e661..b37545e6f47a5e 100644 --- a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.cs +++ b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.cs @@ -90,12 +90,12 @@ public Utf8String(string value) { } public bool Contains(System.Text.Rune value, System.StringComparison comparison) { throw null; } public bool Contains(System.Utf8String value) { throw null; } public bool Contains(System.Utf8String value, System.StringComparison comparison) { throw null; } -#if (!NETSTANDARD2_0 && !NETFRAMEWORK) +#if !NETSTANDARD2_0 public static System.Utf8String Create(int length, TState state, System.Buffers.SpanAction action) { throw null; } #endif public static System.Utf8String CreateFromRelaxed(System.ReadOnlySpan buffer) { throw null; } public static System.Utf8String CreateFromRelaxed(System.ReadOnlySpan buffer) { throw null; } -#if (!NETSTANDARD2_0 && !NETFRAMEWORK) +#if !NETSTANDARD2_0 public static System.Utf8String CreateRelaxed(int length, TState state, System.Buffers.SpanAction action) { throw null; } #endif public bool EndsWith(char value) { throw null; } @@ -168,7 +168,7 @@ public Utf8String(string value) { } public bool TryFindLast(System.Utf8String value, out System.Range range) { throw null; } public bool TryFindLast(System.Utf8String value, System.StringComparison comparisonType, out System.Range range) { throw null; } public static System.Utf8String UnsafeCreateWithoutValidation(System.ReadOnlySpan utf8Contents) { throw null; } -#if (!NETSTANDARD2_0 && !NETFRAMEWORK) +#if !NETSTANDARD2_0 public static System.Utf8String UnsafeCreateWithoutValidation(int length, TState state, System.Buffers.SpanAction action) { throw null; } #endif public readonly partial struct ByteEnumerable : System.Collections.Generic.IEnumerable diff --git a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj index 3c2135e3797a50..4ef79b71fc4671 100644 --- a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj +++ b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj @@ -3,15 +3,14 @@ true $(NoWarn);0809;0618 - netstandard2.0;netstandard2.1;netcoreapp3.0;$(NetCoreAppCurrent);net461;$(NetFrameworkCurrent) - true + netstandard2.0;netstandard2.1;netcoreapp3.0;$(NetCoreAppCurrent) enable - + @@ -21,7 +20,7 @@ - + @@ -37,12 +36,4 @@ - - - - - - - - \ No newline at end of file From 30c751e20c712352c0db31ccbe7f784f384a8fed Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Sat, 11 Jul 2020 00:36:01 -0700 Subject: [PATCH 5/9] Fix issue with M.E.FP.P package by removing NetStandard.Library metapackage dependency --- .../pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj index 6a3148e369e6e3..3f1099b5760144 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj @@ -4,6 +4,12 @@ net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + \ No newline at end of file From 08658de5ee641fb695d4ef960ef570fd31ec8788 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Sat, 11 Jul 2020 17:14:09 -0700 Subject: [PATCH 6/9] Fix issues with depending on higher version than the one available in net461 --- .../src/Microsoft.Extensions.DependencyModel.csproj | 3 ++- .../pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj | 6 ------ .../src/Microsoft.Extensions.FileProviders.Physical.csproj | 5 ++++- .../src/Microsoft.Extensions.Hosting.csproj | 3 ++- .../src/Microsoft.Extensions.Logging.Console.csproj | 3 ++- src/libraries/pkg/baseline/packageIndex.json | 3 +-- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj index 0ac0a1727abcfa..b6794fc1c8e84b 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj @@ -22,7 +22,8 @@ - + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj index 3f1099b5760144..6a3148e369e6e3 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj @@ -4,12 +4,6 @@ net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - - - \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj index 6d94880b9b5929..ccddfffc84a0fc 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj @@ -30,7 +30,10 @@ - + + diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj index 68f31623add69b..d384aae9cc35d7 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -53,7 +53,8 @@ - + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index cb3e6cdbe5880f..394095904715eb 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -37,7 +37,8 @@ - + + diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json index e14e5f878d3207..1446eaab32977a 100644 --- a/src/libraries/pkg/baseline/packageIndex.json +++ b/src/libraries/pkg/baseline/packageIndex.json @@ -5560,12 +5560,11 @@ "4.3.0", "4.3.1" ], - "BaselineVersion": "4.3.0", + "BaselineVersion": "4.3.1", "InboxOn": { "netcoreapp2.0": "4.3.0.0", "netcoreapp2.1": "4.3.1.0", "net5.0": "5.0.0.0", - "net461": "4.2.0.0", "netstandard2.0": "4.2.0.0", "monoandroid10": "Any", "monotouch10": "Any", From 41e0208e68f92ae8cdcaef87bdec7c61e3404bbb Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Mon, 13 Jul 2020 12:13:48 -0700 Subject: [PATCH 7/9] Disable UTF8String verifyClosure on package --- .../net/DisableVerifyClosure.targets | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/libraries/pkg/test/packageSettings/System.Utf8String.Experimental/net/DisableVerifyClosure.targets diff --git a/src/libraries/pkg/test/packageSettings/System.Utf8String.Experimental/net/DisableVerifyClosure.targets b/src/libraries/pkg/test/packageSettings/System.Utf8String.Experimental/net/DisableVerifyClosure.targets new file mode 100644 index 00000000000000..a5776c43914482 --- /dev/null +++ b/src/libraries/pkg/test/packageSettings/System.Utf8String.Experimental/net/DisableVerifyClosure.targets @@ -0,0 +1,7 @@ + + + + false + + \ No newline at end of file From 4bb19f870ae508fd36ff0533fc7f05d55c1714d4 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Tue, 14 Jul 2020 13:00:11 -0700 Subject: [PATCH 8/9] Undo changes to Microsoft.XmlSerializer.Generator --- .../src/Microsoft.XmlSerializer.Generator.csproj | 8 +------- .../net/disableNetstandardTest.targets | 7 +++++++ 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 src/libraries/pkg/test/packageSettings/Microsoft.XmlSerializer.Generator/net/disableNetstandardTest.targets diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj b/src/libraries/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj index 146a82abf3d02c..a560c12aaf67cb 100644 --- a/src/libraries/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj +++ b/src/libraries/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj @@ -5,16 +5,10 @@ ..\..\System.Private.Xml\src\Resources\Strings.resx FxResources.$(AssemblyName.Replace('-', '_')).SR Exe - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0 - - - - - \ No newline at end of file diff --git a/src/libraries/pkg/test/packageSettings/Microsoft.XmlSerializer.Generator/net/disableNetstandardTest.targets b/src/libraries/pkg/test/packageSettings/Microsoft.XmlSerializer.Generator/net/disableNetstandardTest.targets new file mode 100644 index 00000000000000..8b493f6d4b60ab --- /dev/null +++ b/src/libraries/pkg/test/packageSettings/Microsoft.XmlSerializer.Generator/net/disableNetstandardTest.targets @@ -0,0 +1,7 @@ + + + + true + false + + \ No newline at end of file From 1124b48ac7a3aa1d825d9d38e05408a018122b4a Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Tue, 14 Jul 2020 20:40:01 -0700 Subject: [PATCH 9/9] Update src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj Co-authored-by: Eric StJohn --- .../src/Microsoft.Extensions.FileProviders.Physical.csproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj index ccddfffc84a0fc..ba390655fe156c 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj @@ -30,9 +30,7 @@ - +