-
Notifications
You must be signed in to change notification settings - Fork 446
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
[automated] Merge branch 'release/8.0.2xx' => 'main' #17482
[automated] Merge branch 'release/8.0.2xx' => 'main' #17482
Conversation
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23421.11 -> To Version 8.0.100-rc.2.23421.16
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23421.11 -> To Version 8.0.100-rc.2.23421.18 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-rc.2.23421.15 -> To Version 8.0.0-rc.2.23421.21 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23421.18 -> To Version 8.0.100-rc.2.23421.21
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23421.18 -> To Version 8.0.100-rc.2.23422.3 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-rc.2.23421.21 -> To Version 8.0.0-rc.2.23421.27 (parent: Microsoft.NET.Sdk
…ence-packages build 20230821.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23414.1 -> To Version 8.0.0-alpha.1.23421.1
…rom dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:87a23e77-90d2-4087-288b-08db9cf9af34) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 87a23e77-90d2-4087-288b-08db9cf9af34 - **Build**: 20230821.12 - **Date Produced**: August 21, 2023 11:55:00 PM UTC - **Commit**: ad2dbea - **Branch**: refs/heads/internal/release/8.0.1xx-rc1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100-rc.1.23420.16 to 8.0.100-rc.1.23421.12][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rc.1.23420.16 to 8.0.100-rc.1.23421.12][1] - **Microsoft.NET.Sdk**: [from 8.0.100-rc.1.23420.16 to 8.0.100-rc.1.23421.12][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rc.1.23420.16 to 8.0.100-rc.1.23421.12][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17][2] - **dotnet-dev-certs**: [from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17][2] - **dotnet-user-jwts**: [from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17][2] - **dotnet-user-secrets**: [from 8.0.0-rc.1.23420.3 to 8.0.0-rc.1.23421.17][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbfb1d91852&targetVersion=GCad2dbeae65&_a=files [2]: https://dev....
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23422.3 -> To Version 8.0.100-rc.2.23422.14
…rom dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:87a23e77-90d2-4087-288b-08db9cf9af34) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 87a23e77-90d2-4087-288b-08db9cf9af34 - **Build**: 20230822.10 - **Date Produced**: August 22, 2023 6:03:03 PM UTC - **Commit**: 9e4cce0 - **Branch**: refs/heads/internal/release/8.0.1xx-rc1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100-rc.1.23421.12 to 8.0.100-rc.1.23422.10][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rc.1.23421.12 to 8.0.100-rc.1.23422.10][1] - **Microsoft.NET.Sdk**: [from 8.0.100-rc.1.23421.12 to 8.0.100-rc.1.23422.10][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rc.1.23421.12 to 8.0.100-rc.1.23422.10][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2] - **dotnet-dev-certs**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2] - **dotnet-user-jwts**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2] - **dotnet-user-secrets**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCad2dbeae65&targetVersion=GC9e4cce0571&_a=files [2]:...
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23422.3 -> To Version 8.0.100-rc.2.23422.20
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23422.20 -> To Version 8.0.100-rc.2.23422.30
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23422.20 -> To Version 8.0.100-rc.2.23422.34 Dependency coherency updates Microsoft.Build,NuGet.Build.Tasks From Version 17.8.0-preview-23421-02 -> To Version 17.8.0-preview-23422-03 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23422.34 -> To Version 8.0.100-rc.2.23422.36 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-rc.2.23421.27 -> To Version 8.0.0-rc.2.23422.12 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23422.34 -> To Version 8.0.100-rc.2.23423.1 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset From Version 8.0.0-rc.2.23421.27 -> To Version 8.0.0-rc.2.23422.12 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23422.34 -> To Version 8.0.100-rc.2.23423.3 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset From Version 8.0.0-rc.2.23421.27 -> To Version 8.0.0-rc.2.23422.15 (parent: Microsoft.NET.Sdk
…822.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23419.1 -> To Version 8.0.0-beta.23422.1
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23422.34 -> To Version 8.0.100-rc.2.23423.6 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 8.0.0-rc.2.23421.27 -> To Version 8.0.0-rc.2.23422.15 (parent: Microsoft.NET.Sdk
…rom dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:87a23e77-90d2-4087-288b-08db9cf9af34) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 87a23e77-90d2-4087-288b-08db9cf9af34 - **Build**: 20230822.28 - **Date Produced**: August 23, 2023 12:01:06 AM UTC - **Commit**: 6c278c1 - **Branch**: refs/heads/internal/release/8.0.1xx-rc1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100-rc.1.23422.13 to 8.0.100-rc.1.23422.28][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rc.1.23422.13 to 8.0.100-rc.1.23422.28][1] - **Microsoft.NET.Sdk**: [from 8.0.100-rc.1.23422.13 to 8.0.100-rc.1.23422.28][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rc.1.23422.13 to 8.0.100-rc.1.23422.28][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa8ab70ff0f&targetVersion=GC6c278c1ca2&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:87a23e77-90d2-4087-288b-08db9cf9af34)
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23423.6 -> To Version 8.0.100-rc.2.23423.9 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,NuGet.Build.Tasks From Version 8.0.0-rc.2.23422.15 -> To Version 8.0.0-rc.2.23423.5 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rc.2.23423.6 -> To Version 8.0.100-rc.2.23423.13 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,NuGet.Build.Tasks From Version 8.0.0-rc.2.23422.15 -> To Version 8.0.0-rc.2.23423.5 (parent: Microsoft.NET.Sdk
[release/8.0.1xx] Update dependencies from dotnet/sdk
[release/8.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: William Godbe <wigodbe@microsoft.com>
@dotnet/source-build-internal looks like a source-build failure. Could you take a look? |
The source-build issue depends on #17473. |
# Conflicts: # src/SourceBuild/content/eng/Versions.props # src/SourceBuild/content/global.json
…/release/8.0.2xx-to-main
Latest error from https://dev.azure.com/dnceng-public/public/_build/results?buildId=449006&view=results:
@NikolaMilosavljevic - Are you able to help with this? |
I suspect this has to do with prebuilts in main right now. I saw this before because of prebuilts. We may have to relax this check for a period or maybe cross check with the prebuilts. |
I'll prepare the PR to relax this check and create an issue to track re-enabling it. |
I detected changes in the release/8.0.2xx branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on release/8.0.2xx by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/8.0.2xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.