diff --git a/build/common.props b/build/common.props index f2d9508e5..7ce50d277 100644 --- a/build/common.props +++ b/build/common.props @@ -8,10 +8,17 @@ $(MSBuildThisFileDirectory)Key.snk true true + 1.2.0-* + 1.6.2-* + $(VersionSuffix)-$(BuildNumber) - + + + + + \ No newline at end of file diff --git a/global.json b/global.json deleted file mode 100644 index 1e3e060e8..000000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "1.0.0-preview4-004233" - } -} diff --git a/makefile.shade b/makefile.shade index f5ea5ac9e..76d5bf85e 100644 --- a/makefile.shade +++ b/makefile.shade @@ -5,4 +5,4 @@ use-standard-lifecycle k-standard-goals #pack-sources target='build-pack' - dotnet command='msbuild shared/build.proj /t:Pack /v:n' + dotnet command='msbuild shared/sources.csproj "/t:Restore;PackAll" /v:n' diff --git a/samples/CookieSample/CookieSample.csproj b/samples/CookieSample/CookieSample.csproj index 7a3ab4792..e9987f3a8 100644 --- a/samples/CookieSample/CookieSample.csproj +++ b/samples/CookieSample/CookieSample.csproj @@ -5,22 +5,11 @@ Exe win7-x64 + 1.2.0-* - - - PreserveNewest - - - - - true - - - - @@ -29,8 +18,4 @@ - - - - diff --git a/samples/CookieSessionSample/CookieSessionSample.csproj b/samples/CookieSessionSample/CookieSessionSample.csproj index 4a77be127..62bb9f4a9 100644 --- a/samples/CookieSessionSample/CookieSessionSample.csproj +++ b/samples/CookieSessionSample/CookieSessionSample.csproj @@ -5,22 +5,11 @@ Exe win7-x64 + 1.2.0-* - - - PreserveNewest - - - - - true - - - - @@ -29,8 +18,4 @@ - - - - diff --git a/samples/JwtBearerSample/JwtBearerSample.csproj b/samples/JwtBearerSample/JwtBearerSample.csproj index 273cfaf89..83c0c643d 100644 --- a/samples/JwtBearerSample/JwtBearerSample.csproj +++ b/samples/JwtBearerSample/JwtBearerSample.csproj @@ -7,22 +7,11 @@ win7-x64 Exe aspnet5-JwtBearerSample-20151210102827 - - - - - PreserveNewest - - + 1.2.0-* + - - true - - - - @@ -30,8 +19,4 @@ - - - - diff --git a/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj b/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj index 9b27985b7..6cb421a2a 100644 --- a/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj +++ b/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj @@ -5,31 +5,17 @@ win7-x64 aspnet5-OpenIdConnectSample-20151210110318 + 1.2.0-* - - - PreserveNewest - - - - true - - - - - - - - \ No newline at end of file diff --git a/samples/OpenIdConnectSample/OpenIdConnectSample.csproj b/samples/OpenIdConnectSample/OpenIdConnectSample.csproj index 78d799be1..acbae28b4 100644 --- a/samples/OpenIdConnectSample/OpenIdConnectSample.csproj +++ b/samples/OpenIdConnectSample/OpenIdConnectSample.csproj @@ -6,22 +6,12 @@ win7-x64 aspnet5-OpenIdConnectSample-20151210110318 + 1.2.0-* - - - - - - - true - - - - @@ -30,13 +20,6 @@ - - - - - - - diff --git a/samples/SocialSample/SocialSample.csproj b/samples/SocialSample/SocialSample.csproj index 1af3fe1c2..1c137b6d5 100644 --- a/samples/SocialSample/SocialSample.csproj +++ b/samples/SocialSample/SocialSample.csproj @@ -6,28 +6,15 @@ win7-x64 aspnet5-SocialSample-20151210111056 + 1.2.0-* - - - - - - - true - - - true - - - - @@ -38,8 +25,4 @@ - - - - diff --git a/shared/build.proj b/shared/build.proj deleted file mode 100644 index d3fc56ba8..000000000 --- a/shared/build.proj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - $(MSBuildThisFileDirectory)..\artifacts\build - $(VersionPrefix) - $(Version)-$(VersionSuffix) - - - - - - - - - - - \ No newline at end of file diff --git a/shared/sources.csproj b/shared/sources.csproj new file mode 100644 index 000000000..70c6cdbf2 --- /dev/null +++ b/shared/sources.csproj @@ -0,0 +1,29 @@ + + + + + + $(MSBuildThisFileDirectory)..\artifacts\build + $(MSBuildThisFileDirectory)\$(PackageId) + netstandard1.0 + false + $(PackageId) + false + contentFiles + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/shared/sources.nuspec b/shared/sources.nuspec deleted file mode 100644 index 0eb708b9b..000000000 --- a/shared/sources.nuspec +++ /dev/null @@ -1,19 +0,0 @@ - - - - $id$ - $version$ - Microsoft - Microsoft - false - $id$ - - - - - - - - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj b/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj index bdbcff276..01f5b635d 100644 --- a/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj +++ b/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj @@ -12,23 +12,14 @@ - - - - - - + - diff --git a/src/Microsoft.AspNetCore.Authentication.Cookies/__TemporarySources__/TaskCache.cs b/src/Microsoft.AspNetCore.Authentication.Cookies/__TemporarySources__/TaskCache.cs deleted file mode 100644 index 67a87fca5..000000000 --- a/src/Microsoft.AspNetCore.Authentication.Cookies/__TemporarySources__/TaskCache.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// A that's already completed successfully. - /// - /// - /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done - /// by Task.CompletedTask. - /// -#if NET451 - public static readonly Task CompletedTask = Task.FromResult(0); -#else - public static readonly Task CompletedTask = Task.CompletedTask; -#endif - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.Cookies/__TemporarySources__/TaskCacheOfT.cs b/src/Microsoft.AspNetCore.Authentication.Cookies/__TemporarySources__/TaskCacheOfT.cs deleted file mode 100644 index 5015e3aba..000000000 --- a/src/Microsoft.AspNetCore.Authentication.Cookies/__TemporarySources__/TaskCacheOfT.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// Gets a completed with the value of default(T). - /// - public static Task DefaultCompletedTask { get; } = Task.FromResult(default(T)); - } - -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj b/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj index 999bb8bd8..7d7e3ad04 100644 --- a/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj +++ b/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj @@ -10,20 +10,8 @@ aspnetcore;authentication;security - - - - - - - true - - - - - diff --git a/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj b/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj index e66ceff78..30545dd69 100644 --- a/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj +++ b/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj @@ -10,20 +10,8 @@ aspnetcore;authentication;security - - - - - - - true - - - - - diff --git a/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj b/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj index db5d30bd2..b53e5ee85 100644 --- a/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj +++ b/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj @@ -7,19 +7,9 @@ true aspnetcore;authentication;security - - - - - - - + - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.JwtBearer/__TemporarySources__/TaskCache.cs b/src/Microsoft.AspNetCore.Authentication.JwtBearer/__TemporarySources__/TaskCache.cs deleted file mode 100644 index 67a87fca5..000000000 --- a/src/Microsoft.AspNetCore.Authentication.JwtBearer/__TemporarySources__/TaskCache.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// A that's already completed successfully. - /// - /// - /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done - /// by Task.CompletedTask. - /// -#if NET451 - public static readonly Task CompletedTask = Task.FromResult(0); -#else - public static readonly Task CompletedTask = Task.CompletedTask; -#endif - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.JwtBearer/__TemporarySources__/TaskCacheOfT.cs b/src/Microsoft.AspNetCore.Authentication.JwtBearer/__TemporarySources__/TaskCacheOfT.cs deleted file mode 100644 index 5015e3aba..000000000 --- a/src/Microsoft.AspNetCore.Authentication.JwtBearer/__TemporarySources__/TaskCacheOfT.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// Gets a completed with the value of default(T). - /// - public static Task DefaultCompletedTask { get; } = Task.FromResult(default(T)); - } - -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj b/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj index 0af3a9d0d..559b78a3c 100644 --- a/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj +++ b/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj @@ -10,20 +10,8 @@ aspnetcore;authentication;security - - - - - - - true - - - - - diff --git a/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj b/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj index 1bb635bfc..3a0ad122c 100644 --- a/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj +++ b/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj @@ -10,21 +10,9 @@ aspnetcore;authentication;security - - - - - - - - - - + diff --git a/src/Microsoft.AspNetCore.Authentication.OAuth/__TemporarySources__/TaskCache.cs b/src/Microsoft.AspNetCore.Authentication.OAuth/__TemporarySources__/TaskCache.cs deleted file mode 100644 index 67a87fca5..000000000 --- a/src/Microsoft.AspNetCore.Authentication.OAuth/__TemporarySources__/TaskCache.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// A that's already completed successfully. - /// - /// - /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done - /// by Task.CompletedTask. - /// -#if NET451 - public static readonly Task CompletedTask = Task.FromResult(0); -#else - public static readonly Task CompletedTask = Task.CompletedTask; -#endif - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.OAuth/__TemporarySources__/TaskCacheOfT.cs b/src/Microsoft.AspNetCore.Authentication.OAuth/__TemporarySources__/TaskCacheOfT.cs deleted file mode 100644 index 5015e3aba..000000000 --- a/src/Microsoft.AspNetCore.Authentication.OAuth/__TemporarySources__/TaskCacheOfT.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// Gets a completed with the value of default(T). - /// - public static Task DefaultCompletedTask { get; } = Task.FromResult(default(T)); - } - -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj index d6b200629..72da65f4c 100644 --- a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj +++ b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj @@ -7,19 +7,9 @@ true aspnetcore;authentication;security - - - - - - - + - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/__TemporarySources__/TaskCache.cs b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/__TemporarySources__/TaskCache.cs deleted file mode 100644 index 67a87fca5..000000000 --- a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/__TemporarySources__/TaskCache.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// A that's already completed successfully. - /// - /// - /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done - /// by Task.CompletedTask. - /// -#if NET451 - public static readonly Task CompletedTask = Task.FromResult(0); -#else - public static readonly Task CompletedTask = Task.CompletedTask; -#endif - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/__TemporarySources__/TaskCacheOfT.cs b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/__TemporarySources__/TaskCacheOfT.cs deleted file mode 100644 index 5015e3aba..000000000 --- a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/__TemporarySources__/TaskCacheOfT.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// Gets a completed with the value of default(T). - /// - public static Task DefaultCompletedTask { get; } = Task.FromResult(default(T)); - } - -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj b/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj index b7222fd9c..0368a8be0 100644 --- a/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj +++ b/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj @@ -10,21 +10,9 @@ aspnetcore;authentication;security - - - - - - - - - - + diff --git a/src/Microsoft.AspNetCore.Authentication.Twitter/__TemporarySources__/TaskCache.cs b/src/Microsoft.AspNetCore.Authentication.Twitter/__TemporarySources__/TaskCache.cs deleted file mode 100644 index 67a87fca5..000000000 --- a/src/Microsoft.AspNetCore.Authentication.Twitter/__TemporarySources__/TaskCache.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// A that's already completed successfully. - /// - /// - /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done - /// by Task.CompletedTask. - /// -#if NET451 - public static readonly Task CompletedTask = Task.FromResult(0); -#else - public static readonly Task CompletedTask = Task.CompletedTask; -#endif - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.Twitter/__TemporarySources__/TaskCacheOfT.cs b/src/Microsoft.AspNetCore.Authentication.Twitter/__TemporarySources__/TaskCacheOfT.cs deleted file mode 100644 index 5015e3aba..000000000 --- a/src/Microsoft.AspNetCore.Authentication.Twitter/__TemporarySources__/TaskCacheOfT.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// Gets a completed with the value of default(T). - /// - public static Task DefaultCompletedTask { get; } = Task.FromResult(default(T)); - } - -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj b/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj index edc85f76e..e93061de6 100644 --- a/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj +++ b/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj @@ -11,24 +11,15 @@ aspnetcore;authentication;security - - - - - - + + - diff --git a/src/Microsoft.AspNetCore.Authentication/__TemporarySources__/SecurityHelper.cs b/src/Microsoft.AspNetCore.Authentication/__TemporarySources__/SecurityHelper.cs deleted file mode 100644 index 408ef6b22..000000000 --- a/src/Microsoft.AspNetCore.Authentication/__TemporarySources__/SecurityHelper.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Security.Claims; - -namespace Microsoft.Extensions.Internal -{ - /// - /// Helper code used when implementing authentication middleware - /// - internal static class SecurityHelper - { - /// - /// Add all ClaimsIdentities from an additional ClaimPrincipal to the ClaimsPrincipal - /// Merges a new claims principal, placing all new identities first, and eliminating - /// any empty unauthenticated identities from context.User - /// - /// The containing existing . - /// The containing to be added. - public static ClaimsPrincipal MergeUserPrincipal(ClaimsPrincipal existingPrincipal, ClaimsPrincipal additionalPrincipal) - { - var newPrincipal = new ClaimsPrincipal(); - - // New principal identities go first - if (additionalPrincipal != null) - { - newPrincipal.AddIdentities(additionalPrincipal.Identities); - } - - // Then add any existing non empty or authenticated identities - if (existingPrincipal != null) - { - newPrincipal.AddIdentities(existingPrincipal.Identities.Where(i => i.IsAuthenticated || i.Claims.Any())); - } - return newPrincipal; - } - } -} diff --git a/src/Microsoft.AspNetCore.Authentication/__TemporarySources__/TaskCache.cs b/src/Microsoft.AspNetCore.Authentication/__TemporarySources__/TaskCache.cs deleted file mode 100644 index 67a87fca5..000000000 --- a/src/Microsoft.AspNetCore.Authentication/__TemporarySources__/TaskCache.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// A that's already completed successfully. - /// - /// - /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done - /// by Task.CompletedTask. - /// -#if NET451 - public static readonly Task CompletedTask = Task.FromResult(0); -#else - public static readonly Task CompletedTask = Task.CompletedTask; -#endif - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication/__TemporarySources__/TaskCacheOfT.cs b/src/Microsoft.AspNetCore.Authentication/__TemporarySources__/TaskCacheOfT.cs deleted file mode 100644 index 5015e3aba..000000000 --- a/src/Microsoft.AspNetCore.Authentication/__TemporarySources__/TaskCacheOfT.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// Gets a completed with the value of default(T). - /// - public static Task DefaultCompletedTask { get; } = Task.FromResult(default(T)); - } - -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj b/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj index fdc54f10b..6a1c60f94 100644 --- a/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj +++ b/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj @@ -13,19 +13,10 @@ Microsoft.AspNetCore.Authorization.AuthorizeAttribute aspnetcore;authorization - - - - - - - + diff --git a/src/Microsoft.AspNetCore.Authorization/__TemporarySources__/TaskCache.cs b/src/Microsoft.AspNetCore.Authorization/__TemporarySources__/TaskCache.cs deleted file mode 100644 index 67a87fca5..000000000 --- a/src/Microsoft.AspNetCore.Authorization/__TemporarySources__/TaskCache.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// A that's already completed successfully. - /// - /// - /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done - /// by Task.CompletedTask. - /// -#if NET451 - public static readonly Task CompletedTask = Task.FromResult(0); -#else - public static readonly Task CompletedTask = Task.CompletedTask; -#endif - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authorization/__TemporarySources__/TaskCacheOfT.cs b/src/Microsoft.AspNetCore.Authorization/__TemporarySources__/TaskCacheOfT.cs deleted file mode 100644 index 5015e3aba..000000000 --- a/src/Microsoft.AspNetCore.Authorization/__TemporarySources__/TaskCacheOfT.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; - -namespace Microsoft.Extensions.Internal -{ - internal static class TaskCache - { - /// - /// Gets a completed with the value of default(T). - /// - public static Task DefaultCompletedTask { get; } = Task.FromResult(default(T)); - } - -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj b/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj index 0d0e37c80..2f5b094c0 100644 --- a/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj +++ b/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj @@ -10,15 +10,9 @@ aspnetcore - - - - - - diff --git a/src/Microsoft.Owin.Security.Interop/Microsoft.Owin.Security.Interop.csproj b/src/Microsoft.Owin.Security.Interop/Microsoft.Owin.Security.Interop.csproj index 7ec8078c5..4c6cb7a83 100644 --- a/src/Microsoft.Owin.Security.Interop/Microsoft.Owin.Security.Interop.csproj +++ b/src/Microsoft.Owin.Security.Interop/Microsoft.Owin.Security.Interop.csproj @@ -10,15 +10,9 @@ aspnetcore;katana;owin;security - - - - - - diff --git a/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj b/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj index 39c01086e..0a9adfd43 100644 --- a/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj +++ b/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj @@ -6,11 +6,6 @@ netcoreapp1.1;net451 - - - - - @@ -19,24 +14,11 @@ - - true - - - true - - - - - + - - - - diff --git a/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj b/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj index 424132eb2..62b041f37 100644 --- a/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj +++ b/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj @@ -6,18 +6,9 @@ netcoreapp1.1;net451 - - - - - - - - - - + @@ -25,8 +16,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj b/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj index 4c4da177f..672309b92 100644 --- a/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj +++ b/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj @@ -7,20 +7,14 @@ - - - + - - - - diff --git a/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj b/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj index b46df5b99..91e98ad98 100644 --- a/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj +++ b/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj @@ -6,29 +6,14 @@ netcoreapp1.1;net451 - - - - - - - true - - - - - + - - - - diff --git a/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj b/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj index d78da4397..408703450 100644 --- a/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj +++ b/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj @@ -6,26 +6,14 @@ net451 - - - - - - - true - - - - - + -