From 0a1c60e2d352ea76d537b7fe07c5a7b32af8d0a4 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Mon, 8 Oct 2018 16:59:40 -0700 Subject: [PATCH 01/14] Update Moq to 4.11.0 This is the latest version of Moq, should have a fix for https://github.com/aspnet/Home/issues/3569 --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 3686d55b21..425b6cbe65 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -100,7 +100,7 @@ 4.3.0.1 1.3.8 1.0.1 - 4.7.49 + 4.11.0 1.6.1 2.0.3 1.15.1 From 85ecc5ba4cca1e63986659a16b33dd61d2cca9f5 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Tue, 9 Oct 2018 14:50:50 -0700 Subject: [PATCH 02/14] Add Redis 2.0 (#1459) --- build/dependencies.props | 1 + 1 file changed, 1 insertion(+) diff --git a/build/dependencies.props b/build/dependencies.props index 425b6cbe65..e7b26e4d4b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -122,6 +122,7 @@ 1.1.11 1.1.11 1.2.6 + 2.0.513 1.1.92 1.0.0 4.5.0 From 904c9d362326d2a5be3087b393aee8965b33cd15 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Tue, 9 Oct 2018 14:59:15 -0700 Subject: [PATCH 03/14] Use Moq v4.10 --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index e7b26e4d4b..62e05ca835 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -100,7 +100,7 @@ 4.3.0.1 1.3.8 1.0.1 - 4.11.0 + 4.10.0 1.6.1 2.0.3 1.15.1 From 3cf20afc8ad293993f49abd89000ad33295278a5 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 9 Oct 2018 14:43:47 -0700 Subject: [PATCH 04/14] Fix syntax error --- scripts/UpdateRepos.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/UpdateRepos.ps1 b/scripts/UpdateRepos.ps1 index a3362a2bd2..c4291f2190 100755 --- a/scripts/UpdateRepos.ps1 +++ b/scripts/UpdateRepos.ps1 @@ -110,7 +110,7 @@ try { Invoke-Block { & git @gitConfigArgs push origin HEAD:$newBranch} } catch { - Write-Warning "Error in pushing $newBranch: $_" + Write-Warning "Error in pushing $($newBranch): $_" $build_errors += @{ Repo = $submodule.module Message = $_ From 62d2410ecefb10dad966cc2006f49b63d99c026d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 9 Oct 2018 23:40:05 +0000 Subject: [PATCH 05/14] Updating submodule(s) Common => 7d8418b3b3957ff902cf70406052e8f1b80b584a EntityFrameworkCore => 46b802819e0783b02e12e7048c0d6406a6b016a2 IISIntegration => 80a01a751b0ae96be39cfb4f7fdbc02b404e948d Logging => b3d506624b9f20413c7a24f849ca0da76da831d2 SignalR => b63c3816d53e422582591811034562612b8464de [auto-updated: submodules] --- modules/Common | 2 +- modules/EntityFrameworkCore | 2 +- modules/IISIntegration | 2 +- modules/Logging | 2 +- modules/SignalR | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/Common b/modules/Common index 519bdbd0b3..7d8418b3b3 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit 519bdbd0b358fbdc6282a77c2d532cbfee4e409b +Subproject commit 7d8418b3b3957ff902cf70406052e8f1b80b584a diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 17bcfb4acf..46b802819e 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 17bcfb4acf4a045ccbd8a8b711d581bbef4200d5 +Subproject commit 46b802819e0783b02e12e7048c0d6406a6b016a2 diff --git a/modules/IISIntegration b/modules/IISIntegration index 23db53eae6..80a01a751b 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 23db53eae664db68ff3e8d3bd5051ae5a80988ca +Subproject commit 80a01a751b0ae96be39cfb4f7fdbc02b404e948d diff --git a/modules/Logging b/modules/Logging index 32a4fb2fe3..b3d506624b 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit 32a4fb2fe374d83561212de6ce6849ef9972fd1e +Subproject commit b3d506624b9f20413c7a24f849ca0da76da831d2 diff --git a/modules/SignalR b/modules/SignalR index f87d8b4aaf..b63c3816d5 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit f87d8b4aaf17a8f31b4e6f8ad577c4c293d6505e +Subproject commit b63c3816d53e422582591811034562612b8464de From 8fbaccaa9e9d4d44c697bc02a137582063840855 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 10 Oct 2018 00:41:01 +0000 Subject: [PATCH 06/14] Updating submodule(s) EntityFrameworkCore => ea3d7e364116351dbf170b4424cd2d559ae04c75 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 46b802819e..ea3d7e3641 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 46b802819e0783b02e12e7048c0d6406a6b016a2 +Subproject commit ea3d7e364116351dbf170b4424cd2d559ae04c75 From fa2eccad2f681517aa30a3c86eb1e34264306c40 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 10 Oct 2018 05:49:20 +0000 Subject: [PATCH 07/14] Updating submodule(s) Mvc => 9daf5ff7a4e092b3a84c060c44148d7d5d40b5c3 [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index 6cee2431f1..9daf5ff7a4 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 6cee2431f1d5247ea2f5de7af5198f3c328015cc +Subproject commit 9daf5ff7a4e092b3a84c060c44148d7d5d40b5c3 From 79feb3677fafe9be33c5c731efb99830b1a9f864 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 10 Oct 2018 15:41:36 +0000 Subject: [PATCH 08/14] Updating submodule(s) HttpAbstractions => f6e20a38e29226703d550e02593d084db44146c4 [auto-updated: submodules] --- modules/HttpAbstractions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions index 2368024490..f6e20a38e2 160000 --- a/modules/HttpAbstractions +++ b/modules/HttpAbstractions @@ -1 +1 @@ -Subproject commit 2368024490e796329ba4e50c57e6e376011c45ee +Subproject commit f6e20a38e29226703d550e02593d084db44146c4 From 03f142a96f54e783894f319b7fdcc58cb08707be Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 10 Oct 2018 16:45:16 +0000 Subject: [PATCH 09/14] Updating submodule(s) SignalR => cd33755bee1bae855dd0366c3dffcc69d52804f9 [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index b63c3816d5..cd33755bee 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit b63c3816d53e422582591811034562612b8464de +Subproject commit cd33755bee1bae855dd0366c3dffcc69d52804f9 From 2c365b8fc5b023f81342065e2e6373412ff22117 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 10 Oct 2018 09:26:24 -0700 Subject: [PATCH 10/14] Explicitly push to a branch --- scripts/UpdateRepos.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/UpdateRepos.ps1 b/scripts/UpdateRepos.ps1 index c4291f2190..69d23232d8 100755 --- a/scripts/UpdateRepos.ps1 +++ b/scripts/UpdateRepos.ps1 @@ -107,7 +107,7 @@ try { if (-not $NoPush -and ($Force -or ($PSCmdlet.ShouldContinue("Pushing updates to repos.", 'Push the changes to these repos?')))) { try { $newBranch = "maestro/$($submodule.branch)" - Invoke-Block { & git @gitConfigArgs push origin HEAD:$newBranch} + Invoke-Block { & git @gitConfigArgs push origin HEAD:refs/heads/$newBranch} } catch { Write-Warning "Error in pushing $($newBranch): $_" From fd9789c7799356e977282aa961c52b58dce8a693 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 10 Oct 2018 18:25:17 +0000 Subject: [PATCH 11/14] Updating submodule(s) EntityFrameworkCore => 172d5e68db74043d649c070300e3a78757e33da1 IISIntegration => ac7a6b56d47fa39030d772fc8a5153e685d1e1dc SignalR => 692185f7d22167e7e062f24b95df5c3885890798 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/IISIntegration | 2 +- modules/SignalR | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index ea3d7e3641..172d5e68db 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit ea3d7e364116351dbf170b4424cd2d559ae04c75 +Subproject commit 172d5e68db74043d649c070300e3a78757e33da1 diff --git a/modules/IISIntegration b/modules/IISIntegration index 80a01a751b..ac7a6b56d4 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 80a01a751b0ae96be39cfb4f7fdbc02b404e948d +Subproject commit ac7a6b56d47fa39030d772fc8a5153e685d1e1dc diff --git a/modules/SignalR b/modules/SignalR index cd33755bee..692185f7d2 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit cd33755bee1bae855dd0366c3dffcc69d52804f9 +Subproject commit 692185f7d22167e7e062f24b95df5c3885890798 From 194af32e5fdc26e65be9056d56f8ff9597e83af6 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 10 Oct 2018 19:36:55 +0000 Subject: [PATCH 12/14] Updating submodule(s) SignalR => be4fe6c6f9fb33b6b0348d8f9018ddb07729f5db Templating => 7d09ec6ccc563b38febaf8cac2a2f5f134dee250 [auto-updated: submodules] --- modules/SignalR | 2 +- modules/Templating | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/SignalR b/modules/SignalR index 692185f7d2..be4fe6c6f9 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 692185f7d22167e7e062f24b95df5c3885890798 +Subproject commit be4fe6c6f9fb33b6b0348d8f9018ddb07729f5db diff --git a/modules/Templating b/modules/Templating index c6a371abe1..7d09ec6ccc 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit c6a371abe15783a34049b6139e7e9c4b479eecba +Subproject commit 7d09ec6ccc563b38febaf8cac2a2f5f134dee250 From 1fa70901fe47cfb9f0d2bdca8a5bdc0351ad32fc Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 10 Oct 2018 20:40:22 +0000 Subject: [PATCH 13/14] Updating submodule(s) Common => d3cbcd0e83f2dfd406ef14c0629ff9d346af4e29 IISIntegration => ab124fc344608ddd588738116d68a367c4b64a13 [auto-updated: submodules] --- modules/Common | 2 +- modules/IISIntegration | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/Common b/modules/Common index 7d8418b3b3..d3cbcd0e83 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit 7d8418b3b3957ff902cf70406052e8f1b80b584a +Subproject commit d3cbcd0e83f2dfd406ef14c0629ff9d346af4e29 diff --git a/modules/IISIntegration b/modules/IISIntegration index ac7a6b56d4..ab124fc344 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit ac7a6b56d47fa39030d772fc8a5153e685d1e1dc +Subproject commit ab124fc344608ddd588738116d68a367c4b64a13 From ad8aeca6a772cdaa335b2a10d2d57e5364ed0e28 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 10 Oct 2018 14:57:02 -0700 Subject: [PATCH 14/14] Updating submodule(s) IISIntegration => bfa583a9aa2acae53c6f7b3d903f689710a6e0c3 SignalR => 2ee351786f66f1ac437c824977516ebc04f9a01e [auto-updated: submodules] --- modules/IISIntegration | 2 +- modules/SignalR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/IISIntegration b/modules/IISIntegration index ab124fc344..bfa583a9aa 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit ab124fc344608ddd588738116d68a367c4b64a13 +Subproject commit bfa583a9aa2acae53c6f7b3d903f689710a6e0c3 diff --git a/modules/SignalR b/modules/SignalR index be4fe6c6f9..2ee351786f 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit be4fe6c6f9fb33b6b0348d8f9018ddb07729f5db +Subproject commit 2ee351786f66f1ac437c824977516ebc04f9a01e