Skip to content

[automated] Merge branch 'release/8.0' => 'main' #4554

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

Merged
merged 34 commits into from
Nov 8, 2023

Conversation

dotnet-maestro-bot
Copy link
Contributor

@dotnet-maestro-bot dotnet-maestro-bot commented Oct 11, 2023

I detected changes in the release/8.0 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 by the following committers:

  • sebastienros
  • dotnet-maestro[bot]
  • xakep139
  • MackinnonBuck
  • carlossanlop
  • Tratcher

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.

merge button instructions

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.

git fetch
git checkout release/8.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/8.0

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/Common HEAD:merge/release/8.0-to-main
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/Common HEAD:merge/release/8.0-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

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-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/8.0-to-main main
git pull https://github.com/dotnet-maestro-bot/Common merge/release/8.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/Common HEAD:merge/release/8.0-to-main
or if you are using SSH
git checkout -b merge/release/8.0-to-main main
git pull git@github.com:dotnet-maestro-bot/Common merge/release/8.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/Common HEAD:merge/release/8.0-to-main

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.

Microsoft Reviewers: Open in CodeFlow

sebastienros and others added 8 commits October 9, 2023 11:01
* Remove project names

* Revert changes made in other PR
* Layer enrichment & redaction on top of HttpLogging

* Cleanup

* Extract enrichment, cleanup

* Remove duration

* Remove duration

* API updates

* Experimental

* Target net80, remove old code, fix up tests

* PR feedback, tests

* Test cleanup

* CombineLogs, fix tests

* Cleanup, reduce diff

* Spacing

* React to duration changes

* Update SDK to 8.0.100-rc.2.23451.1

* Experimental

* Use HttpContext

* Config binding

* Cleanup

* Duplicate options?

* Remove LogMethodHelper

* Revert "Duplicate options?"

This reverts commit 582a508.

# Conflicts:
#	src/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware/Logging/HttpLoggingServiceCollectionExtensions.cs

* Don't combine options

* Consolidate enrichers

* Cleanup metadata

* Remove LogMethodHelper tests

* More LogMethodHelper

* Warnings

* More LogMethodHelper

* Fixup baseline

* Test coverage

* Update src/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware/Logging/RequestHeadersLogEnricherOptions.cs

* Delete src/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware/Logging/RequestHeadersLogEnricherOptionsValidator.cs

* Update RequestHeadersEnricherServiceCollectionExtensions.cs

* Delete more

* Delete more

* Options, docs, binding

* Cleanup headers log enricher

* Less experimental

* Warnings

* Fix dimensions
* Pasting the exact same file as in dotnet/runtime.

* Remove runtime-specific code.

* Update global.json Microsoft.Build.NoTargets to 3.7.0.

* Add LibrariesProjectRoot property to root Directory.Build.props

* Initial adaptation of Microsoft.Internal.Extensions.DotNetApiDocs.Transport.proj

* Failed attempt to fix the first set of errors

* Make transport package build

* tweaks

* More tweaks

* boo

* Fix stage

* Append the specific *.proj to the _ProjectsToBuild in eng/build.proj

* Move PackageDescription a few lines below so that TargetFramework is the first property.

* Exclude this proj from ProjectReference

* Update src/Packages/Microsoft.Internal.Extensions.DotNetApiDocs.Transport/Microsoft.Internal.Extensions.DotNetApiDocs.Transport.proj

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>

---------

Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Igor Velikorossov <igor.velikorossov@microsoft.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
* Update global.json

* Fix build

---------

Co-authored-by: Igor Velikorossov <igor.velikorossov@microsoft.com>
Place internal files appropriately

Co-authored-by: Nikita Balabaev <nbalabaev@microsoft.com>
…0231009.3 (dotnet#4547)

Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Mvc.Testing , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.Caching.StackExchangeRedis , Microsoft.Extensions.Diagnostics.HealthChecks , Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions , Microsoft.Extensions.Features , Microsoft.Extensions.Http.Polly , Microsoft.Extensions.ObjectPool
 From Version 8.0.0-rtm.23506.5 -> To Version 8.0.0-rtm.23509.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
sebastienros and others added 3 commits October 11, 2023 14:40
* Add HeaderParsing README

* Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md

Co-authored-by: Chris Ross <Tratcher@Outlook.com>

* Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md

Co-authored-by: Chris Ross <Tratcher@Outlook.com>

* Fix named argument for configuration

* Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md

Co-authored-by: Chris Ross <Tratcher@Outlook.com>

* Fix build errors

* Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md

Co-authored-by: Chris Ross <Tratcher@Outlook.com>

* Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md

Co-authored-by: Dan Moseley <danmose@microsoft.com>

* Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md

Co-authored-by: Dan Moseley <danmose@microsoft.com>

* Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md

---------

Co-authored-by: Chris Ross <Tratcher@Outlook.com>
Co-authored-by: Dan Moseley <danmose@microsoft.com>
…0231010.7 (dotnet#4551)

Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Mvc.Testing , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.Caching.StackExchangeRedis , Microsoft.Extensions.Diagnostics.HealthChecks , Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions , Microsoft.Extensions.Features , Microsoft.Extensions.Http.Polly , Microsoft.Extensions.ObjectPool
 From Version 8.0.0-rtm.23509.3 -> To Version 8.0.0-rtm.23510.7

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@RussKie RussKie force-pushed the merge/release/8.0-to-main branch from 1f1261a to 91a4d41 Compare October 12, 2023 01:23
@RussKie
Copy link
Contributor

RussKie commented Oct 12, 2023

@rafal-mz could you please help me? There were merge conflicts related to #4362, which I tried to resolve, but I clearly didn't resolve those correctly.

sebastienros and others added 5 commits October 12, 2023 10:05
* Fix FakeTimeProvider namespace, add readme

* More namespaces

* get set

* Revert "More namespaces"

This reverts commit c6ff1a3.


Revert "Fix FakeTimeProvider namespace, add readme"

This reverts commit 3e4e2fc.

# Conflicts:
#	src/Libraries/Microsoft.Extensions.TimeProvider.Testing/README.md

* Standardize
* Add Diagnostics.Middleware readme

* Feedback

* Standardize
* Update Parser.cs

* Create NoNamespace test file

* Update test/Generators/Microsoft.Gen.EnumStrings/TestClasses/NoNamespace.cs

* Update test/Generators/Microsoft.Gen.EnumStrings/TestClasses/NoNamespace.cs
* Removing the XXHash3Redactor

* Addressing Feedback

---------

Co-authored-by: Jose Perez Rodriguez <joperezr@microsoft.com>
@eerhardt
Copy link
Member

@rafal-mz - any updates here? Can you help unblock this PR?

carlossanlop and others added 7 commits October 16, 2023 10:02
…005.1 (dotnet#4569)

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23505.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Martin Taillefer <mataille@microsoft.com>
@Tratcher
Copy link
Member

Tratcher commented Oct 19, 2023

dotnet/installer#17581 should fix this. We'll need to pull a new SDK.

@xakep139
Copy link
Contributor

dotnet/installer#17581 should fix this. We'll need to pull a new SDK.

@RussKie do we have to do that manually?

@Tratcher
Copy link
Member

@xakep139 should be fixed now.

@Tratcher Tratcher removed the blocked label Oct 23, 2023
@Tratcher
Copy link
Member

Oh, restore is broken in this build...

  Determining projects to restore...
  Unhandled exception: System.AggregateException: One or more errors occurred. (The process cannot access the file 'C:\
  Users\chrross\AppData\Local\Temp\590af33f-98ef-43fe-89e6-7b475e5d69e4\project.assets.json' because it is being used b
  y another process.) (The process cannot access the file 'C:\Users\chrross\AppData\Local\Temp\590af33f-98ef-43fe-89e6-
  7b475e5d69e4\project.assets.json' because it is being used by another process.)
   ---> System.IO.IOException: The process cannot access the file 'C:\Users\chrross\AppData\Local\Temp\590af33f-98ef-43
  fe-89e6-7b475e5d69e4\project.assets.json' because it is being used by another process.
     at Microsoft.Win32.SafeHandles.SafeFileHandle.CreateFile(String fullPath, FileMode mode, FileAccess access, FileSh
  are share, FileOptions options)
     at Microsoft.Win32.SafeHandles.SafeFileHandle.Open(String fullPath, FileMode mode, FileAccess access, FileShare sh
  are, FileOptions options, Int64 preallocationSize, Nullable`1 unixCreateMode)
     at System.IO.Strategies.OSFileStreamStrategy..ctor(String path, FileMode mode, FileAccess access, FileShare share,
   FileOptions options, Int64 preallocationSize, Nullable`1 unixCreateMode)
     at System.IO.Strategies.FileStreamHelpers.ChooseStrategyCore(String path, FileMode mode, FileAccess access, FileSh
  are share, FileOptions options, Int64 preallocationSize, Nullable`1 unixCreateMode)
     at System.IO.FileStream..ctor(String path, FileMode mode, FileAccess access, FileShare share)
     at NuGet.ProjectModel.LockFileFormat.Write(String filePath, LockFile lockFile)
     at Microsoft.DotNet.Cli.ToolPackage.ToolPackageDownloader.CreateAssetFile(PackageId packageId, NuGetVersion versio
  n, DirectoryPath packagesRootPath, DirectoryPath assetFileDirectory, String runtimeJsonGraph, String targetFramework)
     at Microsoft.DotNet.Cli.ToolPackage.ToolPackageDownloader.<>c__DisplayClass8_0.<InstallPackage>b__0()
     at Microsoft.DotNet.Cli.TransactionalAction.Run[T](Func`1 action, Action commit, Action rollback)
     at Microsoft.DotNet.Tools.Tool.Restore.ToolRestoreCommand.InstallPackages(ToolManifestPackage package, Nullable`1
  configFile)
     at Microsoft.DotNet.Tools.Tool.Restore.ToolRestoreCommand.<>c__DisplayClass10_0.<Execute>b__0(ToolManifestPackage
  package)
     at System.Linq.Parallel.SelectQueryOperator`2.SelectQueryOperatorResults.GetElement(Int32 index)
     at System.Linq.Parallel.QueryResults`1.get_Item(Int32 index)
     at System.Linq.Parallel.PartitionedDataSource`1.ListContiguousIndexRangeEnumerator.MoveNext(T& currentElement, Int
  32& currentKey)
     at System.Linq.Parallel.StopAndGoSpoolingTask`2.SpoolingWork()
     at System.Linq.Parallel.SpoolingTaskBase.Work()
     at System.Linq.Parallel.QueryTask.BaseWork(Object unused)
     at System.Threading.ExecutionContext.RunFromThreadPoolDispatchLoop(Thread threadPoolThread, ExecutionContext execu
  tionContext, ContextCallback callback, Object state)
  --- End of stack trace from previous location ---
     at System.Threading.ExecutionContext.RunFromThreadPoolDispatchLoop(Thread threadPoolThread, ExecutionContext execu
  tionContext, ContextCallback callback, Object state)
     at System.Threading.Tasks.Task.ExecuteWithThreadLocal(Task& currentTaskSlot, Thread threadPoolThread)
     --- End of inner exception stack trace ---
     at System.Linq.Parallel.QueryTaskGroupState.QueryEnd(Boolean userInitiatedDispose)
     at System.Linq.Parallel.SpoolingTask.SpoolStopAndGo[TInputOutput,TIgnoreKey](QueryTaskGroupState groupState, Parti
  tionedStream`2 partitions, SynchronousChannel`1[] channels, TaskScheduler taskScheduler)
     at System.Linq.Parallel.DefaultMergeHelper`2.System.Linq.Parallel.IMergeHelper<TInputOutput>.Execute()
     at System.Linq.Parallel.MergeExecutor`1.Execute()
     at System.Linq.Parallel.MergeExecutor`1.Execute[TKey](PartitionedStream`2 partitions, Boolean ignoreOutput, Parall
  elMergeOptions options, TaskScheduler taskScheduler, Boolean isOrdered, CancellationState cancellationState, Int32 qu
  eryId)
     at System.Linq.Parallel.PartitionedStreamMerger`1.Receive[TKey](PartitionedStream`2 partitionedStream)
     at System.Linq.Parallel.UnaryQueryOperator`2.UnaryQueryOperatorResults.GivePartitionedStream(IPartitionedStreamRec
  ipient`1 recipient)
     at System.Linq.Parallel.QueryOperator`1.ExecuteAndGetResultsAsArray()
     at System.Linq.ParallelEnumerable.ToArray[TSource](ParallelQuery`1 source)
     at Microsoft.DotNet.Tools.Tool.Restore.ToolRestoreCommand.Execute()
     at System.CommandLine.Invocation.InvocationPipeline.Invoke(ParseResult parseResult)
     at Microsoft.DotNet.Cli.Program.ProcessArgs(String[] args, TimeSpan startupTime, ITelemetry telemetryClient)
   ---> (Inner Exception #1) System.IO.IOException: The process cannot access the file 'C:\Users\chrross\AppData\Local\
  Temp\590af33f-98ef-43fe-89e6-7b475e5d69e4\project.assets.json' because it is being used by another process.
     at Microsoft.Win32.SafeHandles.SafeFileHandle.CreateFile(String fullPath, FileMode mode, FileAccess access, FileSh
  are share, FileOptions options)
     at Microsoft.Win32.SafeHandles.SafeFileHandle.Open(String fullPath, FileMode mode, FileAccess access, FileShare sh
  are, FileOptions options, Int64 preallocationSize, Nullable`1 unixCreateMode)
     at System.IO.Strategies.OSFileStreamStrategy..ctor(String path, FileMode mode, FileAccess access, FileShare share,
   FileOptions options, Int64 preallocationSize, Nullable`1 unixCreateMode)
     at System.IO.Strategies.FileStreamHelpers.ChooseStrategyCore(String path, FileMode mode, FileAccess access, FileSh
  are share, FileOptions options, Int64 preallocationSize, Nullable`1 unixCreateMode)
     at System.IO.FileStream..ctor(String path, FileMode mode, FileAccess access, FileShare share)
     at NuGet.ProjectModel.LockFileFormat.Write(String filePath, LockFile lockFile)
     at Microsoft.DotNet.Cli.ToolPackage.ToolPackageDownloader.CreateAssetFile(PackageId packageId, NuGetVersion versio
  n, DirectoryPath packagesRootPath, DirectoryPath assetFileDirectory, String runtimeJsonGraph, String targetFramework)
     at Microsoft.DotNet.Cli.ToolPackage.ToolPackageDownloader.<>c__DisplayClass8_0.<InstallPackage>b__0()
     at Microsoft.DotNet.Cli.TransactionalAction.Run[T](Func`1 action, Action commit, Action rollback)
     at Microsoft.DotNet.Tools.Tool.Restore.ToolRestoreCommand.InstallPackages(ToolManifestPackage package, Nullable`1
  configFile)
     at Microsoft.DotNet.Tools.Tool.Restore.ToolRestoreCommand.<>c__DisplayClass10_0.<Execute>b__0(ToolManifestPackage
  package)
     at System.Linq.Parallel.SelectQueryOperator`2.SelectQueryOperatorResults.GetElement(Int32 index)
     at System.Linq.Parallel.QueryResults`1.get_Item(Int32 index)
     at System.Linq.Parallel.PartitionedDataSource`1.ListContiguousIndexRangeEnumerator.MoveNext(T& currentElement, Int
  32& currentKey)
     at System.Linq.Parallel.StopAndGoSpoolingTask`2.SpoolingWork()
     at System.Linq.Parallel.SpoolingTaskBase.Work()
     at System.Linq.Parallel.QueryTask.BaseWork(Object unused)
     at System.Threading.ExecutionContext.RunFromThreadPoolDispatchLoop(Thread threadPoolThread, ExecutionContext execu
  tionContext, ContextCallback callback, Object state)
  --- End of stack trace from previous location ---
     at System.Threading.ExecutionContext.RunFromThreadPoolDispatchLoop(Thread threadPoolThread, ExecutionContext execu
  tionContext, ContextCallback callback, Object state)
     at System.Threading.Tasks.Task.ExecuteWithThreadLocal(Task& currentTaskSlot, Thread threadPoolThread)<---

D:\.nuget\packages\microsoft.dotnet.arcade.sdk\9.0.0-beta.23510.4\tools\Tools.proj(56,5): error MSB3073: The command ""
D:\git\extensions\.dotnet\dotnet.exe" tool restore" exited with code 1.

@RussKie
Copy link
Contributor

RussKie commented Oct 23, 2023

This failure is the one where multiple tools in a dotnet-tools.json file causes a concurrent access issue - was fixed in 8.0 by dotnet/sdk#35884. @JL03-Yue has that fix been ported to main yet?

@Tratcher Tratcher mentioned this pull request Oct 27, 2023
@Tratcher
Copy link
Member

Now blocked by a different SDK issue being investigated independently: #4606

@RussKie
Copy link
Contributor

RussKie commented Oct 29, 2023

Now blocked by a different SDK issue being investigated independently: #4606

A never-ending story, hah...

@Tratcher Tratcher removed the blocked label Nov 8, 2023
@Tratcher Tratcher self-assigned this Nov 8, 2023
@Tratcher Tratcher merged commit e03de28 into dotnet:main Nov 8, 2023
@ghost ghost added this to the 9.0-preview1 milestone Nov 8, 2023
@sebastienros
Copy link
Member

The extensions/src/Libraries/Microsoft.AspNetCore.AsyncState /README.md file didn't get updated. Will it be in a next PR?

@Tratcher
Copy link
Member

Tratcher commented Nov 9, 2023

Yes, I'd expect another merge PR now that this one finally went through. It might not trigger until we merge into release/8.0 again. We could also do it manually.

@RussKie
Copy link
Contributor

RussKie commented Nov 9, 2023

@wtgodbe do you know if the automated release/8.0->main merge is still active for this repo?

@Tratcher
Copy link
Member

Tratcher commented Nov 9, 2023

I started a manual merge PR: #4689. Anyone want to work on merge conflicts? 😆

@RussKie
Copy link
Contributor

RussKie commented Nov 9, 2023

I started a manual merge PR: #4689. Anyone want to work on merge conflicts? 😆

I'll have a go at those, at least as far as obvious ones.

@wtgodbe
Copy link
Member

wtgodbe commented Nov 9, 2023

do you know if the automated release/8.0->main merge is still active for this repo?

It is - Chris' comment above yours is correct, the next commit into 8.0 will trigger another PR being opened.

@github-actions github-actions bot locked and limited conversation to collaborators Dec 9, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.