diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index f06a1c628670ba..e06a637880dd52 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -5,21 +5,38 @@ + + + + + + + + + + - - + + + + + + + + MicrosoftAspNetCore true - $(NoWarn);SA1129;SA1028;SA1027;SA1121;CA1200;SA1000;CA1507;CA1802;CA1825 - + $(NoWarn);SA1129;SA1028;SA1027;SA1121;CA1200;SA1000;CA1507;CA1802;CA1825;CA1018;SA1648;CA2007;SA1001;SA1026 + $(NoWarn);CS0618 + $(RepoRoot)artifacts\toolset\Common\ diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/pkg/Microsoft.Extensions.Caching.Abstractions.pkgproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/pkg/Microsoft.Extensions.Caching.Abstractions.pkgproj new file mode 100644 index 00000000000000..1b13b47a2bc4bf --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/pkg/Microsoft.Extensions.Caching.Abstractions.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.cs similarity index 93% rename from src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.netcoreapp.cs rename to src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.cs index 91fc1c18b67398..8e4779f1e987c2 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.netcoreapp.cs +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.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.Caching.Distributed { @@ -20,7 +23,6 @@ public DistributedCacheEntryOptions() { } public static partial class DistributedCacheExtensions { public static string GetString(this Microsoft.Extensions.Caching.Distributed.IDistributedCache cache, string key) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] public static System.Threading.Tasks.Task GetStringAsync(this Microsoft.Extensions.Caching.Distributed.IDistributedCache cache, string key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) { throw null; } public static void Set(this Microsoft.Extensions.Caching.Distributed.IDistributedCache cache, string key, byte[] value) { } public static System.Threading.Tasks.Task SetAsync(this Microsoft.Extensions.Caching.Distributed.IDistributedCache cache, string key, byte[] value, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) { throw null; } @@ -59,7 +61,6 @@ public static partial class CacheEntryExtensions public static partial class CacheExtensions { public static object Get(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] public static System.Threading.Tasks.Task GetOrCreateAsync(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key, System.Func> factory) { throw null; } public static TItem GetOrCreate(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key, System.Func factory) { throw null; } public static TItem Get(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key) { throw null; } @@ -120,17 +121,17 @@ public partial class MemoryCacheEntryOptions public MemoryCacheEntryOptions() { } public System.DateTimeOffset? AbsoluteExpiration { get { throw null; } set { } } public System.TimeSpan? AbsoluteExpirationRelativeToNow { get { throw null; } set { } } - public System.Collections.Generic.IList ExpirationTokens { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public System.Collections.Generic.IList PostEvictionCallbacks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public Microsoft.Extensions.Caching.Memory.CacheItemPriority Priority { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } + public System.Collections.Generic.IList ExpirationTokens { get { throw null; } } + public System.Collections.Generic.IList PostEvictionCallbacks { get { throw null; } } + public Microsoft.Extensions.Caching.Memory.CacheItemPriority Priority { get { throw null; } set { } } public long? Size { get { throw null; } set { } } public System.TimeSpan? SlidingExpiration { get { throw null; } set { } } } public partial class PostEvictionCallbackRegistration { public PostEvictionCallbackRegistration() { } - public Microsoft.Extensions.Caching.Memory.PostEvictionDelegate EvictionCallback { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public object State { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } + public Microsoft.Extensions.Caching.Memory.PostEvictionDelegate EvictionCallback { get { throw null; } set { } } + public object State { get { throw null; } set { } } } public delegate void PostEvictionDelegate(object key, object value, Microsoft.Extensions.Caching.Memory.EvictionReason reason, object state); } diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj index 5a386d5714d4ad..ffcb96718ce0d3 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj @@ -1,14 +1,9 @@ - - netstandard2.0;$(DefaultNetCoreTargetFramework) + netstandard2.0 - - - - - - - + + + diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.netstandard2.0.cs deleted file mode 100644 index 91fc1c18b67398..00000000000000 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.netstandard2.0.cs +++ /dev/null @@ -1,148 +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.Caching.Distributed -{ - public static partial class DistributedCacheEntryExtensions - { - public static Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions SetAbsoluteExpiration(this Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions options, System.DateTimeOffset absolute) { throw null; } - public static Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions SetAbsoluteExpiration(this Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions options, System.TimeSpan relative) { throw null; } - public static Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions SetSlidingExpiration(this Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions options, System.TimeSpan offset) { throw null; } - } - public partial class DistributedCacheEntryOptions - { - public DistributedCacheEntryOptions() { } - public System.DateTimeOffset? AbsoluteExpiration { get { throw null; } set { } } - public System.TimeSpan? AbsoluteExpirationRelativeToNow { get { throw null; } set { } } - public System.TimeSpan? SlidingExpiration { get { throw null; } set { } } - } - public static partial class DistributedCacheExtensions - { - public static string GetString(this Microsoft.Extensions.Caching.Distributed.IDistributedCache cache, string key) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task GetStringAsync(this Microsoft.Extensions.Caching.Distributed.IDistributedCache cache, string key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) { throw null; } - public static void Set(this Microsoft.Extensions.Caching.Distributed.IDistributedCache cache, string key, byte[] value) { } - public static System.Threading.Tasks.Task SetAsync(this Microsoft.Extensions.Caching.Distributed.IDistributedCache cache, string key, byte[] value, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) { throw null; } - public static void SetString(this Microsoft.Extensions.Caching.Distributed.IDistributedCache cache, string key, string value) { } - public static void SetString(this Microsoft.Extensions.Caching.Distributed.IDistributedCache cache, string key, string value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions options) { } - public static System.Threading.Tasks.Task SetStringAsync(this Microsoft.Extensions.Caching.Distributed.IDistributedCache cache, string key, string value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions options, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SetStringAsync(this Microsoft.Extensions.Caching.Distributed.IDistributedCache cache, string key, string value, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) { throw null; } - } - public partial interface IDistributedCache - { - byte[] Get(string key); - System.Threading.Tasks.Task GetAsync(string key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)); - void Refresh(string key); - System.Threading.Tasks.Task RefreshAsync(string key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)); - void Remove(string key); - System.Threading.Tasks.Task RemoveAsync(string key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)); - void Set(string key, byte[] value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions options); - System.Threading.Tasks.Task SetAsync(string key, byte[] value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions options, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)); - } -} -namespace Microsoft.Extensions.Caching.Memory -{ - public static partial class CacheEntryExtensions - { - public static Microsoft.Extensions.Caching.Memory.ICacheEntry AddExpirationToken(this Microsoft.Extensions.Caching.Memory.ICacheEntry entry, Microsoft.Extensions.Primitives.IChangeToken expirationToken) { throw null; } - public static Microsoft.Extensions.Caching.Memory.ICacheEntry RegisterPostEvictionCallback(this Microsoft.Extensions.Caching.Memory.ICacheEntry entry, Microsoft.Extensions.Caching.Memory.PostEvictionDelegate callback) { throw null; } - public static Microsoft.Extensions.Caching.Memory.ICacheEntry RegisterPostEvictionCallback(this Microsoft.Extensions.Caching.Memory.ICacheEntry entry, Microsoft.Extensions.Caching.Memory.PostEvictionDelegate callback, object state) { throw null; } - public static Microsoft.Extensions.Caching.Memory.ICacheEntry SetAbsoluteExpiration(this Microsoft.Extensions.Caching.Memory.ICacheEntry entry, System.DateTimeOffset absolute) { throw null; } - public static Microsoft.Extensions.Caching.Memory.ICacheEntry SetAbsoluteExpiration(this Microsoft.Extensions.Caching.Memory.ICacheEntry entry, System.TimeSpan relative) { throw null; } - public static Microsoft.Extensions.Caching.Memory.ICacheEntry SetOptions(this Microsoft.Extensions.Caching.Memory.ICacheEntry entry, Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions options) { throw null; } - public static Microsoft.Extensions.Caching.Memory.ICacheEntry SetPriority(this Microsoft.Extensions.Caching.Memory.ICacheEntry entry, Microsoft.Extensions.Caching.Memory.CacheItemPriority priority) { throw null; } - public static Microsoft.Extensions.Caching.Memory.ICacheEntry SetSize(this Microsoft.Extensions.Caching.Memory.ICacheEntry entry, long size) { throw null; } - public static Microsoft.Extensions.Caching.Memory.ICacheEntry SetSlidingExpiration(this Microsoft.Extensions.Caching.Memory.ICacheEntry entry, System.TimeSpan offset) { throw null; } - public static Microsoft.Extensions.Caching.Memory.ICacheEntry SetValue(this Microsoft.Extensions.Caching.Memory.ICacheEntry entry, object value) { throw null; } - } - public static partial class CacheExtensions - { - public static object Get(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task GetOrCreateAsync(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key, System.Func> factory) { throw null; } - public static TItem GetOrCreate(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key, System.Func factory) { throw null; } - public static TItem Get(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key) { throw null; } - public static TItem Set(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key, TItem value) { throw null; } - public static TItem Set(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key, TItem value, Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions options) { throw null; } - public static TItem Set(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key, TItem value, Microsoft.Extensions.Primitives.IChangeToken expirationToken) { throw null; } - public static TItem Set(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key, TItem value, System.DateTimeOffset absoluteExpiration) { throw null; } - public static TItem Set(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key, TItem value, System.TimeSpan absoluteExpirationRelativeToNow) { throw null; } - public static bool TryGetValue(this Microsoft.Extensions.Caching.Memory.IMemoryCache cache, object key, out TItem value) { throw null; } - } - public enum CacheItemPriority - { - Low = 0, - Normal = 1, - High = 2, - NeverRemove = 3, - } - public enum EvictionReason - { - None = 0, - Removed = 1, - Replaced = 2, - Expired = 3, - TokenExpired = 4, - Capacity = 5, - } - public partial interface ICacheEntry : System.IDisposable - { - System.DateTimeOffset? AbsoluteExpiration { get; set; } - System.TimeSpan? AbsoluteExpirationRelativeToNow { get; set; } - System.Collections.Generic.IList ExpirationTokens { get; } - object Key { get; } - System.Collections.Generic.IList PostEvictionCallbacks { get; } - Microsoft.Extensions.Caching.Memory.CacheItemPriority Priority { get; set; } - long? Size { get; set; } - System.TimeSpan? SlidingExpiration { get; set; } - object Value { get; set; } - } - public partial interface IMemoryCache : System.IDisposable - { - Microsoft.Extensions.Caching.Memory.ICacheEntry CreateEntry(object key); - void Remove(object key); - bool TryGetValue(object key, out object value); - } - public static partial class MemoryCacheEntryExtensions - { - public static Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions AddExpirationToken(this Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions options, Microsoft.Extensions.Primitives.IChangeToken expirationToken) { throw null; } - public static Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions RegisterPostEvictionCallback(this Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions options, Microsoft.Extensions.Caching.Memory.PostEvictionDelegate callback) { throw null; } - public static Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions RegisterPostEvictionCallback(this Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions options, Microsoft.Extensions.Caching.Memory.PostEvictionDelegate callback, object state) { throw null; } - public static Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions SetAbsoluteExpiration(this Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions options, System.DateTimeOffset absolute) { throw null; } - public static Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions SetAbsoluteExpiration(this Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions options, System.TimeSpan relative) { throw null; } - public static Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions SetPriority(this Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions options, Microsoft.Extensions.Caching.Memory.CacheItemPriority priority) { throw null; } - public static Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions SetSize(this Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions options, long size) { throw null; } - public static Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions SetSlidingExpiration(this Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions options, System.TimeSpan offset) { throw null; } - } - public partial class MemoryCacheEntryOptions - { - public MemoryCacheEntryOptions() { } - public System.DateTimeOffset? AbsoluteExpiration { get { throw null; } set { } } - public System.TimeSpan? AbsoluteExpirationRelativeToNow { get { throw null; } set { } } - public System.Collections.Generic.IList ExpirationTokens { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public System.Collections.Generic.IList PostEvictionCallbacks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public Microsoft.Extensions.Caching.Memory.CacheItemPriority Priority { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public long? Size { get { throw null; } set { } } - public System.TimeSpan? SlidingExpiration { get { throw null; } set { } } - } - public partial class PostEvictionCallbackRegistration - { - public PostEvictionCallbackRegistration() { } - public Microsoft.Extensions.Caching.Memory.PostEvictionDelegate EvictionCallback { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public object State { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - } - public delegate void PostEvictionDelegate(object key, object value, Microsoft.Extensions.Caching.Memory.EvictionReason reason, object state); -} -namespace Microsoft.Extensions.Internal -{ - public partial interface ISystemClock - { - System.DateTimeOffset UtcNow { get; } - } - public partial class SystemClock : Microsoft.Extensions.Internal.ISystemClock - { - public SystemClock() { } - public System.DateTimeOffset UtcNow { get { throw null; } } - } -} diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj index 8e9ffd7ea338ff..9633abd2b4f74a 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj @@ -1,22 +1,13 @@  - Caching abstractions for in-memory cache and distributed cache. -Commonly used types: -Microsoft.Extensions.Caching.Distributed.IDistributedCache -Microsoft.Extensions.Caching.Memory.IMemoryCache - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + netstandard2.0 $(NoWarn);CS1591 - true - cache;memorycache;distributedcache - true - true + true - diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.netcoreapp.cs rename to src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.cs diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj index ea36e245c17e13..e971c59c800809 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj @@ -1,20 +1,13 @@ - netstandard2.0;$(DefaultNetCoreTargetFramework) + netstandard2.0 - - - - - - - - - - - - - + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.netstandard2.0.cs deleted file mode 100644 index a1d47175fb2943..00000000000000 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.netstandard2.0.cs +++ /dev/null @@ -1,59 +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.Caching.Distributed -{ - public partial class MemoryDistributedCache : Microsoft.Extensions.Caching.Distributed.IDistributedCache - { - public MemoryDistributedCache(Microsoft.Extensions.Options.IOptions optionsAccessor) { } - public MemoryDistributedCache(Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public byte[] Get(string key) { throw null; } - public System.Threading.Tasks.Task GetAsync(string key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) { throw null; } - public void Refresh(string key) { } - public System.Threading.Tasks.Task RefreshAsync(string key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) { throw null; } - public void Remove(string key) { } - public System.Threading.Tasks.Task RemoveAsync(string key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) { throw null; } - public void Set(string key, byte[] value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions options) { } - public System.Threading.Tasks.Task SetAsync(string key, byte[] value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions options, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) { throw null; } - } -} -namespace Microsoft.Extensions.Caching.Memory -{ - public partial class MemoryCache : Microsoft.Extensions.Caching.Memory.IMemoryCache, System.IDisposable - { - public MemoryCache(Microsoft.Extensions.Options.IOptions optionsAccessor) { } - public MemoryCache(Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public int Count { get { throw null; } } - public void Compact(double percentage) { } - public Microsoft.Extensions.Caching.Memory.ICacheEntry CreateEntry(object key) { throw null; } - public void Dispose() { } - protected virtual void Dispose(bool disposing) { } - ~MemoryCache() { } - public void Remove(object key) { } - public bool TryGetValue(object key, out object result) { throw null; } - } - public partial class MemoryCacheOptions : Microsoft.Extensions.Options.IOptions - { - public MemoryCacheOptions() { } - public Microsoft.Extensions.Internal.ISystemClock Clock { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public double CompactionPercentage { get { throw null; } set { } } - public System.TimeSpan ExpirationScanFrequency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - Microsoft.Extensions.Caching.Memory.MemoryCacheOptions Microsoft.Extensions.Options.IOptions.Value { get { throw null; } } - public long? SizeLimit { get { throw null; } set { } } - } - public partial class MemoryDistributedCacheOptions : Microsoft.Extensions.Caching.Memory.MemoryCacheOptions - { - public MemoryDistributedCacheOptions() { } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class MemoryCacheServiceCollectionExtensions - { - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddDistributedMemoryCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddDistributedMemoryCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action setupAction) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddMemoryCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddMemoryCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action setupAction) { throw null; } - } -} diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj index 9c9e871ef78b30..d3a007618f5695 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj @@ -1,20 +1,11 @@  - In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache. - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + netstandard2.0 $(NoWarn);CS1591 - true - cache;memorycache - true - true + true - - - - diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..8d94a5672f8464 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/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.Caching.Memory.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/pkg/Microsoft.Extensions.Configuration.Abstractions.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/pkg/Microsoft.Extensions.Configuration.Abstractions.pkgproj new file mode 100644 index 00000000000000..b33b49659eb28c --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/pkg/Microsoft.Extensions.Configuration.Abstractions.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.cs b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.cs index b488394ee9ec68..4c2c27406eddb7 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.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.Configuration { 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 cd753bd8abeca9..b7895cdb04d2b3 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 @@ -4,6 +4,6 @@ - + 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 10641f00d8d7fb..d22e391d881975 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -1,10 +1,13 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + netstandard2.0 + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/pkg/Microsoft.Extensions.Configuration.Binder.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/pkg/Microsoft.Extensions.Configuration.Binder.pkgproj new file mode 100644 index 00000000000000..efc73b15575b52 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/pkg/Microsoft.Extensions.Configuration.Binder.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.cs index b7061cdeb5ee79..041d0e62dfc3c0 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.cs @@ -1,13 +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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ 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 bool BindNonPublicProperties { get { throw null; } set { } } } public static partial class ConfigurationBinder { 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 46f4aee0bca9a9..4df616e013206b 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 @@ -4,6 +4,7 @@ - + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/ConfigurationBinder.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/ConfigurationBinder.cs index bbbba06ddca36b..a7bd00f188fc35 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/ConfigurationBinder.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/ConfigurationBinder.cs @@ -7,7 +7,6 @@ using System.ComponentModel; using System.Linq; using System.Reflection; -using Microsoft.Extensions.Configuration.Binder; namespace Microsoft.Extensions.Configuration { @@ -355,14 +354,14 @@ private static object CreateInstance(Type type) if (typeInfo.IsInterface || typeInfo.IsAbstract) { - throw new InvalidOperationException(Resources.FormatError_CannotActivateAbstractOrInterface(type)); + throw new InvalidOperationException(SR.Format(SR.Error_CannotActivateAbstractOrInterface, type)); } if (type.IsArray) { if (typeInfo.GetArrayRank() > 1) { - throw new InvalidOperationException(Resources.FormatError_UnsupportedMultidimensionalArray(type)); + throw new InvalidOperationException(SR.Format(SR.Error_UnsupportedMultidimensionalArray, type)); } return Array.CreateInstance(typeInfo.GetElementType(), 0); @@ -371,7 +370,7 @@ private static object CreateInstance(Type type) var hasDefaultConstructor = typeInfo.DeclaredConstructors.Any(ctor => ctor.IsPublic && ctor.GetParameters().Length == 0); if (!hasDefaultConstructor) { - throw new InvalidOperationException(Resources.FormatError_MissingParameterlessConstructor(type)); + throw new InvalidOperationException(SR.Format(SR.Error_MissingParameterlessConstructor, type)); } try @@ -380,7 +379,7 @@ private static object CreateInstance(Type type) } catch (Exception ex) { - throw new InvalidOperationException(Resources.FormatError_FailedToActivate(type), ex); + throw new InvalidOperationException(SR.Format(SR.Error_FailedToActivate, type), ex); } } @@ -514,7 +513,7 @@ private static bool TryConvertValue(Type type, string value, string path, out ob } catch (Exception ex) { - error = new InvalidOperationException(Resources.FormatError_FailedBinding(path, type), ex); + error = new InvalidOperationException(SR.Format(SR.Error_FailedBinding, path, type), ex); } return true; } 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 7e91caf6095377..2c2e03156d12b2 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,16 +1,13 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + netstandard2.0 + true - - - - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..f1ac16c5d801a0 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/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.Configuration.Binder.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/ConfigurationBinderTests.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/ConfigurationBinderTests.cs index 6dbff86d9ac3e7..6de2c01dd31b6c 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/ConfigurationBinderTests.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/ConfigurationBinderTests.cs @@ -399,13 +399,13 @@ public void ConsistentExceptionOnFailedBinding(Type type) Assert.NotNull(exception.InnerException); Assert.NotNull(getException.InnerException); Assert.Equal( - Resources.FormatError_FailedBinding(ConfigKey, type), + SR.Format(SR.Error_FailedBinding, ConfigKey, type), exception.Message); Assert.Equal( - Resources.FormatError_FailedBinding(ConfigKey, type), + SR.Format(SR.Error_FailedBinding, ConfigKey, type), getException.Message); Assert.Equal( - Resources.FormatError_FailedBinding(ConfigKey, type), + SR.Format(SR.Error_FailedBinding, ConfigKey, type), getValueException.Message); } @@ -429,7 +429,7 @@ public void ExceptionOnFailedBindingIncludesPath() var exception = Assert.Throws( () => config.Bind(options)); - Assert.Equal(Resources.FormatError_FailedBinding(ConfigKey, typeof(int)), + Assert.Equal(SR.Format(SR.Error_FailedBinding, ConfigKey, typeof(int)), exception.Message); } @@ -728,7 +728,7 @@ public void ExceptionWhenTryingToBindToInterface() var exception = Assert.Throws( () => config.Bind(new TestOptions())); Assert.Equal( - Resources.FormatError_CannotActivateAbstractOrInterface(typeof(ISomeInterface)), + SR.Format(SR.Error_CannotActivateAbstractOrInterface, typeof(ISomeInterface)), exception.Message); } @@ -747,7 +747,7 @@ public void ExceptionWhenTryingToBindClassWithoutParameterlessConstructor() var exception = Assert.Throws( () => config.Bind(new TestOptions())); Assert.Equal( - Resources.FormatError_MissingParameterlessConstructor(typeof(ClassWithoutPublicConstructor)), + SR.Format(SR.Error_MissingParameterlessConstructor, typeof(ClassWithoutPublicConstructor)), exception.Message); } @@ -767,7 +767,7 @@ public void ExceptionWhenTryingToBindToTypeThrowsWhenActivated() () => config.Bind(new TestOptions())); Assert.NotNull(exception.InnerException); Assert.Equal( - Resources.FormatError_FailedToActivate(typeof(ThrowsWhenActivated)), + SR.Format(SR.Error_FailedToActivate, typeof(ThrowsWhenActivated)), exception.Message); } @@ -786,7 +786,7 @@ public void ExceptionIncludesKeyOfFailedBinding() var exception = Assert.Throws( () => config.Bind(new TestOptions())); Assert.Equal( - Resources.FormatError_CannotActivateAbstractOrInterface(typeof(ISomeInterface)), + SR.Format(SR.Error_CannotActivateAbstractOrInterface, typeof(ISomeInterface)), exception.Message); } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/ConfigurationCollectionBindingTests.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/ConfigurationCollectionBindingTests.cs index b66baba664201d..71752590f6c48d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/ConfigurationCollectionBindingTests.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/ConfigurationCollectionBindingTests.cs @@ -810,7 +810,7 @@ public void UnsupportedMultidimensionalArrays() var exception = Assert.Throws( () => config.Bind(options)); Assert.Equal( - Resources.FormatError_UnsupportedMultidimensionalArray(typeof(string[,])), + SR.Format(SR.Error_UnsupportedMultidimensionalArray, typeof(string[,])), exception.Message); } 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 5df935b970a25d..df49f6059b5017 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 @@ -2,16 +2,20 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - + + Common\ConfigurationProviderExtensions.cs + + + Common\TestStreamHelpers.cs + - - - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/pkg/Microsoft.Extensions.Configuration.CommandLine.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/pkg/Microsoft.Extensions.Configuration.CommandLine.pkgproj new file mode 100644 index 00000000000000..6bb24130672402 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/pkg/Microsoft.Extensions.Configuration.CommandLine.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.cs b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.cs index 454aad7db04000..68dca57765d12f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.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.Configuration { @@ -16,14 +19,14 @@ namespace Microsoft.Extensions.Configuration.CommandLine public partial class CommandLineConfigurationProvider : Microsoft.Extensions.Configuration.ConfigurationProvider { public CommandLineConfigurationProvider(System.Collections.Generic.IEnumerable args, System.Collections.Generic.IDictionary switchMappings = null) { } - protected System.Collections.Generic.IEnumerable Args { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + protected System.Collections.Generic.IEnumerable Args { get { throw null; } } public override void Load() { } } public partial class CommandLineConfigurationSource : Microsoft.Extensions.Configuration.IConfigurationSource { public CommandLineConfigurationSource() { } - public System.Collections.Generic.IEnumerable Args { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public System.Collections.Generic.IDictionary SwitchMappings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } + public System.Collections.Generic.IEnumerable Args { get { throw null; } set { } } + public System.Collections.Generic.IDictionary SwitchMappings { get { throw null; } set { } } public Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; } } } 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 bfcbf852a60129..152fd02a26577d 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 @@ -4,6 +4,7 @@ - + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/CommandLineConfigurationProvider.cs b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/CommandLineConfigurationProvider.cs index 45bed3b70458de..a3cb1b9234ed9c 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/CommandLineConfigurationProvider.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/CommandLineConfigurationProvider.cs @@ -113,7 +113,7 @@ public override void Load() // If the switch starts with a single "-" and it isn't in given mappings , it is an invalid usage else if (keyStartIndex == 1) { - throw new FormatException(Resources.FormatError_ShortSwitchNotDefined(currentArg)); + throw new FormatException(SR.Format(SR.Error_ShortSwitchNotDefined, currentArg)); } // Otherwise, use the switch name directly as a key else @@ -144,14 +144,14 @@ private Dictionary GetValidatedSwitchMappingsCopy(IDictionary netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + true - - - - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..6589aea16eeaaf --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/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.Configuration.CommandLine.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/CommandLineTest.cs b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/CommandLineTest.cs index 9bd1e478f9039a..dfcdc44a5907ff 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/CommandLineTest.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/CommandLineTest.cs @@ -139,8 +139,8 @@ public void ThrowExceptionWhenPassingSwitchMappingsWithDuplicatedKeys() set.Add(mapping.Key); } - var expectedMsg = new ArgumentException(Resources. - FormatError_DuplicatedKeyInSwitchMappings(expectedDup), "switchMappings").Message; + var expectedMsg = new ArgumentException(SR. + Format(SR.Error_DuplicatedKeyInSwitchMappings, expectedDup), "switchMappings").Message; // Act var exception = Assert.Throws( @@ -167,7 +167,7 @@ public void ThrowExceptionWhenSwitchMappingsContainInvalidKey() { "--Key2", "SuperLongKey2" }, { "/Key3", "AnotherSuperLongKey3" } }; - var expectedMsg = new ArgumentException(Resources.FormatError_InvalidSwitchMapping("/Key3"), + var expectedMsg = new ArgumentException(SR.Format(SR.Error_InvalidSwitchMapping,"/Key3"), "switchMappings").Message; var exception = Assert.Throws( 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 aab6587e9e3f4a..4b9c4ed4aa1a43 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 @@ -2,17 +2,23 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - - + + Common\ConfigurationProviderTestBase.cs + + + Common\ConfigurationProviderExtensions.cs + + + Common\TestStreamHelpers.cs + - - - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/pkg/Microsoft.Extensions.Configuration.EnvironmentVariables.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/pkg/Microsoft.Extensions.Configuration.EnvironmentVariables.pkgproj new file mode 100644 index 00000000000000..bc1798bad6bea7 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/pkg/Microsoft.Extensions.Configuration.EnvironmentVariables.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.cs b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.cs index ca46a6aba06ee4..388cccc820f1f3 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.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.Configuration { @@ -22,7 +25,7 @@ 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 string Prefix { get { throw null; } 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.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj index 0073a6482919aa..2cdfea08ba7b95 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 @@ -4,6 +4,7 @@ - + + 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 6cf4826e8c3028..2c2e03156d12b2 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,16 +1,13 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + netstandard2.0 + true - - - - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..9afc9e5fc28c8c --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/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.Configuration.EnvironmentVariables.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] 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 827966ebedbe47..74357f4d7bec52 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 @@ -2,18 +2,23 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - - + + Common\ConfigurationProviderTestBase.cs + + + Common\ConfigurationProviderExtensions.cs + + + Common\TestStreamHelpers.cs + - - - - + - + diff --git a/src/libraries/Microsoft.Extensions.Configuration/pkg/Microsoft.Extensions.Configuration.pkgproj b/src/libraries/Microsoft.Extensions.Configuration/pkg/Microsoft.Extensions.Configuration.pkgproj new file mode 100644 index 00000000000000..c11ff1e2ecb047 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration/pkg/Microsoft.Extensions.Configuration.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.cs b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.cs index c2305fce390ff0..b77e4887c8ed76 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.cs +++ b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.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.Configuration { @@ -22,28 +25,28 @@ public void Set(string key, string value) { } 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.IConfiguration Configuration { get { throw null; } set { } } + public bool ShouldDisposeConfiguration { get { throw null; } 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 Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public System.Collections.Generic.IList Sources { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public System.Collections.Generic.IDictionary Properties { get { throw null; } } + public System.Collections.Generic.IList Sources { 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 { public ConfigurationKeyComparer() { } - public static Microsoft.Extensions.Configuration.ConfigurationKeyComparer Instance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public static Microsoft.Extensions.Configuration.ConfigurationKeyComparer Instance { 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 Data { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } + protected System.Collections.Generic.IDictionary Data { get { throw null; } set { } } public virtual System.Collections.Generic.IEnumerable GetChildKeys(System.Collections.Generic.IEnumerable earlierKeys, string parentPath) { throw null; } public Microsoft.Extensions.Primitives.IChangeToken GetReloadToken() { throw null; } public virtual void Load() { } @@ -90,14 +93,14 @@ public static partial class MemoryConfigurationBuilderExtensions 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 Microsoft.Extensions.Configuration.StreamConfigurationSource Source { 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 System.IO.Stream Stream { get { throw null; } set { } } public abstract Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder); } } @@ -113,7 +116,7 @@ public void Add(string key, string value) { } public partial class MemoryConfigurationSource : Microsoft.Extensions.Configuration.IConfigurationSource { public MemoryConfigurationSource() { } - public System.Collections.Generic.IEnumerable> InitialData { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } + public System.Collections.Generic.IEnumerable> InitialData { get { throw null; } set { } } public Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; } } } 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 ee8f8625ad7bc1..724bfef2ca5b4e 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj @@ -4,6 +4,7 @@ - + + diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/ConfigurationRoot.cs b/src/libraries/Microsoft.Extensions.Configuration/src/ConfigurationRoot.cs index 6679290bf99a49..c211a74438b8e1 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/src/ConfigurationRoot.cs +++ b/src/libraries/Microsoft.Extensions.Configuration/src/ConfigurationRoot.cs @@ -69,7 +69,7 @@ public string this[string key] { if (!_providers.Any()) { - throw new InvalidOperationException(Resources.Error_NoSources); + throw new InvalidOperationException(SR.Error_NoSources); } foreach (var provider in _providers) 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 5ba0399f11ea84..da09e22fc90e3f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj @@ -1,16 +1,13 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + netstandard2.0 + true - - - - + diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.Configuration/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..27f7fecc2d80bf --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration/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.Configuration.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/ConfigurationTest.cs b/src/libraries/Microsoft.Extensions.Configuration/tests/ConfigurationTest.cs index 84be4dcde8771a..3e5af7d129f15c 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/tests/ConfigurationTest.cs +++ b/src/libraries/Microsoft.Extensions.Configuration/tests/ConfigurationTest.cs @@ -535,7 +535,7 @@ public void SetValueThrowsExceptionNoSourceRegistered() var configurationBuilder = new ConfigurationBuilder(); var config = configurationBuilder.Build(); - var expectedMsg = Resources.Error_NoSources; + var expectedMsg = SR.Error_NoSources; // Act var ex = Assert.Throws(() => config["Title"] = "Welcome"); 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 2745ede6a0f758..ddfc57ce028db5 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 @@ -5,15 +5,13 @@ - - + + - - - - + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/pkg/Microsoft.Extensions.DependencyInjection.Abstractions.pkgproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/pkg/Microsoft.Extensions.DependencyInjection.Abstractions.pkgproj new file mode 100644 index 00000000000000..dc757ca30f0a78 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/pkg/Microsoft.Extensions.DependencyInjection.Abstractions.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.cs b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.cs index 79c26110d52560..733838e7e5f223 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.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.DependencyInjection { @@ -63,17 +66,16 @@ public static partial class ServiceCollectionServiceExtensions public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddTransient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) where TService : class where TImplementation : class, TService { throw null; } public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddTransient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Func implementationFactory) where TService : class where TImplementation : class, TService { throw null; } } - [System.Diagnostics.DebuggerDisplayAttribute("Lifetime = {Lifetime}, ServiceType = {ServiceType}, ImplementationType = {ImplementationType}")] public partial class ServiceDescriptor { public ServiceDescriptor(System.Type serviceType, System.Func factory, Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime) { } public ServiceDescriptor(System.Type serviceType, object instance) { } public ServiceDescriptor(System.Type serviceType, System.Type implementationType, Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime) { } - public System.Func ImplementationFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public object ImplementationInstance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public System.Type ImplementationType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public Microsoft.Extensions.DependencyInjection.ServiceLifetime Lifetime { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public System.Type ServiceType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public System.Func ImplementationFactory { get { throw null; } } + public object ImplementationInstance { get { throw null; } } + public System.Type ImplementationType { get { throw null; } } + public Microsoft.Extensions.DependencyInjection.ServiceLifetime Lifetime { get { throw null; } } + public System.Type ServiceType { get { throw null; } } public static Microsoft.Extensions.DependencyInjection.ServiceDescriptor Describe(System.Type serviceType, System.Func implementationFactory, Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime) { throw null; } public static Microsoft.Extensions.DependencyInjection.ServiceDescriptor Describe(System.Type serviceType, System.Type implementationType, Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime) { throw null; } public static Microsoft.Extensions.DependencyInjection.ServiceDescriptor Scoped(System.Type service, System.Func implementationFactory) { throw null; } diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Extensions/ServiceCollectionDescriptorExtensions.cs b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Extensions/ServiceCollectionDescriptorExtensions.cs index 61966fd55dcb9b..ece382a735a99f 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Extensions/ServiceCollectionDescriptorExtensions.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Extensions/ServiceCollectionDescriptorExtensions.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Extensions.DependencyInjection.Abstractions; namespace Microsoft.Extensions.DependencyInjection.Extensions { @@ -603,7 +602,7 @@ public static void TryAddEnumerable( implementationType == descriptor.ServiceType) { throw new ArgumentException( - Resources.FormatTryAddIndistinguishableTypeToEnumerable( + SR.Format(SR.TryAddIndistinguishableTypeToEnumerable, implementationType, descriptor.ServiceType), nameof(descriptor)); 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 d7263dcedf4ba8..a88b34d985e02a 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,17 +1,24 @@  - netstandard2.0 + netstandard2.0 $(DefineConstants);ActivatorUtilities_In_DependencyInjection + true - - - - - - + + Common\src\Extensions\ParameterDefaultValue\ParameterDefaultValue.cs + + + Common\src\Extensions\ActivatorUtilities\ActivatorUtilities.cs + + + Common\src\Extensions\ActivatorUtilities\ActivatorUtilitiesConstructorAttribute.cs + + + Common\src\Extensions\ActivatorUtilities\ObjectFactory.cs + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..43610cd6167f78 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/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.DependencyInjection.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ServiceProviderServiceExtensions.cs b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ServiceProviderServiceExtensions.cs index 0cf36637503bc5..1a7ffad12ad7d8 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ServiceProviderServiceExtensions.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ServiceProviderServiceExtensions.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; -using Microsoft.Extensions.DependencyInjection.Abstractions; namespace Microsoft.Extensions.DependencyInjection { @@ -57,7 +56,7 @@ public static object GetRequiredService(this IServiceProvider provider, Type ser var service = provider.GetService(serviceType); if (service == null) { - throw new InvalidOperationException(Resources.FormatNoServiceRegistered(serviceType)); + throw new InvalidOperationException(SR.Format(SR.NoServiceRegistered, serviceType)); } return service; diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/pkg/Microsoft.Extensions.DependencyInjection.pkgproj b/src/libraries/Microsoft.Extensions.DependencyInjection/pkg/Microsoft.Extensions.DependencyInjection.pkgproj new file mode 100644 index 00000000000000..becfee5e2d37ba --- /dev/null +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/pkg/Microsoft.Extensions.DependencyInjection.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file 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 7c02fba66924f4..d4098d54f3b8d6 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj @@ -4,9 +4,10 @@ - + + 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 038878582d55b0..23dacffd9a7a6f 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj @@ -1,8 +1,7 @@  - $(DefaultNetCoreTargetFramework);net461;netstandard2.0;netstandard2.1 - true + net461;netstandard2.0;netstandard2.1 True $(DefineConstants);IL_EMIT @@ -12,26 +11,34 @@ $(DefineConstants);SAVE_ASSEMBLIES - - - - - + + + + + + + + + - - + + Common\src\Extensions\ParameterDefaultValue\ParameterDefaultValue.cs + + + Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..243928d971686c --- /dev/null +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/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.DependencyInjection.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] +[assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyInjection.Performance, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteChain.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteChain.cs index 7c2bd7a80eea43..e81e90110b25cb 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteChain.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteChain.cs @@ -40,7 +40,7 @@ public void Add(Type serviceType, Type implementationType = null) private string CreateCircularDependencyExceptionMessage(Type type) { var messageBuilder = new StringBuilder(); - messageBuilder.AppendFormat(Resources.CircularDependencyException, TypeNameHelper.GetTypeDisplayName(type)); + messageBuilder.AppendFormat(SR.CircularDependencyException, TypeNameHelper.GetTypeDisplayName(type)); messageBuilder.AppendLine(); AppendResolutionPath(messageBuilder, type); diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteFactory.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteFactory.cs index 2be75fdd56ff36..71c70cee8d3e1b 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteFactory.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteFactory.cs @@ -40,14 +40,14 @@ private void Populate() if (implementationTypeInfo == null || !implementationTypeInfo.IsGenericTypeDefinition) { throw new ArgumentException( - Resources.FormatOpenGenericServiceRequiresOpenGenericImplementation(descriptor.ServiceType), + SR.Format(SR.OpenGenericServiceRequiresOpenGenericImplementation, descriptor.ServiceType), "descriptors"); } if (implementationTypeInfo.IsAbstract || implementationTypeInfo.IsInterface) { throw new ArgumentException( - Resources.FormatTypeCannotBeActivated(descriptor.ImplementationType, descriptor.ServiceType)); + SR.Format(SR.TypeCannotBeActivated, descriptor.ImplementationType, descriptor.ServiceType)); } } else if (descriptor.ImplementationInstance == null && descriptor.ImplementationFactory == null) @@ -60,7 +60,7 @@ private void Populate() implementationTypeInfo.IsInterface) { throw new ArgumentException( - Resources.FormatTypeCannotBeActivated(descriptor.ImplementationType, descriptor.ServiceType)); + SR.Format(SR.TypeCannotBeActivated, descriptor.ImplementationType, descriptor.ServiceType)); } } @@ -260,7 +260,7 @@ private ServiceCallSite CreateConstructorCallSite(ResultCache lifetime, Type ser if (constructors.Length == 0) { - throw new InvalidOperationException(Resources.FormatNoConstructorMatch(implementationType)); + throw new InvalidOperationException(SR.Format(SR.NoConstructorMatch, implementationType)); } else if (constructors.Length == 1) { @@ -320,7 +320,7 @@ private ServiceCallSite CreateConstructorCallSite(ResultCache lifetime, Type ser // Ambiguous match exception var message = string.Join( Environment.NewLine, - Resources.FormatAmbiguousConstructorException(implementationType), + SR.Format(SR.AmbiguousConstructorException, implementationType), bestConstructor, constructors[i]); throw new InvalidOperationException(message); @@ -332,7 +332,7 @@ private ServiceCallSite CreateConstructorCallSite(ResultCache lifetime, Type ser if (bestConstructor == null) { throw new InvalidOperationException( - Resources.FormatUnableToActivateTypeException(implementationType)); + SR.Format(SR.UnableToActivateTypeException, implementationType)); } else { @@ -368,7 +368,7 @@ private ServiceCallSite[] CreateArgumentCallSites( { if (throwIfCallSiteNotFound) { - throw new InvalidOperationException(Resources.FormatCannotResolveService( + throw new InvalidOperationException(SR.Format(SR.CannotResolveService, parameterType, implementationType)); } diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteValidator.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteValidator.cs index 163d72cd54e2c5..72b94ce4e1a50c 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteValidator.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteValidator.cs @@ -29,12 +29,12 @@ public void ValidateResolution(Type serviceType, IServiceScope scope, IServiceSc if (serviceType == scopedService) { throw new InvalidOperationException( - Resources.FormatDirectScopedResolvedFromRootException(serviceType, + SR.Format(SR.DirectScopedResolvedFromRootException, serviceType, nameof(ServiceLifetime.Scoped).ToLowerInvariant())); } throw new InvalidOperationException( - Resources.FormatScopedResolvedFromRootException( + SR.Format(SR.ScopedResolvedFromRootException, serviceType, scopedService, nameof(ServiceLifetime.Scoped).ToLowerInvariant())); @@ -85,7 +85,7 @@ protected override Type VisitScopeCache(ServiceCallSite scopedCallSite, CallSite } if (state.Singleton != null) { - throw new InvalidOperationException(Resources.FormatScopedInSingletonException( + throw new InvalidOperationException(SR.Format(SR.ScopedInSingletonException, scopedCallSite.ServiceType, state.Singleton.ServiceType, nameof(ServiceLifetime.Scoped).ToLowerInvariant(), diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ConstantCallSite.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ConstantCallSite.cs index 8557b15618bd3c..b4ff7c075a6277 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ConstantCallSite.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ConstantCallSite.cs @@ -14,7 +14,7 @@ public ConstantCallSite(Type serviceType, object defaultValue): base(ResultCache { if (defaultValue != null && !serviceType.IsInstanceOfType(defaultValue)) { - throw new ArgumentException(Resources.FormatConstantCantBeConvertedToServiceType(defaultValue.GetType(), serviceType)); + throw new ArgumentException(SR.Format(SR.ConstantCantBeConvertedToServiceType, defaultValue.GetType(), serviceType)); } DefaultValue = defaultValue; diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ConstructorCallSite.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ConstructorCallSite.cs index 3a5265d3c51411..08e6147b5a05ff 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ConstructorCallSite.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ConstructorCallSite.cs @@ -20,7 +20,7 @@ public ConstructorCallSite(ResultCache cache, Type serviceType, ConstructorInfo { if (!serviceType.IsAssignableFrom(constructorInfo.DeclaringType)) { - throw new ArgumentException(Resources.FormatImplementationTypeCantBeConvertedToServiceType(constructorInfo.DeclaringType, serviceType)); + throw new ArgumentException(SR.Format(SR.ImplementationTypeCantBeConvertedToServiceType, constructorInfo.DeclaringType, serviceType)); } ServiceType = serviceType; diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ServiceProviderEngineScope.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ServiceProviderEngineScope.cs index f765ac650d1666..a60bfbad4bc1bd 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ServiceProviderEngineScope.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ServiceProviderEngineScope.cs @@ -77,7 +77,7 @@ public void Dispose() } else { - throw new InvalidOperationException(Resources.FormatAsyncDisposableServiceDispose(TypeNameHelper.GetTypeDisplayName(toDispose[i]))); + throw new InvalidOperationException(SR.Format(SR.AsyncDisposableServiceDispose, TypeNameHelper.GetTypeDisplayName(toDispose[i]))); } } } 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 f4b7aae8743bed..6f7344c8ff8cfa 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 @@ -3,13 +3,13 @@ Microsoft.Extensions.FileProviders netstandard2.0 + true Common\src\Extensions\EmptyDisposable.cs - 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 134d041f29c9fe..75718c41b115be 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 @@ -3,12 +3,9 @@ Microsoft.Extensions.FileProviders netstandard2.0 + true - - - - 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 7f73088dfe4885..ecb606a8b719e8 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 @@ -3,20 +3,11 @@ Microsoft.Extensions.FileProviders.Composite $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - - - - - - - - - - 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 da32c8db673752..5f23ebcc600ad6 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 @@ -4,6 +4,7 @@ Microsoft.Extensions.FileProviders netstandard2.0 true + true @@ -13,7 +14,6 @@ Common\src\Extensions\NonCapturingTimer\NonCapturingTimer.cs - 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 95fc496fd614dd..8cb5229c139d3e 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 @@ -3,10 +3,10 @@ Microsoft.Extensions.FileProviders.Physical $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\ITestCondition.cs @@ -17,19 +17,7 @@ - - - - - - - - - - - - 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 0b0c85d73935e4..00d510d0cede57 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj @@ -3,13 +3,13 @@ netstandard2.0 $(NoWarn);CS1591 + true Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs - 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 bb2be1175ca05b..ec30023fd0ec80 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 @@ -2,14 +2,7 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - - - - - - - - diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/pkg/Microsoft.Extensions.Hosting.Abstractions.pkgproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/pkg/Microsoft.Extensions.Hosting.Abstractions.pkgproj new file mode 100644 index 00000000000000..13333274e7b1b6 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/pkg/Microsoft.Extensions.Hosting.Abstractions.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.cs b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.cs index 880dff83911420..0f26a6bf6de097 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.cs +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.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.DependencyInjection { @@ -18,7 +21,6 @@ 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)] @@ -37,9 +39,9 @@ public static partial class Environments public partial class HostBuilderContext { public HostBuilderContext(System.Collections.Generic.IDictionary 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 Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public Microsoft.Extensions.Configuration.IConfiguration Configuration { get { throw null; } set { } } + public Microsoft.Extensions.Hosting.IHostEnvironment HostingEnvironment { get { throw null; } set { } } + public System.Collections.Generic.IDictionary Properties { get { throw null; } } } public static partial class HostDefaults { @@ -57,18 +59,15 @@ public static partial class HostEnvironmentEnvExtensions 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 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 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 84664b981272f7..3220cd20db6e89 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,11 +1,15 @@ - netstandard2.0 + netstandard2.0;netstandard2.1 + + + + 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 5a9396d8471a08..1996b8d4effcb2 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,10 +1,10 @@ - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + netstandard2.0;$(NetCoreAppCurrent) $(NoWarn);CS1591 Microsoft.Extensions.Hosting + true @@ -12,10 +12,13 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.netcoreapp.cs b/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.netcoreapp.cs rename to src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.cs diff --git a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj index 097173637ff1cf..46164f9d0127a4 100644 --- a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj @@ -1,18 +1,11 @@ - - netstandard2.0;$(DefaultNetCoreTargetFramework) + netstandard2.0 - - - - - - - - - - - + + + + + diff --git a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.netstandard2.0.cs b/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.netstandard2.0.cs deleted file mode 100644 index 3348637e8fd871..00000000000000 --- a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.netstandard2.0.cs +++ /dev/null @@ -1,120 +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 HttpClientBuilderExtensions - { - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpMessageHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func configureHandler) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpMessageHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func configureHandler) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpMessageHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder) where THandler : System.Net.Http.DelegatingHandler { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddTypedClient(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder) where TClient : class { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddTypedClient(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func factory) where TClient : class { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddTypedClient(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func factory) where TClient : class { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddTypedClient(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder) where TClient : class where TImplementation : class, TClient { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder ConfigureHttpClient(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Action configureClient) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder ConfigureHttpClient(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Action configureClient) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder ConfigureHttpMessageHandlerBuilder(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Action configureBuilder) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder ConfigurePrimaryHttpMessageHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func configureHandler) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder ConfigurePrimaryHttpMessageHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func configureHandler) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder ConfigurePrimaryHttpMessageHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder) where THandler : System.Net.Http.HttpMessageHandler { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder RedactLoggedHeaders(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Collections.Generic.IEnumerable redactedLoggedHeaderNames) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder RedactLoggedHeaders(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func shouldRedactHeaderValue) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder SetHandlerLifetime(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.TimeSpan handlerLifetime) { throw null; } - } - public static partial class HttpClientFactoryServiceCollectionExtensions - { - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name, System.Action configureClient) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name, System.Action configureClient) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) where TClient : class { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configureClient) where TClient : class { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configureClient) where TClient : class { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name) where TClient : class { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name, System.Action configureClient) where TClient : class { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name, System.Action configureClient) where TClient : class { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) where TClient : class where TImplementation : class, TClient { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configureClient) where TClient : class where TImplementation : class, TClient { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configureClient) where TClient : class where TImplementation : class, TClient { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Func factory) where TClient : class where TImplementation : class, TClient { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Func factory) where TClient : class where TImplementation : class, TClient { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name) where TClient : class where TImplementation : class, TClient { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name, System.Action configureClient) where TClient : class where TImplementation : class, TClient { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name, System.Action configureClient) where TClient : class where TImplementation : class, TClient { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name, System.Func factory) where TClient : class where TImplementation : class, TClient { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string name, System.Func factory) where TClient : class where TImplementation : class, TClient { throw null; } - } - public partial interface IHttpClientBuilder - { - string Name { get; } - Microsoft.Extensions.DependencyInjection.IServiceCollection Services { get; } - } -} -namespace Microsoft.Extensions.Http -{ - public partial class HttpClientFactoryOptions - { - public HttpClientFactoryOptions() { } - public System.TimeSpan HandlerLifetime { get { throw null; } set { } } - public System.Collections.Generic.IList> HttpClientActions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public System.Collections.Generic.IList> HttpMessageHandlerBuilderActions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public System.Func ShouldRedactHeaderValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public bool SuppressHandlerScope { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - } - public abstract partial class HttpMessageHandlerBuilder - { - protected HttpMessageHandlerBuilder() { } - public abstract System.Collections.Generic.IList AdditionalHandlers { get; } - public abstract string Name { get; set; } - public abstract System.Net.Http.HttpMessageHandler PrimaryHandler { get; set; } - public virtual System.IServiceProvider Services { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public abstract System.Net.Http.HttpMessageHandler Build(); - protected internal static System.Net.Http.HttpMessageHandler CreateHandlerPipeline(System.Net.Http.HttpMessageHandler primaryHandler, System.Collections.Generic.IEnumerable additionalHandlers) { throw null; } - } - public partial interface IHttpMessageHandlerBuilderFilter - { - System.Action Configure(System.Action next); - } - public partial interface ITypedHttpClientFactory - { - TClient CreateClient(System.Net.Http.HttpClient httpClient); - } -} -namespace Microsoft.Extensions.Http.Logging -{ - public partial class LoggingHttpMessageHandler : System.Net.Http.DelegatingHandler - { - public LoggingHttpMessageHandler(Microsoft.Extensions.Logging.ILogger logger) { } - public LoggingHttpMessageHandler(Microsoft.Extensions.Logging.ILogger logger, Microsoft.Extensions.Http.HttpClientFactoryOptions options) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task SendAsync(System.Net.Http.HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) { throw null; } - } - public partial class LoggingScopeHttpMessageHandler : System.Net.Http.DelegatingHandler - { - public LoggingScopeHttpMessageHandler(Microsoft.Extensions.Logging.ILogger logger) { } - public LoggingScopeHttpMessageHandler(Microsoft.Extensions.Logging.ILogger logger, Microsoft.Extensions.Http.HttpClientFactoryOptions options) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task SendAsync(System.Net.Http.HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) { throw null; } - } -} -namespace System.Net.Http -{ - public static partial class HttpClientFactoryExtensions - { - public static System.Net.Http.HttpClient CreateClient(this System.Net.Http.IHttpClientFactory factory) { throw null; } - } - public static partial class HttpMessageHandlerFactoryExtensions - { - public static System.Net.Http.HttpMessageHandler CreateHandler(this System.Net.Http.IHttpMessageHandlerFactory factory) { throw null; } - } - public partial interface IHttpClientFactory - { - System.Net.Http.HttpClient CreateClient(string name); - } - public partial interface IHttpMessageHandlerFactory - { - System.Net.Http.HttpMessageHandler CreateHandler(string name); - } -} diff --git a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj index b7c800e035ec61..208cae23f9c305 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj @@ -1,29 +1,21 @@  - - The HttpClient factory is a pattern for configuring and retrieving named HttpClients in a composable way. The HttpClient factory provides extensibility to plug in DelegatingHandlers that address cross-cutting concerns such as service location, load balancing, and reliability. The default HttpClient factory provides built-in diagnostics and logging and manages the lifetimes of connections in a performant way. - Commonly used types: - System.Net.Http.IHttpClientFactory - - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + netstandard2.0 $(NoWarn);CS1591 - true - aspnetcore;httpclient - true - true + true - - - - - - - - + + Common\src\Extensions\NonCapturingTimer\NonCapturingTimer.cs + + + Common\src\Extensions\TypeNameHelper.cs + + + Common\src\Extensions\ValueStopwatch\ValueStopwatch.cs + diff --git a/src/libraries/Microsoft.Extensions.Http/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.Http/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..665c90dba1e02a --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Http/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.Http.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/pkg/Microsoft.Extensions.Logging.Abstractions.pkgproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/pkg/Microsoft.Extensions.Logging.Abstractions.pkgproj new file mode 100644 index 00000000000000..748c29f6212db4 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/pkg/Microsoft.Extensions.Logging.Abstractions.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs index dcbf6da13a5ea7..878f0c4cba03a1 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.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.Logging { - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly partial struct EventId { private readonly object _dummy; private readonly int _dummyPrimitive; public EventId(int id, string name = null) { throw null; } - public int Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public int Id { get { throw null; } } + public string Name { get { throw null; } } public bool Equals(Microsoft.Extensions.Logging.EventId other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } @@ -127,7 +129,7 @@ namespace Microsoft.Extensions.Logging.Abstractions public partial class NullLogger : Microsoft.Extensions.Logging.ILogger { internal NullLogger() { } - public static Microsoft.Extensions.Logging.Abstractions.NullLogger Instance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public static Microsoft.Extensions.Logging.Abstractions.NullLogger Instance { get { throw null; } } public System.IDisposable BeginScope(TState state) { throw null; } public bool IsEnabled(Microsoft.Extensions.Logging.LogLevel logLevel) { throw null; } public void Log(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, TState state, System.Exception exception, System.Func formatter) { } @@ -143,7 +145,7 @@ public void Dispose() { } public partial class NullLoggerProvider : Microsoft.Extensions.Logging.ILoggerProvider, System.IDisposable { internal NullLoggerProvider() { } - public static Microsoft.Extensions.Logging.Abstractions.NullLoggerProvider Instance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public static Microsoft.Extensions.Logging.Abstractions.NullLoggerProvider Instance { get { throw null; } } public Microsoft.Extensions.Logging.ILogger CreateLogger(string categoryName) { throw null; } public void Dispose() { } } diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LoggerMessage.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LoggerMessage.cs index 81177f20ca0c3d..7101c09d986f58 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LoggerMessage.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LoggerMessage.cs @@ -259,7 +259,7 @@ private static LogValuesFormatter CreateLogValuesFormatter(string formatString, if (actualCount != expectedNamedParameterCount) { throw new ArgumentException( - Resource.FormatUnexpectedNumberOfNamedParameters(formatString, expectedNamedParameterCount, actualCount)); + SR.Format(SR.UnexpectedNumberOfNamedParameters, expectedNamedParameterCount, actualCount)); } return logValuesFormatter; 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 34bc1818a72fdc..247ee6768e7a8d 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,17 +1,21 @@ - netstandard2.0 + netstandard2.0 $(NoWarn);CS1591 + true - - - - - - + + Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs + + + Common\src\Extensions\Logging\NullExternalScopeProvider.cs + + + Common\src\Extensions\Logging\NullScope.cs + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..a3841254b41bb5 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/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.Logging.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/pkg/Microsoft.Extensions.Options.ConfigurationExtensions.pkgproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/pkg/Microsoft.Extensions.Options.ConfigurationExtensions.pkgproj new file mode 100644 index 00000000000000..a0b57f23c3c5b1 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/pkg/Microsoft.Extensions.Options.ConfigurationExtensions.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.cs b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.cs index e66c32090379a5..42b3ae6d7c4949 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.cs +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.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.DependencyInjection { @@ -23,7 +26,7 @@ public partial class ConfigurationChangeTokenSource : Microsoft.Extens { 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 string Name { get { throw null; } } public Microsoft.Extensions.Primitives.IChangeToken GetChangeToken() { throw null; } } public partial class ConfigureFromConfigurationOptions : Microsoft.Extensions.Options.ConfigureOptions where TOptions : class 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 fe70d4f69ca309..be66538ec516b3 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 @@ -4,9 +4,10 @@ - - - - + + + + + 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 5a83d1492919f0..de569c7bd8fd90 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,8 +1,8 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + netstandard2.0;$(NetCoreAppCurrent) + true @@ -10,6 +10,12 @@ + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/pkg/Microsoft.Extensions.Options.DataAnnotations.pkgproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/pkg/Microsoft.Extensions.Options.DataAnnotations.pkgproj new file mode 100644 index 00000000000000..de950358cd2e93 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/pkg/Microsoft.Extensions.Options.DataAnnotations.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.cs b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.cs index 13fdbc84780657..0839723b9a2b10 100644 --- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.cs +++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.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.DependencyInjection { @@ -14,7 +17,7 @@ namespace Microsoft.Extensions.Options public partial class DataAnnotationValidateOptions : Microsoft.Extensions.Options.IValidateOptions where TOptions : class { public DataAnnotationValidateOptions(string name) { } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public string Name { get { throw null; } } public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options) { throw null; } } } 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 c8291cba6676f2..b8dd59bff6fe78 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,13 +1,10 @@ - netstandard2.0 + netstandard2.0;netstandard2.1 - - - - - + + 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 e848318f76e6f9..18a3307bfe228f 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,8 +1,8 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + netstandard2.0;$(NetCoreAppCurrent) + true @@ -10,8 +10,14 @@ - + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Options/pkg/Microsoft.Extensions.Options.pkgproj b/src/libraries/Microsoft.Extensions.Options/pkg/Microsoft.Extensions.Options.pkgproj new file mode 100644 index 00000000000000..f50e78baa3f9f3 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Options/pkg/Microsoft.Extensions.Options.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.cs b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.cs index 76e96b817796f7..b10fa502425485 100644 --- a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.cs +++ b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.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.DependencyInjection { @@ -25,70 +28,70 @@ namespace Microsoft.Extensions.Options public partial class ConfigureNamedOptions : Microsoft.Extensions.Options.IConfigureNamedOptions, Microsoft.Extensions.Options.IConfigureOptions where TOptions : class { public ConfigureNamedOptions(string name, System.Action action) { } - public System.Action Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public System.Action Action { get { throw null; } } + public string Name { get { throw null; } } public virtual void Configure(string name, TOptions options) { } public void Configure(TOptions options) { } } public partial class ConfigureNamedOptions : Microsoft.Extensions.Options.IConfigureNamedOptions, Microsoft.Extensions.Options.IConfigureOptions where TOptions : class where TDep : class { public ConfigureNamedOptions(string name, TDep dependency, System.Action action) { } - public System.Action 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 System.Action Action { get { throw null; } } + public TDep Dependency { get { throw null; } } + public string Name { get { throw null; } } public virtual void Configure(string name, TOptions options) { } public void Configure(TOptions options) { } } public partial class ConfigureNamedOptions : Microsoft.Extensions.Options.IConfigureNamedOptions, Microsoft.Extensions.Options.IConfigureOptions where TOptions : class where TDep1 : class where TDep2 : class { public ConfigureNamedOptions(string name, TDep1 dependency, TDep2 dependency2, System.Action action) { } - public System.Action 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 System.Action Action { get { throw null; } } + public TDep1 Dependency1 { get { throw null; } } + public TDep2 Dependency2 { get { throw null; } } + public string Name { get { throw null; } } public virtual void Configure(string name, TOptions options) { } public void Configure(TOptions options) { } } public partial class ConfigureNamedOptions : Microsoft.Extensions.Options.IConfigureNamedOptions, Microsoft.Extensions.Options.IConfigureOptions where TOptions : class where TDep1 : class where TDep2 : class where TDep3 : class { public ConfigureNamedOptions(string name, TDep1 dependency, TDep2 dependency2, TDep3 dependency3, System.Action action) { } - public System.Action 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 System.Action Action { get { throw null; } } + public TDep1 Dependency1 { get { throw null; } } + public TDep2 Dependency2 { get { throw null; } } + public TDep3 Dependency3 { get { throw null; } } + public string Name { get { throw null; } } public virtual void Configure(string name, TOptions options) { } public void Configure(TOptions options) { } } public partial class ConfigureNamedOptions : Microsoft.Extensions.Options.IConfigureNamedOptions, Microsoft.Extensions.Options.IConfigureOptions 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 action) { } - public System.Action 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 System.Action Action { get { throw null; } } + public TDep1 Dependency1 { get { throw null; } } + public TDep2 Dependency2 { get { throw null; } } + public TDep3 Dependency3 { get { throw null; } } + public TDep4 Dependency4 { get { throw null; } } + public string Name { get { throw null; } } public virtual void Configure(string name, TOptions options) { } public void Configure(TOptions options) { } } public partial class ConfigureNamedOptions : Microsoft.Extensions.Options.IConfigureNamedOptions, Microsoft.Extensions.Options.IConfigureOptions 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 action) { } - public System.Action 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 System.Action Action { get { throw null; } } + public TDep1 Dependency1 { get { throw null; } } + public TDep2 Dependency2 { get { throw null; } } + public TDep3 Dependency3 { get { throw null; } } + public TDep4 Dependency4 { get { throw null; } } + public TDep5 Dependency5 { get { throw null; } } + public string Name { get { throw null; } } public virtual void Configure(string name, TOptions options) { } public void Configure(TOptions options) { } } public partial class ConfigureOptions : Microsoft.Extensions.Options.IConfigureOptions where TOptions : class { public ConfigureOptions(System.Action action) { } - public System.Action Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public System.Action Action { get { throw null; } } public virtual void Configure(TOptions options) { } } public partial interface IConfigureNamedOptions : Microsoft.Extensions.Options.IConfigureOptions where TOptions : class @@ -145,8 +148,8 @@ public static partial class Options public partial class OptionsBuilder 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 string Name { get { throw null; } } + public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { get { throw null; } } public virtual Microsoft.Extensions.Options.OptionsBuilder Configure(System.Action configureOptions) { throw null; } public virtual Microsoft.Extensions.Options.OptionsBuilder Configure(System.Action configureOptions) where TDep : class { throw null; } public virtual Microsoft.Extensions.Options.OptionsBuilder Configure(System.Action configureOptions) where TDep1 : class where TDep2 : class { throw null; } @@ -208,75 +211,75 @@ public void Dispose() { } public partial class OptionsValidationException : System.Exception { public OptionsValidationException(string optionsName, System.Type optionsType, System.Collections.Generic.IEnumerable failureMessages) { } - public System.Collections.Generic.IEnumerable Failures { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public System.Collections.Generic.IEnumerable Failures { 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 string OptionsName { get { throw null; } } + public System.Type OptionsType { get { throw null; } } } public partial class OptionsWrapper : Microsoft.Extensions.Options.IOptions where TOptions : class { public OptionsWrapper(TOptions options) { } - public TOptions Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public TOptions Value { get { throw null; } } } public partial class PostConfigureOptions : Microsoft.Extensions.Options.IPostConfigureOptions where TOptions : class { public PostConfigureOptions(string name, System.Action action) { } - public System.Action Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public System.Action Action { get { throw null; } } + public string Name { get { throw null; } } public virtual void PostConfigure(string name, TOptions options) { } } public partial class PostConfigureOptions : Microsoft.Extensions.Options.IPostConfigureOptions where TOptions : class where TDep : class { public PostConfigureOptions(string name, TDep dependency, System.Action action) { } - public System.Action 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 System.Action Action { get { throw null; } } + public TDep Dependency { get { throw null; } } + public string Name { get { throw null; } } public virtual void PostConfigure(string name, TOptions options) { } public void PostConfigure(TOptions options) { } } public partial class PostConfigureOptions : Microsoft.Extensions.Options.IPostConfigureOptions where TOptions : class where TDep1 : class where TDep2 : class { public PostConfigureOptions(string name, TDep1 dependency, TDep2 dependency2, System.Action action) { } - public System.Action 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 System.Action Action { get { throw null; } } + public TDep1 Dependency1 { get { throw null; } } + public TDep2 Dependency2 { get { throw null; } } + public string Name { get { throw null; } } public virtual void PostConfigure(string name, TOptions options) { } public void PostConfigure(TOptions options) { } } public partial class PostConfigureOptions : Microsoft.Extensions.Options.IPostConfigureOptions where TOptions : class where TDep1 : class where TDep2 : class where TDep3 : class { public PostConfigureOptions(string name, TDep1 dependency, TDep2 dependency2, TDep3 dependency3, System.Action action) { } - public System.Action 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 System.Action Action { get { throw null; } } + public TDep1 Dependency1 { get { throw null; } } + public TDep2 Dependency2 { get { throw null; } } + public TDep3 Dependency3 { get { throw null; } } + public string Name { get { throw null; } } public virtual void PostConfigure(string name, TOptions options) { } public void PostConfigure(TOptions options) { } } public partial class PostConfigureOptions : Microsoft.Extensions.Options.IPostConfigureOptions 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 action) { } - public System.Action 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 System.Action Action { get { throw null; } } + public TDep1 Dependency1 { get { throw null; } } + public TDep2 Dependency2 { get { throw null; } } + public TDep3 Dependency3 { get { throw null; } } + public TDep4 Dependency4 { get { throw null; } } + public string Name { get { throw null; } } public virtual void PostConfigure(string name, TOptions options) { } public void PostConfigure(TOptions options) { } } public partial class PostConfigureOptions : Microsoft.Extensions.Options.IPostConfigureOptions 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 action) { } - public System.Action 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 System.Action Action { get { throw null; } } + public TDep1 Dependency1 { get { throw null; } } + public TDep2 Dependency2 { get { throw null; } } + public TDep3 Dependency3 { get { throw null; } } + public TDep4 Dependency4 { get { throw null; } } + public TDep5 Dependency5 { get { throw null; } } + public string Name { get { throw null; } } public virtual void PostConfigure(string name, TOptions options) { } public void PostConfigure(TOptions options) { } } @@ -285,75 +288,75 @@ 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 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 bool Failed { get { throw null; } protected set { } } + public string FailureMessage { get { throw null; } protected set { } } + public System.Collections.Generic.IEnumerable Failures { get { throw null; } protected set { } } + public bool Skipped { get { throw null; } protected set { } } + public bool Succeeded { get { throw null; } protected set { } } public static Microsoft.Extensions.Options.ValidateOptionsResult Fail(System.Collections.Generic.IEnumerable failures) { throw null; } public static Microsoft.Extensions.Options.ValidateOptionsResult Fail(string failureMessage) { throw null; } } public partial class ValidateOptions : Microsoft.Extensions.Options.IValidateOptions where TOptions : class { public ValidateOptions(string name, System.Func 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 Validation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public string FailureMessage { get { throw null; } } + public string Name { get { throw null; } } + public System.Func Validation { get { throw null; } } public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options) { throw null; } } public partial class ValidateOptions : Microsoft.Extensions.Options.IValidateOptions where TOptions : class { public ValidateOptions(string name, TDep dependency, System.Func 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 Validation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public TDep Dependency { get { throw null; } } + public string FailureMessage { get { throw null; } } + public string Name { get { throw null; } } + public System.Func Validation { get { throw null; } } public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options) { throw null; } } public partial class ValidateOptions : Microsoft.Extensions.Options.IValidateOptions where TOptions : class { public ValidateOptions(string name, TDep1 dependency1, TDep2 dependency2, System.Func 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 Validation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public TDep1 Dependency1 { get { throw null; } } + public TDep2 Dependency2 { get { throw null; } } + public string FailureMessage { get { throw null; } } + public string Name { get { throw null; } } + public System.Func Validation { get { throw null; } } public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options) { throw null; } } public partial class ValidateOptions : Microsoft.Extensions.Options.IValidateOptions where TOptions : class { public ValidateOptions(string name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, System.Func 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 Validation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public TDep1 Dependency1 { get { throw null; } } + public TDep2 Dependency2 { get { throw null; } } + public TDep3 Dependency3 { get { throw null; } } + public string FailureMessage { get { throw null; } } + public string Name { get { throw null; } } + public System.Func Validation { get { throw null; } } public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options) { throw null; } } public partial class ValidateOptions : Microsoft.Extensions.Options.IValidateOptions where TOptions : class { public ValidateOptions(string name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, TDep4 dependency4, System.Func 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 Validation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public TDep1 Dependency1 { get { throw null; } } + public TDep2 Dependency2 { get { throw null; } } + public TDep3 Dependency3 { get { throw null; } } + public TDep4 Dependency4 { get { throw null; } } + public string FailureMessage { get { throw null; } } + public string Name { get { throw null; } } + public System.Func Validation { get { throw null; } } public Microsoft.Extensions.Options.ValidateOptionsResult Validate(string name, TOptions options) { throw null; } } public partial class ValidateOptions : Microsoft.Extensions.Options.IValidateOptions where TOptions : class { public ValidateOptions(string name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, TDep4 dependency4, TDep5 dependency5, System.Func 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 Validation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public TDep1 Dependency1 { get { throw null; } } + public TDep2 Dependency2 { get { throw null; } } + public TDep3 Dependency3 { get { throw null; } } + public TDep4 Dependency4 { get { throw null; } } + public TDep5 Dependency5 { get { throw null; } } + public string FailureMessage { get { throw null; } } + public string Name { get { throw null; } } + public System.Func Validation { 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.csproj b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj index df0de680df1f81..a119724225afd6 100644 --- a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj @@ -3,11 +3,11 @@ netstandard2.0;netstandard2.1 - + - - + + 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 3d3c2ae30473ab..a2fb7384785946 100644 --- a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj @@ -1,19 +1,24 @@ - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + netstandard2.0;$(NetCoreAppCurrent) + true - - - - + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Options/src/OptionsServiceCollectionExtensions.cs b/src/libraries/Microsoft.Extensions.Options/src/OptionsServiceCollectionExtensions.cs index 457b5218eacfa0..164fc84c935197 100644 --- a/src/libraries/Microsoft.Extensions.Options/src/OptionsServiceCollectionExtensions.cs +++ b/src/libraries/Microsoft.Extensions.Options/src/OptionsServiceCollectionExtensions.cs @@ -155,8 +155,8 @@ private static IEnumerable FindIConfigureOptions(Type type) { throw new InvalidOperationException( IsAction(type) - ? Resources.Error_NoIConfigureOptionsAndAction - : Resources.Error_NoIConfigureOptions); + ? SR.Error_NoIConfigureOptionsAndAction + : SR.Error_NoIConfigureOptions); } return serviceTypes; } diff --git a/src/libraries/Microsoft.Extensions.Options/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.Options/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..20cf4cac86329e --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Options/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.Options.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] 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 ea3f5bbdba2662..c4f7c1a92fd6fa 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 @@ -2,6 +2,7 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true diff --git a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.cs b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.cs index 37f8f8a869baf7..c75aa6129cb365 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.cs +++ b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.cs @@ -37,6 +37,7 @@ public partial interface IChangeToken bool HasChanged { get; } System.IDisposable RegisterChangeCallback(System.Action callback, object state); } + [System.ObsoleteAttribute("This type is obsolete and will be removed in a future version.")] public partial struct InplaceStringBuilder { private object _dummy; 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 09e032e80f957d..224c54a8cedf89 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 @@ -16,9 +16,5 @@ - - - - diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json index 5eebf5e6b2e8d5..7114331622978e 100644 --- a/src/libraries/pkg/baseline/packageIndex.json +++ b/src/libraries/pkg/baseline/packageIndex.json @@ -145,6 +145,220 @@ "5.0.0.0": "5.0.0" } }, + "Microsoft.Extensions.Caching.Abstractions": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.1.2", + "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.Configuration": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "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.Configuration.Abstractions": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "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.Configuration.Binder": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.1.10", + "2.2.0", + "2.2.4", + "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.Configuration.CommandLine": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "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.Configuration.EnvironmentVariables": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.2.0", + "2.2.4", + "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.DependencyInjection": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "2.0.0", + "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.DependencyInjection.Abstractions": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "2.0.0", + "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.Abstractions": { "StableVersions": [ "1.0.0", @@ -239,6 +453,125 @@ "5.0.0.0": "5.0.0" } }, + "Microsoft.Extensions.Hosting.Abstractions": { + "StableVersions": [ + "2.0.0", + "2.0.1", + "2.0.2", + "2.0.3", + "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.Logging.Abstractions": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "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.Options": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "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.Options.ConfigurationExtensions": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "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.Options.DataAnnotations": { + "StableVersions": [ + "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.Primitives": { "StableVersions": [ "1.0.0", diff --git a/src/libraries/pkg/descriptions.json b/src/libraries/pkg/descriptions.json index cd991471690984..45937674b626f1 100644 --- a/src/libraries/pkg/descriptions.json +++ b/src/libraries/pkg/descriptions.json @@ -14,13 +14,26 @@ "Description": "Provides a portable version of the Microsoft.Cci library", "CommonTypes": [] }, + { + "Name": "Microsoft.Extensions.Caching.Abstractions", + "Description": "Caching abstractions for in-memory cache and distributed cache.", + "CommonTypes": [ + "Microsoft.Extensions.Caching.Distributed.IDistributedCache", + "Microsoft.Extensions.Caching.Memory.IMemoryCache" + ] + }, + { + "Name": "Microsoft.Extensions.Caching.Memory", + "Description": "In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache.", + "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", + "Name": "Microsoft.Extensions.Configuration.Abstractions", "Description": "Abstractions of key-value pair based configuration.", "CommonTypes": [ "Microsoft.Extensions.Configuration.IConfiguration", @@ -31,7 +44,7 @@ ] }, { - "Name": "Microsoft.Extensions.Configuration.Bindar", + "Name": "Microsoft.Extensions.Configuration.Binder", "Description": "Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration.", "CommonTypes": [] }, @@ -116,6 +129,13 @@ "Description": ".NET Core hosting and startup abstractions for applications.", "CommonTypes": [] }, + { + "Name": "Microsoft.Extensions.Http", + "Description": "The HttpClient factory is a pattern for configuring and retrieving named HttpClients in a composable way. The HttpClient factory provides extensibility to plug in DelegatingHandlers that address cross-cutting concerns such as service location, load balancing, and reliability. The default HttpClient factory provides built-in diagnostics and logging and manages the lifetimes of connections in a performant way.", + "CommonTypes": [ + "System.Net.Http.IHttpClientFactory" + ] + }, { "Name": "Microsoft.Extensions.Logging", "Description": "Logging infrastructure default implementation for Microsoft.Extensions.Logging.", diff --git a/src/libraries/restore/netstandard/netstandard.depproj b/src/libraries/restore/netstandard/netstandard.depproj index 6ecf6cb0ee7866..756d35dd515247 100644 --- a/src/libraries/restore/netstandard/netstandard.depproj +++ b/src/libraries/restore/netstandard/netstandard.depproj @@ -69,6 +69,9 @@ 4.7.0 + + 4.7.0 +