Skip to content

[main] Update dependencies from dotnet/efcore dotnet/runtime dotnet/emsdk #31748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 18 commits into from
Apr 17, 2021
Merged

[main] Update dependencies from dotnet/efcore dotnet/runtime dotnet/emsdk #31748

merged 18 commits into from
Apr 17, 2021

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Apr 13, 2021 •
edited
Loading

This pull request updates the following dependencies

From https://github.com/dotnet/runtime

  • Subscription: 32db3699-5666-45da-a1b7-08d8b804cd75
  • Build: 20210415.13
  • Date Produced: 4/16/2021 8:21 AM
  • Commit: d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30
  • Branch: refs/heads/main

From https://github.com/dotnet/efcore

  • Subscription: 8ce5251e-8269-419d-3b2a-08d8b8050dda
  • Build: 20210415.1
  • Date Produced: 4/15/2021 8:05 PM
  • Commit: 99166b37d72cb6adca7fe1cb9f8511b8a6dd3192
  • Branch: refs/heads/main

From https://github.com/dotnet/emsdk

  • Subscription: 96159334-0390-4e49-6777-08d8f479343c
  • Build: 20210416.2
  • Date Produced: 4/16/2021 6:36 PM
  • Commit: 4352f818926282e9d5ecbc9d8a411e006d5a7853
  • Branch: refs/heads/main

@dotnet-maestro dotnet-maestro bot requested a review from dougbu as a code owner April 13, 2021 12:10
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Dependency Update 🔼 labels Apr 13, 2021
ghost
ghost approved these changes Apr 13, 2021
View reviewed changes
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approving dependency update.

@ghost ghost added the tell-mode Indicates a PR which is being merged during tell-mode label Apr 13, 2021
@pranavkm pranavkm added the blocked The work on this issue is blocked due to some dependency label Apr 13, 2021
@lewing lewing mentioned this pull request Apr 13, 2021
Merged
@pranavkm
Copy link
Contributor

This PR is blocked on a new installer update reacting to a runtime change: https://github.com/dotnet/installer/pull/10206/files

@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime [main] Update dependencies from dotnet/runtime dotnet/efcore Apr 13, 2021
@pranavkm
Copy link
Contributor

@akoeplinger I tried bumping up to a version of the installer that includes your rename reaction. Unfortunately restore continues to fail as before. It looks like there's 2 sections in the SDK KnownFrameworkReference and KnownRuntimePack. The former hasn't been updated but is what gets used to construct the package name during restore:

    <KnownFrameworkReference Include="Microsoft.NETCore.App"
                              TargetFramework="net6.0"
                              RuntimeFrameworkName="Microsoft.NETCore.App"
                              DefaultRuntimeFrameworkVersion="6.0.0-preview.4.21205.3"
                              LatestRuntimeFrameworkVersion="6.0.0-preview.4.21205.3"
                              TargetingPackName="Microsoft.NETCore.App.Ref"
                              TargetingPackVersion="6.0.0-preview.4.21205.3"
                              RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
                              RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;browser-wasm;osx-arm64;ios-arm64;ios-arm;iossimulator-arm64;iossimulator-x64;iossimulator-x86;tvos-arm64;tvossimulator-arm64;tvossimulator-x64;maccatalyst-x64;maccatalyst-arm64;android-arm64;android-arm;android-x64;android-x86"
                              />
...

    <KnownRuntimePack Include="Microsoft.NETCore.App"
                      TargetFramework="net6.0"
                      RuntimeFrameworkName="Microsoft.NETCore.App"
                      LatestRuntimeFrameworkVersion="6.0.0-preview.4.21205.3"
                      RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**"
                      RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;browser-wasm;osx-arm64;ios-arm64;ios-arm;iossimulator-arm64;iossimulator-x64;iossimulator-x86;tvos-arm64;tvossimulator-arm64;tvossimulator-x64;maccatalyst-x64;maccatalyst-arm64;android-arm64;android-arm;android-x64;android-x86"
                      RuntimePackLabels="Mono"
                      IsTrimmable="true"
                      />

image

FYI @lewing

@akoeplinger
Copy link
Member

@pranavkm the new SDK wasn't inserted into dotnet/installer yet, I think that's the issue: dotnet/installer#10185

@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime dotnet/efcore [main] Update dependencies from dotnet/efcore dotnet/runtime Apr 14, 2021
@dotnet-maestro dotnet-maestro bot requested review from a team as code owners April 14, 2021 14:44
@pranavkm
Copy link
Contributor

Blocked on dotnet/templating#3039. https://github.com/dotnet/sdk/issues/16906.

