huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[automated] Merge branch 'release/5.0-preview3' => 'master' (#20621) 

* Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200406.4 (#20600)

- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-preview.3.20206.4
- Microsoft.AspNetCore.Razor.Language - 5.0.0-preview.3.20206.4
- Microsoft.CodeAnalysis.Razor - 5.0.0-preview.3.20206.4
- Microsoft.NET.Sdk.Razor - 5.0.0-preview.3.20206.4

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Caching.Memory - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Json - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.DependencyInjection - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Hosting - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Http - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Console - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Debug - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Testing - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Options - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Primitives - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Internal.Extensions.Refs - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Win32.Registry - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.3.20206.14 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Win32.SystemEvents - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-preview.3-runtime.20206.14 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-preview.3.20206.14 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Internal - 5.0.0-preview.3.20206.14 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-preview.3.20206.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-preview.3.20206.5 (parent: Microsoft.AspNetCore.Razor.Language)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* [3.1] Remove Code_check job from publish-build-assets.yml `dependsOn` (#20558) (#20612)

- nit: remove redundant conditions for easier reading

Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>

* Use correct version f or 3.1 SiteExtension package (#20615)

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: John Luo <johluo@microsoft.com>
This commit is contained in:
dotnet-maestro-bot 2020-04-08 10:52:39 -07:00 committed by GitHub
parent 827178a775
commit d509084d25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eng/Versions.props
View File

@ -204,7 +204,7 @@
<!-- Packages from 2.1/2.2 branches used for site extension build -->
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>3.1.3</MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>3.1.3-servicing.20163.14</MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>
<!-- 3rd party dependencies -->
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
<BenchmarkDotNetPackageVersion>0.12.0</BenchmarkDotNetPackageVersion>