diff --git a/Directory.Build.targets b/Directory.Build.targets index 7bf9e763a6..246f7ac20c 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,6 +1,4 @@ - + - - diff --git a/build/common.props b/build/common.props index b396529090..c8e78f37a9 100644 --- a/build/common.props +++ b/build/common.props @@ -12,7 +12,7 @@ - + diff --git a/build/dependencies.props b/build/dependencies.props index 9edf701582..05ca15a928 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,21 +1,63 @@  - 2.0.0 - 2.3.2 - 3.14.1 - 2.1.4 - 4.4.0 - 2.2.1 - 2.0.1-rtm-15400 - 4.7.49 - 2.0.0 - 2.0.0 - 3.0.1 - 2.0.0 - 15.3.0 - 2.3.0-beta2-build3683 - 2.3.0-beta2-build1317 - 2.2.0 + 2.0.2-beta-15522 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.0 + 2.2.1 + 2.3.2 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 3.14.1 + 2.1.4 + 15.3.0 + 3.0.1 + 2.0.1-rtm-83 + 2.0.1-rtm-83 + 4.7.49 + 2.0.1-rtm-83 + 4.4.0 + 2.3.0-beta2-build3683 + 2.3.0-beta2-build1317 diff --git a/build/dependencies.targets b/build/dependencies.targets deleted file mode 100644 index 4c2b3ee12c..0000000000 --- a/build/dependencies.targets +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/sources.props b/build/sources.props index ff68f685fa..804940f029 100644 --- a/build/sources.props +++ b/build/sources.props @@ -3,11 +3,14 @@ $(DotNetRestoreSources) - + $(RestoreSources); https://dotnet.myget.org/F/aspnet-2-0-2-october2017-patch/api/v3/index.json; https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json; https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; + + + $(RestoreSources); https://api.nuget.org/v3/index.json; diff --git a/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj b/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj index 190305773a..20e7c48034 100644 --- a/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj +++ b/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0 @@ -7,35 +7,35 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj b/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj index f652e77396..c6ca718ec7 100644 --- a/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj +++ b/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj @@ -14,27 +14,27 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + diff --git a/src/Microsoft.AspNet.Identity.AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj b/src/Microsoft.AspNet.Identity.AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj index 8c4bf0c48a..9e5d0f665e 100644 --- a/src/Microsoft.AspNet.Identity.AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj +++ b/src/Microsoft.AspNet.Identity.AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj b/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj index 1a94e969f5..4ce5ab55d4 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj +++ b/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj @@ -1,4 +1,4 @@ - + @@ -11,8 +11,8 @@ - - + + @@ -23,7 +23,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj b/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj index 8769c408b9..f7e5495449 100644 --- a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj +++ b/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj @@ -1,4 +1,4 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Microsoft.AspNetCore.Identity.Service.Abstractions.csproj b/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Microsoft.AspNetCore.Identity.Service.Abstractions.csproj index cee896d111..8a8f3f34a2 100644 --- a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Microsoft.AspNetCore.Identity.Service.Abstractions.csproj +++ b/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Microsoft.AspNetCore.Identity.Service.Abstractions.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Microsoft.AspNetCore.Identity.Service.AzureKeyVault/Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj b/src/Microsoft.AspNetCore.Identity.Service.AzureKeyVault/Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj index 7562e6bca8..49a169a371 100644 --- a/src/Microsoft.AspNetCore.Identity.Service.AzureKeyVault/Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj +++ b/src/Microsoft.AspNetCore.Identity.Service.AzureKeyVault/Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj @@ -1,4 +1,4 @@ - + @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Microsoft.AspNetCore.Identity.Service.Core.csproj b/src/Microsoft.AspNetCore.Identity.Service.Core/Microsoft.AspNetCore.Identity.Service.Core.csproj index 3ecb167d83..a2591c625c 100644 --- a/src/Microsoft.AspNetCore.Identity.Service.Core/Microsoft.AspNetCore.Identity.Service.Core.csproj +++ b/src/Microsoft.AspNetCore.Identity.Service.Core/Microsoft.AspNetCore.Identity.Service.Core.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj b/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj index 3c3396db32..3b45d9f2f0 100644 --- a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj +++ b/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Microsoft.AspNetCore.Identity.Service.Mvc/Microsoft.AspNetCore.Identity.Service.Mvc.csproj b/src/Microsoft.AspNetCore.Identity.Service.Mvc/Microsoft.AspNetCore.Identity.Service.Mvc.csproj index fc0ce8e6ac..9de5d5d1c4 100644 --- a/src/Microsoft.AspNetCore.Identity.Service.Mvc/Microsoft.AspNetCore.Identity.Service.Mvc.csproj +++ b/src/Microsoft.AspNetCore.Identity.Service.Mvc/Microsoft.AspNetCore.Identity.Service.Mvc.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj b/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj index 920a049da1..8c61875e7e 100644 --- a/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj +++ b/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj @@ -1,4 +1,4 @@ - + @@ -18,10 +18,10 @@ - - - - + + + + diff --git a/src/Microsoft.AspNetCore.Identity.Service/Microsoft.AspNetCore.Identity.Service.csproj b/src/Microsoft.AspNetCore.Identity.Service/Microsoft.AspNetCore.Identity.Service.csproj index 6ac3b00937..e2cd04a535 100644 --- a/src/Microsoft.AspNetCore.Identity.Service/Microsoft.AspNetCore.Identity.Service.csproj +++ b/src/Microsoft.AspNetCore.Identity.Service/Microsoft.AspNetCore.Identity.Service.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Identity.Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Microsoft.AspNetCore.Identity.Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj index 6133bad678..fdf21942d8 100644 --- a/src/Microsoft.AspNetCore.Identity.Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj +++ b/src/Microsoft.AspNetCore.Identity.Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj @@ -1,4 +1,4 @@ - + @@ -14,10 +14,10 @@ - - - - + + + + diff --git a/src/Microsoft.AspNetCore.Identity/Microsoft.AspNetCore.Identity.csproj b/src/Microsoft.AspNetCore.Identity/Microsoft.AspNetCore.Identity.csproj index 4a5a88ad8f..4a2047a324 100644 --- a/src/Microsoft.AspNetCore.Identity/Microsoft.AspNetCore.Identity.csproj +++ b/src/Microsoft.AspNetCore.Identity/Microsoft.AspNetCore.Identity.csproj @@ -1,4 +1,4 @@ - + @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Microsoft.Extensions.Identity.Core/Microsoft.Extensions.Identity.Core.csproj b/src/Microsoft.Extensions.Identity.Core/Microsoft.Extensions.Identity.Core.csproj index bf3e00d25b..c9aff1c5d7 100644 --- a/src/Microsoft.Extensions.Identity.Core/Microsoft.Extensions.Identity.Core.csproj +++ b/src/Microsoft.Extensions.Identity.Core/Microsoft.Extensions.Identity.Core.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/src/Microsoft.Extensions.Identity.Stores/Microsoft.Extensions.Identity.Stores.csproj b/src/Microsoft.Extensions.Identity.Stores/Microsoft.Extensions.Identity.Stores.csproj index fda563c84e..c477c49b39 100644 --- a/src/Microsoft.Extensions.Identity.Stores/Microsoft.Extensions.Identity.Stores.csproj +++ b/src/Microsoft.Extensions.Identity.Stores/Microsoft.Extensions.Identity.Stores.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj index 50edce94d9..5587ef4b06 100644 --- a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj @@ -18,14 +18,14 @@ - - - - - - - - + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj index 1a6497130d..7bb00861ba 100644 --- a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj @@ -19,19 +19,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Identity.InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj b/test/Microsoft.AspNetCore.Identity.InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj index 2f8eb65950..680c3ee041 100644 --- a/test/Microsoft.AspNetCore.Identity.InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj @@ -17,14 +17,14 @@ - - - - - - - - + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj b/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj index a18986a50a..35809687c3 100644 --- a/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj @@ -9,12 +9,12 @@ - - - - - - + + + + + + diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj b/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj index 2bf15ae0a2..ff564f236b 100644 --- a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj @@ -11,12 +11,12 @@ - - - - - - + + + + + + diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj b/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj index d96bb31a61..7bbdee12bf 100644 --- a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj @@ -19,14 +19,14 @@ - - - - - - - - + + + + + + + + - \ No newline at end of file + diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj b/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj index e6420f31f5..5a091c1831 100644 --- a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj @@ -22,19 +22,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Identity.Service.InMemory.Test/Microsoft.AspNetCore.Identity.Service.InMemory.Test.csproj b/test/Microsoft.AspNetCore.Identity.Service.InMemory.Test/Microsoft.AspNetCore.Identity.Service.InMemory.Test.csproj index 7f114df930..90af62f68c 100644 --- a/test/Microsoft.AspNetCore.Identity.Service.InMemory.Test/Microsoft.AspNetCore.Identity.Service.InMemory.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.Service.InMemory.Test/Microsoft.AspNetCore.Identity.Service.InMemory.Test.csproj @@ -17,14 +17,14 @@ - - - - - - - - + + + + + + + + - \ No newline at end of file + diff --git a/test/Microsoft.AspNetCore.Identity.Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj b/test/Microsoft.AspNetCore.Identity.Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj index 57e7e9f109..76cde2d873 100644 --- a/test/Microsoft.AspNetCore.Identity.Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj @@ -12,12 +12,12 @@ - - - - - - + + + + + + diff --git a/test/Microsoft.AspNetCore.Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/test/Microsoft.AspNetCore.Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj index 9ff608fb10..80a35df0b5 100644 --- a/test/Microsoft.AspNetCore.Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj @@ -17,15 +17,15 @@ - - - - - - - - - + + + + + + + + +