@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/efcore dotnet/runtime [main] Update dependencies from dotnet/runtime dotnet/efcore Apr 14, 2021
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime dotnet/efcore [main] Update dependencies from dotnet/efcore dotnet/runtime Apr 15, 2021
@mmitche
Copy link
Member

mmitche commented Apr 15, 2021

@pranavkm Can this PR be dealt with now? Installer has a more up-to-date runtime now

@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/efcore dotnet/runtime [main] Update dependencies from dotnet/efcore dotnet/runtime dotnet/emsdk Apr 15, 2021
@jkotalik
Copy link
Contributor

@mmitche you think we now can revert 360f705?

@mmitche
Copy link
Member

mmitche commented Apr 15, 2021

@mmitche you think we now can revert 360f705?

Not sure. Just noticed this dotnet/installer#10185 is merged.

@jkotalik
Copy link
Contributor

Current error on template tests (hit in a lot of them)

Process exited with code 1\nStdErr: Object reference not set to an instance of an object.\r\n   at Microsoft.TemplateEngine.Cli.TemplatePackageCoordinator.EnterInstallFlowAsync(INewCommandInput commandInput, CancellationToken cancellationToken) in Microsoft.TemplateEngine.Cli.dll:token 0x600018b+0x2f6\r\n   at Microsoft.TemplateEngine.Cli.New3Command.ExecuteAsync() in Microsoft.TemplateEngine.Cli.dll:token 0x6000148+0x381\r\n   at Microsoft.TemplateEngine.Cli.CommandParsing.NewCommandInputCli.<>c__DisplayClass102_0.<<OnExecute>b__0>d.MoveNext() in Microsoft.TemplateEngine.Cli.dll:token 0x60004b5+0x71\r\n\nStdOut: Getting ready...\r\nThe following template packages will be installed:\r\n  D:\workspace\_work\1\s\artifacts\packages\Release\Shipping\Microsoft.DotNet.Web.Client.ItemTemplates.6.0.0-ci.nupkg\r\n\r\n\r\nExpected: True\r\nActual:   False

@pranavkm did you see this when you were working on this PR?

@DavidKarlas
Copy link
Contributor

@jkotalik this is what bug dotnet/templating#3039 is fixing.
But that change didn't propagated yet, because its stuck on dotnet/installer#10226 afaiu.

@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/efcore dotnet/runtime dotnet/emsdk [main] Update dependencies from dotnet/runtime dotnet/emsdk dotnet/efcore Apr 15, 2021
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime dotnet/emsdk dotnet/efcore [main] Update dependencies from dotnet/emsdk dotnet/efcore dotnet/runtime Apr 16, 2021
@marek-safar
Copy link
Contributor

@ManickaP @karelz what's the recommendation about resolving the quic dependency error for Kestrel to unblock this PR?

@karelz
Copy link
Member

karelz commented Apr 16, 2021 •
edited
Loading

@marek-safar this is weird -- is Kestrel supported/building on any other platform than Windows, Linux, MacOS? If not, then I don't understand why it fails -- perhaps some tooling bug? @jkotalik @JamesNK can you please advise?

