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/cecil, dotnet/hotreload-utils, dotnet/icu, dotnet/runtime, dotnet/runtime-assets, dotnet/sdk, dotnet/xharness #97640

Merged
merged 89 commits into from
Feb 12, 2024

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 29, 2024

This pull request updates the following dependencies

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

  • Subscription: 3db4b8c8-0fae-4f82-086c-08dad31ae87d
  • Build: 20240211.9
  • Date Produced: February 12, 2024 8:14:29 AM UTC
  • Commit: 9699f39
  • Branch: refs/heads/main

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

  • Subscription: 736b3d22-d45c-4c36-de26-08db63374d9b
  • Build: 20240212.1
  • Date Produced: February 12, 2024 10:26:46 AM UTC
  • Commit: 0962c1f89f5daf924a9fe876c80e80b0bde63b0d
  • Branch: refs/heads/main

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

  • Subscription: 4247a230-8931-4538-5b64-08d8d8feb47e
  • Build: 20240205.1
  • Date Produced: February 5, 2024 3:23:38 PM UTC
  • Commit: 0664e5d5a59ae8ad8fe0cc1e82ed8a32baac43f7
  • Branch: refs/heads/dotnet/main

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

  • Subscription: be30ac4f-4b72-4287-1eb6-08d8d8fef0ea
  • Build: 20240212.1
  • Date Produced: February 12, 2024 11:45:46 AM UTC
  • Commit: 2f3f51a1adec18475563c8a49fd9b668ae9f2f31
  • Branch: refs/heads/main

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

  • Subscription: 0c5a34f5-504e-413b-9376-08d8d8ff2d75
  • Build: 20240208.2
  • Date Produced: February 9, 2024 1:22:02 AM UTC
  • Commit: b5ac2d9031d4b2dc40683b31de86b05a20b670af
  • Branch: refs/heads/main

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

  • Subscription: bfe6dacf-8231-4ea1-e2fe-08d962847885
  • Build: 20240205.1
  • Date Produced: February 5, 2024 3:11:17 PM UTC
  • Commit: c3893319be301c7acdd167c276a5178c1004f10f
  • Branch: refs/heads/main

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

  • Subscription: bb5d2106-9fd3-425f-0abc-08daad65778c
  • Build: 20240205.1
  • Date Produced: February 5, 2024 2:53:28 PM UTC
  • Commit: 93dcb576e191a965008eae9b622527436653873f
  • Branch: refs/heads/main

…0129.2

Microsoft.DotNet.ILCompiler , Microsoft.NET.Sdk.IL , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.ILAsm , runtime.native.System.IO.Ports , System.Text.Json
 From Version 9.0.0-alpha.1.24072.1 -> To Version 9.0.0-preview.2.24079.2
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-codeflow for labeling automated codeflow label Jan 29, 2024
Microsoft.DotNet.ApiCompat.Task
 From Version 9.0.100-alpha.1.24072.3 -> To Version 9.0.100-preview.2.24078.5
Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-preview.2.24072.3 -> To Version 9.0.0-preview.2.24079.1
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/runtime, dotnet/sdk [main] Update dependencies from dotnet/icu, dotnet/runtime, dotnet/sdk Jan 30, 2024
…40130.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 9.0.0-prerelease.24077.1 -> To Version 9.0.0-prerelease.24080.1
…ld 20240130.1

Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
 From Version 9.0.0-beta.24072.1 -> To Version 9.0.0-beta.24080.1
…ild 20240129.1

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 9.0.0-alpha.0.24072.1 -> To Version 9.0.0-alpha.0.24079.1
…29.1

Microsoft.DotNet.Cecil
 From Version 0.11.4-alpha.24065.1 -> To Version 0.11.4-alpha.24079.1
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/icu, dotnet/runtime, dotnet/sdk [main] Update dependencies from dotnet/cecil, dotnet/hotreload-utils, dotnet/icu, dotnet/runtime, dotnet/runtime-assets, dotnet/sdk, dotnet/xharness Jan 30, 2024
Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-preview.2.24072.3 -> To Version 9.0.0-preview.2.24079.1
…40130.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 9.0.0-prerelease.24077.1 -> To Version 9.0.0-prerelease.24080.1
…ld 20240130.1

Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
 From Version 9.0.0-beta.24072.1 -> To Version 9.0.0-beta.24080.1
…ild 20240129.1

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 9.0.0-alpha.0.24072.1 -> To Version 9.0.0-alpha.0.24079.1
…30.1

Microsoft.DotNet.Cecil
 From Version 0.11.4-alpha.24065.1 -> To Version 0.11.4-alpha.24080.1
Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-preview.2.24072.3 -> To Version 9.0.0-preview.2.24079.1
…40130.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 9.0.0-prerelease.24077.1 -> To Version 9.0.0-prerelease.24080.1
…ld 20240130.1

Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
 From Version 9.0.0-beta.24072.1 -> To Version 9.0.0-beta.24080.1
dotnet-maestro bot and others added 4 commits February 12, 2024 14:06
…ild 20240205.1

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 9.0.0-alpha.0.24072.1 -> To Version 9.0.0-alpha.0.24105.1
…05.1

Microsoft.SourceBuild.Intermediate.cecil , Microsoft.DotNet.Cecil
 From Version 0.11.4-alpha.24065.1 -> To Version 0.11.4-alpha.24105.1
Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.ApiCompat.Task
 From Version 9.0.100-alpha.1.24072.3 -> To Version 9.0.100-preview.2.24112.1
eng/Versions.props Outdated Show resolved Hide resolved
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
<SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
<!-- when building from source we need to use the current version of MetadataLoadContext -->
<SystemReflectionMetadataLoadContextToolsetVersion Condition="'$(DotNetBuildFromSource)' == 'true'">$(SystemReflectionMetadataLoadContextVersion)</SystemReflectionMetadataLoadContextToolsetVersion>
Copy link
Member

Choose a reason for hiding this comment

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

I question if this is going to work correctly in the product source build. The source build versions.props gets imported after this. The SystemReflectionMetadataLoadContextToolsetVersion is not going to be set to the correct SB version.

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

@MichaelSimons is correct.

Copy link
Member

Choose a reason for hiding this comment

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

Viktor suggested setting SystemReflectionMetadataLoadContextToolsetVersion in Directory.Build.targets so we get the correct version in source build, pushed that.

@mthalman
Copy link
Member

mthalman commented Feb 12, 2024

I haven't look at this closely but are these changes going to fix this issue related to WasmAppBuilder: dotnet/installer#18616 (comment)

@akoeplinger
Copy link
Member

@mthalman yes

@ViktorHofer ViktorHofer merged commit 4f09909 into main Feb 12, 2024
192 of 196 checks passed
@ViktorHofer ViktorHofer deleted the darc-main-bbefd152-0322-43a0-b4ae-de49ecb50aaa branch February 12, 2024 19:59
@github-actions github-actions bot locked and limited conversation to collaborators Mar 14, 2024
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.

8 participants