Skip to content
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.

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

[main] Update dependencies from dotnet/runtime #20859

Merged
merged 10 commits into from
Sep 15, 2021

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Sep 9, 2021

This pull request updates the following dependencies

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

  • Subscription: aa69f164-2492-460a-3914-08d8e9750bf8
  • Build: 20210914.4
  • Date Produced: 9/14/2021 3:50 PM
  • Commit: a56b7321692d682bedf328c53dc8d47bbb193154
  • Branch: refs/heads/main

…0909.5

Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.App.Runtime.win-x64 , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Host.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , System.Text.Encoding.CodePages , System.Security.Cryptography.ProtectedData , System.Resources.Extensions , System.Reflection.MetadataLoadContext
 From Version 7.0.0-alpha.1.21425.4 -> To Version 7.0.0-alpha.1.21459.5
@sfoslund
Copy link
Member

sfoslund commented Sep 9, 2021

@ViktorHofer can you take a look at the build error? Is this expected?

##[error]src\Tests\Microsoft.NET.Sdk.Razor.SourceGenerators.Tests\RazorSourceGeneratorTests.cs(1019,25): error CS8767: (NETCORE_ENGINEERING_TELEMETRY=Build) Nullability of reference types in type of parameter 'assemblies' of 'bool AppLocalResolver.TryResolveAssemblyPaths(CompilationLibrary library, List assemblies)' doesn't match implicitly implemented member 'bool ICompilationAssemblyResolver.TryResolveAssemblyPaths(CompilationLibrary library, List? assemblies)' (possibly because of nullability attributes).
D:\workspace_work\1\s\src\Tests\Microsoft.NET.Sdk.Razor.SourceGenerators.Tests\RazorSourceGeneratorTests.cs(1057,51): error CS8602: Dereference of a possibly null reference. [D:\workspace_work\1\s\src\Tests\Microsoft.NET.Sdk.Razor.SourceGenerators.Tests\Microsoft.NET.Sdk.Razor.SourceGenerators.Tests.csproj]
##[error]src\Tests\Microsoft.NET.Sdk.Razor.SourceGenerators.Tests\RazorSourceGeneratorTests.cs(1057,51): error CS8602: (NETCORE_ENGINEERING_TELEMETRY=Build) Dereference of a possibly null reference.

@ViktorHofer
Copy link
Member

cc @maryamariyan @michaelgsharp @safern @tarekgh who are the owners of Microsoft.Extensions.DependencyModel (ICompilationAssemblyResolver)

dotnet-maestro bot and others added 2 commits September 10, 2021 12:18
…0910.1

Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.App.Runtime.win-x64 , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Host.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , System.Resources.Extensions , System.Reflection.MetadataLoadContext , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages
 From Version 7.0.0-alpha.1.21425.4 -> To Version 7.0.0-alpha.1.21460.1
@maryamariyan
Copy link
Member

looking

…0910.17

Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.App.Runtime.win-x64 , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Host.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , System.Resources.Extensions , System.Reflection.MetadataLoadContext , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages
 From Version 7.0.0-alpha.1.21425.4 -> To Version 7.0.0-alpha.1.21460.17
…0911.7

Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.App.Runtime.win-x64 , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Host.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , System.Resources.Extensions , System.Reflection.MetadataLoadContext , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages
 From Version 7.0.0-alpha.1.21425.4 -> To Version 7.0.0-alpha.1.21461.7
…0913.1

Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.App.Runtime.win-x64 , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Host.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , System.Resources.Extensions , System.Reflection.MetadataLoadContext , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages
 From Version 7.0.0-alpha.1.21425.4 -> To Version 7.0.0-alpha.1.21463.1
@danmoseley
Copy link
Member

@maryamariyan I know your xunit issue is first priority, do you prefer one of the other folks above take a look at this one?

We are a bit stale in our main flow.

@ericstj
Copy link
Member

ericstj commented Sep 13, 2021

