Uh oh!
There was an error while loading. Please reload this page.
[release/7.0-staging] Update dependencies from dotnet/linker dotnet/msquic dotnet/runtime-assets dotnet/emsdk - #84145
Conversation
…23.1 Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.4 -> To Version 7.0.5
…315.1 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22423.4 -> To Version 7.0.100-1.23165.1
…909.1 System.Net.MsQuic.Transport From Version 7.0.0-alpha.1.22406.1 -> To Version 7.0.0-alpha.1.22459.1
…ld 20230329.6 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 7.0.0-beta.23151.1 -> To Version 7.0.0-beta.23179.6
@steveisok@lewing the conflict here is caused by the addition of two more emsdk keys under the original one. Is the expectation to keep all 3, or only one of them? Their ID seems to be the same, except for the suffix numbers 1 and 2 (and the original key lacking one): <!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-7fa7119" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-7fa7119c/nuget/v3/index.json" />
<<<<<<< darc-release/7.0-staging-4f9ec8a2-1957-4623-8f24-8d66192eb170
+ <add key="darc-pub-dotnet-emsdk-7fa7119-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-7fa7119c-2/nuget/v3/index.json" />+ <add key="darc-pub-dotnet-emsdk-7fa7119-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-7fa7119c-1/nuget/v3/index.json" />
=======
>>>>>>> release/7.0-staging
<!-- End: Package sources from dotnet-emsdk --> |
steveisok
commented
Apr 1, 2023
I'd keep what is in the 7.0 branch. My guess is what darc is trying to add is just a duplicate. |
…c8a2-1957-4623-8f24-8d66192eb170
carlossanlop
left a comment
There was a problem hiding this comment.
I'd keep what is in the 7.0 branch. My guess is what darc is trying to add is just a duplicate.
Ok great, fixed, @steveisok. I know it was probably a dumb question, but mono/wasm sometimes works in mysterious ways 😄.
lewing
commented
Apr 3, 2023
@steveisok is that a known thing? |
steveisok
commented
Apr 3, 2023
No, new to me. @premun@akoeplinger why would https://github.com/dotnet/xharness/blob/98b5cb9b33fa4270c017301f9f1ea93fc285f58c/src/Microsoft.DotNet.XHarness.iOS.Shared/Hardware/HardwareDeviceLoader.cs#L96-L104 fail? |
premun
commented
Apr 3, 2023
The log it points to says this: |
premun
commented
Apr 3, 2023
@rolfbjarne have you seen the error above? Is this something around new Xcode that mlaunch needs to work with?
|
carlossanlop
commented
Apr 4, 2023
Reminder: Code complete is on April 10th to ensure this change gets included in the May Servicing Release. |
…05.1 Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.5 -> To Version 7.0.6
steveisok
commented
Apr 5, 2023
I don't think the tvOS failure should stop this change. It's an infra problem that appears to be intermittent. |
carlossanlop
commented
Apr 6, 2023
The latest CI run hit only two failures:
Based on:
I'll merge this. |
This pull request updates the following dependencies
From https://github.com/dotnet/emsdk
From https://github.com/dotnet/linker
From https://github.com/dotnet/msquic
From https://github.com/dotnet/runtime-assets