From cc4c8d7551ddcf416c1c6b8443695eec5bdfbd06 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 10 Jan 2018 14:59:17 -0800 Subject: [PATCH] Update repos to bumped versions and update the list of shipping packages --- build/artifacts.props | 30 ++++++++++++++++++++++++++++++ build/dependencies.props | 31 ------------------------------- build/submodules.props | 10 +++++----- modules/Diagnostics | 2 +- modules/Identity | 2 +- modules/JavaScriptServices | 2 +- modules/MetaPackages | 2 +- modules/Mvc | 2 +- modules/MvcPrecompilation | 2 +- modules/Scaffolding | 2 +- scripts/PatchVersionPrefix.ps1 | 4 ++++ 11 files changed, 46 insertions(+), 43 deletions(-) mode change 100644 => 100755 scripts/PatchVersionPrefix.ps1 diff --git a/build/artifacts.props b/build/artifacts.props index f52c802dbe..5550616050 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -10,6 +10,15 @@ + + + + + + + + + @@ -28,11 +37,32 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/build/dependencies.props b/build/dependencies.props index 072abddc4d..c9ea2a7c47 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -363,9 +363,6 @@ not building again in this patch. - - - @@ -375,12 +372,8 @@ not building again in this patch. - - - - @@ -394,33 +387,13 @@ not building again in this patch. - - - - - - - - - - - - - - - - - - - - @@ -432,10 +405,6 @@ not building again in this patch. diff --git a/build/submodules.props b/build/submodules.props index 6c6e81fe60..6bcfb4041d 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -7,7 +7,12 @@ + + + + + @@ -27,22 +32,17 @@ - - - - - diff --git a/modules/Diagnostics b/modules/Diagnostics index 111b6a4821..e10016ae41 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit 111b6a4821f3d23b33a720a45b91a79ed720fab5 +Subproject commit e10016ae41eb75199a294bb5360387dcd11c9f27 diff --git a/modules/Identity b/modules/Identity index becf1df9c5..0ab57e8184 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit becf1df9c5a3b908e28ec3c1272b072d8801e3dc +Subproject commit 0ab57e8184f524928b4e58791172b5a9d98940b1 diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices index d5a664e481..79fd6debad 160000 --- a/modules/JavaScriptServices +++ b/modules/JavaScriptServices @@ -1 +1 @@ -Subproject commit d5a664e4817a395cbafec942387162b5afeba7bf +Subproject commit 79fd6debad12fd4e9b7fbe5af125fa05ab402c00 diff --git a/modules/MetaPackages b/modules/MetaPackages index 62790d278f..57e644b813 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit 62790d278fe79b90d51e288c3ff3fe2313acc7bb +Subproject commit 57e644b813bf51a7e73e092995dc8511511074ba diff --git a/modules/Mvc b/modules/Mvc index 67f48064ce..f8b48b528f 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 67f48064ced9ac9c2917d369ffc7d1866d03c84d +Subproject commit f8b48b528fc6290c3248c1d99b00fceddb108622 diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation index f510e70340..46d5f4e3d0 160000 --- a/modules/MvcPrecompilation +++ b/modules/MvcPrecompilation @@ -1 +1 @@ -Subproject commit f510e7034000e346f6771197d30aaf791ce2bf48 +Subproject commit 46d5f4e3d056310955f180da6af9ebe1333a0534 diff --git a/modules/Scaffolding b/modules/Scaffolding index 069ca26129..793c266455 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit 069ca2612999a49e2b19099f21d8196f422c82de +Subproject commit 793c266455bf499d0d30434a4ef47cf673dd81c8 diff --git a/scripts/PatchVersionPrefix.ps1 b/scripts/PatchVersionPrefix.ps1 old mode 100644 new mode 100755 index 17303de53a..b67b953b60 --- a/scripts/PatchVersionPrefix.ps1 +++ b/scripts/PatchVersionPrefix.ps1 @@ -1,3 +1,5 @@ +#!/usr/bin/env pwsh + <# .SYNOPSIS Updates the version.props file in repos to a newer patch version @@ -40,10 +42,12 @@ function BumpPatch([System.Xml.XmlNode]$node) { } [version] $version = $node.InnerText $node.InnerText = "{0}.{1}.{2}" -f $version.Major, $version.Minor, ($version.Build + 1) + Write-Host "Changing $version to $($node.InnerText)" } foreach ($repo in $Repos) { $path = "$PSScriptRoot/../modules/$repo/version.props" + Write-Host -ForegroundColor Magenta "Updating $repo" if (-not (Test-Path $path)) { Write-Warning "$path does not exist" continue