This was caused by nullable annotations being added to Microsoft.Extensions here: dotnet/runtime#57445
cc @eerhardt

I believe we can simply just update the tests here to match the nullable annotations which were added. This type of break is expected when new assemblies add nullable annotations and there are already upstack assemblies with nullable enabled.

@ericstj
Copy link
Member

ericstj commented Sep 13, 2021

This should fix it, I just added some null-forgiving operators, since this is test code and it'd be OK if it throws NRE (test failure).

@danmoseley
Copy link
Member

Thanks, I was about to push the same change..

@danmoseley
Copy link
Member

Bunch of WASM tests have net6.0 hard coded in them. I guess I'll let all tests finish before we fix those.

Expected item[73].OriginalItemSpec to be
"C:\h\w\B404097E\w\AB1B093B\e\Assets.nuget\packages\microsoft.netcore.app.runtime.mono.browser-wasm\7.0.0-alpha.1.21463.1\runtimes\browser-wasm\lib\net6.0\Microsoft.CSharp.dll", but
"C:\h\w\B404097E\w\AB1B093B\e\Assets.nuget\packages\microsoft.netcore.app.runtime.mono.browser-wasm\7.0.0-alpha.1.21463.1\runtimes\browser-wasm\lib\net7.0\Microsoft.CSharp.dll" differs near "7.0" (index 151).

@maryamariyan
Copy link
Member

@maryamariyan I know your xunit issue is first priority, do you prefer one of the other folks above take a look at this one?

thanks @ericstj for unblocking this.

@ericstj
Copy link
Member

ericstj commented Sep 13, 2021

cc @javiercn @pranavkm @captainsafia for the blazor test failures. Looks like a lot of them. It wasn't clear what to update.

I see host tests failing because the HostModel assembly is still referencing 6.0.0 dependencies, yet SDK is deploying 7.0 (and doesn't implement redirection on .NETFramework):

      C:\h\w\BAC00A2E\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.PackTool.targets(122,5): error MSB4018: System.IO.FileNotFoundException: Could not load file or assembly 'System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' or one of its dependencies. The system cannot find the file specified. [C:\h\w\BAC00A2E\t\dotnetSdkTests\5znvd2ye.hwi\NupkgOfPackWi---59E82B0D\consoledemo.csproj]
      C:\h\w\BAC00A2E\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.PackTool.targets(122,5): error MSB4018: File name: 'System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' [C:\h\w\BAC00A2E\t\dotnetSdkTests\5znvd2ye.hwi\NupkgOfPackWi---59E82B0D\consoledemo.csproj]
      C:\h\w\BAC00A2E\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.PackTool.targets(122,5): error MSB4018:    at Microsoft.NET.HostModel.AppHost.MachOUtils.RemoveSignature(FileStream stream) [C:\h\w\BAC00A2E\t\dotnetSdkTests\5znvd2ye.hwi\NupkgOfPackWi---59E82B0D\consoledemo.csproj]

@agocke / @eerhardt looks like this needs an update (and ideally should build against live bits)
https://github.com/dotnet/runtime/blob/57bfe474518ab5b7cfe6bf7424a79ce3af9d6657/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj#L23-L24

@eerhardt
Copy link
Member

host tests failing because the HostModel assembly is still referencing 6.0.0 dependencies

According to dotnet/runtime#1823 (comment), we should have a subscription set up that updates those dependencies.

cc @jkoritzinsky

@eerhardt
Copy link
Member

I'm looking into it. It looks like the NuGet package version is 7.0.0-alpha, but the library contained inside of it is still AssemblyVersion 6.0.0.0. So we will need a new update, I'll do that manually to unblock:

https://github.com/dotnet/runtime/blob/88eb71e6a2e12f02c2952ffb2b9161635de1c04b/eng/Versions.props#L111-L112

@pranavkm
Copy link
Contributor

@javiercn could you update the Blazor SDK tests.?

@javiercn
Copy link
Member

@pranavkm I updated the Razor/Blazor baselines, the only two tests failing after I believe have unrelated failures. What I'm seeing is that they fail during CreateAppHost. Here is one sample exception

          CompilerServer: server - server processed compilation - 10494fb3-6682-43c1-977d-78bb416b463b
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018: The "CreateAppHost" task failed unexpectedly. [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018: System.IO.FileNotFoundException: Could not load file or assembly 'System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' or one of its dependencies. The system cannot find the file specified. [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018: File name: 'System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018:    at Microsoft.NET.HostModel.AppHost.MachOUtils.RemoveSignature(FileStream stream) [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018:    at Microsoft.NET.HostModel.AppHost.HostWriter.<>c__DisplayClass2_0.<CreateAppHost>b__2() [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018:    at Microsoft.NET.HostModel.RetryUtil.RetryOnIOError(Action func) [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018:    at Microsoft.NET.HostModel.AppHost.HostWriter.CreateAppHost(String appHostSourceFilePath, String appHostDestinationFilePath, String appBinaryFilePath, Boolean windowsGraphicalUserInterface, String assemblyToCopyResorcesFrom, Boolean enableMacOSCodeSign) [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018:    at Microsoft.NET.Build.Tasks.CreateAppHost.ExecuteCore() in /_/src/Tasks/Microsoft.NET.Build.Tasks/CreateAppHost.cs:line 90 [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018:    at Microsoft.NET.Build.Tasks.TaskBase.Execute() in /_/src/Tasks/Common/TaskBase.cs:line 47 [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018:    at Microsoft.Build.BackEnd.TaskExecutionHost.Microsoft.Build.BackEnd.ITaskExecutionHost.Execute() [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018:    at Microsoft.Build.BackEnd.TaskBuilder.<ExecuteInstantiatedTask>d__26.MoveNext() [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018:  [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018: WRN: Assembly binding logging is turned OFF. [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018: To enable assembly bind failure logging, set the registry value [HKLM\Software\Microsoft\Fusion!EnableLog] (DWORD) to 1. [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018: Note: There is some performance penalty associated with assembly bind failure logging. [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018: To turn this feature off, remove the registry value [HKLM\Software\Microsoft\Fusion!EnableLog]. [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        C:\h\w\B0300976\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(553,5): error MSB4018:  [C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj]
        Done Building Project "C:\h\w\B0300976\t\dotnetSdkTests\kk0d3qen.x44\Publish_Hoste---052745EF\blazorhosted\blazorhosted-rid.csproj" (Publish target(s)) -- FAILED.
        Deferred Messages

@eerhardt
Copy link
Member

@javiercn - the The "CreateAppHost" task failed unexpectedly. failures will be fixed by dotnet/runtime#59067.

…0913.20

Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.App.Runtime.win-x64 , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Host.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , System.Resources.Extensions , System.Reflection.MetadataLoadContext , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages
 From Version 7.0.0-alpha.1.21425.4 -> To Version 7.0.0-alpha.1.21463.20
…0914.4

Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.App.Runtime.win-x64 , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Host.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , System.Resources.Extensions , System.Reflection.MetadataLoadContext , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages
 From Version 7.0.0-alpha.1.21425.4 -> To Version 7.0.0-alpha.1.21464.4
{
foreach (var assembly in library.Assemblies)
{
var dll = Path.Combine(Directory.GetCurrentDirectory(), "refs", Path.GetFileName(assembly));
if (File.Exists(dll))
{
assemblies.Add(dll);
assemblies!.Add(dll);
Copy link
Contributor

Choose a reason for hiding this comment

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

instead add a check before the loop?

if (assemblies == null) return false

Copy link
Contributor

Choose a reason for hiding this comment

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

on second thought if someone does pass null here it will blow up with NRE as before. disregard.

@marcpopMSFT marcpopMSFT merged commit 9db5806 into main Sep 15, 2021
@eerhardt eerhardt deleted the darc-main-afcf2dcf-a3f8-44d7-bb88-bad4c01bfefe branch September 15, 2021 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants