From 97747ea42077dbc62402f53e3ff9cb0319409412 Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Wed, 11 Mar 2020 11:23:14 -0700
Subject: [PATCH 01/12] Correct conflict resolution on Primitives

- No changes in Extensions repo since first commit history move
- So should remain unchanged as is on runtime repo:
---
 .../Microsoft.Extensions.Primitives.csproj    |   9 +-
 ...rosoft.Extensions.Primitives.netcoreapp.cs | 203 ------------------
 ...ft.Extensions.Primitives.netstandard2.0.cs | 203 ------------------
 .../Microsoft.Extensions.Primitives.csproj    |  46 ++--
 .../src/Resources.resx                        | 135 ------------
 .../src/StringSegmentComparer.cs              |   2 +-
 .../src/StringValues.cs                       |   1 -
 ...crosoft.Extensions.Primitives.Tests.csproj |  13 ++
 8 files changed, 46 insertions(+), 566 deletions(-)
 delete mode 100644 src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.netcoreapp.cs
 delete mode 100644 src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.netstandard2.0.cs
 delete mode 100644 src/libraries/Microsoft.Extensions.Primitives/src/Resources.resx

diff --git a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj
index bc59b799f6593c..a96a2cac069ce3 100644
--- a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj
+++ b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj
@@ -1,14 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Primitives.netstandard2.0.cs" />
     <Reference Include="System.Memory"  />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Primitives.netcoreapp.cs" />
