From e4e3551a1ed44fac3e2323c6ee16543dd36c6cbf Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 12 Jun 2018 15:18:36 -0700 Subject: [PATCH] Prepare 2.1.2 patch --- build/artifacts.props | 216 +---------------------------- build/dependencies.props | 16 +-- build/external-dependencies.props | 221 +++++++++++++++++++++++++++++- build/repo.targets | 12 +- build/sources.props | 3 - build/submodules.props | 78 +++++------ modules/Identity | 2 +- modules/KestrelHttpServer | 2 +- modules/MetaPackages | 2 +- modules/SignalR | 2 +- scripts/PatchVersionPrefix.ps1 | 2 +- version.props | 4 +- 12 files changed, 281 insertions(+), 279 deletions(-) diff --git a/build/artifacts.props b/build/artifacts.props index 583384852a..dae497a65d 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -20,79 +20,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -105,57 +42,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -164,119 +56,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/build/dependencies.props b/build/dependencies.props index bf163efb53..222a21dbed 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,14 +1,9 @@ - + - 2.1.0 - 2.1.0 - 4.5.0 - 4.5.0 - 4.5.0 - 4.5.0 - 4.5.0 + 2.1.1 + 2.1.1 @@ -106,17 +101,21 @@ 4.5.0 1.5.0 4.5.0 + 4.5.1 4.5.0 4.5.0 5.2.0 3.1.1 4.5.0 + 4.5.1 4.3.2 4.5.0 + 4.5.1 4.5.0 3.1.1 4.3.0 1.6.0 + 4.5.1 4.3.0 4.5.0 4.5.0 @@ -126,6 +125,7 @@ 4.5.0 4.5.0 4.9.0 + 4.5.1 4.5.0 1.3.7 9.0.1 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 4fe479655a..7a491d2990 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -1,4 +1,4 @@ - + @@ -160,6 +160,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/repo.targets b/build/repo.targets index 85bb04244f..21e585ec5d 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -180,6 +180,12 @@ DependsOnTargets="_PrepareRepositories;GeneratePropsFiles;ComputeGraph;_BuildRepositories" /> + + <_UndeclaredPackageArtifact Include="%(ArtifactInfo.PackageId)" Condition="'%(ArtifactInfo.ArtifactType)' == 'NuGetPackage'" /> <_UndeclaredPackageArtifact Remove="@(PackageArtifact)" /> @@ -188,12 +194,6 @@ - - - https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180515-07/final/assets/ - $(DotNetAdditionalRestoreSources); $(DotNetRestoreSources); @@ -12,7 +10,6 @@ $(RestoreSources); https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; - https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180515-07/final/index.json; https://api.nuget.org/v3/index.json; diff --git a/build/submodules.props b/build/submodules.props index 3ed74a06e6..0b97a955a8 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -6,54 +6,54 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/Identity b/modules/Identity index 64a88252ce..788e324115 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 64a88252ce62f83fdb78762a62af0a2c06aff1a9 +Subproject commit 788e324115196d9fb1e15693266943a607644f87 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index ab5fb559e5..11ddd9174c 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit ab5fb559e54244d0fa36b86ff18a0363530f4a46 +Subproject commit 11ddd9174c7c2af231ad70cf3efad85012e2fd73 diff --git a/modules/MetaPackages b/modules/MetaPackages index d5cd1cf821..337c3a3a70 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit d5cd1cf82110eea62b625783247b5289059a61fa +Subproject commit 337c3a3a7013709e07fa47c7bc5b5745092c5389 diff --git a/modules/SignalR b/modules/SignalR index c7fc179b27..559d93c15e 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit c7fc179b2700bd08acd13432811bdcb6f8780ced +Subproject commit 559d93c15e10c2025ec9406612c0eaabb1fd7e2b diff --git a/scripts/PatchVersionPrefix.ps1 b/scripts/PatchVersionPrefix.ps1 index 367c00d7fa..7ca81a78c5 100755 --- a/scripts/PatchVersionPrefix.ps1 +++ b/scripts/PatchVersionPrefix.ps1 @@ -1,4 +1,4 @@ -#!/usr/bin/env pwsh +#!/usr/bin/env pwsh -c <# .SYNOPSIS diff --git a/version.props b/version.props index a6263b44b2..81ac3b82ce 100644 --- a/version.props +++ b/version.props @@ -2,14 +2,14 @@ 2 1 - 1 + 2 $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) rtm $(VersionPrefix) - 0.1.1 + 0.1.2 rtm $(PrereleaseVersionLabel)