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.

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

[main] Update dependencies from dotnet/runtime dotnet/arcade dotnet/icu dotnet/xharness dotnet/runtime-assets dotnet/hotreload-utils #53171

Merged
merged 18 commits into from
May 28, 2021
Merged

[main] Update dependencies from dotnet/runtime dotnet/arcade dotnet/icu dotnet/xharness dotnet/runtime-assets dotnet/hotreload-utils #53171

merged 18 commits into from
May 28, 2021

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented May 24, 2021 •
edited
Loading

This pull request updates the following dependencies

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

  • Subscription: 772acd8f-b0cb-4d38-9377-08d8d8ff2d75
  • Build: 20210524.1
  • Date Produced: 5/24/2021 8:25 AM
  • Commit: 5a26d12
  • Branch: refs/heads/main

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

  • Subscription: c32383ee-d79c-4435-5b63-08d8d8feb47e
  • Build: 20210526.5
  • Date Produced: 5/26/2021 7:45 PM
  • Commit: c2a8af3f309fc27402fa9c18bac6df757a9c41ed
  • Branch: refs/heads/main

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

  • Subscription: 4247a230-8931-4538-5b64-08d8d8feb47e
  • Build: 20210524.1
  • Date Produced: 5/24/2021 1:06 PM
  • Commit: 2a47d0a1051260215d42a95583ff8a331efca4c7
  • Branch: refs/heads/maint/maint-67

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

  • Subscription: be30ac4f-4b72-4287-1eb6-08d8d8fef0ea
  • Build: 20210526.1
  • Date Produced: 5/26/2021 11:55 AM
  • Commit: fd2a4a5
  • Branch: refs/heads/main

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

  • Subscription: 0c5a34f5-504e-413b-9376-08d8d8ff2d75
  • Build: 20210525.1
  • Date Produced: 5/25/2021 11:10 AM
  • Commit: 3f92f2642a176248e735f61d748ace8b9dfaa56a
  • Branch: refs/heads/main

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

  • Subscription: a712faa5-42ec-4225-f239-08d913ef4ff4
  • Build: 20210526.1
  • Date Produced: 5/26/2021 12:41 PM
  • Commit: 57f47db25bed1a6d79444ab839cf7e364ea96716
  • Branch: refs/heads/main

@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
d1e1314 
…0524.1

Microsoft.NETCore.DotNetHost , Microsoft.NETCore.DotNetHostPolicy , Microsoft.NETCore.ILAsm , runtime.native.System.IO.Ports , Microsoft.NET.Sdk.IL , System.Runtime.CompilerServices.Unsafe , System.Text.Json
 From Version 6.0.0-preview.5.21267.1 -> To Version 6.0.0-preview.6.21274.1
@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.

radical and others added 2 commits May 25, 2021 00:08
@radical
Merge remote-tracking branch 'origin/main' into darc-main-4c502370-0a…
35e2e5a 
…49-4df3-8093-5c22f01af678

.. to pick up emscripten.python fixes .
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
824ccea 
…524.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.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
 From Version 6.0.0-beta.21271.3 -> To Version 6.0.0-beta.21274.6
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime [main] Update dependencies from dotnet/runtime dotnet/arcade May 25, 2021
dotnet-maestro bot added 4 commits May 25, 2021 13:05
@dotnet-maestro
Update dependencies from https://github.com/dotnet/icu build 20210524.1
ddca04f 
Microsoft.NETCore.Runtime.ICU.Transport
 From Version 6.0.0-preview.6.21268.1 -> To Version 6.0.0-preview.6.21274.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/xharness build 202…
4f2b287 
…10524.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.21271.1 -> To Version 1.0.0-prerelease.21274.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime-assets bui…
b7d8e40 
…ld 20210525.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.21267.1 -> To Version 6.0.0-beta.21275.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dccab6f 
…ild 20210524.2

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 1.0.1-alpha.0.21271.1 -> To Version 1.0.1-alpha.0.21274.2
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime dotnet/arcade [main] Update dependencies from dotnet/runtime dotnet/arcade dotnet/icu dotnet/xharness dotnet/runtime-assets dotnet/hotreload-utils May 25, 2021
@radical
Copy link
Member

radical commented May 26, 2021 •
edited by akoeplinger
Loading

installer/osx:

Muxer_activation_of_dotnet_test_XUnit_on_Standalone_Test_App_Succeeds (and other tests) failing with:

/Users/runner/work/1/s/.dotnet/sdk/6.0.100-preview.3.21202.5/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets(391,5):
error : Unrecognized file type 'PgoData' in /Users/runner/work/1/s/artifacts/obj/TestPackageCache/microsoft.netcore.app.runtime.osx-x64/6.0.0-ci/data/RuntimeList.xml [/Users/runner/work/1/s/artifacts/tests/Release/ha/f4byk3ki.2ex/StandaloneTestApp/StandaloneTestApp.csproj]

@akoeplinger @steveisok any idea what might be going on here?

@akoeplinger
Copy link
Member

