Update branding to 2.1.12 (#10865)

This commit is contained in:
Nate McMaster 2019-06-04 16:58:12 -07:00 committed by GitHub
parent d558350d50
commit 6ab3df58af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 93 additions and 43 deletions

View File

@ -2,9 +2,8 @@
<!-- These package versions may be overridden or updated by automation. -->
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
<!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
<MicrosoftNETCoreAppPackageVersion>2.1.10</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.10</MicrosoftNETCoreDotNetAppHostPackageVersion>
<SystemMemoryPackageVersion>4.5.2</SystemMemoryPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.1.11</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.11</MicrosoftNETCoreDotNetAppHostPackageVersion>
</PropertyGroup>
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
@ -187,6 +186,7 @@
<SystemDiagnosticsEventLogPackageVersion>4.5.0</SystemDiagnosticsEventLogPackageVersion>
<SystemIdentityModelTokensJwtPackageVersion>5.2.0</SystemIdentityModelTokensJwtPackageVersion>
<SystemInteractiveAsyncPackageVersion>3.1.1</SystemInteractiveAsyncPackageVersion>
<SystemMemoryPackageVersion>4.5.3</SystemMemoryPackageVersion>
<SystemNetHttpPackageVersion>4.3.4</SystemNetHttpPackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>4.5.3</SystemNetHttpWinHttpHandlerPackageVersion>
<SystemNumericsVectorsPackageVersion>4.5.0</SystemNumericsVectorsPackageVersion>

View File

@ -37,6 +37,6 @@
<ItemGroup>
<Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\Templating\" />
<Repository Include="EntityFrameworkCore" />
<ShippedRepository Include="EntityFrameworkCore" />
</ItemGroup>
</Project>

View File

@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<AspNetCoreBaselineVersion>2.1.10</AspNetCoreBaselineVersion>
<AspNetCoreBaselineVersion>2.1.11</AspNetCoreBaselineVersion>
</PropertyGroup>
<!-- Package: dotnet-dev-certs-->
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@ -542,14 +542,14 @@
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Identity.UI-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' ">
<BaselinePackageVersion>2.1.6</BaselinePackageVersion>
<BaselinePackageVersion>2.1.11</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Identity" Version="[2.1.6, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[2.1.6, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[2.1.6, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Identity-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity' ">
@ -618,15 +618,15 @@
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Mvc.Core-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Core' ">
<BaselinePackageVersion>2.1.3</BaselinePackageVersion>
<BaselinePackageVersion>2.1.11</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Core' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="[2.1.3, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Authorization.Policy" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="[2.1.3, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Routing" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[2.1.1, )" />
@ -634,7 +634,7 @@
<BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="System.Diagnostics.DiagnosticSource" Version="[4.5.1, )" />
<BaselinePackageReference Include="System.Threading.Tasks.Extensions" Version="[4.5.1, )" />
<BaselinePackageReference Include="System.Threading.Tasks.Extensions" Version="[4.5.2, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Mvc.Cors-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Cors' ">
@ -727,7 +727,7 @@
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Mvc.RazorPages-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.RazorPages' ">
<BaselinePackageVersion>2.1.3</BaselinePackageVersion>
<BaselinePackageVersion>2.1.11</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.RazorPages' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="[2.1.3, )" />
@ -1081,19 +1081,19 @@
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.SignalR.Protocols.MessagePack-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.MessagePack' ">
<BaselinePackageVersion>1.0.4</BaselinePackageVersion>
<BaselinePackageVersion>1.0.11</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.MessagePack' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="MessagePack" Version="[1.7.3.7, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[1.0.4, )" />
<BaselinePackageReference Include="MessagePack" Version="[1.7.3.4, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.SignalR.Redis-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Redis' ">
<BaselinePackageVersion>1.0.4</BaselinePackageVersion>
<BaselinePackageVersion>1.0.11</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Redis' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="MessagePack" Version="[1.7.3.7, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="[1.0.4, )" />
<BaselinePackageReference Include="MessagePack" Version="[1.7.3.4, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
<BaselinePackageReference Include="StackExchange.Redis.StrongName" Version="[1.2.6, )" />
</ItemGroup>

View File

@ -1,10 +1,10 @@
<!--
<!--
This file contains a list of all the packages and their versions which were released in the last servicing
build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
-->
<Baseline Version="2.1.10">
<Baseline Version="2.1.11">
<Package Id="dotnet-dev-certs" Version="2.1.1" />
<Package Id="dotnet-sql-cache" Version="2.1.1" />
<Package Id="dotnet-user-secrets" Version="2.1.1" />
@ -61,7 +61,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.HttpsPolicy" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.6" />
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="2.1.6" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="2.1.6" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="2.1.11" />
<Package Id="Microsoft.AspNetCore.Identity" Version="2.1.6" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Localization.Routing" Version="2.1.1" />
@ -70,7 +70,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.Analyzers" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.Core" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.Core" Version="2.1.11" />
<Package Id="Microsoft.AspNetCore.Mvc.Cors" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.1.3" />
@ -79,7 +79,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.1.11" />
<Package Id="Microsoft.AspNetCore.Mvc.TagHelpers" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.1.3" />
@ -111,8 +111,8 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="1.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Core" Version="1.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="1.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="1.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Redis" Version="1.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="1.0.11" />
<Package Id="Microsoft.AspNetCore.SignalR.Redis" Version="1.0.11" />
<Package Id="Microsoft.AspNetCore.SignalR" Version="1.0.4" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.SpaServices" Version="2.1.1" />
@ -127,4 +127,4 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.Net.Http.Headers" Version="2.1.1" />
<Package Id="Microsoft.Net.Sdk.Razor" Version="2.1.2" />
<Package Id="Microsoft.Owin.Security.Interop" Version="2.1.2" />
</Baseline>
</Baseline>

View File

@ -35,5 +35,8 @@ Later on, this will be checked using this condition:
Microsoft.AspNetCore.SignalR.Redis;
</PackagesInPatch>
</PropertyGroup>
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.12' ">
<PackagesInPatch>
</PackagesInPatch>
</PropertyGroup>
</Project>

View File

@ -61,7 +61,11 @@ namespace PackageBaselineGenerator
var sourceRepository = new SourceRepository(packageSource, providers);
if (_update.HasValue())
{
return await RunUpdateAsync(inputPath, input, sourceRepository);
var updateResult = await RunUpdateAsync(inputPath, input, sourceRepository);
if (updateResult != 0)
{
return updateResult;
}
}
var feedType = await sourceRepository.GetFeedType(CancellationToken.None);

View File

@ -8,8 +8,8 @@ Add `--package-source {source}` to the commands below if the packages of interes
### Auto-update
1. Run `dotnet run --update` in this project folder.
2. Run `dotnet run` in this project.
Run `dotnet run --update` in this project folder. This will attempt to find the latest patch version of packages and
update the baseline file.
### Manual update

View File

@ -5,6 +5,7 @@ using System;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
@ -21,6 +22,8 @@ Usage: <ZIP> <OUTPUT>
<OUTPUT> The output file path for the ZIP manifest file.");
}
private const int ZipDoesNotExist = 404;
public static async Task<int> Main(string[] args)
{
if (args.Length != 2)
@ -42,6 +45,13 @@ Usage: <ZIP> <OUTPUT>
Console.WriteLine($"log: Downloading {url}");
zipPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName() + ".zip");
var response = await new HttpClient().GetAsync(url);
if (response.StatusCode == HttpStatusCode.NotFound)
{
Console.Error.WriteLine($"Could not find {url}.");
return ZipDoesNotExist;
}
response.EnsureSuccessStatusCode();
using (var outStream = File.Create(zipPath))

View File

@ -1,5 +1,5 @@
ZipManifestGenerator
---------
--------------------
This console app is used to generate the list of files in a zip archive.
@ -13,19 +13,10 @@ Usage: <ZIP> <OUTPUT>
Example: dotnet run ./archive.zip files.txt
```
## Example for servicing updates
## Servicing updates
To generate a new manifest for the incremental CI server package caches, you would run
For convenience, this folder contains [./UpdateBaselines.ps1](./UpdateBaselines.ps1) to update
the baselines from the last patch release.
```ps1
$ProdConBuild='20180919-01'
$Version='2.1.5'
$patchUrl = "https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/${ProdconBuild}/final/assets/aspnetcore/Runtime/${Version}/nuGetPackagesArchive-ci-server-${Version}.patch.zip"
dotnet run $patchUrl "../Archive.CiServer.Patch/ArchiveBaseline.${Version}.txt"
$compatPatchUrl = "https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/${ProdconBuild}/final/assets/aspnetcore/Runtime/${Version}/nuGetPackagesArchive-ci-server-compat-${Version}.patch.zip"
dotnet run $compatPatchUrl "../Archive.CiServer.Patch.Compat/ArchiveBaseline.${Version}.txt"
```
Using version.props to figure out the last version, this script reads the build manifests from https://github.com/dotnet/versions/tree/master/build-info/dotnet/product/cli/release and
invokes the manifest generator

View File

@ -0,0 +1,40 @@
$ErrorActionPreference = 'Stop'
$ProgressPreference = 'SilentlyContinue'
Push-Location $PSScriptRoot
try {
[xml]$versionProps = Get-Content "$PSScriptRoot/../../../version.props"
$LastVersion = "$($versionProps.Project.PropertyGroup.AspNetCoreMajorVersion).$($versionProps.Project.PropertyGroup.AspNetCoreMinorVersion).$($versionProps.Project.PropertyGroup.AspNetCorePatchVersion - 1)"
$manifestUrl = "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/product/cli/release/$LastVersion/build.xml"
$buildXml = Invoke-RestMethod -Method GET $manifestUrl
$feedUrl = $buildXml.OrchestratedBuild.Endpoint.Url
$baseFeedUrl = $feedUrl -replace 'final/index.json',''
Write-Host "Last patch version = $LastVersion"
Write-Host "BaseURL = $baseFeedUrl"
function CreateBaseLineFromZip($url, $filePath) {
dotnet run $url $filePath
if ($lastexitcode -eq 404) {
Write-Host -f Yellow "It appears there was no patch zip in the last release, so creating an empty baseline file in $filePath."
Set-Content -path $filePath ''
}
elseif($lastexitcode -ne 0) {
Write-Error "ZipGenerator failed"
exit 1
}
}
CreateBaseLineFromZip `
"$baseFeedUrl/final/assets/aspnetcore/Runtime/${LastVersion}/nuGetPackagesArchive-ci-server-${LastVersion}.patch.zip" `
"../Archive.CiServer.Patch/ArchiveBaseline.${LastVersion}.txt"
CreateBaseLineFromZip `
"$baseFeedUrl/final/assets/aspnetcore/Runtime/${LastVersion}/nuGetPackagesArchive-ci-server-compat-${LastVersion}.patch.zip" `
"../Archive.CiServer.Patch.Compat/ArchiveBaseline.${LastVersion}.txt"
}
finally {
Pop-Location
}

View File

@ -2,7 +2,7 @@
<PropertyGroup>
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>11</AspNetCorePatchVersion>
<AspNetCorePatchVersion>12</AspNetCorePatchVersion>
<PreReleaseLabel>servicing</PreReleaseLabel>
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>