diff --git a/build/artifacts.props b/build/artifacts.props index 7daf7b0337..18f0f91d3a 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -10,193 +10,29 @@ - - - false - - - - false - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/dependencies.props b/build/dependencies.props index 269e58bb6e..2f7c7bc9d6 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,6 +1,6 @@  - 1.0.1990 + 2.1.1991 0.10.3 6.1.3 4.2.1 @@ -29,9 +29,9 @@ 3.14.1 2.1.4 5.2.0 - 1.0.8 - 1.1.5 - 2.0.7 + 1.0.11 + 1.1.8 + 2.0.8-servicing-26407-02 1.0.1 15.3.0 3.0.1 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index c9b1478110..f7ff11b9eb 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -197,6 +197,161 @@ not building again in this patch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/submodules.props b/build/submodules.props index fd4d65b78e..97dc758fa7 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -7,42 +7,10 @@ - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..38785ff532 --- /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/korebuild-lock.txt b/korebuild-lock.txt index 5e0e3247df..b66b9a0b0e 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.0.8-rtm-10029 -commithash:02ac27ac741ef7b2a2ecd6ac08ff7b352007408a +version:2.0.8-rtm-10033 +commithash:a415fe50b6f5d7465e2e5d8576225a4a095eca7d diff --git a/modules/AzureIntegration b/modules/AzureIntegration index a926239281..6188e9edeb 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit a926239281dba7fd83404e321e8ce263569c68f7 +Subproject commit 6188e9edebca6f372da462ef086fbf40fa5e088b diff --git a/modules/Identity b/modules/Identity index 1a5f6945d9..952b38aa4e 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 1a5f6945d945f24624dae50b0d122c70f4a688d3 +Subproject commit 952b38aa4ed42261465b4e7054a0fc0cc94b8f80 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index b080a943c1..45abc6a931 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit b080a943c138f611c9463a2856e11db16a599778 +Subproject commit 45abc6a931b49bd121ad1ec5867cb71862a71349 diff --git a/modules/MetaPackages b/modules/MetaPackages index d700049929..1916862d77 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit d700049929ba09abab94596b3ea05a4e79affb74 +Subproject commit 1916862d7770b35ffe6ead9028eeb00e0f8799b6 diff --git a/src/Microsoft.AspNetCore.All/build/aspnetcore-store-2.0.8.xml b/src/Microsoft.AspNetCore.All/build/aspnetcore-store-2.0.8.xml new file mode 100644 index 0000000000..5da200395f --- /dev/null +++ b/src/Microsoft.AspNetCore.All/build/aspnetcore-store-2.0.8.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/version.props b/version.props index 876f139605..3314f5b6c0 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ 2 0 - 8 + 9 $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) rtm $(PrereleaseVersionLabel) @@ -17,6 +17,6 @@ $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$([MSBuild]::Subtract($(AspNetCorePatchVersion), 1)) - $(RuntimeStoreInstallerDependencyVersion)-231 + $(RuntimeStoreInstallerDependencyVersion)-10026