Will this block Preview 4 snap? If yes, we might have to revert the PR dotnet/runtime#49261 that introduced the problem.
cc @scalablecory @geoffkizer in case you have some ideas (time zones are against us on Friday :()

@marek-safar
Copy link
Contributor

is Kestrel supported/building on any other platform than Windows, Linux, MacOS?

That's my understanding of what it does today.

dotnet-maestro bot and others added 11 commits April 16, 2021 11:28
@dotnet-maestro @jkotalik
Update dependencies from https://github.com/dotnet/runtime build 2021…
c65315d 
…0413.3

Microsoft.Win32.Registry , Microsoft.NETCore.Platforms , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.AspNetCore.Internal.Transport , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Hosting , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Ref , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.IO.Pipelines , System.ComponentModel.Annotations , System.Runtime.CompilerServices.Unsafe , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Principal.Windows , System.ServiceProcess.ServiceController , System.Text.Json , System.Text.Encodings.Web , System.Threading.Channels
 From Version 6.0.0-preview.4.21211.7 -> To Version 6.0.0-preview.4.21213.3
@pranavkm @jkotalik
Update to a newer SDK
131cfb0
@pranavkm @jkotalik
Skip uninstall step
c7c525d
@dotnet-maestro @jkotalik
Update dependencies from https://github.com/dotnet/efcore build 20210…
0025671 
…414.4

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.Design
 From Version 6.0.0-preview.4.21212.2 -> To Version 6.0.0-preview.4.21214.4
@pranavkm @jkotalik
Update NuGet version to keep up with the SDK
7efd7ae
@pranavkm @jkotalik
Fixup test
6e42173
@dotnet-maestro @jkotalik
Update dependencies from https://github.com/dotnet/runtime build 2021…
5c62bcd 
…0414.9

Microsoft.Win32.Registry , Microsoft.NETCore.Platforms , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.AspNetCore.Internal.Transport , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Hosting , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Ref , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Diagnostics.DiagnosticSource , System.ComponentModel.Annotations , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Principal.Windows , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels
 From Version 6.0.0-preview.4.21211.7 -> To Version 6.0.0-preview.4.21214.9
@dotnet-maestro @jkotalik
Update dependencies from https://github.com/dotnet/emsdk build 202104…
9b6d2a2 
…15.1

Microsoft.NET.Runtime.Emscripten.2.0.12.Node.win-x64 , Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x64 , Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x64
 From Version 6.0.0-preview.4.21212.1 -> To Version 6.0.0-preview.4.21215.1
@dotnet-maestro @jkotalik
Update dependencies from https://github.com/dotnet/efcore build 20210…
815475a 
…415.1

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.Design
 From Version 6.0.0-preview.4.21212.2 -> To Version 6.0.0-preview.4.21215.1
@dotnet-maestro @jkotalik
Update dependencies from https://github.com/dotnet/runtime build 2021…
745bd90 
…0415.13

Microsoft.Win32.Registry , Microsoft.NETCore.Platforms , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.AspNetCore.Internal.Transport , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Hosting , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Ref , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Diagnostics.DiagnosticSource , System.ComponentModel.Annotations , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Principal.Windows , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels
 From Version 6.0.0-preview.4.21211.7 -> To Version 6.0.0-preview.4.21215.13
@DavidKarlas @jkotalik
Bumping SDK in attempt to fix dotnet new issues
9dd1046
@jkotalik jkotalik force-pushed the darc-main-1f60ac0a-c0c1-428f-831f-d288ebac2021 branch from c27b7d7 to 9dd1046 Compare April 16, 2021 18:31
@dotnet-maestro
Update dependencies from https://github.com/dotnet/emsdk build 202104…
5dc01f6 
…16.2

Microsoft.NET.Runtime.Emscripten.2.0.12.Node.win-x64 , Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x64 , Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x64
 From Version 6.0.0-preview.4.21212.1 -> To Version 6.0.0-preview.5.21216.2
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/emsdk dotnet/efcore dotnet/runtime [main] Update dependencies from dotnet/efcore dotnet/runtime dotnet/emsdk Apr 16, 2021
@jkotalik jkotalik removed the blocked The work on this issue is blocked due to some dependency label Apr 16, 2021
@jkotalik
Copy link
Contributor

Looks like this will be green in just a bit. Thanks everyone who helped out!

@dotnet-maestro dotnet-maestro bot merged commit cede6c4 into main Apr 17, 2021
@dotnet-maestro dotnet-maestro bot deleted the darc-main-1f60ac0a-c0c1-428f-831f-d288ebac2021 branch April 17, 2021 01:13
@ghost ghost added this to the 6.0-preview5 milestone Apr 17, 2021
pranavkm pushed a commit that referenced this pull request Apr 17, 2021
@dotnet-maestro @pranavkm
[main] Update dependencies from dotnet/efcore dotnet/runtime dotnet/e…
ac903f9 
…msdk (#31748)

[main] Update dependencies from dotnet/efcore dotnet/runtime dotnet/emsdk


 - Update to a newer SDK

 - Skip uninstall step

 - Update NuGet version to keep up with the SDK

 - Fixup test

 - Bumping SDK in attempt to fix `dotnet new` issues

 - Try only 3 platforms

 - Try assembly info

 - using

 - Quarantine test
@dougbu dougbu mentioned this pull request Apr 19, 2021
Closed
@JunTaoLuo JunTaoLuo mentioned this pull request Apr 21, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pranavkm pranavkm pranavkm left review comments

@javiercn javiercn javiercn approved these changes

@jkotalik jkotalik jkotalik approved these changes

@dougbu dougbu Awaiting requested review from dougbu

@halter73 halter73 Awaiting requested review from halter73 halter73 is a code owner

@Tratcher Tratcher Awaiting requested review from Tratcher

Assignees
No one assigned
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode Type: Dependency Update 🔼
Projects
None yet
Milestone
6.0-preview5
Development

Successfully merging this pull request may close these issues.
8 participants
@pranavkm @akoeplinger @mmitche @jkotalik @DavidKarlas @marek-safar @karelz @javiercn