Seems like an issue caused by dotnet/arcade#7425, @davidwrighton can you please take a look?

@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
6125bf0 
…525.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.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
 From Version 6.0.0-beta.21271.3 -> To Version 6.0.0-beta.21275.5
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime dotnet/arcade dotnet/icu dotnet/xharness dotnet/runtime-assets dotnet/hotreload-utils [main] Update dependencies from dotnet/runtime dotnet/icu dotnet/xharness dotnet/runtime-assets dotnet/hotreload-utils dotnet/arcade May 26, 2021
dotnet-maestro bot added 2 commits May 26, 2021 13:11
@dotnet-maestro
Update dependencies from https://github.com/dotnet/xharness build 202…
47b0439 
…10525.2

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.21271.1 -> To Version 1.0.0-prerelease.21275.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
45da403 
…ild 20210525.1

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 1.0.1-alpha.0.21271.1 -> To Version 1.0.1-alpha.0.21275.1
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime dotnet/icu dotnet/xharness dotnet/runtime-assets dotnet/hotreload-utils dotnet/arcade [main] Update dependencies from dotnet/runtime dotnet/arcade dotnet/icu dotnet/xharness dotnet/runtime-assets dotnet/hotreload-utils May 26, 2021
@akoeplinger
Copy link
Member

Hm seems this will fail until dotnet/sdk#17769 gets into the SDK and we're bumped to the new one I think. @davidwrighton @jkoritzinsky is there a way to opt out of this change for now?

@davidwrighton
Copy link
Member

@akoeplinger I'm looking into what we can do here. I was expecting to make dotnet/arcade#7425 a prereq for the dotnet/sdk#17769 change. Is it possible for me to get dotnet/sdk#17769 in, and then take a dependency on a fairly shiny/new sdk?

@davidwrighton
Copy link
Member

@akoeplinger @jkoritzinsky I've made a small tweak in the props to avoid the shared framework sdk adding the mibc to the runtimelist.xml Please take a look.

@akoeplinger
Copy link
Member

@davidwrighton the idea looks good to me but it seems the installer tests still fail with Unrecognized file type 'PgoData' so we're probably missing it somewhere.

@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
9233970 
…526.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.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
 From Version 6.0.0-beta.21271.3 -> To Version 6.0.0-beta.21276.5
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime dotnet/arcade dotnet/icu dotnet/xharness dotnet/runtime-assets dotnet/hotreload-utils [main] Update dependencies from dotnet/runtime dotnet/icu dotnet/xharness dotnet/runtime-assets dotnet/hotreload-utils dotnet/arcade May 27, 2021
dotnet-maestro bot added 2 commits May 27, 2021 13:16
@dotnet-maestro
Update dependencies from https://github.com/dotnet/xharness build 202…
1965b98 
…10526.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.21271.1 -> To Version 1.0.0-prerelease.21276.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
8dc8e43 
…ild 20210526.1

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 1.0.1-alpha.0.21271.1 -> To Version 1.0.1-alpha.0.21276.1
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime dotnet/icu dotnet/xharness dotnet/runtime-assets dotnet/hotreload-utils dotnet/arcade [main] Update dependencies from dotnet/runtime dotnet/arcade dotnet/icu dotnet/xharness dotnet/runtime-assets dotnet/hotreload-utils May 27, 2021
@runfoapp runfoapp bot mentioned this pull request May 27, 2021
Open
@davidwrighton
Adjust R2R compilation to only consider for R2R files with the .exe a…
c27385b 
…nd .dll file extension
@davidwrighton
Merge branch 'darc-main-4c502370-0a49-4df3-8093-5c22f01af678' of gith…
63c4510 
…ub.com:dotnet/runtime into darc-main-4c502370-0a49-4df3-8093-5c22f01af678
@davidwrighton
Copy link
Member

@akoeplinger Of course it turns out there is some exceptionally bizarre behavior difference in a bit of the sdk between Windows and Unix, but I believe I've found a workaround that is a general improvement in the crossgen2tasks logic, which thankfully is customizable for these projects in the runtime repo.

@radical
Copy link
Member

radical commented May 28, 2021

Browser: Wasm.Build.Tests failing, but unrelated to this PR. Being fixed in #53280

Android: runtime test failures

@radical
Copy link
Member

radical commented May 28, 2021

According to @fanyang-mono: the android runtime test failures were disabled ~30mins back in #53357 .
So, it should be safe to ignore them for merging.

@radical radical merged commit 0d4b7fc into main May 28, 2021
@radical radical deleted the darc-main-4c502370-0a49-4df3-8093-5c22f01af678 branch May 28, 2021 00:40
This was referenced May 28, 2021
Closed
Closed
Closed
@ghost ghost locked as resolved and limited conversation to collaborators Jun 27, 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.
Reviewers

@akoeplinger akoeplinger akoeplinger approved these changes

Assignees
No one assigned
Labels
area-codeflow for labeling automated codeflow
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@radical @akoeplinger @davidwrighton @danmoseley