[main] Update dependencies from 4 repositories #58999
Conversation
![dotnet-maestro[bot]](https://avatars.githubusercontent.com/in/16706?s=60&v=4){kind=small}
…otnet-optimization build 20210911.4 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21460.6 -> To Version 1.0.0-prerelease.21461.4
…0913.1 Microsoft.NETCore.ILAsm , Microsoft.NETCore.DotNetHostPolicy , Microsoft.NETCore.DotNetHost , Microsoft.NETCore.App.Runtime.win-x64 , runtime.native.System.IO.Ports , Microsoft.NET.Sdk.IL , System.Runtime.CompilerServices.Unsafe , System.Text.Json From Version 7.0.0-alpha.1.21456.1 -> To Version 7.0.0-alpha.1.21463.1
dotnet-maestro
bot
changed the title
…otnet-optimization build 20210912.2 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21460.6 -> To Version 1.0.0-prerelease.21462.2
…ild 20210912.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.2-alpha.0.21460.1 -> To Version 1.0.2-alpha.0.21462.1
dotnet-maestro
bot
changed the title
dotnet-maestro
bot
changed the title
…913.4 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , 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 7.0.0-beta.21459.5 -> To Version 7.0.0-beta.21463.4
dotnet-maestro
bot
changed the title
|
@josteink do you know how to resolve this conflict? I saw you were making the changes there |
|
To me it almost looks like a complete syntactical rewrite with (among other things) [ ] replaced with [[ ]] and exports only done at the end. I believe due to the excessive amount of changes git fails to merge it despite there being no direct “logical”/fundamental conflict in the changes. How about you force a merge locally, resolve by choosing your branch, and then just “replay” my changes manually on top of yours? |
|
I don't understand this script at all, maybe @jkoritzinsky or @am11 can help here? They authored the clashing change in Arcade |
|
Also, technically speaking, I was only reverting changes incorrectly being made earlier by another "Update dependencies" PR: |
Conflicts: eng/Version.Details.xml eng/Versions.props
|
@josteink the way it works is that the I do not understand this script or its purpose so it's quite hard for me to "replay" your changes (and I cannot simply apply the commit since there is a conflict) but it seems @jkoritzinsky and @am11 were making changes in dotnet/arcade so they might know how to best resolve this? So far I have just put here their version of the script and we will see how the build goes. |
premun
changed the title
ghost
locked as resolved and limited conversation to collaborators
This pull request updates the following dependencies
From https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
From https://github.com/dotnet/runtime
From https://github.com/dotnet/hotreload-utils
From https://github.com/dotnet/arcade