diff --git a/build/artifacts.props b/build/artifacts.props index 92f709039e..64b982b1fa 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -21,290 +21,89 @@ - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/build/dependencies.props b/build/dependencies.props index 76a61b3ddf..7f032d47c8 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,36 +1,36 @@  - 4.5.0-rtm-26514-02 - 2.1.0-rtm-26514-02 + 4.5.0 + 2.1.0 - 2.1.0-rtm-26514-02 - 2.1.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.7.0-rtm.5148 - 4.5.0-rtm-26514-02 - 1.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 1.6.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.9.0-rtm-26514-02 - 4.5.0-rtm-26514-02 - 4.5.0-rtm-26514-02 + 2.1.0 + 2.1.0 + 4.5.0 + 4.7.0 + 4.5.0 + 1.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 1.6.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.0 + 4.9.0 + 4.5.0 + 4.5.0 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 6554f43a9d..c68edeccd3 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -157,4 +157,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/sources.props b/build/sources.props index 9570c654ac..1a0eab7594 100644 --- a/build/sources.props +++ b/build/sources.props @@ -3,6 +3,8 @@ + https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180515-07/final/assets + $(DotNetAdditionalRestoreSources); $(DotNetRestoreSources); @@ -10,6 +12,7 @@ $(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 f53c21c4f6..5a3cc32ed7 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -6,53 +6,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/tools/NuspecBaselineGenerator/NuspecBaselineGenerator.csproj b/build/tools/NuspecBaselineGenerator/NuspecBaselineGenerator.csproj new file mode 100644 index 0000000000..54697dfb5f --- /dev/null +++ b/build/tools/NuspecBaselineGenerator/NuspecBaselineGenerator.csproj @@ -0,0 +1,13 @@ + + + + + Exe + netcoreapp2.0 + + + + + + + diff --git a/build/tools/NuspecBaselineGenerator/NuspecBaselineGenerator.sln b/build/tools/NuspecBaselineGenerator/NuspecBaselineGenerator.sln new file mode 100644 index 0000000000..d6695b6b86 --- /dev/null +++ b/build/tools/NuspecBaselineGenerator/NuspecBaselineGenerator.sln @@ -0,0 +1,34 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuspecBaselineGenerator", "NuspecBaselineGenerator.csproj", "{1A7FFC6E-7343-4AAD-A047-4D7097FBD7BF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1A7FFC6E-7343-4AAD-A047-4D7097FBD7BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A7FFC6E-7343-4AAD-A047-4D7097FBD7BF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A7FFC6E-7343-4AAD-A047-4D7097FBD7BF}.Debug|x64.ActiveCfg = Debug|x64 + {1A7FFC6E-7343-4AAD-A047-4D7097FBD7BF}.Debug|x64.Build.0 = Debug|x64 + {1A7FFC6E-7343-4AAD-A047-4D7097FBD7BF}.Debug|x86.ActiveCfg = Debug|x86 + {1A7FFC6E-7343-4AAD-A047-4D7097FBD7BF}.Debug|x86.Build.0 = Debug|x86 + {1A7FFC6E-7343-4AAD-A047-4D7097FBD7BF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A7FFC6E-7343-4AAD-A047-4D7097FBD7BF}.Release|Any CPU.Build.0 = Release|Any CPU + {1A7FFC6E-7343-4AAD-A047-4D7097FBD7BF}.Release|x64.ActiveCfg = Release|x64 + {1A7FFC6E-7343-4AAD-A047-4D7097FBD7BF}.Release|x64.Build.0 = Release|x64 + {1A7FFC6E-7343-4AAD-A047-4D7097FBD7BF}.Release|x86.ActiveCfg = Release|x86 + {1A7FFC6E-7343-4AAD-A047-4D7097FBD7BF}.Release|x86.Build.0 = Release|x86 + EndGlobalSection +EndGlobal diff --git a/build/tools/NuspecBaselineGenerator/Program.cs b/build/tools/NuspecBaselineGenerator/Program.cs new file mode 100644 index 0000000000..6f2e541aff --- /dev/null +++ b/build/tools/NuspecBaselineGenerator/Program.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using McMaster.Extensions.CommandLineUtils; +using NuGet.Packaging; + +namespace NuspecBaselineGenerator +{ + class Program + { + static void Main(string[] args) => CommandLineApplication.Execute(args); + + [Required] + [DirectoryExists] + [Argument(0)] + public string[] Directories { get; } + + [Required] + [Option] + [FileExists] + public string Artifacts { get; } + + private void OnExecute() + { + var doc = XDocument.Load(Artifacts); + var versions = new List<(string, string)>(); + foreach (var dir in Directories) + { + foreach (var nupkg in Directory.EnumerateFiles(dir, "*.nupkg")) + { + using (var reader = new PackageArchiveReader(nupkg)) + { + var identity = reader.GetIdentity(); + versions.Add((identity.Id, identity.Version.ToNormalizedString())); + } + } + } + + void WriteAttribute(XElement element, string attr) + { + var attribute = element.Attribute(attr); + if (attribute != null) + { + Console.Write($" {attr}=\"{attribute.Value}\""); + } + } + + foreach (var item in versions.OrderBy(i => i.Item1)) + { + var element = doc + .Descendants("PackageArtifact") + .SingleOrDefault(p => p.Attribute("Include")?.Value == item.Item1); + + + Console.Write($""); + } + } + } +} diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 5661677c1c..d6077c3be9 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 5661677c1c7eb6ce3b3a1c8ad1209c2def2b4db5 +Subproject commit d6077c3be9411a3ba316cabdd21e367935e84e8c diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index da21fc89cf..cc35474a7c 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit da21fc89cf9a68a2c86f9fdb77cd6ee813f31d24 +Subproject commit cc35474a7c7466c3adee127694cae7ba5c3a182c diff --git a/modules/Mvc b/modules/Mvc index 74c0d0c287..7b16b56112 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 74c0d0c28744743610b4b856c632f191ff49dc33 +Subproject commit 7b16b5611258063c8ed608462cfe44525237297e diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation index 7f56c68402..a8089026fc 160000 --- a/modules/MvcPrecompilation +++ b/modules/MvcPrecompilation @@ -1 +1 @@ -Subproject commit 7f56c68402c1645ca8dfac9072676cd3b7edf567 +Subproject commit a8089026fcf4348fdb9f567dbd5cbb0c93e6f335 diff --git a/modules/Scaffolding b/modules/Scaffolding index 6420150fe1..42a217a00f 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit 6420150fe16d3ed966280c384af25da464f1494a +Subproject commit 42a217a00f45d1f88836f05a3f182976d402a65a diff --git a/modules/Security b/modules/Security index 4dbcfa5e50..9ee5ed4bf9 160000 --- a/modules/Security +++ b/modules/Security @@ -1 +1 @@ -Subproject commit 4dbcfa5e508221b3d71a2ff7d66979282dacee33 +Subproject commit 9ee5ed4bf908bf09fce2d4d4797a908cc927b72c diff --git a/modules/SignalR b/modules/SignalR index e1a22b315d..145954b36d 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit e1a22b315dae5fc1335114908a545cd706af6c60 +Subproject commit 145954b36d921c8b22611c2c9a8910e0a879f74f diff --git a/modules/Templating b/modules/Templating index ef9fa1868a..5a5837f763 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit ef9fa1868aa1ee42efc00b72f19ac40c636908ce +Subproject commit 5a5837f7630338b025dd8d7bf7f3529da3bf4d64 diff --git a/scripts/PatchVersionPrefix.ps1 b/scripts/PatchVersionPrefix.ps1 new file mode 100755 index 0000000000..367c00d7fa --- /dev/null +++ b/scripts/PatchVersionPrefix.ps1 @@ -0,0 +1,67 @@ +#!/usr/bin/env pwsh + +<# +.SYNOPSIS + Updates the version.props file in repos to a newer patch version +.PARAMETER Repos + A list of the repositories that should be patched +#> +[CmdletBinding()] +param( + [Parameter(Mandatory = $true)] + [string[]]$Repos, + [switch]$NoCommit +) + +$ErrorActionPreference = 'Stop' + +Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1" + +function BumpPatch([System.Xml.XmlNode]$node) { + if (-not $node) { + return + } + [version] $version = $node.InnerText + $node.InnerText = "{0}.{1}.{2}" -f $version.Major, $version.Minor, ($version.Build + 1) + return "Bumping version from $version to $($node.InnerText)" +} + +foreach ($repo in $Repos) { + $repoPath = "$PSScriptRoot/../modules/$repo" + Push-Location $repoPath + try + { + $path = "$repoPath/version.props" + Write-Host -ForegroundColor Magenta "Updating $repo" + if (-not (Test-Path $path)) { + Write-Warning "$path does not exist" + continue + } + $path = Resolve-Path $path + Write-Verbose "$path" + [xml] $xml = LoadXml $path + + $suffix = $xml.SelectSingleNode('/Project/PropertyGroup/VersionSuffix') + if (-not $suffix) { + write-error "$path does not have VersionSuffix" + } + + $versionPrefix = $xml.SelectSingleNode('/Project/PropertyGroup/VersionPrefix') + $epxVersionPrefix = $xml.SelectSingleNode('/Project/PropertyGroup/ExperimentalProjectVersionPrefix') + $exVersionPrefix = $xml.SelectSingleNode('/Project/PropertyGroup/ExperimentalVersionPrefix') + BumpPatch $epxVersionPrefix | write-host + BumpPatch $exVersionPrefix | write-host + $message = BumpPatch $versionPrefix + Write-Host $message + SaveXml $xml $path + if (-not $NoCommit) { + Invoke-Block { & git add $path } + Invoke-Block { & git commit -m $message } + } + } + finally + { + Pop-Location + } +} + diff --git a/version.props b/version.props index 54f2079a2b..ce3f035075 100644 --- a/version.props +++ b/version.props @@ -2,11 +2,11 @@ 2 1 - 0 + 1 $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) rtm - 0.1.0 + 0.1.1 rtm $(PrereleaseVersionLabel)