-    
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Primitives.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.netcoreapp.cs
deleted file mode 100644
index c2397dd21b4e81..00000000000000
--- a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.netcoreapp.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Primitives
-{
-    public partial class CancellationChangeToken : Microsoft.Extensions.Primitives.IChangeToken
-    {
-        public CancellationChangeToken(System.Threading.CancellationToken cancellationToken) { }
-        public bool ActiveChangeCallbacks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public bool HasChanged { get { throw null; } }
-        public System.IDisposable RegisterChangeCallback(System.Action<object> callback, object state) { throw null; }
-    }
-    public static partial class ChangeToken
-    {
-        public static System.IDisposable OnChange(System.Func<Microsoft.Extensions.Primitives.IChangeToken> changeTokenProducer, System.Action changeTokenConsumer) { throw null; }
-        public static System.IDisposable OnChange<TState>(System.Func<Microsoft.Extensions.Primitives.IChangeToken> changeTokenProducer, System.Action<TState> changeTokenConsumer, TState state) { throw null; }
-    }
-    public partial class CompositeChangeToken : Microsoft.Extensions.Primitives.IChangeToken
-    {
-        public CompositeChangeToken(System.Collections.Generic.IReadOnlyList<Microsoft.Extensions.Primitives.IChangeToken> changeTokens) { }
-        public bool ActiveChangeCallbacks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public System.Collections.Generic.IReadOnlyList<Microsoft.Extensions.Primitives.IChangeToken> ChangeTokens { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public bool HasChanged { get { throw null; } }
-        public System.IDisposable RegisterChangeCallback(System.Action<object> callback, object state) { throw null; }
-    }
-    public static partial class Extensions
-    {
-        public static System.Text.StringBuilder Append(this System.Text.StringBuilder builder, Microsoft.Extensions.Primitives.StringSegment segment) { throw null; }
-    }
-    public partial interface IChangeToken
-    {
-        bool ActiveChangeCallbacks { get; }
-        bool HasChanged { get; }
-        System.IDisposable RegisterChangeCallback(System.Action<object> callback, object state);
-    }
-    [System.Diagnostics.DebuggerDisplayAttribute("Value = {_value}")]
-    [System.ObsoleteAttribute("This type is obsolete and will be removed in a future version.")]
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public partial struct InplaceStringBuilder
-    {
-        private object _dummy;
-        private int _dummyPrimitive;
-        public InplaceStringBuilder(int capacity) { throw null; }
-        public int Capacity { get { throw null; } set { } }
-        public void Append(Microsoft.Extensions.Primitives.StringSegment segment) { }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Append(char c) { }
-        public void Append(string value) { }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Append(string value, int offset, int count) { }
-        public override string ToString() { throw null; }
-    }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct StringSegment : System.IEquatable<Microsoft.Extensions.Primitives.StringSegment>, System.IEquatable<string>
-    {
-        private readonly object _dummy;
-        private readonly int _dummyPrimitive;
-        public static readonly Microsoft.Extensions.Primitives.StringSegment Empty;
-        public StringSegment(string buffer) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public StringSegment(string buffer, int offset, int length) { throw null; }
-        public string Buffer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public bool HasValue { get { throw null; } }
-        public char this[int index] { get { throw null; } }
-        public int Length { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public int Offset { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Value { get { throw null; } }
-        public System.ReadOnlyMemory<char> AsMemory() { throw null; }
-        public System.ReadOnlySpan<char> AsSpan() { throw null; }
-        public static int Compare(Microsoft.Extensions.Primitives.StringSegment a, Microsoft.Extensions.Primitives.StringSegment b, System.StringComparison comparisonType) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public bool EndsWith(string text, System.StringComparison comparisonType) { throw null; }
-        public bool Equals(Microsoft.Extensions.Primitives.StringSegment other) { throw null; }
-        public static bool Equals(Microsoft.Extensions.Primitives.StringSegment a, Microsoft.Extensions.Primitives.StringSegment b, System.StringComparison comparisonType) { throw null; }
-        public bool Equals(Microsoft.Extensions.Primitives.StringSegment other, System.StringComparison comparisonType) { throw null; }
-        public override bool Equals(object obj) { throw null; }
-        public bool Equals(string text) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public bool Equals(string text, System.StringComparison comparisonType) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public override int GetHashCode() { throw null; }
-        public int IndexOf(char c) { throw null; }
-        public int IndexOf(char c, int start) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public int IndexOf(char c, int start, int count) { throw null; }
-        public int IndexOfAny(char[] anyOf) { throw null; }
-        public int IndexOfAny(char[] anyOf, int startIndex) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public int IndexOfAny(char[] anyOf, int startIndex, int count) { throw null; }
-        public static bool IsNullOrEmpty(Microsoft.Extensions.Primitives.StringSegment value) { throw null; }
-        public int LastIndexOf(char value) { throw null; }
-        public static bool operator ==(Microsoft.Extensions.Primitives.StringSegment left, Microsoft.Extensions.Primitives.StringSegment right) { throw null; }
-        public static implicit operator System.ReadOnlyMemory<char> (Microsoft.Extensions.Primitives.StringSegment segment) { throw null; }
-        public static implicit operator System.ReadOnlySpan<char> (Microsoft.Extensions.Primitives.StringSegment segment) { throw null; }
-        public static implicit operator Microsoft.Extensions.Primitives.StringSegment (string value) { throw null; }
-        public static bool operator !=(Microsoft.Extensions.Primitives.StringSegment left, Microsoft.Extensions.Primitives.StringSegment right) { throw null; }
-        public Microsoft.Extensions.Primitives.StringTokenizer Split(char[] chars) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public bool StartsWith(string text, System.StringComparison comparisonType) { throw null; }
-        public Microsoft.Extensions.Primitives.StringSegment Subsegment(int offset) { throw null; }
-        public Microsoft.Extensions.Primitives.StringSegment Subsegment(int offset, int length) { throw null; }
-        public string Substring(int offset) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public string Substring(int offset, int length) { throw null; }
-        public override string ToString() { throw null; }
-        public Microsoft.Extensions.Primitives.StringSegment Trim() { throw null; }
-        public Microsoft.Extensions.Primitives.StringSegment TrimEnd() { throw null; }
-        public Microsoft.Extensions.Primitives.StringSegment TrimStart() { throw null; }
-    }
-    public partial class StringSegmentComparer : System.Collections.Generic.IComparer<Microsoft.Extensions.Primitives.StringSegment>, System.Collections.Generic.IEqualityComparer<Microsoft.Extensions.Primitives.StringSegment>
-    {
-        internal StringSegmentComparer() { }
-        public static Microsoft.Extensions.Primitives.StringSegmentComparer Ordinal { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public static Microsoft.Extensions.Primitives.StringSegmentComparer OrdinalIgnoreCase { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public int Compare(Microsoft.Extensions.Primitives.StringSegment x, Microsoft.Extensions.Primitives.StringSegment y) { throw null; }
-        public bool Equals(Microsoft.Extensions.Primitives.StringSegment x, Microsoft.Extensions.Primitives.StringSegment y) { throw null; }
-        public int GetHashCode(Microsoft.Extensions.Primitives.StringSegment obj) { throw null; }
-    }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct StringTokenizer : System.Collections.Generic.IEnumerable<Microsoft.Extensions.Primitives.StringSegment>, System.Collections.IEnumerable
-    {
-        private readonly object _dummy;
-        private readonly int _dummyPrimitive;
-        public StringTokenizer(Microsoft.Extensions.Primitives.StringSegment value, char[] separators) { throw null; }
-        public StringTokenizer(string value, char[] separators) { throw null; }
-        public Microsoft.Extensions.Primitives.StringTokenizer.Enumerator GetEnumerator() { throw null; }
-        System.Collections.Generic.IEnumerator<Microsoft.Extensions.Primitives.StringSegment> System.Collections.Generic.IEnumerable<Microsoft.Extensions.Primitives.StringSegment>.GetEnumerator() { throw null; }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-        [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-        public partial struct Enumerator : System.Collections.Generic.IEnumerator<Microsoft.Extensions.Primitives.StringSegment>, System.Collections.IEnumerator, System.IDisposable
-        {
-            private object _dummy;
-            private int _dummyPrimitive;
-            public Enumerator(ref Microsoft.Extensions.Primitives.StringTokenizer tokenizer) { throw null; }
-            public Microsoft.Extensions.Primitives.StringSegment Current { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-            object System.Collections.IEnumerator.Current { get { throw null; } }
-            public void Dispose() { }
-            public bool MoveNext() { throw null; }
-            public void Reset() { }
-        }
-    }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct StringValues : System.Collections.Generic.ICollection<string>, System.Collections.Generic.IEnumerable<string>, System.Collections.Generic.IList<string>, System.Collections.Generic.IReadOnlyCollection<string>, System.Collections.Generic.IReadOnlyList<string>, System.Collections.IEnumerable, System.IEquatable<Microsoft.Extensions.Primitives.StringValues>, System.IEquatable<string>, System.IEquatable<string[]>
-    {
-        private readonly object _dummy;
-        private readonly int _dummyPrimitive;
-        public static readonly Microsoft.Extensions.Primitives.StringValues Empty;
-        public StringValues(string value) { throw null; }
-        public StringValues(string[] values) { throw null; }
-        public int Count { [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]get { throw null; } }
-        public string this[int index] { [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]get { throw null; } }
-        bool System.Collections.Generic.ICollection<System.String>.IsReadOnly { get { throw null; } }
-        string System.Collections.Generic.IList<System.String>.this[int index] { get { throw null; } set { } }
-        public static Microsoft.Extensions.Primitives.StringValues Concat(Microsoft.Extensions.Primitives.StringValues values1, Microsoft.Extensions.Primitives.StringValues values2) { throw null; }
-        public static Microsoft.Extensions.Primitives.StringValues Concat(in Microsoft.Extensions.Primitives.StringValues values, string value) { throw null; }
-        public static Microsoft.Extensions.Primitives.StringValues Concat(string value, in Microsoft.Extensions.Primitives.StringValues values) { throw null; }
-        public bool Equals(Microsoft.Extensions.Primitives.StringValues other) { throw null; }
-        public static bool Equals(Microsoft.Extensions.Primitives.StringValues left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool Equals(Microsoft.Extensions.Primitives.StringValues left, string right) { throw null; }
-        public static bool Equals(Microsoft.Extensions.Primitives.StringValues left, string[] right) { throw null; }
-        public override bool Equals(object obj) { throw null; }
-        public bool Equals(string other) { throw null; }
-        public static bool Equals(string left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public bool Equals(string[] other) { throw null; }
-        public static bool Equals(string[] left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public Microsoft.Extensions.Primitives.StringValues.Enumerator GetEnumerator() { throw null; }
-        public override int GetHashCode() { throw null; }
-        public static bool IsNullOrEmpty(Microsoft.Extensions.Primitives.StringValues value) { throw null; }
-        public static bool operator ==(Microsoft.Extensions.Primitives.StringValues left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool operator ==(Microsoft.Extensions.Primitives.StringValues left, object right) { throw null; }
-        public static bool operator ==(Microsoft.Extensions.Primitives.StringValues left, string right) { throw null; }
-        public static bool operator ==(Microsoft.Extensions.Primitives.StringValues left, string[] right) { throw null; }
-        public static bool operator ==(object left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool operator ==(string left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool operator ==(string[] left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static implicit operator string (Microsoft.Extensions.Primitives.StringValues values) { throw null; }
-        public static implicit operator string[] (Microsoft.Extensions.Primitives.StringValues value) { throw null; }
-        public static implicit operator Microsoft.Extensions.Primitives.StringValues (string value) { throw null; }
-        public static implicit operator Microsoft.Extensions.Primitives.StringValues (string[] values) { throw null; }
-        public static bool operator !=(Microsoft.Extensions.Primitives.StringValues left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool operator !=(Microsoft.Extensions.Primitives.StringValues left, object right) { throw null; }
-        public static bool operator !=(Microsoft.Extensions.Primitives.StringValues left, string right) { throw null; }
-        public static bool operator !=(Microsoft.Extensions.Primitives.StringValues left, string[] right) { throw null; }
-        public static bool operator !=(object left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool operator !=(string left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool operator !=(string[] left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        void System.Collections.Generic.ICollection<System.String>.Add(string item) { }
-        void System.Collections.Generic.ICollection<System.String>.Clear() { }
-        bool System.Collections.Generic.ICollection<System.String>.Contains(string item) { throw null; }
-        void System.Collections.Generic.ICollection<System.String>.CopyTo(string[] array, int arrayIndex) { }
-        bool System.Collections.Generic.ICollection<System.String>.Remove(string item) { throw null; }
-        System.Collections.Generic.IEnumerator<string> System.Collections.Generic.IEnumerable<System.String>.GetEnumerator() { throw null; }
-        int System.Collections.Generic.IList<System.String>.IndexOf(string item) { throw null; }
-        void System.Collections.Generic.IList<System.String>.Insert(int index, string item) { }
-        void System.Collections.Generic.IList<System.String>.RemoveAt(int index) { }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-        public string[] ToArray() { throw null; }
-        public override string ToString() { throw null; }
-        [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-        public partial struct Enumerator : System.Collections.Generic.IEnumerator<string>, System.Collections.IEnumerator, System.IDisposable
-        {
-            private object _dummy;
-            private int _dummyPrimitive;
-            public Enumerator(ref Microsoft.Extensions.Primitives.StringValues values) { throw null; }
-            public string Current { get { throw null; } }
-            object System.Collections.IEnumerator.Current { get { throw null; } }
-            public void Dispose() { }
-            public bool MoveNext() { throw null; }
-            void System.Collections.IEnumerator.Reset() { }
-        }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.netstandard2.0.cs
deleted file mode 100644
index c2397dd21b4e81..00000000000000
--- a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.netstandard2.0.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Primitives
-{
-    public partial class CancellationChangeToken : Microsoft.Extensions.Primitives.IChangeToken
-    {
-        public CancellationChangeToken(System.Threading.CancellationToken cancellationToken) { }
-        public bool ActiveChangeCallbacks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public bool HasChanged { get { throw null; } }
-        public System.IDisposable RegisterChangeCallback(System.Action<object> callback, object state) { throw null; }
-    }
-    public static partial class ChangeToken
-    {
-        public static System.IDisposable OnChange(System.Func<Microsoft.Extensions.Primitives.IChangeToken> changeTokenProducer, System.Action changeTokenConsumer) { throw null; }
-        public static System.IDisposable OnChange<TState>(System.Func<Microsoft.Extensions.Primitives.IChangeToken> changeTokenProducer, System.Action<TState> changeTokenConsumer, TState state) { throw null; }
-    }
-    public partial class CompositeChangeToken : Microsoft.Extensions.Primitives.IChangeToken
-    {
-        public CompositeChangeToken(System.Collections.Generic.IReadOnlyList<Microsoft.Extensions.Primitives.IChangeToken> changeTokens) { }
-        public bool ActiveChangeCallbacks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public System.Collections.Generic.IReadOnlyList<Microsoft.Extensions.Primitives.IChangeToken> ChangeTokens { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public bool HasChanged { get { throw null; } }
-        public System.IDisposable RegisterChangeCallback(System.Action<object> callback, object state) { throw null; }
-    }
-    public static partial class Extensions
-    {
-        public static System.Text.StringBuilder Append(this System.Text.StringBuilder builder, Microsoft.Extensions.Primitives.StringSegment segment) { throw null; }
-    }
-    public partial interface IChangeToken
-    {
-        bool ActiveChangeCallbacks { get; }
-        bool HasChanged { get; }
-        System.IDisposable RegisterChangeCallback(System.Action<object> callback, object state);
-    }
-    [System.Diagnostics.DebuggerDisplayAttribute("Value = {_value}")]
-    [System.ObsoleteAttribute("This type is obsolete and will be removed in a future version.")]
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public partial struct InplaceStringBuilder
-    {
-        private object _dummy;
-        private int _dummyPrimitive;
-        public InplaceStringBuilder(int capacity) { throw null; }
-        public int Capacity { get { throw null; } set { } }
-        public void Append(Microsoft.Extensions.Primitives.StringSegment segment) { }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Append(char c) { }
-        public void Append(string value) { }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Append(string value, int offset, int count) { }
-        public override string ToString() { throw null; }
-    }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct StringSegment : System.IEquatable<Microsoft.Extensions.Primitives.StringSegment>, System.IEquatable<string>
-    {
-        private readonly object _dummy;
-        private readonly int _dummyPrimitive;
-        public static readonly Microsoft.Extensions.Primitives.StringSegment Empty;
-        public StringSegment(string buffer) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public StringSegment(string buffer, int offset, int length) { throw null; }
-        public string Buffer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public bool HasValue { get { throw null; } }
-        public char this[int index] { get { throw null; } }
-        public int Length { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public int Offset { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Value { get { throw null; } }
-        public System.ReadOnlyMemory<char> AsMemory() { throw null; }
-        public System.ReadOnlySpan<char> AsSpan() { throw null; }
-        public static int Compare(Microsoft.Extensions.Primitives.StringSegment a, Microsoft.Extensions.Primitives.StringSegment b, System.StringComparison comparisonType) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public bool EndsWith(string text, System.StringComparison comparisonType) { throw null; }
-        public bool Equals(Microsoft.Extensions.Primitives.StringSegment other) { throw null; }
-        public static bool Equals(Microsoft.Extensions.Primitives.StringSegment a, Microsoft.Extensions.Primitives.StringSegment b, System.StringComparison comparisonType) { throw null; }
-        public bool Equals(Microsoft.Extensions.Primitives.StringSegment other, System.StringComparison comparisonType) { throw null; }
-        public override bool Equals(object obj) { throw null; }
-        public bool Equals(string text) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public bool Equals(string text, System.StringComparison comparisonType) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public override int GetHashCode() { throw null; }
-        public int IndexOf(char c) { throw null; }
-        public int IndexOf(char c, int start) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public int IndexOf(char c, int start, int count) { throw null; }
-        public int IndexOfAny(char[] anyOf) { throw null; }
-        public int IndexOfAny(char[] anyOf, int startIndex) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public int IndexOfAny(char[] anyOf, int startIndex, int count) { throw null; }
-        public static bool IsNullOrEmpty(Microsoft.Extensions.Primitives.StringSegment value) { throw null; }
-        public int LastIndexOf(char value) { throw null; }
-        public static bool operator ==(Microsoft.Extensions.Primitives.StringSegment left, Microsoft.Extensions.Primitives.StringSegment right) { throw null; }
-        public static implicit operator System.ReadOnlyMemory<char> (Microsoft.Extensions.Primitives.StringSegment segment) { throw null; }
-        public static implicit operator System.ReadOnlySpan<char> (Microsoft.Extensions.Primitives.StringSegment segment) { throw null; }
-        public static implicit operator Microsoft.Extensions.Primitives.StringSegment (string value) { throw null; }
-        public static bool operator !=(Microsoft.Extensions.Primitives.StringSegment left, Microsoft.Extensions.Primitives.StringSegment right) { throw null; }
-        public Microsoft.Extensions.Primitives.StringTokenizer Split(char[] chars) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public bool StartsWith(string text, System.StringComparison comparisonType) { throw null; }
-        public Microsoft.Extensions.Primitives.StringSegment Subsegment(int offset) { throw null; }
-        public Microsoft.Extensions.Primitives.StringSegment Subsegment(int offset, int length) { throw null; }
-        public string Substring(int offset) { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public string Substring(int offset, int length) { throw null; }
-        public override string ToString() { throw null; }
-        public Microsoft.Extensions.Primitives.StringSegment Trim() { throw null; }
-        public Microsoft.Extensions.Primitives.StringSegment TrimEnd() { throw null; }
-        public Microsoft.Extensions.Primitives.StringSegment TrimStart() { throw null; }
-    }
-    public partial class StringSegmentComparer : System.Collections.Generic.IComparer<Microsoft.Extensions.Primitives.StringSegment>, System.Collections.Generic.IEqualityComparer<Microsoft.Extensions.Primitives.StringSegment>
-    {
-        internal StringSegmentComparer() { }
-        public static Microsoft.Extensions.Primitives.StringSegmentComparer Ordinal { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public static Microsoft.Extensions.Primitives.StringSegmentComparer OrdinalIgnoreCase { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public int Compare(Microsoft.Extensions.Primitives.StringSegment x, Microsoft.Extensions.Primitives.StringSegment y) { throw null; }
-        public bool Equals(Microsoft.Extensions.Primitives.StringSegment x, Microsoft.Extensions.Primitives.StringSegment y) { throw null; }
-        public int GetHashCode(Microsoft.Extensions.Primitives.StringSegment obj) { throw null; }
-    }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct StringTokenizer : System.Collections.Generic.IEnumerable<Microsoft.Extensions.Primitives.StringSegment>, System.Collections.IEnumerable
-    {
-        private readonly object _dummy;
-        private readonly int _dummyPrimitive;
-        public StringTokenizer(Microsoft.Extensions.Primitives.StringSegment value, char[] separators) { throw null; }
-        public StringTokenizer(string value, char[] separators) { throw null; }
-        public Microsoft.Extensions.Primitives.StringTokenizer.Enumerator GetEnumerator() { throw null; }
-        System.Collections.Generic.IEnumerator<Microsoft.Extensions.Primitives.StringSegment> System.Collections.Generic.IEnumerable<Microsoft.Extensions.Primitives.StringSegment>.GetEnumerator() { throw null; }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-        [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-        public partial struct Enumerator : System.Collections.Generic.IEnumerator<Microsoft.Extensions.Primitives.StringSegment>, System.Collections.IEnumerator, System.IDisposable
-        {
-            private object _dummy;
-            private int _dummyPrimitive;
-            public Enumerator(ref Microsoft.Extensions.Primitives.StringTokenizer tokenizer) { throw null; }
-            public Microsoft.Extensions.Primitives.StringSegment Current { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-            object System.Collections.IEnumerator.Current { get { throw null; } }
-            public void Dispose() { }
-            public bool MoveNext() { throw null; }
-            public void Reset() { }
-        }
-    }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct StringValues : System.Collections.Generic.ICollection<string>, System.Collections.Generic.IEnumerable<string>, System.Collections.Generic.IList<string>, System.Collections.Generic.IReadOnlyCollection<string>, System.Collections.Generic.IReadOnlyList<string>, System.Collections.IEnumerable, System.IEquatable<Microsoft.Extensions.Primitives.StringValues>, System.IEquatable<string>, System.IEquatable<string[]>
-    {
-        private readonly object _dummy;
-        private readonly int _dummyPrimitive;
-        public static readonly Microsoft.Extensions.Primitives.StringValues Empty;
-        public StringValues(string value) { throw null; }
-        public StringValues(string[] values) { throw null; }
-        public int Count { [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]get { throw null; } }
-        public string this[int index] { [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]get { throw null; } }
-        bool System.Collections.Generic.ICollection<System.String>.IsReadOnly { get { throw null; } }
-        string System.Collections.Generic.IList<System.String>.this[int index] { get { throw null; } set { } }
-        public static Microsoft.Extensions.Primitives.StringValues Concat(Microsoft.Extensions.Primitives.StringValues values1, Microsoft.Extensions.Primitives.StringValues values2) { throw null; }
-        public static Microsoft.Extensions.Primitives.StringValues Concat(in Microsoft.Extensions.Primitives.StringValues values, string value) { throw null; }
-        public static Microsoft.Extensions.Primitives.StringValues Concat(string value, in Microsoft.Extensions.Primitives.StringValues values) { throw null; }
-        public bool Equals(Microsoft.Extensions.Primitives.StringValues other) { throw null; }
-        public static bool Equals(Microsoft.Extensions.Primitives.StringValues left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool Equals(Microsoft.Extensions.Primitives.StringValues left, string right) { throw null; }
-        public static bool Equals(Microsoft.Extensions.Primitives.StringValues left, string[] right) { throw null; }
-        public override bool Equals(object obj) { throw null; }
-        public bool Equals(string other) { throw null; }
-        public static bool Equals(string left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public bool Equals(string[] other) { throw null; }
-        public static bool Equals(string[] left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public Microsoft.Extensions.Primitives.StringValues.Enumerator GetEnumerator() { throw null; }
-        public override int GetHashCode() { throw null; }
-        public static bool IsNullOrEmpty(Microsoft.Extensions.Primitives.StringValues value) { throw null; }
-        public static bool operator ==(Microsoft.Extensions.Primitives.StringValues left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool operator ==(Microsoft.Extensions.Primitives.StringValues left, object right) { throw null; }
-        public static bool operator ==(Microsoft.Extensions.Primitives.StringValues left, string right) { throw null; }
-        public static bool operator ==(Microsoft.Extensions.Primitives.StringValues left, string[] right) { throw null; }
-        public static bool operator ==(object left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool operator ==(string left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool operator ==(string[] left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static implicit operator string (Microsoft.Extensions.Primitives.StringValues values) { throw null; }
-        public static implicit operator string[] (Microsoft.Extensions.Primitives.StringValues value) { throw null; }
-        public static implicit operator Microsoft.Extensions.Primitives.StringValues (string value) { throw null; }
-        public static implicit operator Microsoft.Extensions.Primitives.StringValues (string[] values) { throw null; }
-        public static bool operator !=(Microsoft.Extensions.Primitives.StringValues left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool operator !=(Microsoft.Extensions.Primitives.StringValues left, object right) { throw null; }
-        public static bool operator !=(Microsoft.Extensions.Primitives.StringValues left, string right) { throw null; }
-        public static bool operator !=(Microsoft.Extensions.Primitives.StringValues left, string[] right) { throw null; }
-        public static bool operator !=(object left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool operator !=(string left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        public static bool operator !=(string[] left, Microsoft.Extensions.Primitives.StringValues right) { throw null; }
-        void System.Collections.Generic.ICollection<System.String>.Add(string item) { }
-        void System.Collections.Generic.ICollection<System.String>.Clear() { }
-        bool System.Collections.Generic.ICollection<System.String>.Contains(string item) { throw null; }
-        void System.Collections.Generic.ICollection<System.String>.CopyTo(string[] array, int arrayIndex) { }
-        bool System.Collections.Generic.ICollection<System.String>.Remove(string item) { throw null; }
-        System.Collections.Generic.IEnumerator<string> System.Collections.Generic.IEnumerable<System.String>.GetEnumerator() { throw null; }
-        int System.Collections.Generic.IList<System.String>.IndexOf(string item) { throw null; }
-        void System.Collections.Generic.IList<System.String>.Insert(int index, string item) { }
-        void System.Collections.Generic.IList<System.String>.RemoveAt(int index) { }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-        public string[] ToArray() { throw null; }
-        public override string ToString() { throw null; }
-        [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-        public partial struct Enumerator : System.Collections.Generic.IEnumerator<string>, System.Collections.IEnumerator, System.IDisposable
-        {
-            private object _dummy;
-            private int _dummyPrimitive;
-            public Enumerator(ref Microsoft.Extensions.Primitives.StringValues values) { throw null; }
-            public string Current { get { throw null; } }
-            object System.Collections.IEnumerator.Current { get { throw null; } }
-            public void Dispose() { }
-            public bool MoveNext() { throw null; }
-            void System.Collections.IEnumerator.Reset() { }
-        }
-    }
-}
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 889ecdb292f3bf..407d76de016d8e 100644
--- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj
+++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj
@@ -1,26 +1,38 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Description>Primitives shared by framework extensions. Commonly used types include:
-Microsoft.Extensions.Primitives.IChangeToken
-Microsoft.Extensions.Primitives.StringValues
-Microsoft.Extensions.Primitives.StringSegment</Description>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>primitives</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
+    <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
   </PropertyGroup>
-
   <ItemGroup>
-    <Compile Include="$(SharedSourceRoot)HashCodeCombiner\**\*.cs" />
+    <Compile Include="$(CommonPath)Extensions\HashCodeCombiner\HashCodeCombiner.cs">
+      <Link>Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs</Link>
+    </Compile>
+    <Compile Include="CancellationChangeToken.cs" />
+    <Compile Include="ChangeToken.cs" />
+    <Compile Include="CompositeChangeToken.cs" />
+    <Compile Include="Extensions.cs" />
+    <Compile Include="IChangeToken.cs" />
+    <Compile Include="InplaceStringBuilder.cs" />
+    <Compile Include="StringSegment.cs" />
+    <Compile Include="StringSegmentComparer.cs" />
+    <Compile Include="StringTokenizer.cs" />
+    <Compile Include="StringValues.cs" />
+    <Compile Include="ThrowHelper.cs" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
+    <Reference Include="System.Resources.ResourceManager" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe" />
+    <Reference Include="System.Runtime.Extensions" />
+    <Reference Include="System.Collections" />
+    <Reference Include="System.Diagnostics.Debug" />
+    <Reference Include="System.Memory" />
+    <Reference Include="System.Threading" />
+    <Reference Include="System.Threading.Tasks" />
   </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Reference Include="System.Memory" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe" />
   </ItemGroup>
-
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/Resources.resx b/src/libraries/Microsoft.Extensions.Primitives/src/Resources.resx
deleted file mode 100644
index 197852e21f0f9f..00000000000000
--- a/src/libraries/Microsoft.Extensions.Primitives/src/Resources.resx
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Argument_InvalidOffsetLength" xml:space="preserve">
-    <value>Offset and length are out of bounds for the string or length is greater than the number of characters from index to the end of the string.</value>
-  </data>
-  <data name="Argument_InvalidOffsetLengthStringSegment" xml:space="preserve">
-    <value>Offset and length are out of bounds for this StringSegment or length is greater than the number of characters to the end of this StringSegment.</value>
-  </data>
-  <data name="Capacity_CannotChangeAfterWriteStarted" xml:space="preserve">
-    <value>Cannot change capacity after write started.</value>
-  </data>
-  <data name="Capacity_NotEnough" xml:space="preserve">
-    <value>Not enough capacity to write '{0}' characters, only '{1}' left.</value>
-  </data>
-  <data name="Capacity_NotUsedEntirely" xml:space="preserve">
-    <value>Entire reserved capacity was not used. Capacity: '{0}', written '{1}'.</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/StringSegmentComparer.cs b/src/libraries/Microsoft.Extensions.Primitives/src/StringSegmentComparer.cs
index 97c502e11e9b0a..eaecc9efb764cf 100644
--- a/src/libraries/Microsoft.Extensions.Primitives/src/StringSegmentComparer.cs
+++ b/src/libraries/Microsoft.Extensions.Primitives/src/StringSegmentComparer.cs
@@ -36,7 +36,7 @@ public bool Equals(StringSegment x, StringSegment y)
 
         public int GetHashCode(StringSegment obj)
         {
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD2_1
             return string.GetHashCode(obj.AsSpan(), Comparison);
 #else
             if (!obj.HasValue)
diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/StringValues.cs b/src/libraries/Microsoft.Extensions.Primitives/src/StringValues.cs
index 4e04c88df9b5f2..5fe99cb6c188eb 100644
--- a/src/libraries/Microsoft.Extensions.Primitives/src/StringValues.cs
+++ b/src/libraries/Microsoft.Extensions.Primitives/src/StringValues.cs
@@ -622,7 +622,6 @@ public static bool Equals(StringValues left, StringValues right)
         /// <returns><c>true</c> if the value of <paramref name="other"/> is the same as this instance; otherwise, <c>false</c>.</returns>
         public bool Equals(string[] other) => Equals(this, new StringValues(other));
 
-
         /// <inheritdoc cref="Equals(StringValues, string)" />
         public static bool operator ==(StringValues left, string right) => Equals(left, new StringValues(right));
 
diff --git a/src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj b/src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj
index e2b2727b44fab0..09e032e80f957d 100644
--- a/src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj
@@ -4,6 +4,19 @@
     <TargetFrameworks>$(NetCoreAppCurrent);net472</TargetFrameworks>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="ChangeTokenTest.cs" />
+    <Compile Include="CompositeChangeTokenTest.cs" />
+    <Compile Include="InplaceStringBuilderTest.cs" />
+    <Compile Include="StringSegmentTest.cs" />
+    <Compile Include="StringTokenizerTest.cs" />
+    <Compile Include="StringValuesTests.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+  </ItemGroup>
+  
   <ItemGroup>
     <Reference Include="Microsoft.Extensions.Primitives" />
   </ItemGroup>

From 0b24f12ad3b44ab114c5c06a83c728da5fd8ced5 Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Wed, 4 Mar 2020 22:01:41 -0800
Subject: [PATCH 02/12] - [x] Bulk update all ref csproj except for
 FileProviders/FileSystemGlobbing

---
 ...tensions.Configuration.Abstractions.csproj | 11 ++----
 ...oft.Extensions.Configuration.Binder.csproj | 11 ++----
 ...xtensions.Configuration.CommandLine.csproj | 11 ++----
 ....Configuration.EnvironmentVariables.csproj | 11 ++----
 ...nsions.Configuration.FileExtensions.csproj | 12 ++----
 ...rosoft.Extensions.Configuration.Ini.csproj | 12 ++----
 ...osoft.Extensions.Configuration.Json.csproj | 12 ++----
 ...xtensions.Configuration.UserSecrets.csproj | 11 ++----
 ...rosoft.Extensions.Configuration.Xml.csproj | 13 ++-----
 .../Microsoft.Extensions.Configuration.csproj | 11 ++----
 ...ns.DependencyInjection.Abstractions.csproj |  6 +--
 ...soft.Extensions.DependencyInjection.csproj | 15 ++------
 ...oft.Extensions.Hosting.Abstractions.csproj | 16 ++------
 .../ref/Microsoft.Extensions.Hosting.csproj   | 37 ++-----------------
 ...oft.Extensions.Logging.Abstractions.csproj |  6 +--
 ...ft.Extensions.Logging.Configuration.csproj | 12 ++----
 ...icrosoft.Extensions.Logging.Console.csproj | 13 ++-----
 .../Microsoft.Extensions.Logging.Debug.csproj | 11 ++----
 ...crosoft.Extensions.Logging.EventLog.csproj | 12 ++----
 ...soft.Extensions.Logging.EventSource.csproj |  9 ++---
 ...soft.Extensions.Logging.TraceSource.csproj | 11 ++----
 .../ref/Microsoft.Extensions.Logging.csproj   | 14 ++-----
 ...ons.Options.ConfigurationExtensions.csproj | 14 ++-----
 ....Extensions.Options.DataAnnotations.csproj | 10 ++---
 .../ref/Microsoft.Extensions.Options.csproj   | 10 ++---
 25 files changed, 74 insertions(+), 237 deletions(-)

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj
index 0e2f639e046413..cd753bd8abeca9 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj
@@ -1,14 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.Abstractions.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Primitives"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Configuration.Abstractions.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Configuration.Abstractions.cs" />
     <Reference Include="Microsoft.Extensions.Primitives"  />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj
index e01485dcda49a0..46f4aee0bca9a9 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj
@@ -1,14 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.Binder.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Configuration.Binder.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Configuration.Binder.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj
index 074f010a386791..bfcbf852a60129 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj
@@ -1,14 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.CommandLine.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Configuration.CommandLine.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Configuration.CommandLine.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj
index 1612df673e3985..0073a6482919aa 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj
@@ -1,14 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.EnvironmentVariables.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Configuration.EnvironmentVariables.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Configuration.EnvironmentVariables.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj
index 094350e4afdf2a..9aa9638f9281e5 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj
@@ -1,15 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.FileExtensions.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration"  />
-    <Reference Include="Microsoft.Extensions.FileProviders.Physical"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Configuration.FileExtensions.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Configuration.FileExtensions.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
     <Reference Include="Microsoft.Extensions.FileProviders.Physical"  />
   </ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj
index 6e40290afd8b44..1b0be6f2086f95 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj
@@ -1,15 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.Ini.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration"  />
-    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Configuration.Ini.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Configuration.Ini.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
     <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
   </ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj
index addd1ffd218b82..cc1299a16f6c39 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj
@@ -1,18 +1,12 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.Json.netstandard2.0.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Configuration.Json.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
     <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
     <Reference Include="System.Text.Json"  />
     <Reference Include="System.Threading.Tasks.Extensions"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Configuration.Json.netcoreapp.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration"  />
-    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
-  </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj
index 8c31f90dcd55ee..3aede7fb4c146e 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj
@@ -1,14 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.UserSecrets.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration.Json"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Configuration.UserSecrets.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Configuration.UserSecrets.cs" />
     <Reference Include="Microsoft.Extensions.Configuration.Json"  />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj
index 9f706c9429bb2d..2a442d90a18d35 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj
@@ -1,16 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.Xml.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration"  />
-    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
-    <Reference Include="System.Security.Cryptography.Xml"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Configuration.Xml.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Configuration.Xml.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
     <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
     <Reference Include="System.Security.Cryptography.Xml"  />
diff --git a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj
index 6defcaaf6a33e7..ee8f8625ad7bc1 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj
@@ -1,14 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Configuration.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Configuration.cs" />
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions"  />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj
index 43e405be816b69..0adff566b0bfd4 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj
@@ -1,10 +1,8 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.DependencyInjection.Abstractions.netstandard2.0.cs" />
-    
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.DependencyInjection.Abstractions.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj
index dc39334b96f060..7c02fba66924f4 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj
@@ -1,19 +1,12 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.DependencyInjection.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.DependencyInjection.cs" />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.DependencyInjection.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Reference Include="Microsoft.Bcl.AsyncInterfaces"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <Compile Include="Microsoft.Extensions.DependencyInjection.netstandard2.1.cs" />
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
-  </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj
index a0f842ac44061a..84664b981272f7 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj
@@ -1,21 +1,11 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Hosting.Abstractions.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions"  />
     <Reference Include="Microsoft.Bcl.AsyncInterfaces"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Hosting.Abstractions.netcoreapp.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions"  />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Hosting.Abstractions.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj
index e75cb1125e05fb..459f91e1a48be1 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj
@@ -1,10 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Hosting.netstandard2.0.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Hosting.cs" />
     <Reference Include="Microsoft.Extensions.Hosting.Abstractions"  />
     <Reference Include="Microsoft.Extensions.Configuration"  />
     <Reference Include="Microsoft.Extensions.Configuration.CommandLine"  />
@@ -19,34 +18,4 @@
     <Reference Include="Microsoft.Extensions.Logging.EventLog"  />
     <Reference Include="Microsoft.Bcl.AsyncInterfaces"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <Compile Include="Microsoft.Extensions.Hosting.netstandard2.1.cs" />
-    <Reference Include="Microsoft.Extensions.Hosting.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.Configuration"  />
-    <Reference Include="Microsoft.Extensions.Configuration.CommandLine"  />
-    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables"  />
-    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets"  />
-    <Reference Include="Microsoft.Extensions.DependencyInjection"  />
-    <Reference Include="Microsoft.Extensions.FileProviders.Physical"  />
-    <Reference Include="Microsoft.Extensions.Logging"  />
-    <Reference Include="Microsoft.Extensions.Logging.Console"  />
-    <Reference Include="Microsoft.Extensions.Logging.Debug"  />
-    <Reference Include="Microsoft.Extensions.Logging.EventSource"  />
-    <Reference Include="Microsoft.Extensions.Logging.EventLog"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Hosting.netcoreapp.cs" />
-    <Reference Include="Microsoft.Extensions.Hosting.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.Configuration"  />
-    <Reference Include="Microsoft.Extensions.Configuration.CommandLine"  />
-    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables"  />
-    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets"  />
-    <Reference Include="Microsoft.Extensions.DependencyInjection"  />
-    <Reference Include="Microsoft.Extensions.FileProviders.Physical"  />
-    <Reference Include="Microsoft.Extensions.Logging"  />
-    <Reference Include="Microsoft.Extensions.Logging.Console"  />
-    <Reference Include="Microsoft.Extensions.Logging.Debug"  />
-    <Reference Include="Microsoft.Extensions.Logging.EventSource"  />
-    <Reference Include="Microsoft.Extensions.Logging.EventLog"  />
-  </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj
index 07dea73037f4ab..805321e4b7090d 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj
@@ -1,10 +1,8 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Logging.Abstractions.netstandard2.0.cs" />
-    
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Logging.Abstractions.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj
index 7071343de5b6ba..36116be0c2f7fc 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj
@@ -1,15 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Logging.Configuration.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Logging"  />
-    <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Logging.Configuration.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Logging.Configuration.cs" />
     <Reference Include="Microsoft.Extensions.Logging"  />
     <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions"  />
   </ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj
index b82bf7ebde2fab..137a1dd28296a5 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj
@@ -1,16 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Logging.Console.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.Logging.Configuration"  />
-    <Reference Include="Microsoft.Extensions.Logging"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Logging.Console.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Logging.Console.cs" />
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions"  />
     <Reference Include="Microsoft.Extensions.Logging.Configuration"  />
     <Reference Include="Microsoft.Extensions.Logging"  />
diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj
index b35fb8a34f9984..5c3cbd1a780660 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj
@@ -1,14 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Logging.Debug.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Logging"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Logging.Debug.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Logging.Debug.cs" />
     <Reference Include="Microsoft.Extensions.Logging"  />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj
index 19e726785b9919..b7dc400067cd28 100644
--- a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj
@@ -1,15 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Logging.EventLog.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Logging"  />
-    <Reference Include="System.Diagnostics.EventLog"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Logging.EventLog.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Logging.EventLog.cs" />
     <Reference Include="Microsoft.Extensions.Logging"  />
     <Reference Include="System.Diagnostics.EventLog"  />
   </ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj
index eb007ac3b436ce..00e88870dc3445 100644
--- a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj
@@ -1,16 +1,13 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Logging.EventSource.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Logging"  />
     <Reference Include="System.Text.Json"  />
     <Reference Include="System.Threading.Tasks.Extensions"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Logging.EventSource.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Logging.EventSource.cs" />
     <Reference Include="Microsoft.Extensions.Logging"  />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj
index 780246fa7a0ef9..44ccfa061c23f0 100644
--- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj
@@ -1,14 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Logging.TraceSource.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Logging"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Logging.TraceSource.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Logging.TraceSource.cs" />
     <Reference Include="Microsoft.Extensions.Logging"  />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj
index 0a6d562eb3c11a..4886274d162832 100644
--- a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj
@@ -1,17 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Logging.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration.Binder"  />
-    <Reference Include="Microsoft.Extensions.DependencyInjection"  />
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.Options"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Logging.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Logging.cs" />
     <Reference Include="Microsoft.Extensions.Configuration.Binder"  />
     <Reference Include="Microsoft.Extensions.DependencyInjection"  />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions"  />
diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj
index 3b29d61c467668..fe70d4f69ca309 100644
--- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj
+++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj
@@ -1,17 +1,9 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Options.ConfigurationExtensions.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.Configuration.Binder"  />
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.Options"  />
-  </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Options.ConfigurationExtensions.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Options.ConfigurationExtensions.cs" />
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions"  />
     <Reference Include="Microsoft.Extensions.Configuration.Binder"  />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj
index a7d7979ae86695..c8291cba6676f2 100644
--- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj
+++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj
@@ -1,16 +1,12 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Options.DataAnnotations.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.Options"  />
     <Reference Include="System.ComponentModel.Annotations"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Options.DataAnnotations.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Options.DataAnnotations.cs" />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
     <Reference Include="Microsoft.Extensions.Options"  />
   </ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj
index 8358f43d531a62..df0de680df1f81 100644
--- a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj
+++ b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj
@@ -1,16 +1,12 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.Options.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.Primitives"  />
     <Reference Include="System.ComponentModel.Annotations"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.Options.netcoreapp.cs" />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.Options.cs" />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
     <Reference Include="Microsoft.Extensions.Primitives"  />
   </ItemGroup>

From 8e0ac9c446c01f096243a305a5c479761726158f Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Wed, 4 Mar 2020 22:15:29 -0800
Subject: [PATCH 03/12] - Bulk move Descriptions to json file, all except for
 FileProviders and FileSystemGlobbing

---
 ...tensions.Configuration.Abstractions.csproj |   9 -
 ...oft.Extensions.Configuration.Binder.csproj |   3 -
 ...xtensions.Configuration.CommandLine.csproj |   4 -
 ....Configuration.EnvironmentVariables.csproj |   4 -
 ...nsions.Configuration.FileExtensions.csproj |   3 -
 ...rosoft.Extensions.Configuration.Ini.csproj |   4 -
 ...osoft.Extensions.Configuration.Json.csproj |   5 -
 ...xtensions.Configuration.UserSecrets.csproj |   4 -
 ...rosoft.Extensions.Configuration.Xml.csproj |   4 -
 .../Microsoft.Extensions.Configuration.csproj |   3 -
 ...ns.DependencyInjection.Abstractions.csproj |   7 -
 ...soft.Extensions.DependencyInjection.csproj |   4 -
 ...oft.Extensions.Hosting.Abstractions.csproj |   5 -
 .../src/Microsoft.Extensions.Hosting.csproj   |   5 -
 ...oft.Extensions.Logging.Abstractions.csproj |  11 --
 ...ft.Extensions.Logging.Configuration.csproj |   3 -
 ...icrosoft.Extensions.Logging.Console.csproj |   3 -
 .../Microsoft.Extensions.Logging.Debug.csproj |   3 -
 ...crosoft.Extensions.Logging.EventLog.csproj |   4 -
 ...soft.Extensions.Logging.EventSource.csproj |   4 -
 ...soft.Extensions.Logging.TraceSource.csproj |   5 -
 .../src/Microsoft.Extensions.Logging.csproj   |   3 -
 ...ons.Options.ConfigurationExtensions.csproj |   5 -
 ....Extensions.Options.DataAnnotations.csproj |   5 -
 .../src/Microsoft.Extensions.Options.csproj   |   5 -
 src/libraries/pkg/descriptions.json           | 165 ++++++++++++++++++
 26 files changed, 165 insertions(+), 115 deletions(-)

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 367e597d27e774..10641f00d8d7fb 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
@@ -3,15 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <Description>Abstractions of key-value pair based configuration.
-Commonly used types:
-Microsoft.Extensions.Configuration.IConfiguration
-Microsoft.Extensions.Configuration.IConfigurationBuilder
-Microsoft.Extensions.Configuration.IConfigurationProvider
-Microsoft.Extensions.Configuration.IConfigurationRoot
-Microsoft.Extensions.Configuration.IConfigurationSection</Description>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 7b336a56e7e16e..7e91caf6095377 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,11 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 8966564bac4b9a..dc07fb36fe3841 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,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Command line configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <PackageTags>$(PackageTags);commandline</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 6e95fafa1bb83c..6cf4826e8c3028 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,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Environment variables configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <PackageTags>$(PackageTags);envvar;environmentvariable</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 3ddd53c1892635..04ad307caecdd4 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,11 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 3739129821ce35..a8eb8425f2ba1a 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,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>INI configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <PackageTags>$(PackageTags);ini</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 8b14a9a151ea70..61d76b7820c27d 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,14 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>JSON configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <PackageTags>$(PackageTags);json</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <IsPackable>true</IsPackable>
     <NoWarn>$(NoWarn);3021</NoWarn>
   </PropertyGroup>
 
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 bf88139bc98bda..c87f73ebd36941 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,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>User secrets configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <PackageTags>$(PackageTags);secrets;usersecrets</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 9468359d7aff67..c97b9136938f2d 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,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>XML configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <PackageTags>$(PackageTags);xml</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 dfa2c258f58aca..5ba0399f11ea84 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj
@@ -1,11 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Implementation of key-value pair based configuration for Microsoft.Extensions.Configuration. Includes the memory configuration provider.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 2d04219949fda6..d7263dcedf4ba8 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,15 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Abstractions for dependency injection.
-Commonly used types:
-Microsoft.Extensions.DependencyInjection.IServiceCollection</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>dependencyinjection;di</PackageTags>
     <DefineConstants>$(DefineConstants);ActivatorUtilities_In_DependencyInjection</DefineConstants>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
index eb488c625218ff..038878582d55b0 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
@@ -1,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Default implementation of dependency injection for Microsoft.Extensions.DependencyInjection.</Description>
     <TargetFrameworks>$(DefaultNetCoreTargetFramework);net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>dependencyinjection;di</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
 
     <ILEmitBackend Condition="$(TargetFramework) != 'netstandard2.0'">True</ILEmitBackend>
     <DefineConstants Condition="'$(ILEmitBackend)' == 'True'">$(DefineConstants);IL_EMIT</DefineConstants>
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 fc4e84b4452f09..5a9396d8471a08 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,15 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>.NET Core hosting and startup abstractions for applications.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>hosting</PackageTags>
     <RootNamespace>Microsoft.Extensions.Hosting</RootNamespace>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 7f57888ba324d2..b0092a632bc88c 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj
@@ -1,14 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>.NET Core hosting and startup infrastructures for applications.</Description>
     <TargetFrameworks>netstandard2.0;netstandard2.1;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>hosting</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 68323592522366..34bc1818a72fdc 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,19 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Logging abstractions for Microsoft.Extensions.Logging.
-Commonly used types:
-Microsoft.Extensions.Logging.ILogger
-Microsoft.Extensions.Logging.ILoggerFactory
-Microsoft.Extensions.Logging.ILogger&lt;TCategoryName&gt;
-Microsoft.Extensions.Logging.LogLevel
-Microsoft.Extensions.Logging.Logger&lt;T&gt;
-Microsoft.Extensions.Logging.LoggerMessage
-Microsoft.Extensions.Logging.Abstractions.NullLogger</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 bc77602e1e20a3..234ea3fbcad9bf 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,11 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Configuration support for Microsoft.Extensions.Logging.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 f907dbcf7c5b7d..c2f0ce66369e56 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,12 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Console logger provider implementation for Microsoft.Extensions.Logging.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 9e4e8768e0ea4d..a405d88709cde9 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,12 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Debug output logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a debugger monitor by writing messages with System.Diagnostics.Debug.WriteLine().</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 1b0e8438191efd..adb5a465f07afc 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
@@ -1,13 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Windows Event Log logger provider implementation for Microsoft.Extensions.Logging.</Description>
     <TargetFrameworks>netstandard2.0;net461;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
-    <PackageTags>$(PackageTags);eventlog;windowseventlog</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 9a64eb21127040..05e3c9453d0dbd 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,13 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>EventSource/EventListener logger provider implementation for Microsoft.Extensions.Logging.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <PackageTags>$(PackageTags);EventSource;ETW</PackageTags>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
     <NoWarn>$(NoWarn);CS3021</NoWarn>
   </PropertyGroup>
 
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 16dda708a5c381..c4ad607e269385 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,14 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>TraceSource logger provider implementation for Microsoft.Extensions.Logging.  This logger logs messages to a trace listener by writing messages with System.Diagnostics.TraceSource.TraceEvent().</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>logging;tracesource</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 16cd1d46d3ffa1..404661273b35be 100644
--- a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj
@@ -1,12 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Logging infrastructure default implementation for Microsoft.Extensions.Logging.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 b417e4c8c83346..5a83d1492919f0 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,13 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Provides additional configuration specific functionality related to Options.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>aspnetcore;configuration;options</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 c44c8b7b6ec906..e848318f76e6f9 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,13 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Provides additional DataAnnotations specific functionality related to Options.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>aspnetcore;validation;options</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
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 f86a9f1ad06eff..3d3c2ae30473ab 100644
--- a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj
+++ b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj
@@ -1,13 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Provides a strongly typed way of specifying and accessing settings using dependency injection.</Description>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>aspnetcore;options</PackageTags>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/pkg/descriptions.json b/src/libraries/pkg/descriptions.json
index 9c10db8a8bcfec..dbd09dceb15c44 100644
--- a/src/libraries/pkg/descriptions.json
+++ b/src/libraries/pkg/descriptions.json
@@ -14,6 +14,171 @@
     "Description": "Provides a portable version of the Microsoft.Cci library",
     "CommonTypes": []
   },
+  {
+    "Name": "Microsoft.Extensions.Configuration",
+    "Description": "Implementation of key-value pair based configuration for Microsoft.Extensions.Configuration. Includes the memory configuration provider.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Configuration.Abstraction",
+    "Description": "Abstractions of key-value pair based configuration.",
+    "CommonTypes": [
+      "Microsoft.Extensions.Configuration.IConfiguration",
+      "Microsoft.Extensions.Configuration.IConfigurationBuilder",
+      "Microsoft.Extensions.Configuration.IConfigurationProvider",
+      "Microsoft.Extensions.Configuration.IConfigurationRoot",
+      "Microsoft.Extensions.Configuration.IConfigurationSection"
+    ]
+  },
+  {
+    "Name": "Microsoft.Extensions.Configuration.Bindar",
+    "Description": "Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Configuration.CommandLine",
+    "Description": "Command line configuration provider implementation for Microsoft.Extensions.Configuration.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Configuration.EnvironmentVariables",
+    "Description": "Environment variables configuration provider implementation for Microsoft.Extensions.Configuration.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Configuration.FileExtensions",
+    "Description": "Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Configuration.Ini",
+    "Description": "INI configuration provider implementation for Microsoft.Extensions.Configuration.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Configuration.Json",
+    "Description": "JSON configuration provider implementation for Microsoft.Extensions.Configuration.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Configuration.UserSecrets",
+    "Description": "User secrets configuration provider implementation for Microsoft.Extensions.Configuration.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Configuration.Xml",
+    "Description": "XML configuration provider implementation for Microsoft.Extensions.Configuration.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.DependencyInjection",
+    "Description": "Default implementation of dependency injection for Microsoft.Extensions.DependencyInjection.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "Description": "Abstractions for dependency injection.",
+    "CommonTypes": [
+      "Microsoft.Extensions.DependencyInjection.IServiceCollection"
+    ]
+  },
+  {
+    "Name": "Microsoft.Extensions.FileProviders.Abstractions",
+    "Description": "Abstractions of files and directories.",
+    "CommonTypes": [
+      "Microsoft.Extensions.FileProviders.IDirectoryContents",
+      "Microsoft.Extensions.FileProviders.IFileInfo",
+      "Microsoft.Extensions.FileProviders.IFileProvider"
+    ]
+  },
+  {
+    "Name": "Microsoft.Extensions.FileProviders.Composite",
+    "Description": "Composite file and directory providers for Microsoft.Extensions.FileProviders.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.FileProviders.Physical",
+    "Description": "File provider for physical files for Microsoft.Extensions.FileProviders.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.FileSystemGlobbing.",
+    "Description": "File system globbing to find files matching a specified pattern.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Hosting",
+    "Description": ".NET Core hosting and startup infrastructures for applications.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Hosting.Abstractions",
+    "Description": ".NET Core hosting and startup abstractions for applications.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Logging",
+    "Description": "Logging infrastructure default implementation for Microsoft.Extensions.Logging.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Logging.Abstractions",
+    "Description": "Logging abstractions for Microsoft.Extensions.Logging.",
+    "CommonTypes": [
+      "Microsoft.Extensions.Logging.ILogger",
+      "Microsoft.Extensions.Logging.ILoggerFactory",
+      "Microsoft.Extensions.Logging.ILogger&lt;TCategoryName&gt;",
+      "Microsoft.Extensions.Logging.LogLevel",
+      "Microsoft.Extensions.Logging.Logger&lt;T&gt;",
+      "Microsoft.Extensions.Logging.LoggerMessage",
+      "Microsoft.Extensions.Logging.Abstractions.NullLogger"
+    ]
+  },
+  {
+    "Name": "Microsoft.Extensions.Logging.Configuration",
+    "Description": "Configuration support for Microsoft.Extensions.Logging.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Logging.Console",
+    "Description": "Console logger provider implementation for Microsoft.Extensions.Logging.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Logging.Debug",
+    "Description": "Debug output logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a debugger monitor by writing messages with System.Diagnostics.Debug.WriteLine().",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Logging.EventLog",
+    "Description": "Windows Event Log logger provider implementation for Microsoft.Extensions.Logging.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Logging.EventSource",
+    "Description": "EventSource/EventListener logger provider implementation for Microsoft.Extensions.Logging.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Logging.TraceSource",
+    "Description": "TraceSource logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a trace listener by writing messages with System.Diagnostics.TraceSource.TraceEvent().",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Options",
+    "Description": "Provides a strongly typed way of specifying and accessing settings using dependency injection.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Options.ConfigurationExtensions",
+    "Description": "Provides additional configuration specific functionality related to Options.",
+    "CommonTypes": []
+  },
+  {
+    "Name": "Microsoft.Extensions.Options.DataAnnotations",
+    "Description": "Provides additional DataAnnotations specific functionality related to Options.",
+    "CommonTypes": []
+  },
   {
     "Name": "Microsoft.Extensions.Primitives",
     "Description": "Primitives shared by framework extensions. Commonly used types include:",

From c509852732aac5a48da363aa05a4f3a1f4895c26 Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Wed, 4 Mar 2020 22:22:16 -0800
Subject: [PATCH 04/12] - Bulk correct test project targetframeworks, all
 except for FileProviders and FileSystemGlobbing

---
 .../Microsoft.Extensions.Configuration.Binder.Tests.csproj      | 2 +-
 .../Microsoft.Extensions.Configuration.CommandLine.Tests.csproj | 2 +-
 ...t.Extensions.Configuration.EnvironmentVariables.Tests.csproj | 2 +-
 ...crosoft.Extensions.Configuration.FileExtensions.Tests.csproj | 2 +-
 .../tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj   | 2 +-
 .../tests/Microsoft.Extensions.Configuration.Json.Tests.csproj  | 2 +-
 .../Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj | 2 +-
 .../test/Microsoft.Extensions.Configuration.Xml.Tests.csproj    | 2 +-
 .../Microsoft.Extensions.Configuration.Functional.Tests.csproj  | 2 +-
 .../tests/Microsoft.Extensions.Configuration.Tests.csproj       | 2 +-
 .../test/Microsoft.Extensions.Logging.Testing.Tests.csproj      | 2 +-
 .../tests/Microsoft.Extensions.DependencyInjection.Tests.csproj | 2 +-
 .../Microsoft.Extensions.Hosting.Functional.Tests.csproj        | 2 +-
 .../UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj    | 2 +-
 .../tests/Microsoft.Extensions.Logging.EventSource.Tests.csproj | 2 +-
 .../tests/Common/Microsoft.Extensions.Logging.Tests.csproj      | 2 +-
 .../tests/Microsoft.Extensions.Options.Tests.csproj             | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj
index 7feebd457bf778..5df935b970a25d 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj
index be4f48b38c5e34..aab6587e9e3f4a 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj
index 9f477e5d40c47a..827966ebedbe47 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj
index 07b150c9b45957..22c2ae43185234 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj
index 27874ea3933f4a..58cecd5c5952fe 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj
index 98be8969e60e7b..94bd9498e551d2 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj
index 0a106b2d6b2819..2847e6d3e448ea 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj
index 3e81a315d28ea2..c1be2c4e604e7e 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj
index c289d4c169daf9..1135395e4120d9 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj
index 0fdc75dc626200..2745ede6a0f758 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/Microsoft.Extensions.Logging.Testing.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/Microsoft.Extensions.Logging.Testing.Tests.csproj
index 4ec80710b7caf9..ac488e52590bb5 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/Microsoft.Extensions.Logging.Testing.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/Microsoft.Extensions.Logging.Testing.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
index 53a41a9f8a1ae6..d63903f481186d 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
     <RootNamespace>Microsoft.Extensions.DependencyInjection</RootNamespace>
   </PropertyGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj
index 0cad57a32b5914..9a50c5fc9ee0ae 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj
index e3e2fbd9e4d0a7..b935250f09bc3f 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/tests/Microsoft.Extensions.Logging.EventSource.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/tests/Microsoft.Extensions.Logging.EventSource.Tests.csproj
index 0b31c4c56423ff..7c7bff323dc9b8 100644
--- a/src/libraries/Microsoft.Extensions.Logging.EventSource/tests/Microsoft.Extensions.Logging.EventSource.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/tests/Microsoft.Extensions.Logging.EventSource.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj
index 2a72f48ef8cf4e..7acbd9fd1ce1e3 100644
--- a/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests.csproj b/src/libraries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests.csproj
index b5e11f2dc39133..ea3f5bbdba2662 100644
--- a/src/libraries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

From fef206364a5cb81f609dc011515216725ecec34f Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Wed, 4 Mar 2020 22:37:47 -0800
Subject: [PATCH 05/12] - Bulk rename ref cs file and delete the extra
 duplicates note: will be replaced by GenerateReferenceSource afterwards

---
 ....Extensions.Configuration.Abstractions.cs} |   0
 ...nfiguration.Abstractions.netstandard2.0.cs |  64 ----
 ...rosoft.Extensions.Configuration.Binder.cs} |   0
 ...ons.Configuration.Binder.netstandard2.0.cs |  26 --
 ...t.Extensions.Configuration.CommandLine.cs} |   0
 ...onfiguration.CommandLine.netstandard2.0.cs |  29 --
 ...ons.Configuration.EnvironmentVariables.cs} |   0
 ...ion.EnvironmentVariables.netstandard2.0.cs |  28 --
 ...xtensions.Configuration.FileExtensions.cs} |   0
 ...iguration.FileExtensions.netstandard2.0.cs |  45 ---
 ...Microsoft.Extensions.Configuration.Ini.cs} |   0
 ...nsions.Configuration.Ini.netstandard2.0.cs |  40 --
 ...icrosoft.Extensions.Configuration.Json.cs} |   0
 ...sions.Configuration.Json.netstandard2.0.cs |  39 --
 ...t.Extensions.Configuration.UserSecrets.cs} |   0
 ...onfiguration.UserSecrets.netstandard2.0.cs |  32 --
 ...Microsoft.Extensions.Configuration.Xml.cs} |   0
 ...nsions.Configuration.Xml.netstandard2.0.cs |  47 ---
 ... => Microsoft.Extensions.Configuration.cs} |   0
 ...Extensions.Configuration.netstandard2.0.cs | 119 ------
 ...sions.DependencyInjection.Abstractions.cs} |   0
 ...crosoft.Extensions.DependencyInjection.cs} |   0
 ...ions.DependencyInjection.netstandard2.0.cs |  50 ---
 ...ions.DependencyInjection.netstandard2.1.cs |  50 ---
 ...rosoft.Extensions.Hosting.Abstractions.cs} |   0
 ...ons.Hosting.Abstractions.netstandard2.0.cs | 138 -------
 ...app.cs => Microsoft.Extensions.Hosting.cs} |   0
 ...osoft.Extensions.Hosting.netstandard2.0.cs |  79 ----
 ...osoft.Extensions.Hosting.netstandard2.1.cs |  79 ----
 ...rosoft.Extensions.Logging.Abstractions.cs} |   0
 ...osoft.Extensions.Logging.Configuration.cs} |   0
 ...ns.Logging.Configuration.netstandard2.0.cs |  34 --
 ...> Microsoft.Extensions.Logging.Console.cs} |   0
 ...tensions.Logging.Console.netstandard2.0.cs |  38 --
 ... => Microsoft.Extensions.Logging.Debug.cs} |   0
 ...Extensions.Logging.Debug.netstandard2.0.cs |  21 -
 ... Microsoft.Extensions.Logging.EventLog.cs} |   0
 ...ensions.Logging.EventLog.netstandard2.0.cs |  34 --
 ...crosoft.Extensions.Logging.EventSource.cs} |   0
 ...ions.Logging.EventSource.netstandard2.0.cs |  34 --
 ...crosoft.Extensions.Logging.TraceSource.cs} |   0
 ...ions.Logging.TraceSource.netstandard2.0.cs |  25 --
 ...app.cs => Microsoft.Extensions.Logging.cs} |   0
 ...osoft.Extensions.Logging.netstandard2.0.cs |  80 ----
 ...nsions.Options.ConfigurationExtensions.cs} |   0
 ....ConfigurationExtensions.netstandard2.0.cs |  38 --
 ...oft.Extensions.Options.DataAnnotations.cs} |   0
 ....Options.DataAnnotations.netstandard2.0.cs |  20 -
 ...app.cs => Microsoft.Extensions.Options.cs} |   0
 ...osoft.Extensions.Options.netstandard2.0.cs | 359 ------------------
 50 files changed, 1548 deletions(-)
 rename src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/{Microsoft.Extensions.Configuration.Abstractions.netcoreapp.cs => Microsoft.Extensions.Configuration.Abstractions.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Configuration.Binder/ref/{Microsoft.Extensions.Configuration.Binder.netcoreapp.cs => Microsoft.Extensions.Configuration.Binder.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/{Microsoft.Extensions.Configuration.CommandLine.netcoreapp.cs => Microsoft.Extensions.Configuration.CommandLine.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/{Microsoft.Extensions.Configuration.EnvironmentVariables.netcoreapp.cs => Microsoft.Extensions.Configuration.EnvironmentVariables.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/{Microsoft.Extensions.Configuration.FileExtensions.netcoreapp.cs => Microsoft.Extensions.Configuration.FileExtensions.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Configuration.Ini/ref/{Microsoft.Extensions.Configuration.Ini.netcoreapp.cs => Microsoft.Extensions.Configuration.Ini.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Configuration.Json/ref/{Microsoft.Extensions.Configuration.Json.netcoreapp.cs => Microsoft.Extensions.Configuration.Json.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/{Microsoft.Extensions.Configuration.UserSecrets.netcoreapp.cs => Microsoft.Extensions.Configuration.UserSecrets.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Configuration.Xml/ref/{Microsoft.Extensions.Configuration.Xml.netcoreapp.cs => Microsoft.Extensions.Configuration.Xml.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Configuration/ref/{Microsoft.Extensions.Configuration.netcoreapp.cs => Microsoft.Extensions.Configuration.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/{Microsoft.Extensions.DependencyInjection.Abstractions.netstandard2.0.cs => Microsoft.Extensions.DependencyInjection.Abstractions.cs} (100%)
 rename src/libraries/Microsoft.Extensions.DependencyInjection/ref/{Microsoft.Extensions.DependencyInjection.netcoreapp.cs => Microsoft.Extensions.DependencyInjection.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.netstandard2.0.cs
 delete mode 100644 src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.netstandard2.1.cs
 rename src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/{Microsoft.Extensions.Hosting.Abstractions.netcoreapp.cs => Microsoft.Extensions.Hosting.Abstractions.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Hosting/ref/{Microsoft.Extensions.Hosting.netcoreapp.cs => Microsoft.Extensions.Hosting.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.netstandard2.0.cs
 delete mode 100644 src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.netstandard2.1.cs
 rename src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/{Microsoft.Extensions.Logging.Abstractions.netstandard2.0.cs => Microsoft.Extensions.Logging.Abstractions.cs} (100%)
 rename src/libraries/Microsoft.Extensions.Logging.Configuration/ref/{Microsoft.Extensions.Logging.Configuration.netcoreapp.cs => Microsoft.Extensions.Logging.Configuration.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Logging.Console/ref/{Microsoft.Extensions.Logging.Console.netcoreapp.cs => Microsoft.Extensions.Logging.Console.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Logging.Debug/ref/{Microsoft.Extensions.Logging.Debug.netcoreapp.cs => Microsoft.Extensions.Logging.Debug.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Logging.EventLog/ref/{Microsoft.Extensions.Logging.EventLog.netcoreapp.cs => Microsoft.Extensions.Logging.EventLog.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Logging.EventSource/ref/{Microsoft.Extensions.Logging.EventSource.netcoreapp.cs => Microsoft.Extensions.Logging.EventSource.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/{Microsoft.Extensions.Logging.TraceSource.netcoreapp.cs => Microsoft.Extensions.Logging.TraceSource.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Logging/ref/{Microsoft.Extensions.Logging.netcoreapp.cs => Microsoft.Extensions.Logging.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/{Microsoft.Extensions.Options.ConfigurationExtensions.netcoreapp.cs => Microsoft.Extensions.Options.ConfigurationExtensions.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/{Microsoft.Extensions.Options.DataAnnotations.netcoreapp.cs => Microsoft.Extensions.Options.DataAnnotations.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.Options/ref/{Microsoft.Extensions.Options.netcoreapp.cs => Microsoft.Extensions.Options.cs} (100%)
 delete mode 100644 src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.netstandard2.0.cs

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.cs
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.netstandard2.0.cs
deleted file mode 100644
index b488394ee9ec68..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.netstandard2.0.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Configuration
-{
-    public static partial class ConfigurationExtensions
-    {
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder Add<TSource>(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, System.Action<TSource> configureSource) where TSource : Microsoft.Extensions.Configuration.IConfigurationSource, new() { throw null; }
-        public static System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> AsEnumerable(this Microsoft.Extensions.Configuration.IConfiguration configuration) { throw null; }
-        public static System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> AsEnumerable(this Microsoft.Extensions.Configuration.IConfiguration configuration, bool makePathsRelative) { throw null; }
-        public static bool Exists(this Microsoft.Extensions.Configuration.IConfigurationSection section) { throw null; }
-        public static string GetConnectionString(this Microsoft.Extensions.Configuration.IConfiguration configuration, string name) { throw null; }
-    }
-    public static partial class ConfigurationPath
-    {
-        public static readonly string KeyDelimiter;
-        public static string Combine(System.Collections.Generic.IEnumerable<string> pathSegments) { throw null; }
-        public static string Combine(params string[] pathSegments) { throw null; }
-        public static string GetParentPath(string path) { throw null; }
-        public static string GetSectionKey(string path) { throw null; }
-    }
-    public static partial class ConfigurationRootExtensions
-    {
-        public static string GetDebugView(this Microsoft.Extensions.Configuration.IConfigurationRoot root) { throw null; }
-    }
-    public partial interface IConfiguration
-    {
-        string this[string key] { get; set; }
-        System.Collections.Generic.IEnumerable<Microsoft.Extensions.Configuration.IConfigurationSection> GetChildren();
-        Microsoft.Extensions.Primitives.IChangeToken GetReloadToken();
-        Microsoft.Extensions.Configuration.IConfigurationSection GetSection(string key);
-    }
-    public partial interface IConfigurationBuilder
-    {
-        System.Collections.Generic.IDictionary<string, object> Properties { get; }
-        System.Collections.Generic.IList<Microsoft.Extensions.Configuration.IConfigurationSource> Sources { get; }
-        Microsoft.Extensions.Configuration.IConfigurationBuilder Add(Microsoft.Extensions.Configuration.IConfigurationSource source);
-        Microsoft.Extensions.Configuration.IConfigurationRoot Build();
-    }
-    public partial interface IConfigurationProvider
-    {
-        System.Collections.Generic.IEnumerable<string> GetChildKeys(System.Collections.Generic.IEnumerable<string> earlierKeys, string parentPath);
-        Microsoft.Extensions.Primitives.IChangeToken GetReloadToken();
-        void Load();
-        void Set(string key, string value);
-        bool TryGet(string key, out string value);
-    }
-    public partial interface IConfigurationRoot : Microsoft.Extensions.Configuration.IConfiguration
-    {
-        System.Collections.Generic.IEnumerable<Microsoft.Extensions.Configuration.IConfigurationProvider> Providers { get; }
-        void Reload();
-    }
-    public partial interface IConfigurationSection : Microsoft.Extensions.Configuration.IConfiguration
-    {
-        string Key { get; }
-        string Path { get; }
-        string Value { get; set; }
-    }
-    public partial interface IConfigurationSource
-    {
-        Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder);
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.cs
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.netstandard2.0.cs
deleted file mode 100644
index b7061cdeb5ee79..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.netstandard2.0.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Configuration
-{
-    public partial class BinderOptions
-    {
-        public BinderOptions() { }
-        public bool BindNonPublicProperties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-    }
-    public static partial class ConfigurationBinder
-    {
-        public static void Bind(this Microsoft.Extensions.Configuration.IConfiguration configuration, object instance) { }
-        public static void Bind(this Microsoft.Extensions.Configuration.IConfiguration configuration, object instance, System.Action<Microsoft.Extensions.Configuration.BinderOptions> configureOptions) { }
-        public static void Bind(this Microsoft.Extensions.Configuration.IConfiguration configuration, string key, object instance) { }
-        public static object Get(this Microsoft.Extensions.Configuration.IConfiguration configuration, System.Type type) { throw null; }
-        public static object Get(this Microsoft.Extensions.Configuration.IConfiguration configuration, System.Type type, System.Action<Microsoft.Extensions.Configuration.BinderOptions> configureOptions) { throw null; }
-        public static object GetValue(this Microsoft.Extensions.Configuration.IConfiguration configuration, System.Type type, string key) { throw null; }
-        public static object GetValue(this Microsoft.Extensions.Configuration.IConfiguration configuration, System.Type type, string key, object defaultValue) { throw null; }
-        public static T GetValue<T>(this Microsoft.Extensions.Configuration.IConfiguration configuration, string key) { throw null; }
-        public static T GetValue<T>(this Microsoft.Extensions.Configuration.IConfiguration configuration, string key, T defaultValue) { throw null; }
-        public static T Get<T>(this Microsoft.Extensions.Configuration.IConfiguration configuration) { throw null; }
-        public static T Get<T>(this Microsoft.Extensions.Configuration.IConfiguration configuration, System.Action<Microsoft.Extensions.Configuration.BinderOptions> configureOptions) { throw null; }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.cs
diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.netstandard2.0.cs
deleted file mode 100644
index 454aad7db04000..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.netstandard2.0.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Configuration
-{
-    public static partial class CommandLineConfigurationExtensions
-    {
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddCommandLine(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, System.Action<Microsoft.Extensions.Configuration.CommandLine.CommandLineConfigurationSource> configureSource) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddCommandLine(this Microsoft.Extensions.Configuration.IConfigurationBuilder configurationBuilder, string[] args) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddCommandLine(this Microsoft.Extensions.Configuration.IConfigurationBuilder configurationBuilder, string[] args, System.Collections.Generic.IDictionary<string, string> switchMappings) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Configuration.CommandLine
-{
-    public partial class CommandLineConfigurationProvider : Microsoft.Extensions.Configuration.ConfigurationProvider
-    {
-        public CommandLineConfigurationProvider(System.Collections.Generic.IEnumerable<string> args, System.Collections.Generic.IDictionary<string, string> switchMappings = null) { }
-        protected System.Collections.Generic.IEnumerable<string> Args { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public override void Load() { }
-    }
-    public partial class CommandLineConfigurationSource : Microsoft.Extensions.Configuration.IConfigurationSource
-    {
-        public CommandLineConfigurationSource() { }
-        public System.Collections.Generic.IEnumerable<string> Args { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public System.Collections.Generic.IDictionary<string, string> SwitchMappings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.cs
diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.netstandard2.0.cs
deleted file mode 100644
index ca46a6aba06ee4..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.netstandard2.0.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Configuration
-{
-    public static partial class EnvironmentVariablesExtensions
-    {
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddEnvironmentVariables(this Microsoft.Extensions.Configuration.IConfigurationBuilder configurationBuilder) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddEnvironmentVariables(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, System.Action<Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationSource> configureSource) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddEnvironmentVariables(this Microsoft.Extensions.Configuration.IConfigurationBuilder configurationBuilder, string prefix) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Configuration.EnvironmentVariables
-{
-    public partial class EnvironmentVariablesConfigurationProvider : Microsoft.Extensions.Configuration.ConfigurationProvider
-    {
-        public EnvironmentVariablesConfigurationProvider() { }
-        public EnvironmentVariablesConfigurationProvider(string prefix) { }
-        public override void Load() { }
-    }
-    public partial class EnvironmentVariablesConfigurationSource : Microsoft.Extensions.Configuration.IConfigurationSource
-    {
-        public EnvironmentVariablesConfigurationSource() { }
-        public string Prefix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.cs
diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.netstandard2.0.cs
deleted file mode 100644
index e32264923f583d..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.netstandard2.0.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Configuration
-{
-    public static partial class FileConfigurationExtensions
-    {
-        public static System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext> GetFileLoadExceptionHandler(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
-        public static Microsoft.Extensions.FileProviders.IFileProvider GetFileProvider(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder SetBasePath(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, string basePath) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder SetFileLoadExceptionHandler(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext> handler) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder SetFileProvider(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, Microsoft.Extensions.FileProviders.IFileProvider fileProvider) { throw null; }
-    }
-    public abstract partial class FileConfigurationProvider : Microsoft.Extensions.Configuration.ConfigurationProvider, System.IDisposable
-    {
-        public FileConfigurationProvider(Microsoft.Extensions.Configuration.FileConfigurationSource source) { }
-        public Microsoft.Extensions.Configuration.FileConfigurationSource Source { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        public override void Load() { }
-        public abstract void Load(System.IO.Stream stream);
-        public override string ToString() { throw null; }
-    }
-    public abstract partial class FileConfigurationSource : Microsoft.Extensions.Configuration.IConfigurationSource
-    {
-        protected FileConfigurationSource() { }
-        public Microsoft.Extensions.FileProviders.IFileProvider FileProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext> OnLoadException { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public bool Optional { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public string Path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public int ReloadDelay { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public bool ReloadOnChange { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public abstract Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder);
-        public void EnsureDefaults(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { }
-        public void ResolveFileProvider() { }
-    }
-    public partial class FileLoadExceptionContext
-    {
-        public FileLoadExceptionContext() { }
-        public System.Exception Exception { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public bool Ignore { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public Microsoft.Extensions.Configuration.FileConfigurationProvider Provider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.cs
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.netstandard2.0.cs
deleted file mode 100644
index 19afb20f2a4dbe..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.netstandard2.0.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Configuration
-{
-    public static partial class IniConfigurationExtensions
-    {
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddIniFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, Microsoft.Extensions.FileProviders.IFileProvider provider, string path, bool optional, bool reloadOnChange) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddIniFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, System.Action<Microsoft.Extensions.Configuration.Ini.IniConfigurationSource> configureSource) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddIniFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, string path) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddIniFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, string path, bool optional) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddIniFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, string path, bool optional, bool reloadOnChange) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddIniStream(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, System.IO.Stream stream) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Configuration.Ini
-{
-    public partial class IniConfigurationProvider : Microsoft.Extensions.Configuration.FileConfigurationProvider
-    {
-        public IniConfigurationProvider(Microsoft.Extensions.Configuration.Ini.IniConfigurationSource source) : base (default(Microsoft.Extensions.Configuration.FileConfigurationSource)) { }
-        public override void Load(System.IO.Stream stream) { }
-    }
-    public partial class IniConfigurationSource : Microsoft.Extensions.Configuration.FileConfigurationSource
-    {
-        public IniConfigurationSource() { }
-        public override Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
-    }
-    public partial class IniStreamConfigurationProvider : Microsoft.Extensions.Configuration.StreamConfigurationProvider
-    {
-        public IniStreamConfigurationProvider(Microsoft.Extensions.Configuration.Ini.IniStreamConfigurationSource source) : base (default(Microsoft.Extensions.Configuration.StreamConfigurationSource)) { }
-        public override void Load(System.IO.Stream stream) { }
-        public static System.Collections.Generic.IDictionary<string, string> Read(System.IO.Stream stream) { throw null; }
-    }
-    public partial class IniStreamConfigurationSource : Microsoft.Extensions.Configuration.StreamConfigurationSource
-    {
-        public IniStreamConfigurationSource() { }
-        public override Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.netstandard2.0.cs
deleted file mode 100644
index 886de43e81ae0e..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.netstandard2.0.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Configuration
-{
-    public static partial class JsonConfigurationExtensions
-    {
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddJsonFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, Microsoft.Extensions.FileProviders.IFileProvider provider, string path, bool optional, bool reloadOnChange) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddJsonFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, System.Action<Microsoft.Extensions.Configuration.Json.JsonConfigurationSource> configureSource) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddJsonFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, string path) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddJsonFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, string path, bool optional) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddJsonFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, string path, bool optional, bool reloadOnChange) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddJsonStream(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, System.IO.Stream stream) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Configuration.Json
-{
-    public partial class JsonConfigurationProvider : Microsoft.Extensions.Configuration.FileConfigurationProvider
-    {
-        public JsonConfigurationProvider(Microsoft.Extensions.Configuration.Json.JsonConfigurationSource source) : base (default(Microsoft.Extensions.Configuration.FileConfigurationSource)) { }
-        public override void Load(System.IO.Stream stream) { }
-    }
-    public partial class JsonConfigurationSource : Microsoft.Extensions.Configuration.FileConfigurationSource
-    {
-        public JsonConfigurationSource() { }
-        public override Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
-    }
-    public partial class JsonStreamConfigurationProvider : Microsoft.Extensions.Configuration.StreamConfigurationProvider
-    {
-        public JsonStreamConfigurationProvider(Microsoft.Extensions.Configuration.Json.JsonStreamConfigurationSource source) : base (default(Microsoft.Extensions.Configuration.StreamConfigurationSource)) { }
-        public override void Load(System.IO.Stream stream) { }
-    }
-    public partial class JsonStreamConfigurationSource : Microsoft.Extensions.Configuration.StreamConfigurationSource
-    {
-        public JsonStreamConfigurationSource() { }
-        public override Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.cs
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.netstandard2.0.cs
deleted file mode 100644
index f2335c384b84be..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.netstandard2.0.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Configuration
-{
-    public static partial class UserSecretsConfigurationExtensions
-    {
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddUserSecrets(this Microsoft.Extensions.Configuration.IConfigurationBuilder configuration, System.Reflection.Assembly assembly) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddUserSecrets(this Microsoft.Extensions.Configuration.IConfigurationBuilder configuration, System.Reflection.Assembly assembly, bool optional) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddUserSecrets(this Microsoft.Extensions.Configuration.IConfigurationBuilder configuration, System.Reflection.Assembly assembly, bool optional, bool reloadOnChange) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddUserSecrets(this Microsoft.Extensions.Configuration.IConfigurationBuilder configuration, string userSecretsId) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddUserSecrets(this Microsoft.Extensions.Configuration.IConfigurationBuilder configuration, string userSecretsId, bool reloadOnChange) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddUserSecrets<T>(this Microsoft.Extensions.Configuration.IConfigurationBuilder configuration) where T : class { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddUserSecrets<T>(this Microsoft.Extensions.Configuration.IConfigurationBuilder configuration, bool optional) where T : class { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddUserSecrets<T>(this Microsoft.Extensions.Configuration.IConfigurationBuilder configuration, bool optional, bool reloadOnChange) where T : class { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Configuration.UserSecrets
-{
-    public partial class PathHelper
-    {
-        public PathHelper() { }
-        public static string GetSecretsPathFromSecretsId(string userSecretsId) { throw null; }
-    }
-    [System.AttributeUsageAttribute(System.AttributeTargets.Assembly, Inherited=false, AllowMultiple=false)]
-    public partial class UserSecretsIdAttribute : System.Attribute
-    {
-        public UserSecretsIdAttribute(string userSecretId) { }
-        public string UserSecretsId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.cs
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.netstandard2.0.cs
deleted file mode 100644
index c2e37f3c5ab593..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.netstandard2.0.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Configuration
-{
-    public static partial class XmlConfigurationExtensions
-    {
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddXmlFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, Microsoft.Extensions.FileProviders.IFileProvider provider, string path, bool optional, bool reloadOnChange) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddXmlFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, System.Action<Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource> configureSource) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddXmlFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, string path) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddXmlFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, string path, bool optional) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddXmlFile(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, string path, bool optional, bool reloadOnChange) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddXmlStream(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, System.IO.Stream stream) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Configuration.Xml
-{
-    public partial class XmlConfigurationProvider : Microsoft.Extensions.Configuration.FileConfigurationProvider
-    {
-        public XmlConfigurationProvider(Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource source) : base (default(Microsoft.Extensions.Configuration.FileConfigurationSource)) { }
-        public override void Load(System.IO.Stream stream) { }
-    }
-    public partial class XmlConfigurationSource : Microsoft.Extensions.Configuration.FileConfigurationSource
-    {
-        public XmlConfigurationSource() { }
-        public override Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
-    }
-    public partial class XmlDocumentDecryptor
-    {
-        public static readonly Microsoft.Extensions.Configuration.Xml.XmlDocumentDecryptor Instance;
-        protected XmlDocumentDecryptor() { }
-        public System.Xml.XmlReader CreateDecryptingXmlReader(System.IO.Stream input, System.Xml.XmlReaderSettings settings) { throw null; }
-        protected virtual System.Xml.XmlReader DecryptDocumentAndCreateXmlReader(System.Xml.XmlDocument document) { throw null; }
-    }
-    public partial class XmlStreamConfigurationProvider : Microsoft.Extensions.Configuration.StreamConfigurationProvider
-    {
-        public XmlStreamConfigurationProvider(Microsoft.Extensions.Configuration.Xml.XmlStreamConfigurationSource source) : base (default(Microsoft.Extensions.Configuration.StreamConfigurationSource)) { }
-        public override void Load(System.IO.Stream stream) { }
-        public static System.Collections.Generic.IDictionary<string, string> Read(System.IO.Stream stream, Microsoft.Extensions.Configuration.Xml.XmlDocumentDecryptor decryptor) { throw null; }
-    }
-    public partial class XmlStreamConfigurationSource : Microsoft.Extensions.Configuration.StreamConfigurationSource
-    {
-        public XmlStreamConfigurationSource() { }
-        public override Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.cs
diff --git a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.netstandard2.0.cs
deleted file mode 100644
index c2305fce390ff0..00000000000000
--- a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.netstandard2.0.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Configuration
-{
-    public static partial class ChainedBuilderExtensions
-    {
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddConfiguration(this Microsoft.Extensions.Configuration.IConfigurationBuilder configurationBuilder, Microsoft.Extensions.Configuration.IConfiguration config) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddConfiguration(this Microsoft.Extensions.Configuration.IConfigurationBuilder configurationBuilder, Microsoft.Extensions.Configuration.IConfiguration config, bool shouldDisposeConfiguration) { throw null; }
-    }
-    public partial class ChainedConfigurationProvider : Microsoft.Extensions.Configuration.IConfigurationProvider, System.IDisposable
-    {
-        public ChainedConfigurationProvider(Microsoft.Extensions.Configuration.ChainedConfigurationSource source) { }
-        public void Dispose() { }
-        public System.Collections.Generic.IEnumerable<string> GetChildKeys(System.Collections.Generic.IEnumerable<string> earlierKeys, string parentPath) { throw null; }
-        public Microsoft.Extensions.Primitives.IChangeToken GetReloadToken() { throw null; }
-        public void Load() { }
-        public void Set(string key, string value) { }
-        public bool TryGet(string key, out string value) { throw null; }
-    }
-    public partial class ChainedConfigurationSource : Microsoft.Extensions.Configuration.IConfigurationSource
-    {
-        public ChainedConfigurationSource() { }
-        public Microsoft.Extensions.Configuration.IConfiguration Configuration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public bool ShouldDisposeConfiguration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
-    }
-    public partial class ConfigurationBuilder : Microsoft.Extensions.Configuration.IConfigurationBuilder
-    {
-        public ConfigurationBuilder() { }
-        public System.Collections.Generic.IDictionary<string, object> Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public System.Collections.Generic.IList<Microsoft.Extensions.Configuration.IConfigurationSource> Sources { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public Microsoft.Extensions.Configuration.IConfigurationBuilder Add(Microsoft.Extensions.Configuration.IConfigurationSource source) { throw null; }
-        public Microsoft.Extensions.Configuration.IConfigurationRoot Build() { throw null; }
-    }
-    public partial class ConfigurationKeyComparer : System.Collections.Generic.IComparer<string>
-    {
-        public ConfigurationKeyComparer() { }
-        public static Microsoft.Extensions.Configuration.ConfigurationKeyComparer Instance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public int Compare(string x, string y) { throw null; }
-    }
-    public abstract partial class ConfigurationProvider : Microsoft.Extensions.Configuration.IConfigurationProvider
-    {
-        protected ConfigurationProvider() { }
-        protected System.Collections.Generic.IDictionary<string, string> Data { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public virtual System.Collections.Generic.IEnumerable<string> GetChildKeys(System.Collections.Generic.IEnumerable<string> earlierKeys, string parentPath) { throw null; }
-        public Microsoft.Extensions.Primitives.IChangeToken GetReloadToken() { throw null; }
-        public virtual void Load() { }
-        protected void OnReload() { }
-        public virtual void Set(string key, string value) { }
-        public override string ToString() { throw null; }
-        public virtual bool TryGet(string key, out string value) { throw null; }
-    }
-    public partial class ConfigurationReloadToken : Microsoft.Extensions.Primitives.IChangeToken
-    {
-        public ConfigurationReloadToken() { }
-        public bool ActiveChangeCallbacks { get { throw null; } }
-        public bool HasChanged { get { throw null; } }
-        public void OnReload() { }
-        public System.IDisposable RegisterChangeCallback(System.Action<object> callback, object state) { throw null; }
-    }
-    public partial class ConfigurationRoot : Microsoft.Extensions.Configuration.IConfiguration, Microsoft.Extensions.Configuration.IConfigurationRoot, System.IDisposable
-    {
-        public ConfigurationRoot(System.Collections.Generic.IList<Microsoft.Extensions.Configuration.IConfigurationProvider> providers) { }
-        public string this[string key] { get { throw null; } set { } }
-        public System.Collections.Generic.IEnumerable<Microsoft.Extensions.Configuration.IConfigurationProvider> Providers { get { throw null; } }
-        public void Dispose() { }
-        public System.Collections.Generic.IEnumerable<Microsoft.Extensions.Configuration.IConfigurationSection> GetChildren() { throw null; }
-        public Microsoft.Extensions.Primitives.IChangeToken GetReloadToken() { throw null; }
-        public Microsoft.Extensions.Configuration.IConfigurationSection GetSection(string key) { throw null; }
-        public void Reload() { }
-    }
-    public partial class ConfigurationSection : Microsoft.Extensions.Configuration.IConfiguration, Microsoft.Extensions.Configuration.IConfigurationSection
-    {
-        public ConfigurationSection(Microsoft.Extensions.Configuration.IConfigurationRoot root, string path) { }
-        public string this[string key] { get { throw null; } set { } }
-        public string Key { get { throw null; } }
-        public string Path { get { throw null; } }
-        public string Value { get { throw null; } set { } }
-        public System.Collections.Generic.IEnumerable<Microsoft.Extensions.Configuration.IConfigurationSection> GetChildren() { throw null; }
-        public Microsoft.Extensions.Primitives.IChangeToken GetReloadToken() { throw null; }
-        public Microsoft.Extensions.Configuration.IConfigurationSection GetSection(string key) { throw null; }
-    }
-    public static partial class MemoryConfigurationBuilderExtensions
-    {
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddInMemoryCollection(this Microsoft.Extensions.Configuration.IConfigurationBuilder configurationBuilder) { throw null; }
-        public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddInMemoryCollection(this Microsoft.Extensions.Configuration.IConfigurationBuilder configurationBuilder, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> initialData) { throw null; }
-    }
-    public abstract partial class StreamConfigurationProvider : Microsoft.Extensions.Configuration.ConfigurationProvider
-    {
-        public StreamConfigurationProvider(Microsoft.Extensions.Configuration.StreamConfigurationSource source) { }
-        public Microsoft.Extensions.Configuration.StreamConfigurationSource Source { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public override void Load() { }
-        public abstract void Load(System.IO.Stream stream);
-    }
-    public abstract partial class StreamConfigurationSource : Microsoft.Extensions.Configuration.IConfigurationSource
-    {
-        protected StreamConfigurationSource() { }
-        public System.IO.Stream Stream { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public abstract Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder);
-    }
-}
-namespace Microsoft.Extensions.Configuration.Memory
-{
-    public partial class MemoryConfigurationProvider : Microsoft.Extensions.Configuration.ConfigurationProvider, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>>, System.Collections.IEnumerable
-    {
-        public MemoryConfigurationProvider(Microsoft.Extensions.Configuration.Memory.MemoryConfigurationSource source) { }
-        public void Add(string key, string value) { }
-        public System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, string>> GetEnumerator() { throw null; }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-    }
-    public partial class MemoryConfigurationSource : Microsoft.Extensions.Configuration.IConfigurationSource
-    {
-        public MemoryConfigurationSource() { }
-        public System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> InitialData { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.netstandard2.0.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.netcoreapp.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.netstandard2.0.cs
deleted file mode 100644
index 2ebdaeef946922..00000000000000
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.netstandard2.0.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    public partial class DefaultServiceProviderFactory : Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<Microsoft.Extensions.DependencyInjection.IServiceCollection>
-    {
-        public DefaultServiceProviderFactory() { }
-        public DefaultServiceProviderFactory(Microsoft.Extensions.DependencyInjection.ServiceProviderOptions options) { }
-        public Microsoft.Extensions.DependencyInjection.IServiceCollection CreateBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; }
-        public System.IServiceProvider CreateServiceProvider(Microsoft.Extensions.DependencyInjection.IServiceCollection containerBuilder) { throw null; }
-    }
-    public partial class ServiceCollection : Microsoft.Extensions.DependencyInjection.IServiceCollection, System.Collections.Generic.ICollection<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>, System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>, System.Collections.Generic.IList<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>, System.Collections.IEnumerable
-    {
-        public ServiceCollection() { }
-        public int Count { get { throw null; } }
-        public bool IsReadOnly { get { throw null; } }
-        public Microsoft.Extensions.DependencyInjection.ServiceDescriptor this[int index] { get { throw null; } set { } }
-        public void Clear() { }
-        public bool Contains(Microsoft.Extensions.DependencyInjection.ServiceDescriptor item) { throw null; }
-        public void CopyTo(Microsoft.Extensions.DependencyInjection.ServiceDescriptor[] array, int arrayIndex) { }
-        public System.Collections.Generic.IEnumerator<Microsoft.Extensions.DependencyInjection.ServiceDescriptor> GetEnumerator() { throw null; }
-        public int IndexOf(Microsoft.Extensions.DependencyInjection.ServiceDescriptor item) { throw null; }
-        public void Insert(int index, Microsoft.Extensions.DependencyInjection.ServiceDescriptor item) { }
-        public bool Remove(Microsoft.Extensions.DependencyInjection.ServiceDescriptor item) { throw null; }
-        public void RemoveAt(int index) { }
-        void System.Collections.Generic.ICollection<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>.Add(Microsoft.Extensions.DependencyInjection.ServiceDescriptor item) { }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-    }
-    public static partial class ServiceCollectionContainerBuilderExtensions
-    {
-        public static Microsoft.Extensions.DependencyInjection.ServiceProvider BuildServiceProvider(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.ServiceProvider BuildServiceProvider(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.DependencyInjection.ServiceProviderOptions options) { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.ServiceProvider BuildServiceProvider(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, bool validateScopes) { throw null; }
-    }
-    public sealed partial class ServiceProvider : System.IAsyncDisposable, System.IDisposable, System.IServiceProvider
-    {
-        internal ServiceProvider() { }
-        public void Dispose() { }
-        public System.Threading.Tasks.ValueTask DisposeAsync() { throw null; }
-        public object GetService(System.Type serviceType) { throw null; }
-    }
-    public partial class ServiceProviderOptions
-    {
-        public ServiceProviderOptions() { }
-        public bool ValidateOnBuild { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public bool ValidateScopes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.netstandard2.1.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.netstandard2.1.cs
deleted file mode 100644
index 2ebdaeef946922..00000000000000
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.netstandard2.1.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    public partial class DefaultServiceProviderFactory : Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<Microsoft.Extensions.DependencyInjection.IServiceCollection>
-    {
-        public DefaultServiceProviderFactory() { }
-        public DefaultServiceProviderFactory(Microsoft.Extensions.DependencyInjection.ServiceProviderOptions options) { }
-        public Microsoft.Extensions.DependencyInjection.IServiceCollection CreateBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; }
-        public System.IServiceProvider CreateServiceProvider(Microsoft.Extensions.DependencyInjection.IServiceCollection containerBuilder) { throw null; }
-    }
-    public partial class ServiceCollection : Microsoft.Extensions.DependencyInjection.IServiceCollection, System.Collections.Generic.ICollection<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>, System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>, System.Collections.Generic.IList<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>, System.Collections.IEnumerable
-    {
-        public ServiceCollection() { }
-        public int Count { get { throw null; } }
-        public bool IsReadOnly { get { throw null; } }
-        public Microsoft.Extensions.DependencyInjection.ServiceDescriptor this[int index] { get { throw null; } set { } }
-        public void Clear() { }
-        public bool Contains(Microsoft.Extensions.DependencyInjection.ServiceDescriptor item) { throw null; }
-        public void CopyTo(Microsoft.Extensions.DependencyInjection.ServiceDescriptor[] array, int arrayIndex) { }
-        public System.Collections.Generic.IEnumerator<Microsoft.Extensions.DependencyInjection.ServiceDescriptor> GetEnumerator() { throw null; }
-        public int IndexOf(Microsoft.Extensions.DependencyInjection.ServiceDescriptor item) { throw null; }
-        public void Insert(int index, Microsoft.Extensions.DependencyInjection.ServiceDescriptor item) { }
-        public bool Remove(Microsoft.Extensions.DependencyInjection.ServiceDescriptor item) { throw null; }
-        public void RemoveAt(int index) { }
-        void System.Collections.Generic.ICollection<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>.Add(Microsoft.Extensions.DependencyInjection.ServiceDescriptor item) { }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-    }
-    public static partial class ServiceCollectionContainerBuilderExtensions
-    {
-        public static Microsoft.Extensions.DependencyInjection.ServiceProvider BuildServiceProvider(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.ServiceProvider BuildServiceProvider(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.DependencyInjection.ServiceProviderOptions options) { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.ServiceProvider BuildServiceProvider(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, bool validateScopes) { throw null; }
-    }
-    public sealed partial class ServiceProvider : System.IAsyncDisposable, System.IDisposable, System.IServiceProvider
-    {
-        internal ServiceProvider() { }
-        public void Dispose() { }
-        public System.Threading.Tasks.ValueTask DisposeAsync() { throw null; }
-        public object GetService(System.Type serviceType) { throw null; }
-    }
-    public partial class ServiceProviderOptions
-    {
-        public ServiceProviderOptions() { }
-        public bool ValidateOnBuild { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public bool ValidateScopes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.cs
diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.netstandard2.0.cs
deleted file mode 100644
index 880dff83911420..00000000000000
--- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.netstandard2.0.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    public static partial class ServiceCollectionHostedServiceExtensions
-    {
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddHostedService<THostedService>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) where THostedService : class, Microsoft.Extensions.Hosting.IHostedService { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddHostedService<THostedService>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Func<System.IServiceProvider, THostedService> implementationFactory) where THostedService : class, Microsoft.Extensions.Hosting.IHostedService { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Hosting
-{
-    public abstract partial class BackgroundService : Microsoft.Extensions.Hosting.IHostedService, System.IDisposable
-    {
-        protected BackgroundService() { }
-        public virtual void Dispose() { }
-        protected abstract System.Threading.Tasks.Task ExecuteAsync(System.Threading.CancellationToken stoppingToken);
-        public virtual System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken) { throw null; }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        public virtual System.Threading.Tasks.Task StopAsync(System.Threading.CancellationToken cancellationToken) { throw null; }
-    }
-    [System.ObsoleteAttribute("This type is obsolete and will be removed in a future version. The recommended alternative is Microsoft.Extensions.Hosting.Environments.", false)]
-    public static partial class EnvironmentName
-    {
-        public static readonly string Development;
-        public static readonly string Production;
-        public static readonly string Staging;
-    }
-    public static partial class Environments
-    {
-        public static readonly string Development;
-        public static readonly string Production;
-        public static readonly string Staging;
-    }
-    public partial class HostBuilderContext
-    {
-        public HostBuilderContext(System.Collections.Generic.IDictionary<object, object> properties) { }
-        public Microsoft.Extensions.Configuration.IConfiguration Configuration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public Microsoft.Extensions.Hosting.IHostEnvironment HostingEnvironment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public System.Collections.Generic.IDictionary<object, object> Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-    }
-    public static partial class HostDefaults
-    {
-        public static readonly string ApplicationKey;
-        public static readonly string ContentRootKey;
-        public static readonly string EnvironmentKey;
-    }
-    public static partial class HostEnvironmentEnvExtensions
-    {
-        public static bool IsDevelopment(this Microsoft.Extensions.Hosting.IHostEnvironment hostEnvironment) { throw null; }
-        public static bool IsEnvironment(this Microsoft.Extensions.Hosting.IHostEnvironment hostEnvironment, string environmentName) { throw null; }
-        public static bool IsProduction(this Microsoft.Extensions.Hosting.IHostEnvironment hostEnvironment) { throw null; }
-        public static bool IsStaging(this Microsoft.Extensions.Hosting.IHostEnvironment hostEnvironment) { throw null; }
-    }
-    public static partial class HostingAbstractionsHostBuilderExtensions
-    {
-        public static Microsoft.Extensions.Hosting.IHost Start(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder) { throw null; }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        public static System.Threading.Tasks.Task<Microsoft.Extensions.Hosting.IHost> StartAsync(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public static partial class HostingAbstractionsHostExtensions
-    {
-        public static void Run(this Microsoft.Extensions.Hosting.IHost host) { }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        public static System.Threading.Tasks.Task RunAsync(this Microsoft.Extensions.Hosting.IHost host, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) { throw null; }
-        public static void Start(this Microsoft.Extensions.Hosting.IHost host) { }
-        public static System.Threading.Tasks.Task StopAsync(this Microsoft.Extensions.Hosting.IHost host, System.TimeSpan timeout) { throw null; }
-        public static void WaitForShutdown(this Microsoft.Extensions.Hosting.IHost host) { }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        public static System.Threading.Tasks.Task WaitForShutdownAsync(this Microsoft.Extensions.Hosting.IHost host, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public static partial class HostingEnvironmentExtensions
-    {
-        public static bool IsDevelopment(this Microsoft.Extensions.Hosting.IHostingEnvironment hostingEnvironment) { throw null; }
-        public static bool IsEnvironment(this Microsoft.Extensions.Hosting.IHostingEnvironment hostingEnvironment, string environmentName) { throw null; }
-        public static bool IsProduction(this Microsoft.Extensions.Hosting.IHostingEnvironment hostingEnvironment) { throw null; }
-        public static bool IsStaging(this Microsoft.Extensions.Hosting.IHostingEnvironment hostingEnvironment) { throw null; }
-    }
-    [System.ObsoleteAttribute("This type is obsolete and will be removed in a future version. The recommended alternative is Microsoft.Extensions.Hosting.IHostApplicationLifetime.", false)]
-    public partial interface IApplicationLifetime
-    {
-        System.Threading.CancellationToken ApplicationStarted { get; }
-        System.Threading.CancellationToken ApplicationStopped { get; }
-        System.Threading.CancellationToken ApplicationStopping { get; }
-        void StopApplication();
-    }
-    public partial interface IHost : System.IDisposable
-    {
-        System.IServiceProvider Services { get; }
-        System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
-        System.Threading.Tasks.Task StopAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
-    }
-    public partial interface IHostApplicationLifetime
-    {
-        System.Threading.CancellationToken ApplicationStarted { get; }
-        System.Threading.CancellationToken ApplicationStopped { get; }
-        System.Threading.CancellationToken ApplicationStopping { get; }
-        void StopApplication();
-    }
-    public partial interface IHostBuilder
-    {
-        System.Collections.Generic.IDictionary<object, object> Properties { get; }
-        Microsoft.Extensions.Hosting.IHost Build();
-        Microsoft.Extensions.Hosting.IHostBuilder ConfigureAppConfiguration(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext, Microsoft.Extensions.Configuration.IConfigurationBuilder> configureDelegate);
-        Microsoft.Extensions.Hosting.IHostBuilder ConfigureContainer<TContainerBuilder>(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext, TContainerBuilder> configureDelegate);
-        Microsoft.Extensions.Hosting.IHostBuilder ConfigureHostConfiguration(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder> configureDelegate);
-        Microsoft.Extensions.Hosting.IHostBuilder ConfigureServices(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext, Microsoft.Extensions.DependencyInjection.IServiceCollection> configureDelegate);
-        Microsoft.Extensions.Hosting.IHostBuilder UseServiceProviderFactory<TContainerBuilder>(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder> factory);
-        Microsoft.Extensions.Hosting.IHostBuilder UseServiceProviderFactory<TContainerBuilder>(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext, Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>> factory);
-    }
-    public partial interface IHostedService
-    {
-        System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken);
-        System.Threading.Tasks.Task StopAsync(System.Threading.CancellationToken cancellationToken);
-    }
-    public partial interface IHostEnvironment
-    {
-        string ApplicationName { get; set; }
-        Microsoft.Extensions.FileProviders.IFileProvider ContentRootFileProvider { get; set; }
-        string ContentRootPath { get; set; }
-        string EnvironmentName { get; set; }
-    }
-    [System.ObsoleteAttribute("This type is obsolete and will be removed in a future version. The recommended alternative is Microsoft.Extensions.Hosting.IHostEnvironment.", false)]
-    public partial interface IHostingEnvironment
-    {
-        string ApplicationName { get; set; }
-        Microsoft.Extensions.FileProviders.IFileProvider ContentRootFileProvider { get; set; }
-        string ContentRootPath { get; set; }
-        string EnvironmentName { get; set; }
-    }
-    public partial interface IHostLifetime
-    {
-        System.Threading.Tasks.Task StopAsync(System.Threading.CancellationToken cancellationToken);
-        System.Threading.Tasks.Task WaitForStartAsync(System.Threading.CancellationToken cancellationToken);
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.cs
diff --git a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.netstandard2.0.cs
deleted file mode 100644
index 6e77a2d68d0cac..00000000000000
--- a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.netstandard2.0.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Hosting
-{
-    public partial class ConsoleLifetimeOptions
-    {
-        public ConsoleLifetimeOptions() { }
-        public bool SuppressStatusMessages { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-    }
-    public static partial class Host
-    {
-        public static Microsoft.Extensions.Hosting.IHostBuilder CreateDefaultBuilder() { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder CreateDefaultBuilder(string[] args) { throw null; }
-    }
-    public partial class HostBuilder : Microsoft.Extensions.Hosting.IHostBuilder
-    {
-        public HostBuilder() { }
-        public System.Collections.Generic.IDictionary<object, object> Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public Microsoft.Extensions.Hosting.IHost Build() { throw null; }
-        public Microsoft.Extensions.Hosting.IHostBuilder ConfigureAppConfiguration(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext, Microsoft.Extensions.Configuration.IConfigurationBuilder> configureDelegate) { throw null; }
-        public Microsoft.Extensions.Hosting.IHostBuilder ConfigureContainer<TContainerBuilder>(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext, TContainerBuilder> configureDelegate) { throw null; }
-        public Microsoft.Extensions.Hosting.IHostBuilder ConfigureHostConfiguration(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder> configureDelegate) { throw null; }
-        public Microsoft.Extensions.Hosting.IHostBuilder ConfigureServices(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext, Microsoft.Extensions.DependencyInjection.IServiceCollection> configureDelegate) { throw null; }
-        public Microsoft.Extensions.Hosting.IHostBuilder UseServiceProviderFactory<TContainerBuilder>(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder> factory) { throw null; }
-        public Microsoft.Extensions.Hosting.IHostBuilder UseServiceProviderFactory<TContainerBuilder>(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext, Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>> factory) { throw null; }
-    }
-    public static partial class HostingHostBuilderExtensions
-    {
-        public static Microsoft.Extensions.Hosting.IHostBuilder ConfigureAppConfiguration(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder> configureDelegate) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder ConfigureContainer<TContainerBuilder>(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<TContainerBuilder> configureDelegate) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder ConfigureLogging(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.Hosting.HostBuilderContext, Microsoft.Extensions.Logging.ILoggingBuilder> configureLogging) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder ConfigureLogging(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.Logging.ILoggingBuilder> configureLogging) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder ConfigureServices(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection> configureDelegate) { throw null; }
-        public static System.Threading.Tasks.Task RunConsoleAsync(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions> configureOptions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public static System.Threading.Tasks.Task RunConsoleAsync(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder UseConsoleLifetime(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder UseConsoleLifetime(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions> configureOptions) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder UseContentRoot(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, string contentRoot) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder UseDefaultServiceProvider(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.DependencyInjection.ServiceProviderOptions> configure) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder UseDefaultServiceProvider(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.Hosting.HostBuilderContext, Microsoft.Extensions.DependencyInjection.ServiceProviderOptions> configure) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder UseEnvironment(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, string environment) { throw null; }
-    }
-    public partial class HostOptions
-    {
-        public HostOptions() { }
-        public System.TimeSpan ShutdownTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-    }
-}
-namespace Microsoft.Extensions.Hosting.Internal
-{
-    public partial class ApplicationLifetime : Microsoft.Extensions.Hosting.IApplicationLifetime, Microsoft.Extensions.Hosting.IHostApplicationLifetime
-    {
-        public ApplicationLifetime(Microsoft.Extensions.Logging.ILogger<Microsoft.Extensions.Hosting.Internal.ApplicationLifetime> logger) { }
-        public System.Threading.CancellationToken ApplicationStarted { get { throw null; } }
-        public System.Threading.CancellationToken ApplicationStopped { get { throw null; } }
-        public System.Threading.CancellationToken ApplicationStopping { get { throw null; } }
-        public void NotifyStarted() { }
-        public void NotifyStopped() { }
-        public void StopApplication() { }
-    }
-    public partial class ConsoleLifetime : Microsoft.Extensions.Hosting.IHostLifetime, System.IDisposable
-    {
-        public ConsoleLifetime(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions> options, Microsoft.Extensions.Hosting.IHostEnvironment environment, Microsoft.Extensions.Hosting.IHostApplicationLifetime applicationLifetime, Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Hosting.HostOptions> hostOptions) { }
-        public ConsoleLifetime(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions> options, Microsoft.Extensions.Hosting.IHostEnvironment environment, Microsoft.Extensions.Hosting.IHostApplicationLifetime applicationLifetime, Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Hosting.HostOptions> hostOptions, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { }
-        public void Dispose() { }
-        public System.Threading.Tasks.Task StopAsync(System.Threading.CancellationToken cancellationToken) { throw null; }
-        public System.Threading.Tasks.Task WaitForStartAsync(System.Threading.CancellationToken cancellationToken) { throw null; }
-    }
-    public partial class HostingEnvironment : Microsoft.Extensions.Hosting.IHostEnvironment, Microsoft.Extensions.Hosting.IHostingEnvironment
-    {
-        public HostingEnvironment() { }
-        public string ApplicationName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public Microsoft.Extensions.FileProviders.IFileProvider ContentRootFileProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public string ContentRootPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public string EnvironmentName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.netstandard2.1.cs b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.netstandard2.1.cs
deleted file mode 100644
index 6e77a2d68d0cac..00000000000000
--- a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.netstandard2.1.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Hosting
-{
-    public partial class ConsoleLifetimeOptions
-    {
-        public ConsoleLifetimeOptions() { }
-        public bool SuppressStatusMessages { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-    }
-    public static partial class Host
-    {
-        public static Microsoft.Extensions.Hosting.IHostBuilder CreateDefaultBuilder() { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder CreateDefaultBuilder(string[] args) { throw null; }
-    }
-    public partial class HostBuilder : Microsoft.Extensions.Hosting.IHostBuilder
-    {
-        public HostBuilder() { }
-        public System.Collections.Generic.IDictionary<object, object> Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public Microsoft.Extensions.Hosting.IHost Build() { throw null; }
-        public Microsoft.Extensions.Hosting.IHostBuilder ConfigureAppConfiguration(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext, Microsoft.Extensions.Configuration.IConfigurationBuilder> configureDelegate) { throw null; }
-        public Microsoft.Extensions.Hosting.IHostBuilder ConfigureContainer<TContainerBuilder>(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext, TContainerBuilder> configureDelegate) { throw null; }
-        public Microsoft.Extensions.Hosting.IHostBuilder ConfigureHostConfiguration(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder> configureDelegate) { throw null; }
-        public Microsoft.Extensions.Hosting.IHostBuilder ConfigureServices(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext, Microsoft.Extensions.DependencyInjection.IServiceCollection> configureDelegate) { throw null; }
-        public Microsoft.Extensions.Hosting.IHostBuilder UseServiceProviderFactory<TContainerBuilder>(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder> factory) { throw null; }
-        public Microsoft.Extensions.Hosting.IHostBuilder UseServiceProviderFactory<TContainerBuilder>(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext, Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>> factory) { throw null; }
-    }
-    public static partial class HostingHostBuilderExtensions
-    {
-        public static Microsoft.Extensions.Hosting.IHostBuilder ConfigureAppConfiguration(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder> configureDelegate) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder ConfigureContainer<TContainerBuilder>(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<TContainerBuilder> configureDelegate) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder ConfigureLogging(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.Hosting.HostBuilderContext, Microsoft.Extensions.Logging.ILoggingBuilder> configureLogging) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder ConfigureLogging(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.Logging.ILoggingBuilder> configureLogging) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder ConfigureServices(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection> configureDelegate) { throw null; }
-        public static System.Threading.Tasks.Task RunConsoleAsync(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions> configureOptions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public static System.Threading.Tasks.Task RunConsoleAsync(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder UseConsoleLifetime(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder UseConsoleLifetime(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions> configureOptions) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder UseContentRoot(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, string contentRoot) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder UseDefaultServiceProvider(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.DependencyInjection.ServiceProviderOptions> configure) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder UseDefaultServiceProvider(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action<Microsoft.Extensions.Hosting.HostBuilderContext, Microsoft.Extensions.DependencyInjection.ServiceProviderOptions> configure) { throw null; }
-        public static Microsoft.Extensions.Hosting.IHostBuilder UseEnvironment(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, string environment) { throw null; }
-    }
-    public partial class HostOptions
-    {
-        public HostOptions() { }
-        public System.TimeSpan ShutdownTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-    }
-}
-namespace Microsoft.Extensions.Hosting.Internal
-{
-    public partial class ApplicationLifetime : Microsoft.Extensions.Hosting.IApplicationLifetime, Microsoft.Extensions.Hosting.IHostApplicationLifetime
-    {
-        public ApplicationLifetime(Microsoft.Extensions.Logging.ILogger<Microsoft.Extensions.Hosting.Internal.ApplicationLifetime> logger) { }
-        public System.Threading.CancellationToken ApplicationStarted { get { throw null; } }
-        public System.Threading.CancellationToken ApplicationStopped { get { throw null; } }
-        public System.Threading.CancellationToken ApplicationStopping { get { throw null; } }
-        public void NotifyStarted() { }
-        public void NotifyStopped() { }
-        public void StopApplication() { }
-    }
-    public partial class ConsoleLifetime : Microsoft.Extensions.Hosting.IHostLifetime, System.IDisposable
-    {
-        public ConsoleLifetime(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions> options, Microsoft.Extensions.Hosting.IHostEnvironment environment, Microsoft.Extensions.Hosting.IHostApplicationLifetime applicationLifetime, Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Hosting.HostOptions> hostOptions) { }
-        public ConsoleLifetime(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions> options, Microsoft.Extensions.Hosting.IHostEnvironment environment, Microsoft.Extensions.Hosting.IHostApplicationLifetime applicationLifetime, Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Hosting.HostOptions> hostOptions, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { }
-        public void Dispose() { }
-        public System.Threading.Tasks.Task StopAsync(System.Threading.CancellationToken cancellationToken) { throw null; }
-        public System.Threading.Tasks.Task WaitForStartAsync(System.Threading.CancellationToken cancellationToken) { throw null; }
-    }
-    public partial class HostingEnvironment : Microsoft.Extensions.Hosting.IHostEnvironment, Microsoft.Extensions.Hosting.IHostingEnvironment
-    {
-        public HostingEnvironment() { }
-        public string ApplicationName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public Microsoft.Extensions.FileProviders.IFileProvider ContentRootFileProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public string ContentRootPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public string EnvironmentName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.netstandard2.0.cs
rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs
diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.cs
diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.netstandard2.0.cs
deleted file mode 100644
index e91e792916278f..00000000000000
--- a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.netstandard2.0.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Logging
-{
-    public static partial class LoggingBuilderExtensions
-    {
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddConfiguration(this Microsoft.Extensions.Logging.ILoggingBuilder builder, Microsoft.Extensions.Configuration.IConfiguration configuration) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Logging.Configuration
-{
-    public partial interface ILoggerProviderConfigurationFactory
-    {
-        Microsoft.Extensions.Configuration.IConfiguration GetConfiguration(System.Type providerType);
-    }
-    public partial interface ILoggerProviderConfiguration<T>
-    {
-        Microsoft.Extensions.Configuration.IConfiguration Configuration { get; }
-    }
-    public static partial class LoggerProviderOptions
-    {
-        public static void RegisterProviderOptions<TOptions, TProvider>(Microsoft.Extensions.DependencyInjection.IServiceCollection services) where TOptions : class { }
-    }
-    public partial class LoggerProviderOptionsChangeTokenSource<TOptions, TProvider> : Microsoft.Extensions.Options.ConfigurationChangeTokenSource<TOptions>
-    {
-        public LoggerProviderOptionsChangeTokenSource(Microsoft.Extensions.Logging.Configuration.ILoggerProviderConfiguration<TProvider> providerConfiguration) : base (default(Microsoft.Extensions.Configuration.IConfiguration)) { }
-    }
-    public static partial class LoggingBuilderConfigurationExtensions
-    {
-        public static void AddConfiguration(this Microsoft.Extensions.Logging.ILoggingBuilder builder) { }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.cs
diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.netstandard2.0.cs
deleted file mode 100644
index ddb8a8779179ec..00000000000000
--- a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.netstandard2.0.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Logging
-{
-    public static partial class ConsoleLoggerExtensions
-    {
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddConsole(this Microsoft.Extensions.Logging.ILoggingBuilder builder) { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddConsole(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Action<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions> configure) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Logging.Console
-{
-    public enum ConsoleLoggerFormat
-    {
-        Default = 0,
-        Systemd = 1,
-    }
-    public partial class ConsoleLoggerOptions
-    {
-        public ConsoleLoggerOptions() { }
-        public bool DisableColors { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public Microsoft.Extensions.Logging.Console.ConsoleLoggerFormat Format { get { throw null; } set { } }
-        public bool IncludeScopes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public Microsoft.Extensions.Logging.LogLevel LogToStandardErrorThreshold { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public string TimestampFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public bool UseUtcTimestamp { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-    }
-    [Microsoft.Extensions.Logging.ProviderAliasAttribute("Console")]
-    public partial class ConsoleLoggerProvider : Microsoft.Extensions.Logging.ILoggerProvider, Microsoft.Extensions.Logging.ISupportExternalScope, System.IDisposable
-    {
-        public ConsoleLoggerProvider(Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions> options) { }
-        public Microsoft.Extensions.Logging.ILogger CreateLogger(string name) { throw null; }
-        public void Dispose() { }
-        public void SetScopeProvider(Microsoft.Extensions.Logging.IExternalScopeProvider scopeProvider) { }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.cs
diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.netstandard2.0.cs
deleted file mode 100644
index 8583f37e586cc1..00000000000000
--- a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.netstandard2.0.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Logging
-{
-    public static partial class DebugLoggerFactoryExtensions
-    {
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddDebug(this Microsoft.Extensions.Logging.ILoggingBuilder builder) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Logging.Debug
-{
-    [Microsoft.Extensions.Logging.ProviderAliasAttribute("Debug")]
-    public partial class DebugLoggerProvider : Microsoft.Extensions.Logging.ILoggerProvider, System.IDisposable
-    {
-        public DebugLoggerProvider() { }
-        public Microsoft.Extensions.Logging.ILogger CreateLogger(string name) { throw null; }
-        public void Dispose() { }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.cs
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.netstandard2.0.cs
deleted file mode 100644
index ce5db7be8c0a8b..00000000000000
--- a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.netstandard2.0.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Logging
-{
-    public static partial class EventLoggerFactoryExtensions
-    {
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddEventLog(this Microsoft.Extensions.Logging.ILoggingBuilder builder) { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddEventLog(this Microsoft.Extensions.Logging.ILoggingBuilder builder, Microsoft.Extensions.Logging.EventLog.EventLogSettings settings) { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddEventLog(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Action<Microsoft.Extensions.Logging.EventLog.EventLogSettings> configure) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Logging.EventLog
-{
-    [Microsoft.Extensions.Logging.ProviderAliasAttribute("EventLog")]
-    public partial class EventLogLoggerProvider : Microsoft.Extensions.Logging.ILoggerProvider, Microsoft.Extensions.Logging.ISupportExternalScope, System.IDisposable
-    {
-        public EventLogLoggerProvider() { }
-        public EventLogLoggerProvider(Microsoft.Extensions.Logging.EventLog.EventLogSettings settings) { }
-        public EventLogLoggerProvider(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Logging.EventLog.EventLogSettings> options) { }
-        public Microsoft.Extensions.Logging.ILogger CreateLogger(string name) { throw null; }
-        public void Dispose() { }
-        public void SetScopeProvider(Microsoft.Extensions.Logging.IExternalScopeProvider scopeProvider) { }
-    }
-    public partial class EventLogSettings
-    {
-        public EventLogSettings() { }
-        public System.Func<string, Microsoft.Extensions.Logging.LogLevel, bool> Filter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public string LogName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public string MachineName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public string SourceName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.cs
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.netstandard2.0.cs
deleted file mode 100644
index c123c1a5183198..00000000000000
--- a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.netstandard2.0.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Logging
-{
-    public static partial class EventSourceLoggerFactoryExtensions
-    {
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddEventSourceLogger(this Microsoft.Extensions.Logging.ILoggingBuilder builder) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Logging.EventSource
-{
-    [Microsoft.Extensions.Logging.ProviderAliasAttribute("EventSource")]
-    public partial class EventSourceLoggerProvider : Microsoft.Extensions.Logging.ILoggerProvider, System.IDisposable
-    {
-        public EventSourceLoggerProvider(Microsoft.Extensions.Logging.EventSource.LoggingEventSource eventSource) { }
-        public Microsoft.Extensions.Logging.ILogger CreateLogger(string categoryName) { throw null; }
-        public void Dispose() { }
-    }
-    [System.Diagnostics.Tracing.EventSourceAttribute(Name="Microsoft-Extensions-Logging")]
-    public sealed partial class LoggingEventSource : System.Diagnostics.Tracing.EventSource
-    {
-        internal LoggingEventSource() { }
-        protected override void OnEventCommand(System.Diagnostics.Tracing.EventCommandEventArgs command) { }
-        public static partial class Keywords
-        {
-            public const System.Diagnostics.Tracing.EventKeywords FormattedMessage = (System.Diagnostics.Tracing.EventKeywords)(4);
-            public const System.Diagnostics.Tracing.EventKeywords JsonMessage = (System.Diagnostics.Tracing.EventKeywords)(8);
-            public const System.Diagnostics.Tracing.EventKeywords Message = (System.Diagnostics.Tracing.EventKeywords)(2);
-            public const System.Diagnostics.Tracing.EventKeywords Meta = (System.Diagnostics.Tracing.EventKeywords)(1);
-        }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.cs
diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.netstandard2.0.cs
deleted file mode 100644
index 5a7ea4245edf85..00000000000000
--- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.netstandard2.0.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.Logging
-{
-    public static partial class TraceSourceFactoryExtensions
-    {
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddTraceSource(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Diagnostics.SourceSwitch sourceSwitch) { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddTraceSource(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Diagnostics.SourceSwitch sourceSwitch, System.Diagnostics.TraceListener listener) { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddTraceSource(this Microsoft.Extensions.Logging.ILoggingBuilder builder, string switchName) { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddTraceSource(this Microsoft.Extensions.Logging.ILoggingBuilder builder, string switchName, System.Diagnostics.TraceListener listener) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Logging.TraceSource
-{
-    [Microsoft.Extensions.Logging.ProviderAliasAttribute("TraceSource")]
-    public partial class TraceSourceLoggerProvider : Microsoft.Extensions.Logging.ILoggerProvider, System.IDisposable
-    {
-        public TraceSourceLoggerProvider(System.Diagnostics.SourceSwitch rootSourceSwitch) { }
-        public TraceSourceLoggerProvider(System.Diagnostics.SourceSwitch rootSourceSwitch, System.Diagnostics.TraceListener rootTraceListener) { }
-        public Microsoft.Extensions.Logging.ILogger CreateLogger(string name) { throw null; }
-        public void Dispose() { }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs
diff --git a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.netstandard2.0.cs
deleted file mode 100644
index a7233571ac4270..00000000000000
--- a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.netstandard2.0.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    public static partial class LoggingServiceCollectionExtensions
-    {
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action<Microsoft.Extensions.Logging.ILoggingBuilder> configure) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Logging
-{
-    public static partial class FilterLoggingBuilderExtensions
-    {
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddFilter(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Func<Microsoft.Extensions.Logging.LogLevel, bool> levelFilter) { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddFilter(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Func<string, Microsoft.Extensions.Logging.LogLevel, bool> categoryLevelFilter) { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddFilter(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Func<string, string, Microsoft.Extensions.Logging.LogLevel, bool> filter) { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddFilter(this Microsoft.Extensions.Logging.ILoggingBuilder builder, string category, Microsoft.Extensions.Logging.LogLevel level) { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddFilter(this Microsoft.Extensions.Logging.ILoggingBuilder builder, string category, System.Func<Microsoft.Extensions.Logging.LogLevel, bool> levelFilter) { throw null; }
-        public static Microsoft.Extensions.Logging.LoggerFilterOptions AddFilter(this Microsoft.Extensions.Logging.LoggerFilterOptions builder, System.Func<Microsoft.Extensions.Logging.LogLevel, bool> levelFilter) { throw null; }
-        public static Microsoft.Extensions.Logging.LoggerFilterOptions AddFilter(this Microsoft.Extensions.Logging.LoggerFilterOptions builder, System.Func<string, Microsoft.Extensions.Logging.LogLevel, bool> categoryLevelFilter) { throw null; }
-        public static Microsoft.Extensions.Logging.LoggerFilterOptions AddFilter(this Microsoft.Extensions.Logging.LoggerFilterOptions builder, System.Func<string, string, Microsoft.Extensions.Logging.LogLevel, bool> filter) { throw null; }
-        public static Microsoft.Extensions.Logging.LoggerFilterOptions AddFilter(this Microsoft.Extensions.Logging.LoggerFilterOptions builder, string category, Microsoft.Extensions.Logging.LogLevel level) { throw null; }
-        public static Microsoft.Extensions.Logging.LoggerFilterOptions AddFilter(this Microsoft.Extensions.Logging.LoggerFilterOptions builder, string category, System.Func<Microsoft.Extensions.Logging.LogLevel, bool> levelFilter) { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddFilter<T>(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Func<Microsoft.Extensions.Logging.LogLevel, bool> levelFilter) where T : Microsoft.Extensions.Logging.ILoggerProvider { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddFilter<T>(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Func<string, Microsoft.Extensions.Logging.LogLevel, bool> categoryLevelFilter) where T : Microsoft.Extensions.Logging.ILoggerProvider { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddFilter<T>(this Microsoft.Extensions.Logging.ILoggingBuilder builder, string category, Microsoft.Extensions.Logging.LogLevel level) where T : Microsoft.Extensions.Logging.ILoggerProvider { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddFilter<T>(this Microsoft.Extensions.Logging.ILoggingBuilder builder, string category, System.Func<Microsoft.Extensions.Logging.LogLevel, bool> levelFilter) where T : Microsoft.Extensions.Logging.ILoggerProvider { throw null; }
-        public static Microsoft.Extensions.Logging.LoggerFilterOptions AddFilter<T>(this Microsoft.Extensions.Logging.LoggerFilterOptions builder, System.Func<Microsoft.Extensions.Logging.LogLevel, bool> levelFilter) where T : Microsoft.Extensions.Logging.ILoggerProvider { throw null; }
-        public static Microsoft.Extensions.Logging.LoggerFilterOptions AddFilter<T>(this Microsoft.Extensions.Logging.LoggerFilterOptions builder, System.Func<string, Microsoft.Extensions.Logging.LogLevel, bool> categoryLevelFilter) where T : Microsoft.Extensions.Logging.ILoggerProvider { throw null; }
-        public static Microsoft.Extensions.Logging.LoggerFilterOptions AddFilter<T>(this Microsoft.Extensions.Logging.LoggerFilterOptions builder, string category, Microsoft.Extensions.Logging.LogLevel level) where T : Microsoft.Extensions.Logging.ILoggerProvider { throw null; }
-        public static Microsoft.Extensions.Logging.LoggerFilterOptions AddFilter<T>(this Microsoft.Extensions.Logging.LoggerFilterOptions builder, string category, System.Func<Microsoft.Extensions.Logging.LogLevel, bool> levelFilter) where T : Microsoft.Extensions.Logging.ILoggerProvider { throw null; }
-    }
-    public partial interface ILoggingBuilder
-    {
-        Microsoft.Extensions.DependencyInjection.IServiceCollection Services { get; }
-    }
-    public partial class LoggerFactory : Microsoft.Extensions.Logging.ILoggerFactory, System.IDisposable
-    {
-        public LoggerFactory() { }
-        public LoggerFactory(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Logging.ILoggerProvider> providers) { }
-        public LoggerFactory(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Logging.ILoggerProvider> providers, Microsoft.Extensions.Logging.LoggerFilterOptions filterOptions) { }
-        public LoggerFactory(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Logging.ILoggerProvider> providers, Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Extensions.Logging.LoggerFilterOptions> filterOption) { }
-        public void AddProvider(Microsoft.Extensions.Logging.ILoggerProvider provider) { }
-        protected virtual bool CheckDisposed() { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggerFactory Create(System.Action<Microsoft.Extensions.Logging.ILoggingBuilder> configure) { throw null; }
-        public Microsoft.Extensions.Logging.ILogger CreateLogger(string categoryName) { throw null; }
-        public void Dispose() { }
-    }
-    public partial class LoggerFilterOptions
-    {
-        public LoggerFilterOptions() { }
-        public bool CaptureScopes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public Microsoft.Extensions.Logging.LogLevel MinLevel { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public System.Collections.Generic.IList<Microsoft.Extensions.Logging.LoggerFilterRule> Rules { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-    }
-    public partial class LoggerFilterRule
-    {
-        public LoggerFilterRule(string providerName, string categoryName, Microsoft.Extensions.Logging.LogLevel? logLevel, System.Func<string, string, Microsoft.Extensions.Logging.LogLevel, bool> filter) { }
-        public string CategoryName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public System.Func<string, string, Microsoft.Extensions.Logging.LogLevel, bool> Filter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public Microsoft.Extensions.Logging.LogLevel? LogLevel { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string ProviderName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public override string ToString() { throw null; }
-    }
-    public static partial class LoggingBuilderExtensions
-    {
-        public static Microsoft.Extensions.Logging.ILoggingBuilder AddProvider(this Microsoft.Extensions.Logging.ILoggingBuilder builder, Microsoft.Extensions.Logging.ILoggerProvider provider) { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder ClearProviders(this Microsoft.Extensions.Logging.ILoggingBuilder builder) { throw null; }
-        public static Microsoft.Extensions.Logging.ILoggingBuilder SetMinimumLevel(this Microsoft.Extensions.Logging.ILoggingBuilder builder, Microsoft.Extensions.Logging.LogLevel level) { throw null; }
-    }
-    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=false, Inherited=false)]
-    public partial class ProviderAliasAttribute : System.Attribute
-    {
-        public ProviderAliasAttribute(string alias) { }
-        public string Alias { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.cs
diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.netstandard2.0.cs
deleted file mode 100644
index e66c32090379a5..00000000000000
--- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.netstandard2.0.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    public static partial class OptionsBuilderConfigurationExtensions
-    {
-        public static Microsoft.Extensions.Options.OptionsBuilder<TOptions> Bind<TOptions>(this Microsoft.Extensions.Options.OptionsBuilder<TOptions> optionsBuilder, Microsoft.Extensions.Configuration.IConfiguration config) where TOptions : class { throw null; }
-        public static Microsoft.Extensions.Options.OptionsBuilder<TOptions> Bind<TOptions>(this Microsoft.Extensions.Options.OptionsBuilder<TOptions> optionsBuilder, Microsoft.Extensions.Configuration.IConfiguration config, System.Action<Microsoft.Extensions.Configuration.BinderOptions> configureBinder) where TOptions : class { throw null; }
-    }
-    public static partial class OptionsConfigurationServiceCollectionExtensions
-    {
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection Configure<TOptions>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfiguration config) where TOptions : class { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection Configure<TOptions>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfiguration config, System.Action<Microsoft.Extensions.Configuration.BinderOptions> configureBinder) where TOptions : class { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection Configure<TOptions>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name, Microsoft.Extensions.Configuration.IConfiguration config) where TOptions : class { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection Configure<TOptions>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name, Microsoft.Extensions.Configuration.IConfiguration config, System.Action<Microsoft.Extensions.Configuration.BinderOptions> configureBinder) where TOptions : class { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Options
-{
-    public partial class ConfigurationChangeTokenSource<TOptions> : Microsoft.Extensions.Options.IOptionsChangeTokenSource<TOptions>
-    {
-        public ConfigurationChangeTokenSource(Microsoft.Extensions.Configuration.IConfiguration config) { }
-        public ConfigurationChangeTokenSource(string name, Microsoft.Extensions.Configuration.IConfiguration config) { }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public Microsoft.Extensions.Primitives.IChangeToken GetChangeToken() { throw null; }
-    }
-    public partial class ConfigureFromConfigurationOptions<TOptions> : Microsoft.Extensions.Options.ConfigureOptions<TOptions> where TOptions : class
-    {
-        public ConfigureFromConfigurationOptions(Microsoft.Extensions.Configuration.IConfiguration config) : base (default(System.Action<TOptions>)) { }
-    }
-    public partial class NamedConfigureFromConfigurationOptions<TOptions> : Microsoft.Extensions.Options.ConfigureNamedOptions<TOptions> where TOptions : class
-    {
-        public NamedConfigureFromConfigurationOptions(string name, Microsoft.Extensions.Configuration.IConfiguration config) : base (default(string), default(System.Action<TOptions>)) { }
-        public NamedConfigureFromConfigurationOptions(string name, Microsoft.Extensions.Configuration.IConfiguration config, System.Action<Microsoft.Extensions.Configuration.BinderOptions> configureBinder) : base (default(string), default(System.Action<TOptions>)) { }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.cs
diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.netstandard2.0.cs
deleted file mode 100644
index 13fdbc84780657..00000000000000
--- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.netstandard2.0.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    public static partial class OptionsBuilderDataAnnotationsExtensions
-    {
-        public static Microsoft.Extensions.Options.OptionsBuilder<TOptions> ValidateDataAnnotations<TOptions>(this Microsoft.Extensions.Options.OptionsBuilder<TOptions> optionsBuilder) where TOptions : class { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Options
-{
-    public partial class DataAnnotationValidateOptions<TOptions> : Microsoft.Extensions.Options.IValidateOptions<TOptions> where TOptions : class
-    {
-        public DataAnnotationValidateOptions(string name) { }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options) { throw null; }
-    }
-}
diff --git a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.cs
diff --git a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.netstandard2.0.cs
deleted file mode 100644
index 76e96b817796f7..00000000000000
--- a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.netstandard2.0.cs
+++ /dev/null
@@ -1,359 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    public static partial class OptionsServiceCollectionExtensions
-    {
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddOptions(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; }
-        public static Microsoft.Extensions.Options.OptionsBuilder<TOptions> AddOptions<TOptions>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) where TOptions : class { throw null; }
-        public static Microsoft.Extensions.Options.OptionsBuilder<TOptions> AddOptions<TOptions>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name) where TOptions : class { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection ConfigureAll<TOptions>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action<TOptions> configureOptions) where TOptions : class { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection ConfigureOptions(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, object configureInstance) { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection ConfigureOptions(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Type configureType) { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection ConfigureOptions<TConfigureOptions>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) where TConfigureOptions : class { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection Configure<TOptions>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action<TOptions> configureOptions) where TOptions : class { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection Configure<TOptions>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name, System.Action<TOptions> configureOptions) where TOptions : class { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection PostConfigureAll<TOptions>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action<TOptions> configureOptions) where TOptions : class { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection PostConfigure<TOptions>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action<TOptions> configureOptions) where TOptions : class { throw null; }
-        public static Microsoft.Extensions.DependencyInjection.IServiceCollection PostConfigure<TOptions>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name, System.Action<TOptions> configureOptions) where TOptions : class { throw null; }
-    }
-}
-namespace Microsoft.Extensions.Options
-{
-    public partial class ConfigureNamedOptions<TOptions> : Microsoft.Extensions.Options.IConfigureNamedOptions<TOptions>, Microsoft.Extensions.Options.IConfigureOptions<TOptions> where TOptions : class
-    {
-        public ConfigureNamedOptions(string name, System.Action<TOptions> action) { }
-        public System.Action<TOptions> Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual void Configure(string name, TOptions options) { }
-        public void Configure(TOptions options) { }
-    }
-    public partial class ConfigureNamedOptions<TOptions, TDep> : Microsoft.Extensions.Options.IConfigureNamedOptions<TOptions>, Microsoft.Extensions.Options.IConfigureOptions<TOptions> where TOptions : class where TDep : class
-    {
-        public ConfigureNamedOptions(string name, TDep dependency, System.Action<TOptions, TDep> action) { }
-        public System.Action<TOptions, TDep> Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep Dependency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual void Configure(string name, TOptions options) { }
-        public void Configure(TOptions options) { }
-    }
-    public partial class ConfigureNamedOptions<TOptions, TDep1, TDep2> : Microsoft.Extensions.Options.IConfigureNamedOptions<TOptions>, Microsoft.Extensions.Options.IConfigureOptions<TOptions> where TOptions : class where TDep1 : class where TDep2 : class
-    {
-        public ConfigureNamedOptions(string name, TDep1 dependency, TDep2 dependency2, System.Action<TOptions, TDep1, TDep2> action) { }
-        public System.Action<TOptions, TDep1, TDep2> Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep1 Dependency1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep2 Dependency2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual void Configure(string name, TOptions options) { }
-        public void Configure(TOptions options) { }
-    }
-    public partial class ConfigureNamedOptions<TOptions, TDep1, TDep2, TDep3> : Microsoft.Extensions.Options.IConfigureNamedOptions<TOptions>, Microsoft.Extensions.Options.IConfigureOptions<TOptions> where TOptions : class where TDep1 : class where TDep2 : class where TDep3 : class
-    {
-        public ConfigureNamedOptions(string name, TDep1 dependency, TDep2 dependency2, TDep3 dependency3, System.Action<TOptions, TDep1, TDep2, TDep3> action) { }
-        public System.Action<TOptions, TDep1, TDep2, TDep3> Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep1 Dependency1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep2 Dependency2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep3 Dependency3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual void Configure(string name, TOptions options) { }
-        public void Configure(TOptions options) { }
-    }
-    public partial class ConfigureNamedOptions<TOptions, TDep1, TDep2, TDep3, TDep4> : Microsoft.Extensions.Options.IConfigureNamedOptions<TOptions>, Microsoft.Extensions.Options.IConfigureOptions<TOptions> where TOptions : class where TDep1 : class where TDep2 : class where TDep3 : class where TDep4 : class
-    {
-        public ConfigureNamedOptions(string name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, TDep4 dependency4, System.Action<TOptions, TDep1, TDep2, TDep3, TDep4> action) { }
-        public System.Action<TOptions, TDep1, TDep2, TDep3, TDep4> Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep1 Dependency1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep2 Dependency2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep3 Dependency3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep4 Dependency4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual void Configure(string name, TOptions options) { }
-        public void Configure(TOptions options) { }
-    }
-    public partial class ConfigureNamedOptions<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5> : Microsoft.Extensions.Options.IConfigureNamedOptions<TOptions>, Microsoft.Extensions.Options.IConfigureOptions<TOptions> where TOptions : class where TDep1 : class where TDep2 : class where TDep3 : class where TDep4 : class where TDep5 : class
-    {
-        public ConfigureNamedOptions(string name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, TDep4 dependency4, TDep5 dependency5, System.Action<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5> action) { }
-        public System.Action<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5> Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep1 Dependency1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep2 Dependency2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep3 Dependency3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep4 Dependency4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep5 Dependency5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual void Configure(string name, TOptions options) { }
-        public void Configure(TOptions options) { }
-    }
-    public partial class ConfigureOptions<TOptions> : Microsoft.Extensions.Options.IConfigureOptions<TOptions> where TOptions : class
-    {
-        public ConfigureOptions(System.Action<TOptions> action) { }
-        public System.Action<TOptions> Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual void Configure(TOptions options) { }
-    }
-    public partial interface IConfigureNamedOptions<in TOptions> : Microsoft.Extensions.Options.IConfigureOptions<TOptions> where TOptions : class
-    {
-        void Configure(string name, TOptions options);
-    }
-    public partial interface IConfigureOptions<in TOptions> where TOptions : class
-    {
-        void Configure(TOptions options);
-    }
-    public partial interface IOptionsChangeTokenSource<out TOptions>
-    {
-        string Name { get; }
-        Microsoft.Extensions.Primitives.IChangeToken GetChangeToken();
-    }
-    public partial interface IOptionsFactory<TOptions> where TOptions : class
-    {
-        TOptions Create(string name);
-    }
-    public partial interface IOptionsMonitorCache<TOptions> where TOptions : class
-    {
-        void Clear();
-        TOptions GetOrAdd(string name, System.Func<TOptions> createOptions);
-        bool TryAdd(string name, TOptions options);
-        bool TryRemove(string name);
-    }
-    public partial interface IOptionsMonitor<out TOptions>
-    {
-        TOptions CurrentValue { get; }
-        TOptions Get(string name);
-        System.IDisposable OnChange(System.Action<TOptions, string> listener);
-    }
-    public partial interface IOptionsSnapshot<out TOptions> : Microsoft.Extensions.Options.IOptions<TOptions> where TOptions : class
-    {
-        TOptions Get(string name);
-    }
-    public partial interface IOptions<out TOptions> where TOptions : class
-    {
-        TOptions Value { get; }
-    }
-    public partial interface IPostConfigureOptions<in TOptions> where TOptions : class
-    {
-        void PostConfigure(string name, TOptions options);
-    }
-    public partial interface IValidateOptions<TOptions> where TOptions : class
-    {
-        Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options);
-    }
-    public static partial class Options
-    {
-        public static readonly string DefaultName;
-        public static Microsoft.Extensions.Options.IOptions<TOptions> Create<TOptions>(TOptions options) where TOptions : class { throw null; }
-    }
-    public partial class OptionsBuilder<TOptions> where TOptions : class
-    {
-        public OptionsBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name) { }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Configure(System.Action<TOptions> configureOptions) { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Configure<TDep>(System.Action<TOptions, TDep> configureOptions) where TDep : class { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Configure<TDep1, TDep2>(System.Action<TOptions, TDep1, TDep2> configureOptions) where TDep1 : class where TDep2 : class { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Configure<TDep1, TDep2, TDep3>(System.Action<TOptions, TDep1, TDep2, TDep3> configureOptions) where TDep1 : class where TDep2 : class where TDep3 : class { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Configure<TDep1, TDep2, TDep3, TDep4>(System.Action<TOptions, TDep1, TDep2, TDep3, TDep4> configureOptions) where TDep1 : class where TDep2 : class where TDep3 : class where TDep4 : class { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Configure<TDep1, TDep2, TDep3, TDep4, TDep5>(System.Action<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5> configureOptions) where TDep1 : class where TDep2 : class where TDep3 : class where TDep4 : class where TDep5 : class { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> PostConfigure(System.Action<TOptions> configureOptions) { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> PostConfigure<TDep>(System.Action<TOptions, TDep> configureOptions) where TDep : class { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> PostConfigure<TDep1, TDep2>(System.Action<TOptions, TDep1, TDep2> configureOptions) where TDep1 : class where TDep2 : class { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> PostConfigure<TDep1, TDep2, TDep3>(System.Action<TOptions, TDep1, TDep2, TDep3> configureOptions) where TDep1 : class where TDep2 : class where TDep3 : class { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> PostConfigure<TDep1, TDep2, TDep3, TDep4>(System.Action<TOptions, TDep1, TDep2, TDep3, TDep4> configureOptions) where TDep1 : class where TDep2 : class where TDep3 : class where TDep4 : class { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> PostConfigure<TDep1, TDep2, TDep3, TDep4, TDep5>(System.Action<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5> configureOptions) where TDep1 : class where TDep2 : class where TDep3 : class where TDep4 : class where TDep5 : class { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Validate(System.Func<TOptions, bool> validation) { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Validate(System.Func<TOptions, bool> validation, string failureMessage) { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Validate<TDep>(System.Func<TOptions, TDep, bool> validation) { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Validate<TDep>(System.Func<TOptions, TDep, bool> validation, string failureMessage) { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Validate<TDep1, TDep2>(System.Func<TOptions, TDep1, TDep2, bool> validation) { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Validate<TDep1, TDep2>(System.Func<TOptions, TDep1, TDep2, bool> validation, string failureMessage) { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Validate<TDep1, TDep2, TDep3>(System.Func<TOptions, TDep1, TDep2, TDep3, bool> validation) { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Validate<TDep1, TDep2, TDep3>(System.Func<TOptions, TDep1, TDep2, TDep3, bool> validation, string failureMessage) { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Validate<TDep1, TDep2, TDep3, TDep4>(System.Func<TOptions, TDep1, TDep2, TDep3, TDep4, bool> validation) { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Validate<TDep1, TDep2, TDep3, TDep4>(System.Func<TOptions, TDep1, TDep2, TDep3, TDep4, bool> validation, string failureMessage) { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Validate<TDep1, TDep2, TDep3, TDep4, TDep5>(System.Func<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5, bool> validation) { throw null; }
-        public virtual Microsoft.Extensions.Options.OptionsBuilder<TOptions> Validate<TDep1, TDep2, TDep3, TDep4, TDep5>(System.Func<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5, bool> validation, string failureMessage) { throw null; }
-    }
-    public partial class OptionsCache<TOptions> : Microsoft.Extensions.Options.IOptionsMonitorCache<TOptions> where TOptions : class
-    {
-        public OptionsCache() { }
-        public void Clear() { }
-        public virtual TOptions GetOrAdd(string name, System.Func<TOptions> createOptions) { throw null; }
-        public virtual bool TryAdd(string name, TOptions options) { throw null; }
-        public virtual bool TryRemove(string name) { throw null; }
-    }
-    public partial class OptionsFactory<TOptions> : Microsoft.Extensions.Options.IOptionsFactory<TOptions> where TOptions : class
-    {
-        public OptionsFactory(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IConfigureOptions<TOptions>> setups, System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IPostConfigureOptions<TOptions>> postConfigures) { }
-        public OptionsFactory(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IConfigureOptions<TOptions>> setups, System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IPostConfigureOptions<TOptions>> postConfigures, System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IValidateOptions<TOptions>> validations) { }
-        public TOptions Create(string name) { throw null; }
-        protected virtual TOptions CreateInstance(string name) { throw null; }
-    }
-    public partial class OptionsManager<TOptions> : Microsoft.Extensions.Options.IOptions<TOptions>, Microsoft.Extensions.Options.IOptionsSnapshot<TOptions> where TOptions : class
-    {
-        public OptionsManager(Microsoft.Extensions.Options.IOptionsFactory<TOptions> factory) { }
-        public TOptions Value { get { throw null; } }
-        public virtual TOptions Get(string name) { throw null; }
-    }
-    public static partial class OptionsMonitorExtensions
-    {
-        public static System.IDisposable OnChange<TOptions>(this Microsoft.Extensions.Options.IOptionsMonitor<TOptions> monitor, System.Action<TOptions> listener) { throw null; }
-    }
-    public partial class OptionsMonitor<TOptions> : Microsoft.Extensions.Options.IOptionsMonitor<TOptions>, System.IDisposable where TOptions : class
-    {
-        public OptionsMonitor(Microsoft.Extensions.Options.IOptionsFactory<TOptions> factory, System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IOptionsChangeTokenSource<TOptions>> sources, Microsoft.Extensions.Options.IOptionsMonitorCache<TOptions> cache) { }
-        public TOptions CurrentValue { get { throw null; } }
-        public void Dispose() { }
-        public virtual TOptions Get(string name) { throw null; }
-        public System.IDisposable OnChange(System.Action<TOptions, string> listener) { throw null; }
-    }
-    public partial class OptionsValidationException : System.Exception
-    {
-        public OptionsValidationException(string optionsName, System.Type optionsType, System.Collections.Generic.IEnumerable<string> failureMessages) { }
-        public System.Collections.Generic.IEnumerable<string> Failures { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public override string Message { get { throw null; } }
-        public string OptionsName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public System.Type OptionsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-    }
-    public partial class OptionsWrapper<TOptions> : Microsoft.Extensions.Options.IOptions<TOptions> where TOptions : class
-    {
-        public OptionsWrapper(TOptions options) { }
-        public TOptions Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-    }
-    public partial class PostConfigureOptions<TOptions> : Microsoft.Extensions.Options.IPostConfigureOptions<TOptions> where TOptions : class
-    {
-        public PostConfigureOptions(string name, System.Action<TOptions> action) { }
-        public System.Action<TOptions> Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual void PostConfigure(string name, TOptions options) { }
-    }
-    public partial class PostConfigureOptions<TOptions, TDep> : Microsoft.Extensions.Options.IPostConfigureOptions<TOptions> where TOptions : class where TDep : class
-    {
-        public PostConfigureOptions(string name, TDep dependency, System.Action<TOptions, TDep> action) { }
-        public System.Action<TOptions, TDep> Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep Dependency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual void PostConfigure(string name, TOptions options) { }
-        public void PostConfigure(TOptions options) { }
-    }
-    public partial class PostConfigureOptions<TOptions, TDep1, TDep2> : Microsoft.Extensions.Options.IPostConfigureOptions<TOptions> where TOptions : class where TDep1 : class where TDep2 : class
-    {
-        public PostConfigureOptions(string name, TDep1 dependency, TDep2 dependency2, System.Action<TOptions, TDep1, TDep2> action) { }
-        public System.Action<TOptions, TDep1, TDep2> Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep1 Dependency1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep2 Dependency2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual void PostConfigure(string name, TOptions options) { }
-        public void PostConfigure(TOptions options) { }
-    }
-    public partial class PostConfigureOptions<TOptions, TDep1, TDep2, TDep3> : Microsoft.Extensions.Options.IPostConfigureOptions<TOptions> where TOptions : class where TDep1 : class where TDep2 : class where TDep3 : class
-    {
-        public PostConfigureOptions(string name, TDep1 dependency, TDep2 dependency2, TDep3 dependency3, System.Action<TOptions, TDep1, TDep2, TDep3> action) { }
-        public System.Action<TOptions, TDep1, TDep2, TDep3> Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep1 Dependency1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep2 Dependency2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep3 Dependency3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual void PostConfigure(string name, TOptions options) { }
-        public void PostConfigure(TOptions options) { }
-    }
-    public partial class PostConfigureOptions<TOptions, TDep1, TDep2, TDep3, TDep4> : Microsoft.Extensions.Options.IPostConfigureOptions<TOptions> where TOptions : class where TDep1 : class where TDep2 : class where TDep3 : class where TDep4 : class
-    {
-        public PostConfigureOptions(string name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, TDep4 dependency4, System.Action<TOptions, TDep1, TDep2, TDep3, TDep4> action) { }
-        public System.Action<TOptions, TDep1, TDep2, TDep3, TDep4> Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep1 Dependency1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep2 Dependency2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep3 Dependency3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep4 Dependency4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual void PostConfigure(string name, TOptions options) { }
-        public void PostConfigure(TOptions options) { }
-    }
-    public partial class PostConfigureOptions<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5> : Microsoft.Extensions.Options.IPostConfigureOptions<TOptions> where TOptions : class where TDep1 : class where TDep2 : class where TDep3 : class where TDep4 : class where TDep5 : class
-    {
-        public PostConfigureOptions(string name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, TDep4 dependency4, TDep5 dependency5, System.Action<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5> action) { }
-        public System.Action<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5> Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep1 Dependency1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep2 Dependency2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep3 Dependency3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep4 Dependency4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep5 Dependency5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public virtual void PostConfigure(string name, TOptions options) { }
-        public void PostConfigure(TOptions options) { }
-    }
-    public partial class ValidateOptionsResult
-    {
-        public static readonly Microsoft.Extensions.Options.ValidateOptionsResult Skip;
-        public static readonly Microsoft.Extensions.Options.ValidateOptionsResult Success;
-        public ValidateOptionsResult() { }
-        public bool Failed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] protected set { } }
-        public string FailureMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] protected set { } }
-        public System.Collections.Generic.IEnumerable<string> Failures { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] protected set { } }
-        public bool Skipped { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] protected set { } }
-        public bool Succeeded { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] protected set { } }
-        public static Microsoft.Extensions.Options.ValidateOptionsResult Fail(System.Collections.Generic.IEnumerable<string> failures) { throw null; }
-        public static Microsoft.Extensions.Options.ValidateOptionsResult Fail(string failureMessage) { throw null; }
-    }
-    public partial class ValidateOptions<TOptions> : Microsoft.Extensions.Options.IValidateOptions<TOptions> where TOptions : class
-    {
-        public ValidateOptions(string name, System.Func<TOptions, bool> validation, string failureMessage) { }
-        public string FailureMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public System.Func<TOptions, bool> Validation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options) { throw null; }
-    }
-    public partial class ValidateOptions<TOptions, TDep> : Microsoft.Extensions.Options.IValidateOptions<TOptions> where TOptions : class
-    {
-        public ValidateOptions(string name, TDep dependency, System.Func<TOptions, TDep, bool> validation, string failureMessage) { }
-        public TDep Dependency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string FailureMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public System.Func<TOptions, TDep, bool> Validation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options) { throw null; }
-    }
-    public partial class ValidateOptions<TOptions, TDep1, TDep2> : Microsoft.Extensions.Options.IValidateOptions<TOptions> where TOptions : class
-    {
-        public ValidateOptions(string name, TDep1 dependency1, TDep2 dependency2, System.Func<TOptions, TDep1, TDep2, bool> validation, string failureMessage) { }
-        public TDep1 Dependency1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep2 Dependency2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string FailureMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public System.Func<TOptions, TDep1, TDep2, bool> Validation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options) { throw null; }
-    }
-    public partial class ValidateOptions<TOptions, TDep1, TDep2, TDep3> : Microsoft.Extensions.Options.IValidateOptions<TOptions> where TOptions : class
-    {
-        public ValidateOptions(string name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, System.Func<TOptions, TDep1, TDep2, TDep3, bool> validation, string failureMessage) { }
-        public TDep1 Dependency1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep2 Dependency2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep3 Dependency3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string FailureMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public System.Func<TOptions, TDep1, TDep2, TDep3, bool> Validation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options) { throw null; }
-    }
-    public partial class ValidateOptions<TOptions, TDep1, TDep2, TDep3, TDep4> : Microsoft.Extensions.Options.IValidateOptions<TOptions> where TOptions : class
-    {
-        public ValidateOptions(string name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, TDep4 dependency4, System.Func<TOptions, TDep1, TDep2, TDep3, TDep4, bool> validation, string failureMessage) { }
-        public TDep1 Dependency1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep2 Dependency2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep3 Dependency3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep4 Dependency4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string FailureMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public System.Func<TOptions, TDep1, TDep2, TDep3, TDep4, bool> Validation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options) { throw null; }
-    }
-    public partial class ValidateOptions<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5> : Microsoft.Extensions.Options.IValidateOptions<TOptions> where TOptions : class
-    {
-        public ValidateOptions(string name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, TDep4 dependency4, TDep5 dependency5, System.Func<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5, bool> validation, string failureMessage) { }
-        public TDep1 Dependency1 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep2 Dependency2 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep3 Dependency3 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep4 Dependency4 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public TDep5 Dependency5 { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string FailureMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public System.Func<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5, bool> Validation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options) { throw null; }
-    }
-}

From 7e5e5edb1c38d0e97b69589a01e9e3d34bdf01ca Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Wed, 4 Mar 2020 22:57:58 -0800
Subject: [PATCH 06/12] - Bulk move/rename Resources file from: Resources.resx
 to Resources\Strings.resx

---
 .../src/{Resources.resx => Resources/Strings.resx}              | 0
 .../src/{Resources.resx => Resources/Strings.resx}              | 0
 .../src/{Resources.resx => Resources/Strings.resx}              | 0
 .../src/{Resources.resx => Resources/Strings.resx}              | 0
 .../src/{Resources.resx => Resources/Strings.resx}              | 0
 .../src/{Resources.resx => Resources/Strings.resx}              | 0
 .../src/{Resources.resx => Resources/Strings.resx}              | 0
 .../src/{Resources.resx => Resources/Strings.resx}              | 2 +-
 .../src/{Resources.resx => Resources/Strings.resx}              | 0
 .../src/{Resources.resx => Resources/Strings.resx}              | 0
 .../src/{Resource.resx => Resources/Strings.resx}               | 0
 .../src/{Resources.resx => Resources/Strings.resx}              | 0
 12 files changed, 1 insertion(+), 1 deletion(-)
 rename src/libraries/Microsoft.Extensions.Configuration.Binder/src/{Resources.resx => Resources/Strings.resx} (100%)
 rename src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/{Resources.resx => Resources/Strings.resx} (100%)
 rename src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/{Resources.resx => Resources/Strings.resx} (100%)
 rename src/libraries/Microsoft.Extensions.Configuration.Ini/src/{Resources.resx => Resources/Strings.resx} (100%)
 rename src/libraries/Microsoft.Extensions.Configuration.Json/src/{Resources.resx => Resources/Strings.resx} (100%)
 rename src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/{Resources.resx => Resources/Strings.resx} (100%)
 rename src/libraries/Microsoft.Extensions.Configuration.Xml/src/{Resources.resx => Resources/Strings.resx} (100%)
 rename src/libraries/Microsoft.Extensions.Configuration/src/{Resources.resx => Resources/Strings.resx} (99%)
 rename src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/{Resources.resx => Resources/Strings.resx} (100%)
 rename src/libraries/Microsoft.Extensions.DependencyInjection/src/{Resources.resx => Resources/Strings.resx} (100%)
 rename src/libraries/Microsoft.Extensions.Logging.Abstractions/src/{Resource.resx => Resources/Strings.resx} (100%)
 rename src/libraries/Microsoft.Extensions.Options/src/{Resources.resx => Resources/Strings.resx} (100%)

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Resources.resx b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Resources/Strings.resx
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.Binder/src/Resources.resx
rename to src/libraries/Microsoft.Extensions.Configuration.Binder/src/Resources/Strings.resx
diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Resources.resx b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Resources/Strings.resx
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Resources.resx
rename to src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Resources/Strings.resx
diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Resources.resx b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Resources/Strings.resx
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Resources.resx
rename to src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Resources/Strings.resx
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Resources.resx b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Resources/Strings.resx
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.Ini/src/Resources.resx
rename to src/libraries/Microsoft.Extensions.Configuration.Ini/src/Resources/Strings.resx
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Resources.resx b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Resources/Strings.resx
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.Json/src/Resources.resx
rename to src/libraries/Microsoft.Extensions.Configuration.Json/src/Resources/Strings.resx
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Resources.resx b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Resources/Strings.resx
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Resources.resx
rename to src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Resources/Strings.resx
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Resources.resx b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Resources/Strings.resx
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.Xml/src/Resources.resx
rename to src/libraries/Microsoft.Extensions.Configuration.Xml/src/Resources/Strings.resx
diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/Resources.resx b/src/libraries/Microsoft.Extensions.Configuration/src/Resources/Strings.resx
similarity index 99%
rename from src/libraries/Microsoft.Extensions.Configuration/src/Resources.resx
rename to src/libraries/Microsoft.Extensions.Configuration/src/Resources/Strings.resx
index 7909d7e858421a..52fb2be3e50a17 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/src/Resources.resx
+++ b/src/libraries/Microsoft.Extensions.Configuration/src/Resources/Strings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Resources.resx b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Resources/Strings.resx
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Resources.resx
rename to src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Resources/Strings.resx
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Resources.resx b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Resources/Strings.resx
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/src/Resources.resx
rename to src/libraries/Microsoft.Extensions.DependencyInjection/src/Resources/Strings.resx
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Resource.resx b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Resources/Strings.resx
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Resource.resx
rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Resources/Strings.resx
diff --git a/src/libraries/Microsoft.Extensions.Options/src/Resources.resx b/src/libraries/Microsoft.Extensions.Options/src/Resources/Strings.resx
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Options/src/Resources.resx
rename to src/libraries/Microsoft.Extensions.Options/src/Resources/Strings.resx

From 7c4eb5d2ff80fd70af252c8b30d554851a7212eb Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Wed, 4 Mar 2020 23:47:03 -0800
Subject: [PATCH 07/12] - [x] Enables ref/src/test/pkg on FileSystemGlobbing --
 note: in a previous bulk commit, descriptions for FileProviders and
 FileSystemGlobbing were already added in json file

- [ ] TODO: test packaging failed with message:
 Unable to find description for package Microsoft.Extensions.FileSystemGlobbing
 (perhaps because it wants to create package for netcoreapp)
---
 src/libraries/Directory.Build.props           |  3 +-
 ...soft.Extensions.FileSystemGlobbing.pkgproj |  9 +++++
 ...icrosoft.Extensions.FileSystemGlobbing.cs} | 37 +++++++++----------
 ...osoft.Extensions.FileSystemGlobbing.csproj |  6 +--
 ...osoft.Extensions.FileSystemGlobbing.csproj | 14 +++----
 .../src/Properties/InternalsVisibleTo.cs      |  7 ++++
 ...Extensions.FileSystemGlobbing.Tests.csproj |  7 +++-
 src/libraries/pkg/baseline/packageIndex.json  | 26 ++++++++++++-
 8 files changed, 73 insertions(+), 36 deletions(-)
 create mode 100644 src/libraries/Microsoft.Extensions.FileSystemGlobbing/pkg/Microsoft.Extensions.FileSystemGlobbing.pkgproj
 rename src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/{Microsoft.Extensions.FileSystemGlobbing.netstandard2.0.cs => Microsoft.Extensions.FileSystemGlobbing.cs} (88%)
 create mode 100644 src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Properties/InternalsVisibleTo.cs

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 4ff8a6be977978..a68c90bf1d6559 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -5,6 +5,7 @@
   <Import Project="..\..\Directory.Build.props" />
 
   <ItemGroup>
+    <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileSystemGlobbing\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Primitives\**\*csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\ref\**\Microsoft.Extensions.*proj" Exclude="@(PortedExtensionsProject)" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\src\**\Microsoft.Extensions.*proj" Exclude="@(PortedExtensionsProject)" />
@@ -15,7 +16,7 @@
     <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
     <!-- Temporarily ignore nit warning/errors (e.g. extra whitespace) from Extensions projects -->
-    <NoWarn Condition="!$(MSBuildProjectName.EndsWith('.Tests'))">$(NoWarn);SA1129;SA1028;SA1027;SA1121;CA1200</NoWarn>
+    <NoWarn Condition="!$(MSBuildProjectName.EndsWith('.Tests'))">$(NoWarn);SA1129;SA1028;SA1027;SA1121;CA1200;SA1000;CA1507;CA1802;CA1825</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/pkg/Microsoft.Extensions.FileSystemGlobbing.pkgproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/pkg/Microsoft.Extensions.FileSystemGlobbing.pkgproj
new file mode 100644
index 00000000000000..d67bac31378275
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/pkg/Microsoft.Extensions.FileSystemGlobbing.pkgproj
@@ -0,0 +1,9 @@
+<Project DefaultTargets="Build">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
+  <ItemGroup>
+    <ProjectReference Include="..\src\Microsoft.Extensions.FileSystemGlobbing.csproj">
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
+</Project> 
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.cs
similarity index 88%
rename from src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.netstandard2.0.cs
rename to src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.cs
index 960da0d4746cec..abe125e2e38b40 100644
--- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.netstandard2.0.cs
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.cs
@@ -1,17 +1,19 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
+// ------------------------------------------------------------------------------
+// Changes to this file must follow the https://aka.ms/api-review process.
+// ------------------------------------------------------------------------------
 
 namespace Microsoft.Extensions.FileSystemGlobbing
 {
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public partial struct FilePatternMatch : System.IEquatable<Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch>
     {
         private object _dummy;
         private int _dummyPrimitive;
         public FilePatternMatch(string path, string stem) { throw null; }
-        public string Path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Stem { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public readonly string Path { get { throw null; } }
+        public readonly string Stem { get { throw null; } }
         public bool Equals(Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch other) { throw null; }
         public override bool Equals(object obj) { throw null; }
         public override int GetHashCode() { throw null; }
@@ -19,8 +21,8 @@ public partial struct FilePatternMatch : System.IEquatable<Microsoft.Extensions.
     public partial class InMemoryDirectoryInfo : Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
     {
         public InMemoryDirectoryInfo(string rootDir, System.Collections.Generic.IEnumerable<string> files) { }
-        public override string FullName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public override string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public override string FullName { get { throw null; } }
+        public override string Name { get { throw null; } }
         public override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase ParentDirectory { get { throw null; } }
         public override System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase> EnumerateFileSystemInfos() { throw null; }
         public override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase GetDirectory(string path) { throw null; }
@@ -48,8 +50,8 @@ public partial class PatternMatchingResult
     {
         public PatternMatchingResult(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch> files) { }
         public PatternMatchingResult(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch> files, bool hasMatches) { }
-        public System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch> Files { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public bool HasMatches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch> Files { get { throw null; } set { } }
+        public bool HasMatches { get { throw null; } }
     }
 }
 namespace Microsoft.Extensions.FileSystemGlobbing.Abstractions
@@ -126,14 +128,13 @@ public partial class MatcherContext
         public MatcherContext(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern> includePatterns, System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern> excludePatterns, Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directoryInfo, System.StringComparison comparison) { }
         public Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult Execute() { throw null; }
     }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public partial struct PatternTestResult
     {
         private object _dummy;
         private int _dummyPrimitive;
         public static readonly Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult Failed;
-        public bool IsSuccessful { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string Stem { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public readonly bool IsSuccessful { get { throw null; } }
+        public readonly string Stem { get { throw null; } }
         public static Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult Success(string stem) { throw null; }
     }
 }
@@ -149,7 +150,7 @@ public partial class LiteralPathSegment : Microsoft.Extensions.FileSystemGlobbin
     {
         public LiteralPathSegment(string value, System.StringComparison comparisonType) { }
         public bool CanProduceStem { get { throw null; } }
-        public string Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public string Value { get { throw null; } }
         public override bool Equals(object obj) { throw null; }
         public override int GetHashCode() { throw null; }
         public bool Match(string value) { throw null; }
@@ -170,10 +171,10 @@ public partial class WildcardPathSegment : Microsoft.Extensions.FileSystemGlobbi
     {
         public static readonly Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment MatchAll;
         public WildcardPathSegment(string beginsWith, System.Collections.Generic.List<string> contains, string endsWith, System.StringComparison comparisonType) { }
-        public string BeginsWith { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public string BeginsWith { get { throw null; } }
         public bool CanProduceStem { get { throw null; } }
-        public System.Collections.Generic.List<string> Contains { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string EndsWith { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public System.Collections.Generic.List<string> Contains { get { throw null; } }
+        public string EndsWith { get { throw null; } }
         public bool Match(string value) { throw null; }
     }
 }
@@ -182,13 +183,12 @@ namespace Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts
     public abstract partial class PatternContextLinear : Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData>
     {
         public PatternContextLinear(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern pattern) { }
-        protected Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern Pattern { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        protected Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern Pattern { get { throw null; } }
         protected string CalculateStem(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase matchedFile) { throw null; }
         protected bool IsLastSegment() { throw null; }
         public override void PushDirectory(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) { }
         public override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) { throw null; }
         protected bool TestMatchingSegment(string value) { throw null; }
-        [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
         public partial struct FrameData
         {
             private object _dummy;
@@ -214,7 +214,7 @@ public override void Declare(System.Action<Microsoft.Extensions.FileSystemGlobbi
     public abstract partial class PatternContextRagged : Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData>
     {
         public PatternContextRagged(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern pattern) { }
-        protected Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern Pattern { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        protected Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern Pattern { get { throw null; } }
         protected string CalculateStem(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase matchedFile) { throw null; }
         protected bool IsEndingGroup() { throw null; }
         protected bool IsStartingGroup() { throw null; }
@@ -223,7 +223,6 @@ public sealed override void PushDirectory(Microsoft.Extensions.FileSystemGlobbin
         public override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) { throw null; }
         protected bool TestMatchingGroup(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase value) { throw null; }
         protected bool TestMatchingSegment(string value) { throw null; }
-        [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
         public partial struct FrameData
         {
             private object _dummy;
@@ -268,7 +267,7 @@ public partial class PatternBuilder
     {
         public PatternBuilder() { }
         public PatternBuilder(System.StringComparison comparisonType) { }
-        public System.StringComparison ComparisonType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public System.StringComparison ComparisonType { get { throw null; } }
         public Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern Build(string pattern) { throw null; }
     }
 }
diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj
index c93da686d37f2e..3b99a60054e95d 100644
--- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj
@@ -1,10 +1,8 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.FileSystemGlobbing.netstandard2.0.cs" />
-    
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.FileSystemGlobbing.cs" />
   </ItemGroup>
 </Project>
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 65910694d06035..ef749cf22a8fa9 100644
--- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj
@@ -1,15 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <RootNamespace>Microsoft.Extensions.FileSystemGlobbing</RootNamespace>
-    <AssemblyName>Microsoft.Extensions.FileSystemGlobbing</AssemblyName>
-    <Description>File system globbing to find files matching a specified pattern.</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
-    <PackageTags>files;filesystem;glob;globbing</PackageTags>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,7 +10,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="$(SharedSourceRoot)HashCodeCombiner\*.cs" />
+    <Compile Include="$(CommonPath)Extensions\HashCodeCombiner\HashCodeCombiner.cs">
+      <Link>Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs</Link>
+    </Compile>
+    <Compile Include="**\*.cs"></Compile>
   </ItemGroup>
 
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Properties/InternalsVisibleTo.cs
new file mode 100644
index 00000000000000..e9c728eda33d29
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Properties/InternalsVisibleTo.cs
@@ -0,0 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.Extensions.FileSystemGlobbing.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] 
diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/tests/Microsoft.Extensions.FileSystemGlobbing.Tests.csproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/tests/Microsoft.Extensions.FileSystemGlobbing.Tests.csproj
index b153c2f218a88c..bb2be1175ca05b 100644
--- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/tests/Microsoft.Extensions.FileSystemGlobbing.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/tests/Microsoft.Extensions.FileSystemGlobbing.Tests.csproj
@@ -1,12 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <RootNamespace>Microsoft.Extensions.FileSystemGlobbing</RootNamespace>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <Reference Include="Microsoft.Extensions.FileSystemGlobbing" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json
index 19d9a7039dc49c..a0710486edf0c9 100644
--- a/src/libraries/pkg/baseline/packageIndex.json
+++ b/src/libraries/pkg/baseline/packageIndex.json
@@ -145,6 +145,28 @@
         "5.0.0.0": "5.0.0"
       }
     },
+    "Microsoft.Extensions.FileSystemGlobbing": {
+      "StableVersions": [
+        "1.0.0",
+        "1.0.1",
+        "1.1.0",
+        "1.1.1",
+        "2.0.0",
+        "2.0.1",
+        "2.1.0",
+        "2.1.1",
+        "2.2.0",
+        "3.0.0",
+        "3.0.1",
+        "3.0.2",
+        "3.1.0",
+        "3.1.1"
+      ],
+      "InboxOn": {},
+      "AssemblyVersionInPackageVersion": {
+        "5.0.0.0": "5.0.0"
+      }
+    },
     "Microsoft.Extensions.Primitives": {
       "StableVersions": [
         "1.0.0",
@@ -159,8 +181,10 @@
         "3.0.0",
         "3.0.1",
         "3.0.2",
+        "3.0.3",
         "3.1.0",
-        "3.1.1"
+        "3.1.1",
+        "3.1.2"
       ],
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {

From e233a32431b87bbfdfbe952bdfef470b438bf114 Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Wed, 4 Mar 2020 23:53:06 -0800
Subject: [PATCH 08/12] Enables ref/src on FileProviders projects - [x] Enable
 on Directory.Build.props - [x] build ref/src projects and used
 GenerateReferenceSource - [x] cleanup src csproj properties - [x] set proper
 targetframeworks

TODO
- [ ] Add package, 3 projects go in one package
- [ ] Fix failing test on M.E.FP.Physical with message:
Could not load file or assembly 'Microsoft.Extensions.FileProviders.Abstractions, Version=5.0.0.0
---
 src/libraries/Directory.Build.props           |  1 +
 ....Extensions.FileProviders.Abstractions.cs} |  9 +-
 ...tensions.FileProviders.Abstractions.csproj | 11 +--
 ...leProviders.Abstractions.netstandard2.0.cs | 61 -------------
 ...tensions.FileProviders.Abstractions.csproj | 16 ++--
 ...oft.Extensions.FileProviders.Composite.cs} |  3 +
 ....Extensions.FileProviders.Composite.csproj | 13 ++-
 ....FileProviders.Composite.netstandard2.0.cs | 26 ------
 ....Extensions.FileProviders.Composite.csproj | 11 +--
 ...sions.FileProviders.Composite.Tests.csproj |  8 +-
 ...soft.Extensions.FileProviders.Physical.cs} |  9 +-
 ...t.Extensions.FileProviders.Physical.csproj | 13 ++-
 ...s.FileProviders.Physical.netstandard2.0.cs | 90 -------------------
 ...t.Extensions.FileProviders.Physical.csproj | 28 ++++--
 ...nsions.FileProviders.Physical.Tests.csproj |  2 +-
 15 files changed, 71 insertions(+), 230 deletions(-)
 rename src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/{Microsoft.Extensions.FileProviders.Abstractions.netcoreapp.cs => Microsoft.Extensions.FileProviders.Abstractions.cs} (89%)
 delete mode 100644 src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/{Microsoft.Extensions.FileProviders.Composite.netcoreapp.cs => Microsoft.Extensions.FileProviders.Composite.cs} (88%)
 delete mode 100644 src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.netstandard2.0.cs
 rename src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/{Microsoft.Extensions.FileProviders.Physical.netcoreapp.cs => Microsoft.Extensions.FileProviders.Physical.cs} (91%)
 delete mode 100644 src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.netstandard2.0.cs

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index a68c90bf1d6559..676346a0990793 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -5,6 +5,7 @@
   <Import Project="..\..\Directory.Build.props" />
 
   <ItemGroup>
+    <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileSystemGlobbing\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Primitives\**\*csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\ref\**\Microsoft.Extensions.*proj" Exclude="@(PortedExtensionsProject)" />
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.netcoreapp.cs b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.cs
similarity index 89%
rename from src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.cs
index 67200a043329fe..515ed3b87ad316 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.netcoreapp.cs
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.cs
@@ -1,6 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
+// ------------------------------------------------------------------------------
+// Changes to this file must follow the https://aka.ms/api-review process.
+// ------------------------------------------------------------------------------
 
 namespace Microsoft.Extensions.FileProviders
 {
@@ -28,7 +31,7 @@ public partial class NotFoundDirectoryContents : Microsoft.Extensions.FileProvid
     {
         public NotFoundDirectoryContents() { }
         public bool Exists { get { throw null; } }
-        public static Microsoft.Extensions.FileProviders.NotFoundDirectoryContents Singleton { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public static Microsoft.Extensions.FileProviders.NotFoundDirectoryContents Singleton { get { throw null; } }
         public System.Collections.Generic.IEnumerator<Microsoft.Extensions.FileProviders.IFileInfo> GetEnumerator() { throw null; }
         System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
     }
@@ -39,7 +42,7 @@ public NotFoundFileInfo(string name) { }
         public bool IsDirectory { get { throw null; } }
         public System.DateTimeOffset LastModified { get { throw null; } }
         public long Length { get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public string Name { get { throw null; } }
         public string PhysicalPath { get { throw null; } }
         public System.IO.Stream CreateReadStream() { throw null; }
     }
@@ -48,7 +51,7 @@ public partial class NullChangeToken : Microsoft.Extensions.Primitives.IChangeTo
         internal NullChangeToken() { }
         public bool ActiveChangeCallbacks { get { throw null; } }
         public bool HasChanged { get { throw null; } }
-        public static Microsoft.Extensions.FileProviders.NullChangeToken Singleton { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public static Microsoft.Extensions.FileProviders.NullChangeToken Singleton { get { throw null; } }
         public System.IDisposable RegisterChangeCallback(System.Action<object> callback, object state) { throw null; }
     }
     public partial class NullFileProvider : Microsoft.Extensions.FileProviders.IFileProvider
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj
index cd3104535d9876..b08c46254182dc 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj
@@ -1,14 +1,11 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.FileProviders.Abstractions.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.Primitives"  />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.FileProviders.Abstractions.cs" />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.FileProviders.Abstractions.netcoreapp.cs" />
+  <ItemGroup>
     <Reference Include="Microsoft.Extensions.Primitives"  />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.netstandard2.0.cs
deleted file mode 100644
index 67200a043329fe..00000000000000
--- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.netstandard2.0.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.FileProviders
-{
-    public partial interface IDirectoryContents : System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileProviders.IFileInfo>, System.Collections.IEnumerable
-    {
-        bool Exists { get; }
-    }
-    public partial interface IFileInfo
-    {
-        bool Exists { get; }
-        bool IsDirectory { get; }
-        System.DateTimeOffset LastModified { get; }
-        long Length { get; }
-        string Name { get; }
-        string PhysicalPath { get; }
-        System.IO.Stream CreateReadStream();
-    }
-    public partial interface IFileProvider
-    {
-        Microsoft.Extensions.FileProviders.IDirectoryContents GetDirectoryContents(string subpath);
-        Microsoft.Extensions.FileProviders.IFileInfo GetFileInfo(string subpath);
-        Microsoft.Extensions.Primitives.IChangeToken Watch(string filter);
-    }
-    public partial class NotFoundDirectoryContents : Microsoft.Extensions.FileProviders.IDirectoryContents, System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileProviders.IFileInfo>, System.Collections.IEnumerable
-    {
-        public NotFoundDirectoryContents() { }
-        public bool Exists { get { throw null; } }
-        public static Microsoft.Extensions.FileProviders.NotFoundDirectoryContents Singleton { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public System.Collections.Generic.IEnumerator<Microsoft.Extensions.FileProviders.IFileInfo> GetEnumerator() { throw null; }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-    }
-    public partial class NotFoundFileInfo : Microsoft.Extensions.FileProviders.IFileInfo
-    {
-        public NotFoundFileInfo(string name) { }
-        public bool Exists { get { throw null; } }
-        public bool IsDirectory { get { throw null; } }
-        public System.DateTimeOffset LastModified { get { throw null; } }
-        public long Length { get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public string PhysicalPath { get { throw null; } }
-        public System.IO.Stream CreateReadStream() { throw null; }
-    }
-    public partial class NullChangeToken : Microsoft.Extensions.Primitives.IChangeToken
-    {
-        internal NullChangeToken() { }
-        public bool ActiveChangeCallbacks { get { throw null; } }
-        public bool HasChanged { get { throw null; } }
-        public static Microsoft.Extensions.FileProviders.NullChangeToken Singleton { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public System.IDisposable RegisterChangeCallback(System.Action<object> callback, object state) { throw null; }
-    }
-    public partial class NullFileProvider : Microsoft.Extensions.FileProviders.IFileProvider
-    {
-        public NullFileProvider() { }
-        public Microsoft.Extensions.FileProviders.IDirectoryContents GetDirectoryContents(string subpath) { throw null; }
-        public Microsoft.Extensions.FileProviders.IFileInfo GetFileInfo(string subpath) { throw null; }
-        public Microsoft.Extensions.Primitives.IChangeToken Watch(string filter) { throw null; }
-    }
-}
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 49e129e4950a57..f4b7aae8743bed 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,22 +2,18 @@
 
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace>
-    <Description>Abstractions of files and directories.
-Commonly used types:
-Microsoft.Extensions.FileProviders.IDirectoryContents
-Microsoft.Extensions.FileProviders.IFileInfo
-Microsoft.Extensions.FileProviders.IFileProvider</Description>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(SharedSourceRoot)EmptyDisposable.cs" />
+    <Compile Include="$(CommonPath)Extensions\EmptyDisposable.cs">
+      <Link>Common\src\Extensions\EmptyDisposable.cs</Link>
+    </Compile>
+    <Compile Include="**\*.cs" />
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.FileSystemGlobbing" />
     <Reference Include="Microsoft.Extensions.Primitives" />
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.netcoreapp.cs b/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.cs
similarity index 88%
rename from src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.cs
index ef116bada92d67..2531b2c556a6e4 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.netcoreapp.cs
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.cs
@@ -1,6 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
+// ------------------------------------------------------------------------------
+// Changes to this file must follow the https://aka.ms/api-review process.
+// ------------------------------------------------------------------------------
 
 namespace Microsoft.Extensions.FileProviders
 {
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj
index 46f117717c0080..816be3259a3839 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj
@@ -1,14 +1,13 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.FileProviders.Composite.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions"  />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.FileProviders.Composite.cs" />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.FileProviders.Composite.netcoreapp.cs" />
+  <ItemGroup>
     <Reference Include="Microsoft.Extensions.FileProviders.Abstractions"  />
+    <Reference Include="Microsoft.Extensions.Primitives"  />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.netstandard2.0.cs
deleted file mode 100644
index ef116bada92d67..00000000000000
--- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.netstandard2.0.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.FileProviders
-{
-    public partial class CompositeFileProvider : Microsoft.Extensions.FileProviders.IFileProvider
-    {
-        public CompositeFileProvider(params Microsoft.Extensions.FileProviders.IFileProvider[] fileProviders) { }
-        public CompositeFileProvider(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileProviders.IFileProvider> fileProviders) { }
-        public System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileProviders.IFileProvider> FileProviders { get { throw null; } }
-        public Microsoft.Extensions.FileProviders.IDirectoryContents GetDirectoryContents(string subpath) { throw null; }
-        public Microsoft.Extensions.FileProviders.IFileInfo GetFileInfo(string subpath) { throw null; }
-        public Microsoft.Extensions.Primitives.IChangeToken Watch(string pattern) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.FileProviders.Composite
-{
-    public partial class CompositeDirectoryContents : Microsoft.Extensions.FileProviders.IDirectoryContents, System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileProviders.IFileInfo>, System.Collections.IEnumerable
-    {
-        public CompositeDirectoryContents(System.Collections.Generic.IList<Microsoft.Extensions.FileProviders.IFileProvider> fileProviders, string subpath) { }
-        public bool Exists { get { throw null; } }
-        public System.Collections.Generic.IEnumerator<Microsoft.Extensions.FileProviders.IFileInfo> GetEnumerator() { throw null; }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-    }
-}
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 ccec2c0978acc2..134d041f29c9fe 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,15 +2,16 @@
 
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace>
-    <Description>Composite file and directory providers for Microsoft.Extensions.FileProviders.</Description>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Primitives" />
   </ItemGroup>
 
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj
index 327550c9f52dc8..7f73088dfe4885 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj
@@ -2,11 +2,15 @@
 
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.FileProviders.Composite</RootNamespace>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\Shared\**\*.cs" />
+    <Compile Include="**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Moq" Version="$(MoqVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.netcoreapp.cs b/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.cs
similarity index 91%
rename from src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.netcoreapp.cs
rename to src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.cs
index 3840b13413ff7c..9634c4f0d38cd2 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.netcoreapp.cs
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.cs
@@ -1,6 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
+// ------------------------------------------------------------------------------
+// Changes to this file must follow the https://aka.ms/api-review process.
+// ------------------------------------------------------------------------------
 
 namespace Microsoft.Extensions.FileProviders
 {
@@ -8,7 +11,7 @@ public partial class PhysicalFileProvider : Microsoft.Extensions.FileProviders.I
     {
         public PhysicalFileProvider(string root) { }
         public PhysicalFileProvider(string root, Microsoft.Extensions.FileProviders.Physical.ExclusionFilters filters) { }
-        public string Root { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public string Root { get { throw null; } }
         public bool UseActivePolling { get { throw null; } set { } }
         public bool UsePollingFileWatcher { get { throw null; } set { } }
         public void Dispose() { }
@@ -75,14 +78,14 @@ protected virtual void Dispose(bool disposing) { }
     public partial class PollingFileChangeToken : Microsoft.Extensions.Primitives.IChangeToken
     {
         public PollingFileChangeToken(System.IO.FileInfo fileInfo) { }
-        public bool ActiveChangeCallbacks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public bool ActiveChangeCallbacks { get { throw null; } }
         public bool HasChanged { get { throw null; } }
         public System.IDisposable RegisterChangeCallback(System.Action<object> callback, object state) { throw null; }
     }
     public partial class PollingWildCardChangeToken : Microsoft.Extensions.Primitives.IChangeToken
     {
         public PollingWildCardChangeToken(string root, string pattern) { }
-        public bool ActiveChangeCallbacks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
+        public bool ActiveChangeCallbacks { get { throw null; } }
         public bool HasChanged { get { throw null; } }
         protected virtual System.DateTime GetLastWriteUtc(string path) { throw null; }
         System.IDisposable Microsoft.Extensions.Primitives.IChangeToken.RegisterChangeCallback(System.Action<object> callback, object state) { throw null; }
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj
index c662e57343e528..a1dfb3d9e253c6 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj
@@ -1,16 +1,13 @@
-<!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Compile Include="Microsoft.Extensions.FileProviders.Physical.netstandard2.0.cs" />
-    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.FileSystemGlobbing"  />
+  <ItemGroup>
+    <Compile Include="Microsoft.Extensions.FileProviders.Physical.cs" />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
-    <Compile Include="Microsoft.Extensions.FileProviders.Physical.netcoreapp.cs" />
+  <ItemGroup>
     <Reference Include="Microsoft.Extensions.FileProviders.Abstractions"  />
     <Reference Include="Microsoft.Extensions.FileSystemGlobbing"  />
+    <Reference Include="Microsoft.Extensions.Primitives"  />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.netstandard2.0.cs
deleted file mode 100644
index 3840b13413ff7c..00000000000000
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.netstandard2.0.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Extensions.FileProviders
-{
-    public partial class PhysicalFileProvider : Microsoft.Extensions.FileProviders.IFileProvider, System.IDisposable
-    {
-        public PhysicalFileProvider(string root) { }
-        public PhysicalFileProvider(string root, Microsoft.Extensions.FileProviders.Physical.ExclusionFilters filters) { }
-        public string Root { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public bool UseActivePolling { get { throw null; } set { } }
-        public bool UsePollingFileWatcher { get { throw null; } set { } }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        ~PhysicalFileProvider() { }
-        public Microsoft.Extensions.FileProviders.IDirectoryContents GetDirectoryContents(string subpath) { throw null; }
-        public Microsoft.Extensions.FileProviders.IFileInfo GetFileInfo(string subpath) { throw null; }
-        public Microsoft.Extensions.Primitives.IChangeToken Watch(string filter) { throw null; }
-    }
-}
-namespace Microsoft.Extensions.FileProviders.Internal
-{
-    public partial class PhysicalDirectoryContents : Microsoft.Extensions.FileProviders.IDirectoryContents, System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileProviders.IFileInfo>, System.Collections.IEnumerable
-    {
-        public PhysicalDirectoryContents(string directory) { }
-        public PhysicalDirectoryContents(string directory, Microsoft.Extensions.FileProviders.Physical.ExclusionFilters filters) { }
-        public bool Exists { get { throw null; } }
-        public System.Collections.Generic.IEnumerator<Microsoft.Extensions.FileProviders.IFileInfo> GetEnumerator() { throw null; }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-    }
-}
-namespace Microsoft.Extensions.FileProviders.Physical
-{
-    [System.FlagsAttribute]
-    public enum ExclusionFilters
-    {
-        None = 0,
-        DotPrefixed = 1,
-        Hidden = 2,
-        System = 4,
-        Sensitive = 7,
-    }
-    public partial class PhysicalDirectoryInfo : Microsoft.Extensions.FileProviders.IFileInfo
-    {
-        public PhysicalDirectoryInfo(System.IO.DirectoryInfo info) { }
-        public bool Exists { get { throw null; } }
-        public bool IsDirectory { get { throw null; } }
-        public System.DateTimeOffset LastModified { get { throw null; } }
-        public long Length { get { throw null; } }
-        public string Name { get { throw null; } }
-        public string PhysicalPath { get { throw null; } }
-        public System.IO.Stream CreateReadStream() { throw null; }
-    }
-    public partial class PhysicalFileInfo : Microsoft.Extensions.FileProviders.IFileInfo
-    {
-        public PhysicalFileInfo(System.IO.FileInfo info) { }
-        public bool Exists { get { throw null; } }
-        public bool IsDirectory { get { throw null; } }
-        public System.DateTimeOffset LastModified { get { throw null; } }
-        public long Length { get { throw null; } }
-        public string Name { get { throw null; } }
-        public string PhysicalPath { get { throw null; } }
-        public System.IO.Stream CreateReadStream() { throw null; }
-    }
-    public partial class PhysicalFilesWatcher : System.IDisposable
-    {
-        public PhysicalFilesWatcher(string root, System.IO.FileSystemWatcher fileSystemWatcher, bool pollForChanges) { }
-        public PhysicalFilesWatcher(string root, System.IO.FileSystemWatcher fileSystemWatcher, bool pollForChanges, Microsoft.Extensions.FileProviders.Physical.ExclusionFilters filters) { }
-        public Microsoft.Extensions.Primitives.IChangeToken CreateFileChangeToken(string filter) { throw null; }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        ~PhysicalFilesWatcher() { }
-    }
-    public partial class PollingFileChangeToken : Microsoft.Extensions.Primitives.IChangeToken
-    {
-        public PollingFileChangeToken(System.IO.FileInfo fileInfo) { }
-        public bool ActiveChangeCallbacks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public bool HasChanged { get { throw null; } }
-        public System.IDisposable RegisterChangeCallback(System.Action<object> callback, object state) { throw null; }
-    }
-    public partial class PollingWildCardChangeToken : Microsoft.Extensions.Primitives.IChangeToken
-    {
-        public PollingWildCardChangeToken(string root, string pattern) { }
-        public bool ActiveChangeCallbacks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
-        public bool HasChanged { get { throw null; } }
-        protected virtual System.DateTime GetLastWriteUtc(string path) { throw null; }
-        System.IDisposable Microsoft.Extensions.Primitives.IChangeToken.RegisterChangeCallback(System.Action<object> callback, object state) { throw null; }
-    }
-}
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 dee9f559acc55b..985a1636147615 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,12 +2,8 @@
 
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace>
-    <Description>File provider for physical files for Microsoft.Extensions.FileProviders.</Description>
-    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,13 +12,31 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="$(SharedSourceRoot)EmptyDisposable.cs" />
-    <Compile Include="$(SharedSourceRoot)NonCapturingTimer\*.cs" />
+    <Compile Include="$(CommonPath)Extensions\EmptyDisposable.cs">
+      <Link>Common\src\Extensions\EmptyDisposable.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)Extensions\NonCapturingTimer\NonCapturingTimer.cs">
+      <Link>Common\src\Extensions\NonCapturingTimer\NonCapturingTimer.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)Extensions\ParameterDefaultValue\ParameterDefaultValue.cs">
+      <Link>Common\src\Extensions\NonCapturingTimer\NonCapturingTimer.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs">
+      <Link>Common\src\Extensions\NonCapturingTimer\ProviderAliasUtilities.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)Extensions\TypeNameHelper\*.cs">
+      <Link>Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)Extensions\ValueStopWatch\*.cs">
+      <Link>Common\src\Extensions\ValueStopWatch\ValueStopWatch.cs</Link>
+    </Compile>
+    <Compile Include="**\*.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
     <Reference Include="Microsoft.Extensions.FileSystemGlobbing" />
+    <Reference Include="Microsoft.Extensions.Primitives"  />
   </ItemGroup>
 
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj
index 856ab374c3f26e..c233fe3ac06bc3 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.FileProviders.Physical</RootNamespace>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

From e10f1e3525fbae960f8eb72d41ab6935a1fc5489 Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Thu, 5 Mar 2020 14:20:31 -0800
Subject: [PATCH 09/12] For FileSystemGlobbing: - Fix packaging issue - Remove
 InternalsVisibleTo in src csproj - Add sln file

---
 ...icrosoft.Extensions.FileSystemGlobbing.sln | 47 +++++++++++++++++++
 ...osoft.Extensions.FileSystemGlobbing.csproj |  4 --
 src/libraries/pkg/descriptions.json           |  2 +-
 3 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln

diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln
new file mode 100644
index 00000000000000..1382bb70842a20
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln
@@ -0,0 +1,47 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29827.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing.Tests", "tests\Microsoft.Extensions.FileSystemGlobbing.Tests.csproj", "{5E9F6F6C-6B42-42FC-A2C0-2D63B01351F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "src\Microsoft.Extensions.FileSystemGlobbing.csproj", "{58A26DC9-8A10-4F32-927C-D6E2A1B99E1B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "ref\Microsoft.Extensions.FileSystemGlobbing.csproj", "{49CB4AB9-5D76-481D-9FFA-458C9AC394EF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5E9F6F6C-6B42-42FC-A2C0-2D63B01351F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E9F6F6C-6B42-42FC-A2C0-2D63B01351F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E9F6F6C-6B42-42FC-A2C0-2D63B01351F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E9F6F6C-6B42-42FC-A2C0-2D63B01351F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58A26DC9-8A10-4F32-927C-D6E2A1B99E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58A26DC9-8A10-4F32-927C-D6E2A1B99E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58A26DC9-8A10-4F32-927C-D6E2A1B99E1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58A26DC9-8A10-4F32-927C-D6E2A1B99E1B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49CB4AB9-5D76-481D-9FFA-458C9AC394EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49CB4AB9-5D76-481D-9FFA-458C9AC394EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49CB4AB9-5D76-481D-9FFA-458C9AC394EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49CB4AB9-5D76-481D-9FFA-458C9AC394EF}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{5E9F6F6C-6B42-42FC-A2C0-2D63B01351F1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+		{58A26DC9-8A10-4F32-927C-D6E2A1B99E1B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
+		{49CB4AB9-5D76-481D-9FFA-458C9AC394EF} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {904B2FDB-F1D7-4CE0-B0CD-FFDF8C51FDF8}
+	EndGlobalSection
+EndGlobal
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 ef749cf22a8fa9..0b0c85d73935e4 100644
--- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj
@@ -5,10 +5,6 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <InternalsVisibleTo Include="Microsoft.Extensions.FileSystemGlobbing.Tests" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\HashCodeCombiner\HashCodeCombiner.cs">
       <Link>Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs</Link>
diff --git a/src/libraries/pkg/descriptions.json b/src/libraries/pkg/descriptions.json
index dbd09dceb15c44..cd991471690984 100644
--- a/src/libraries/pkg/descriptions.json
+++ b/src/libraries/pkg/descriptions.json
@@ -102,7 +102,7 @@
     "CommonTypes": []
   },
   {
-    "Name": "Microsoft.Extensions.FileSystemGlobbing.",
+    "Name": "Microsoft.Extensions.FileSystemGlobbing",
     "Description": "File system globbing to find files matching a specified pattern.",
     "CommonTypes": []
   },

From c60b54aaee92899c022c91fee5e0c484f0dedae0 Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Fri, 6 Mar 2020 13:42:16 -0800
Subject: [PATCH 10/12] Add packaging for M.E.FileProviders.*: - Abstractions -
 Composite - Physical

---
 src/libraries/Directory.Build.props           |  2 +-
 ...ensions.FileProviders.Abstractions.pkgproj |  9 +++
 ...Extensions.FileProviders.Composite.pkgproj |  9 +++
 ....Extensions.FileProviders.Physical.pkgproj |  9 +++
 src/libraries/pkg/baseline/packageIndex.json  | 72 +++++++++++++++++++
 5 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 src/libraries/Microsoft.Extensions.FileProviders.Abstractions/pkg/Microsoft.Extensions.FileProviders.Abstractions.pkgproj
 create mode 100644 src/libraries/Microsoft.Extensions.FileProviders.Composite/pkg/Microsoft.Extensions.FileProviders.Composite.pkgproj
 create mode 100644 src/libraries/Microsoft.Extensions.FileProviders.Physical/pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 676346a0990793..275686762a3f37 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -5,7 +5,7 @@
   <Import Project="..\..\Directory.Build.props" />
 
   <ItemGroup>
-    <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders\**\*csproj" />
+    <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.*\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileSystemGlobbing\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Primitives\**\*csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\ref\**\Microsoft.Extensions.*proj" Exclude="@(PortedExtensionsProject)" />
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/pkg/Microsoft.Extensions.FileProviders.Abstractions.pkgproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/pkg/Microsoft.Extensions.FileProviders.Abstractions.pkgproj
new file mode 100644
index 00000000000000..84280311dd3064
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/pkg/Microsoft.Extensions.FileProviders.Abstractions.pkgproj
@@ -0,0 +1,9 @@
+<Project DefaultTargets="Build">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
+  <ItemGroup>
+    <ProjectReference Include="..\src\Microsoft.Extensions.FileProviders.Abstractions.csproj">
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
+</Project> 
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/pkg/Microsoft.Extensions.FileProviders.Composite.pkgproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/pkg/Microsoft.Extensions.FileProviders.Composite.pkgproj
new file mode 100644
index 00000000000000..ed4160e4facebb
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/pkg/Microsoft.Extensions.FileProviders.Composite.pkgproj
@@ -0,0 +1,9 @@
+<Project DefaultTargets="Build">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
+  <ItemGroup>
+    <ProjectReference Include="..\src\Microsoft.Extensions.FileProviders.Composite.csproj">
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
+</Project> 
\ No newline at end of file
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
new file mode 100644
index 00000000000000..6a3148e369e6e3
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj
@@ -0,0 +1,9 @@
+<Project DefaultTargets="Build">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
+  <ItemGroup>
+    <ProjectReference Include="..\src\Microsoft.Extensions.FileProviders.Physical.csproj">
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
+</Project> 
\ No newline at end of file
diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json
index a0710486edf0c9..5eebf5e6b2e8d5 100644
--- a/src/libraries/pkg/baseline/packageIndex.json
+++ b/src/libraries/pkg/baseline/packageIndex.json
@@ -145,6 +145,78 @@
         "5.0.0.0": "5.0.0"
       }
     },
+    "Microsoft.Extensions.FileProviders.Abstractions": {
+      "StableVersions": [
+        "1.0.0",
+        "1.0.1",
+        "1.1.0",
+        "1.1.1",
+        "2.0.0",
+        "2.0.1",
+        "2.1.0",
+        "2.1.1",
+        "2.2.0",
+        "3.0.0",
+        "3.0.1",
+        "3.0.2",
+        "3.0.3",
+        "3.1.0",
+        "3.1.1",
+        "3.1.2"
+      ],
+      "InboxOn": {},
+      "AssemblyVersionInPackageVersion": {
+        "5.0.0.0": "5.0.0"
+      }
+    },
+    "Microsoft.Extensions.FileProviders.Composite": {
+      "StableVersions": [
+        "1.0.0",
+        "1.0.1",
+        "1.1.0",
+        "1.1.1",
+        "2.0.0",
+        "2.0.1",
+        "2.1.0",
+        "2.1.1",
+        "2.2.0",
+        "3.0.0",
+        "3.0.1",
+        "3.0.2",
+        "3.0.3",
+        "3.1.0",
+        "3.1.1",
+        "3.1.2"
+      ],
+      "InboxOn": {},
+      "AssemblyVersionInPackageVersion": {
+        "5.0.0.0": "5.0.0"
+      }
+    },
+    "Microsoft.Extensions.FileProviders.Physical": {
+      "StableVersions": [
+        "1.0.0",
+        "1.0.1",
+        "1.1.0",
+        "1.1.1",
+        "2.0.0",
+        "2.0.1",
+        "2.1.0",
+        "2.1.1",
+        "2.2.0",
+        "3.0.0",
+        "3.0.1",
+        "3.0.2",
+        "3.0.3",
+        "3.1.0",
+        "3.1.1",
+        "3.1.2"
+      ],
+      "InboxOn": {},
+      "AssemblyVersionInPackageVersion": {
+        "5.0.0.0": "5.0.0"
+      }
+    },
     "Microsoft.Extensions.FileSystemGlobbing": {
       "StableVersions": [
         "1.0.0",

From c52d061c355dfef3365eef7ad3251b76269cff1c Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Fri, 6 Mar 2020 16:36:26 -0800
Subject: [PATCH 11/12] Switch Reference to ProjectReference in ref proj

---
 .../Microsoft.Extensions.FileProviders.Abstractions.csproj  | 2 +-
 .../ref/Microsoft.Extensions.FileProviders.Composite.csproj | 4 ++--
 .../ref/Microsoft.Extensions.FileProviders.Physical.csproj  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj
index b08c46254182dc..778d01d8f903b5 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj
@@ -6,6 +6,6 @@
     <Compile Include="Microsoft.Extensions.FileProviders.Abstractions.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Extensions.Primitives"  />
+    <ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj
index 816be3259a3839..9c945ef56a7241 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj
@@ -7,7 +7,7 @@
     <Compile Include="Microsoft.Extensions.FileProviders.Composite.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.Primitives"  />
+    <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
+    <ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj
index a1dfb3d9e253c6..c6b18a0ac30719 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj
@@ -6,8 +6,8 @@
     <Compile Include="Microsoft.Extensions.FileProviders.Physical.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions"  />
-    <Reference Include="Microsoft.Extensions.FileSystemGlobbing"  />
-    <Reference Include="Microsoft.Extensions.Primitives"  />
+    <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
+    <ProjectReference Include="..\..\Microsoft.Extensions.FileSystemGlobbing\ref\Microsoft.Extensions.FileSystemGlobbing.csproj" />
+    <ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" />
   </ItemGroup>
 </Project>

From 06bbc1e3a54e56dcc27230291b951c4b54776150 Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Fri, 6 Mar 2020 20:01:18 -0800
Subject: [PATCH 12/12] Fix test project.

- TaskExtensions.cs, ITestCondition.cs, OperatingSystems.cs and OSSkipConditionAttribute.c are needed but are not moved to runtime repo yet
- Removed unnecessary helper files from src project

TODO:
- [ ] bring over more history from extensions repo
---
 .../src/TaskExtensions.cs                     | 67 +++++++++++++++++++
 .../src/xunit/ITestCondition.cs               | 13 ++++
 .../src/xunit/OSSkipConditionAttribute.cs     | 63 +++++++++++++++++
 .../src/xunit/OperatingSystems.cs             | 16 +++++
 ...t.Extensions.FileProviders.Physical.csproj | 14 ----
 .../src/Properties/InternalsVisibleTo.cs      |  8 +++
 ...nsions.FileProviders.Physical.Tests.csproj | 26 +++++++
 .../tests/PhysicalFileProviderTests.cs        |  2 +
 8 files changed, 195 insertions(+), 14 deletions(-)
 create mode 100644 src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/TaskExtensions.cs
 create mode 100644 src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/xunit/ITestCondition.cs
 create mode 100644 src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/xunit/OSSkipConditionAttribute.cs
 create mode 100644 src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/xunit/OperatingSystems.cs
 create mode 100644 src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Properties/InternalsVisibleTo.cs

diff --git a/src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/TaskExtensions.cs b/src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/TaskExtensions.cs
new file mode 100644
index 00000000000000..ff8948dfd06e3f
--- /dev/null
+++ b/src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/TaskExtensions.cs
@@ -0,0 +1,67 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Testing
+{
+    public static class TaskExtensions
+    {
+        public static async Task<T> TimeoutAfter<T>(this Task<T> task, TimeSpan timeout,
+            [CallerFilePath] string filePath = null,
+            [CallerLineNumber] int lineNumber = default)
+        {
+            // Don't create a timer if the task is already completed
+            // or the debugger is attached
+            if (task.IsCompleted || Debugger.IsAttached)
+            {
+                return await task;
+            }
+
+            var cts = new CancellationTokenSource();
+            if (task == await Task.WhenAny(task, Task.Delay(timeout, cts.Token)))
+            {
+                cts.Cancel();
+                return await task;
+            }
+            else
+            {
+                throw new TimeoutException(CreateMessage(timeout, filePath, lineNumber));
+            }
+        }
+
+        public static async Task TimeoutAfter(this Task task, TimeSpan timeout,
+            [CallerFilePath] string filePath = null,
+            [CallerLineNumber] int lineNumber = default)
+        {
+            // Don't create a timer if the task is already completed
+            // or the debugger is attached
+            if (task.IsCompleted || Debugger.IsAttached)
+            {
+                await task;
+                return;
+            }
+
+            var cts = new CancellationTokenSource();
+            if (task == await Task.WhenAny(task, Task.Delay(timeout, cts.Token)))
+            {
+                cts.Cancel();
+                await task;
+            }
+            else
+            {
+                throw new TimeoutException(CreateMessage(timeout, filePath, lineNumber));
+            }
+        }
+
+        private static string CreateMessage(TimeSpan timeout, string filePath, int lineNumber)
+            => string.IsNullOrEmpty(filePath)
+            ? $"The operation timed out after reaching the limit of {timeout.TotalMilliseconds}ms."
+            : $"The operation at {filePath}:{lineNumber} timed out after reaching the limit of {timeout.TotalMilliseconds}ms.";
+    }
+}
\ No newline at end of file
diff --git a/src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/xunit/ITestCondition.cs b/src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/xunit/ITestCondition.cs
new file mode 100644
index 00000000000000..ee8434250401cd
--- /dev/null
+++ b/src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/xunit/ITestCondition.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.AspNetCore.Testing
+{
+    public interface ITestCondition
+    {
+        bool IsMet { get; }
+
+        string SkipReason { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/xunit/OSSkipConditionAttribute.cs b/src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/xunit/OSSkipConditionAttribute.cs
new file mode 100644
index 00000000000000..3574f0ea492304
--- /dev/null
+++ b/src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/xunit/OSSkipConditionAttribute.cs
@@ -0,0 +1,63 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.AspNetCore.Testing
+{
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Assembly, AllowMultiple = true)]
+    public class OSSkipConditionAttribute : Attribute, ITestCondition
+    {
+        private readonly OperatingSystems _excludedOperatingSystem;
+        private readonly OperatingSystems _osPlatform;
+
+        public OSSkipConditionAttribute(OperatingSystems operatingSystem) :
+            this(operatingSystem, GetCurrentOS())
+        {
+        }
+
+        [Obsolete("Use the Minimum/MaximumOSVersionAttribute for version checks.", error: true)]
+        public OSSkipConditionAttribute(OperatingSystems operatingSystem,  params string[] versions) :
+            this(operatingSystem, GetCurrentOS())
+        {
+        }
+
+        // to enable unit testing
+        internal OSSkipConditionAttribute(OperatingSystems operatingSystem, OperatingSystems osPlatform)
+        {
+            _excludedOperatingSystem = operatingSystem;
+            _osPlatform = osPlatform;
+        }
+
+        public bool IsMet
+        {
+            get
+            {
+                var skip = (_excludedOperatingSystem & _osPlatform) == _osPlatform;
+                // Since a test would be excuted only if 'IsMet' is true, return false if we want to skip
+                return !skip;
+            }
+        }
+
+        public string SkipReason { get; set; } = "Test cannot run on this operating system.";
+
+        static private OperatingSystems GetCurrentOS()
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                return OperatingSystems.Windows;
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            {
+                return OperatingSystems.Linux;
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                return OperatingSystems.MacOSX;
+            }
+            throw new PlatformNotSupportedException();
+        }
+    }
+}
diff --git a/src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/xunit/OperatingSystems.cs b/src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/xunit/OperatingSystems.cs
new file mode 100644
index 00000000000000..cc62ac3e9b0d5f
--- /dev/null
+++ b/src/libraries/Common/src/Extensions/Microsoft.AspNetCore.Testing/src/xunit/OperatingSystems.cs
@@ -0,0 +1,16 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Testing
+{
+    [Flags]
+    public enum OperatingSystems
+    {
+        Linux = 1,
+        MacOSX = 2,
+        Windows = 4,
+    }
+}
\ 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 985a1636147615..4c76b00108513e 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
@@ -6,11 +6,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <InternalsVisibleTo Include="Microsoft.Extensions.FileProviders.Physical.Tests" />
-    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\EmptyDisposable.cs">
       <Link>Common\src\Extensions\EmptyDisposable.cs</Link>
@@ -21,15 +16,6 @@
     <Compile Include="$(CommonPath)Extensions\ParameterDefaultValue\ParameterDefaultValue.cs">
       <Link>Common\src\Extensions\NonCapturingTimer\NonCapturingTimer.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs">
-      <Link>Common\src\Extensions\NonCapturingTimer\ProviderAliasUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonPath)Extensions\TypeNameHelper\*.cs">
-      <Link>Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonPath)Extensions\ValueStopWatch\*.cs">
-      <Link>Common\src\Extensions\ValueStopWatch\ValueStopWatch.cs</Link>
-    </Compile>
     <Compile Include="**\*.cs" />
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Properties/InternalsVisibleTo.cs
new file mode 100644
index 00000000000000..f1b92bb90a8118
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Properties/InternalsVisibleTo.cs
@@ -0,0 +1,8 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.Extensions.FileProviders.Physical.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] 
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj
index c233fe3ac06bc3..f336f74c0b52b9 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj
@@ -5,6 +5,32 @@
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+    <Compile Include="$(CommonPath)Extensions\Microsoft.AspNetCore.Testing\src\xunit\OSSkipConditionAttribute.cs">
+      <Link>Common\src\Extensions\Microsoft.AspNetCore.Testing\src\xunit\OSSkipConditionAttribute.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)Extensions\Microsoft.AspNetCore.Testing\src\xunit\OperatingSystems.cs">
+      <Link>Common\src\Extensions\Microsoft.AspNetCore.Testing\src\xunit\OperatingSystems.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)Extensions\Microsoft.AspNetCore.Testing\src\xunit\ITestCondition.cs">
+      <Link>Common\src\Extensions\Microsoft.AspNetCore.Testing\src\xunit\ITestCondition.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)Extensions\Microsoft.AspNetCore.Testing\src\TaskExtensions.cs">
+      <Link>Common\src\Extensions\Microsoft.AspNetCore.Testing\src\TaskExtensions.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. -->
+    <DefaultReferenceExclusions Include="Microsoft.Extensions.FileProviders.Physical" />
+    <ReferenceFromRuntime Include="Microsoft.Extensions.FileProviders.Physical" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
     <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/PhysicalFileProviderTests.cs b/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/PhysicalFileProviderTests.cs
index 35abac6db0c950..3a2f4a006519e6 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/PhysicalFileProviderTests.cs
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/PhysicalFileProviderTests.cs
@@ -555,6 +555,7 @@ private void GetDirectoryContentsReturnsEnumerableDirectoryContentsForValidPathW
         [InlineData("/C:\\Windows\\System32")]
         [InlineData("/\0/")]
         [MemberData(nameof(InvalidPaths))]
+        [PlatformSpecific(TestPlatforms.Windows)]
         public void GetDirectoryContentsReturnsNotFoundDirectoryContentsForInvalidPath_Windows(string path)
         {
             GetDirectoryContentsReturnsNotFoundDirectoryContentsForInvalidPath(path);
@@ -566,6 +567,7 @@ public void GetDirectoryContentsReturnsNotFoundDirectoryContentsForInvalidPath_W
         [InlineData("/\\/")]
         [InlineData("\\/\\/")]
         [MemberData(nameof(InvalidPaths))]
+        [PlatformSpecific(TestPlatforms.AnyUnix)]
         public void GetDirectoryContentsReturnsNotFoundDirectoryContentsForInvalidPath_Unix(string path)
         {
             GetDirectoryContentsReturnsNotFoundDirectoryContentsForInvalidPath(path);