Skip to content

Conversation

@mmitche
Copy link
Member

@mmitche mmitche commented Apr 7, 2020

… (#20558)

  • nit: remove redundant conditions for easier reading

…dotnet#20558)

- nit: remove redundant conditions for easier reading
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Apr 7, 2020
@mmitche mmitche changed the title [3.1] Remove Code_check job from publish-build-assets.yml dependsOn [release/5.0-preview3] Remove Code_check job from publish-build-assets.yml dependsOn Apr 7, 2020
@mmitche mmitche requested a review from dougbu April 7, 2020 15:26
@mmitche
Copy link
Member Author

mmitche commented Apr 7, 2020

Fixes currently blcoking issue for preview3

@wtgodbe
Copy link
Member

wtgodbe commented Apr 7, 2020

This one is also necessary: #20615

@mmitche mmitche merged commit 96b0b00 into dotnet:release/5.0-preview3 Apr 7, 2020
@mmitche mmitche deleted the port-20558 branch April 7, 2020 17:29
@dougbu
Copy link
Contributor

dougbu commented Apr 7, 2020

This is merged but doesn't show in the history. What's going on?

@mmitche
Copy link
Member Author

mmitche commented Apr 7, 2020

I see it in the history now.

@dougbu
Copy link
Contributor

dougbu commented Apr 7, 2020

git show 96b0b000234ce7cc21cc126251409df2661a97a5 looks like a no-op merge on the command line and here in GitHub. Why was it necessary?

@dougbu
Copy link
Contributor

dougbu commented Apr 7, 2020

(The no-op is the reason the change didn't show up in the git log origin/release/5.0-preview3 -- .azure/pipelines/ci.yml history I was looking at.)

pranavkm pushed a commit that referenced this pull request Apr 8, 2020
* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Doug Bunting <[email protected]>
Co-authored-by: William Godbe <[email protected]>
Co-authored-by: John Luo <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants