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 7 repositories #52440

Merged
merged 26 commits into from
May 13, 2021

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented May 7, 2021

This pull request updates the following dependencies

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

  • Subscription: c32383ee-d79c-4435-5b63-08d8d8feb47e
  • Build: 20210513.1
  • Date Produced: 5/13/2021 9:01 AM
  • Commit: 6b9758661f4483a70654bcaf6f8d7c6a79ee5660
  • Branch: refs/heads/main

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

  • Subscription: be30ac4f-4b72-4287-1eb6-08d8d8fef0ea
  • Build: 20210513.1
  • Date Produced: 5/13/2021 11:31 AM
  • Commit: 9596c3f
  • Branch: refs/heads/main

From https://github.com/dotnet/llvm-project

  • Subscription: b8108dfc-f542-401a-9375-08d8d8ff2d75
  • Build: 20210510.1
  • Date Produced: 5/10/2021 2:45 PM
  • Commit: eba3f2dcb38c39d6924f38c168c30336b3e5fc4b
  • Branch: refs/heads/release/9.x

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

  • Subscription: 0c5a34f5-504e-413b-9376-08d8d8ff2d75
  • Build: 20210510.1
  • Date Produced: 5/10/2021 6:49 PM
  • Commit: 6eb103aee0453fa28d8049f59679b41924999e9c
  • Branch: refs/heads/main

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

  • Subscription: 772acd8f-b0cb-4d38-9377-08d8d8ff2d75
  • Build: 20210510.1
  • Date Produced: 5/10/2021 10:25 AM
  • Commit: e39196f
  • Branch: refs/heads/main

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

  • Subscription: 4247a230-8931-4538-5b64-08d8d8feb47e
  • Build: 20210510.1
  • Date Produced: 5/10/2021 1:04 PM
  • Commit: d85ad26c86ead928c42d09e077090d6578e6d2d9
  • Branch: refs/heads/maint/maint-67

From https://github.com/dotnet/hotreload-utils

  • Subscription: a712faa5-42ec-4225-f239-08d913ef4ff4
  • Build: 20210511.2
  • Date Produced: 5/12/2021 12:59 AM
  • Commit: db44d47059b070a687776ff53edbd618593bbe54
  • Branch: refs/heads/main

…506.13

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageValidation , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
 From Version 6.0.0-beta.21256.1 -> To Version 6.0.0-beta.21256.13
@dotnet-issue-labeler
Copy link

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

dotnet-maestro bot added 2 commits May 7, 2021 13:17
…10507.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.21255.1 -> To Version 1.0.0-prerelease.21257.1
… 20210506.1

runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools
 From Version 9.0.1-alpha.1.21253.1 -> To Version 9.0.1-alpha.1.21256.1
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/arcade [main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/llvm-project May 7, 2021
…507.5

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageValidation , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
 From Version 6.0.0-beta.21256.1 -> To Version 6.0.0-beta.21257.5
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/llvm-project [main] Update dependencies from dotnet/xharness dotnet/llvm-project dotnet/arcade May 8, 2021
dotnet-maestro bot added 2 commits May 8, 2021 13:07
…10507.2

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.21255.1 -> To Version 1.0.0-prerelease.21257.2
…ld 20210507.1

System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData
 From Version 6.0.0-beta.21230.1 -> To Version 6.0.0-beta.21257.1
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/xharness dotnet/llvm-project dotnet/arcade [main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/llvm-project dotnet/runtime-assets May 8, 2021
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/llvm-project dotnet/runtime-assets [main] Update dependencies from dotnet/xharness dotnet/llvm-project dotnet/runtime-assets dotnet/arcade May 9, 2021
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/xharness dotnet/llvm-project dotnet/runtime-assets dotnet/arcade [main] Update dependencies from dotnet/llvm-project dotnet/runtime-assets dotnet/arcade dotnet/xharness May 9, 2021
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/llvm-project dotnet/runtime-assets dotnet/arcade dotnet/xharness [main] Update dependencies from dotnet/runtime-assets dotnet/arcade dotnet/xharness dotnet/llvm-project May 9, 2021
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime-assets dotnet/arcade dotnet/xharness dotnet/llvm-project [main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/llvm-project dotnet/runtime-assets May 9, 2021
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/llvm-project dotnet/runtime-assets [main] Update dependencies from dotnet/xharness dotnet/llvm-project dotnet/runtime-assets dotnet/arcade May 10, 2021
…0510.1

Microsoft.NETCore.ILAsm , Microsoft.NETCore.DotNetHostPolicy , Microsoft.NETCore.DotNetHost , runtime.native.System.IO.Ports , Microsoft.NET.Sdk.IL , System.Runtime.CompilerServices.Unsafe , System.Text.Json
 From Version 6.0.0-preview.5.21253.1 -> To Version 6.0.0-preview.5.21260.1
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/xharness dotnet/llvm-project dotnet/runtime-assets dotnet/arcade [main] Update dependencies from dotnet/xharness dotnet/llvm-project dotnet/runtime-assets dotnet/arcade dotnet/runtime May 10, 2021
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/xharness dotnet/llvm-project dotnet/runtime-assets dotnet/arcade dotnet/runtime [main] Update dependencies from dotnet/arcade dotnet/runtime dotnet/xharness dotnet/llvm-project dotnet/runtime-assets May 10, 2021
…510.1

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageValidation , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
 From Version 6.0.0-beta.21256.1 -> To Version 6.0.0-beta.21260.1
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/arcade dotnet/runtime dotnet/xharness dotnet/llvm-project dotnet/runtime-assets [main] Update dependencies from dotnet/runtime dotnet/xharness dotnet/llvm-project dotnet/runtime-assets dotnet/arcade May 11, 2021
safern and others added 9 commits May 12, 2021 11:10
Microsoft.NETCore.Runtime.ICU.Transport
 From Version 6.0.0-preview.5.21253.1 -> To Version 6.0.0-preview.5.21260.1
…10510.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.21255.1 -> To Version 1.0.0-prerelease.21260.1
… 20210510.1

runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools
 From Version 9.0.1-alpha.1.21253.1 -> To Version 9.0.1-alpha.1.21260.1
…ld 20210510.1

System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData
 From Version 6.0.0-beta.21230.1 -> To Version 6.0.0-beta.21260.1
…ild 20210510.2

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 1.0.1-alpha.0.21257.1 -> To Version 1.0.1-alpha.0.21260.2
…511.6

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
 From Version 6.0.0-beta.21256.1 -> To Version 6.0.0-beta.21261.6
…10511.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.21260.1 -> To Version 1.0.0-prerelease.21261.1
…ild 20210511.2

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 1.0.1-alpha.0.21260.2 -> To Version 1.0.1-alpha.0.21261.2
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime dotnet/xharness dotnet/llvm-project dotnet/runtime-assets dotnet/arcade [main] Update dependencies from 7 repositories May 12, 2021
dotnet-maestro bot added 4 commits May 12, 2021 19:36
…10510.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.21255.1 -> To Version 1.0.0-prerelease.21260.1
…ild 20210510.2

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 1.0.1-alpha.0.21257.1 -> To Version 1.0.1-alpha.0.21260.2
…10511.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.21260.1 -> To Version 1.0.0-prerelease.21261.1
…ild 20210511.2

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 1.0.1-alpha.0.21260.2 -> To Version 1.0.1-alpha.0.21261.2
@safern safern closed this May 12, 2021
@safern safern reopened this May 12, 2021
@safern
Copy link
Member

safern commented May 12, 2021

It seems like this: 2aa5062 was merged in between I reacted to API Compat change. Working on fixing the build now.

@@ -403,7 +403,9 @@ public sealed partial class FileSystem
public static void Input(int FileNumber, ref object Value) { }
public static void Input(int FileNumber, ref float Value) { }
public static void Input(int FileNumber, ref string Value) { }
[System.Runtime.Versioning.UnsupportedOSPlatform("ios")]
Copy link
Member

Choose a reason for hiding this comment

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

FYI: @MaximLipnin this was missed on your PR. Let me know if it makes sense.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure if it's related to Lock/Unlock methods which cause PNSE on iOS/tvOS and were annotated in my PR, but it seems that it makes sense to annotate this particular method as well, thank you.

@safern
Copy link
Member

safern commented May 12, 2021

@Anipik @ericstj do you have any idea what might be causing this failure from package testing?

Microsoft (R) Build Engine version 16.10.0-preview-21181-07+073022eb4 for .NET
Copyright (C) Microsoft Corporation. All rights reserved.

  Determining projects to restore...
  Determining projects to restore...
  Restored C:\h\w\A10908E2\w\AB6C0956\u\net462\project.csproj (in 13.42 sec).
  Determining projects to restore...
  Restored C:\h\w\A10908E2\w\AB6C0956\u\net461\project.csproj (in 16.24 sec).
  Determining projects to restore...
  Restored C:\h\w\A10908E2\w\AB6C0956\u\netstandard2.0\project.csproj (in 1.36 sec).
  Restored C:\h\w\A10908E2\w\AB6C0956\u\netcoreapp2.0\project.csproj (in 22.68 sec).
  Testing Microsoft.Extensions.DependencyInjection.Specification.Tests TFM=net462
C:\h\w\A10908E2\p\packageTest.targets(53,5): error : Assembly 'netfx.force.conflicts' has insufficient version for dependency 'System.ServiceModel.Duplex' : 4.0.0.0 < 4.0.2.0. [C:\h\w\A10908E2\w\AB6C0956\u\net462\project.csproj]
  Testing Microsoft.Extensions.DependencyInjection.Specification.Tests TFM=net461
C:\h\w\A10908E2\p\packageTest.targets(53,5): error : Assembly 'netfx.force.conflicts' has insufficient version for dependency 'System.ServiceModel.Duplex' : 4.0.0.0 < 4.0.2.0. [C:\h\w\A10908E2\w\AB6C0956\u\net461\project.csproj]
  Testing Microsoft.Extensions.DependencyInjection.Specification.Tests TFM=netcoreapp2.0
  Testing Microsoft.Extensions.DependencyInjection.Specification.Tests TFM=netstandard2.0

C:\h\w\A10908E2\w\AB6C0956\e>set _commandExitCode=1 

dotnet-maestro bot added 2 commits May 13, 2021 12:13
…513.1

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
 From Version 6.0.0-beta.21256.1 -> To Version 6.0.0-beta.21263.1
…10513.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.21255.1 -> To Version 1.0.0-prerelease.21263.1
@ericstj
Copy link
Member

ericstj commented May 13, 2021

Yeah, I'm actually in the process of fixing this #52554 (comment)

@safern
Copy link
Member

safern commented May 13, 2021

Yeah, I'm actually in the process of fixing this

Thanks!

@ericstj
Copy link
Member

ericstj commented May 13, 2021

The reason this is just now being hit is that when I added this package I made it pack from csproj:
039b148#diff-eca9f7212ff23b6ded37c0d8f25fc9c07227848945559b82ace20cd8152f1e78R7

It was never actually running package testing now (thanks @Anipik for fixing this!)

Any netstandard2.0 asset when running net46 will hit this problem with netfx.force.conflicts when running closure validation on net461 or net462. We didn't hit it before because all our library pkgprojs target net4x specifically. Microsoft.Extensions.DependencyInjection.Specification.Tests does not. We weren't running closure validation on .NETFramework back before we did the net4x targeting work, thus we missed that this suppression is generically required.

I'm planning on suppressing this dependency issue with netfx.force.conflicts.

@safern
Copy link
Member

safern commented May 13, 2021

I'm planning on suppressing this dependency issue with netfx.force.conflicts.

Makes sense. Thank you for taking a look!

@safern
Copy link
Member

safern commented May 13, 2021

Test failure is: #11063

@safern safern merged commit 3b5cefa into main May 13, 2021
@safern safern deleted the darc-main-3c52fbd5-2ada-4054-95f7-8a74ad2300c5 branch May 13, 2021 20:43
@safern
Copy link
Member

safern commented May 13, 2021

@tlakollo API Compat with my fix is now updated, you can now rebase your PR and try it out.

@karelz karelz added this to the 6.0.0 milestone May 20, 2021
@ghost ghost locked as resolved and limited conversation to collaborators Jun 19, 2021
@danmoseley danmoseley added the area-codeflow for labeling automated codeflow label Jul 28, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants