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.

Sign up for GitHub

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

Jump to bottom

Merging main into feature/egressExtension #2673

Merged
merged 445 commits into from
Oct 13, 2022
Merged

Merging main into feature/egressExtension #2673

merged 445 commits into from
Oct 13, 2022

Conversation

kkeirstead
Copy link
Member

Summary

The feature/egressExtension branch is stale from inactivity; before integrating new changes into the branch from my dev branch, this brings the branch up to date with the past few months of work. Some manual changes were required due to merge conflicts, updated packages, and new features to egress (such as the metadata work).

Release Notes Entry

jander-msft and others added 30 commits August 9, 2022 09:46
@jander-msft
Skip CollectionRuleDescriptionPipeline_ExecutingAction test (dotnet#2278
ac10650 
)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
551374a 
…808.3 (dotnet#2280)

[main] Update dependencies from dotnet/arcade
@schmittjoseph
Update fabricbot.json (dotnet#2283)
af9ed58
@dotnet-maestro
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
fad9118 
…0220810.1 (dotnet#2288)

[main] Update dependencies from dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rc.1.22402.10 to 7.0.0-rc.1.22408.9 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22402.10 to 7.0.0-rc.1.22408.9 (parent: VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0)
@kkeirstead
Update releases.md (dotnet#2289)
158c4ed
@dotnet-maestro
Update dependencies from https://github.com/dotnet/diagnostics build …
53dff82 
…20220809.1 (dotnet#2287)

[main] Update dependencies from dotnet/diagnostics
@schmittjoseph
Update fabricbot.json (dotnet#2292)
0e544da
@dotnet-maestro
Update dependencies from https://github.com/dotnet/diagnostics build …
8b7233b 
…20220810.1 (dotnet#2295)

[main] Update dependencies from dotnet/diagnostics
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
2a38f8c 
…810.3 (dotnet#2296)

[main] Update dependencies from dotnet/arcade
@kkeirstead
AKS Video Samples (dotnet#2293)
d3e2bbf
@schmittjoseph
Disallow synchronous IO on output streams by default (dotnet#2291)
499ab55
@dotnet-maestro
Update dependencies from https://github.com/dotnet/diagnostics build …
3d059ba 
…20220811.1 (dotnet#2299)

[main] Update dependencies from dotnet/diagnostics
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
0011482 
…811.2 (dotnet#2300)

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 7.0.0-beta.22410.3 -> To Version 7.0.0-beta.22411.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
[main] Update dependencies from dotnet/aspnetcore (dotnet#2297)
7c0cc02 
* Update dependencies from https://github.com/dotnet/aspnetcore build 20220810.20

Microsoft.AspNetCore.App.Runtime.win-x64 , VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22410.1 -> To Version 7.0.0-rc.1.22410.20

Dependency coherency updates

Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22408.9 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.AspNetCore.App.Runtime.win-x64

* Update dependencies from https://github.com/dotnet/aspnetcore build 20220812.1

Microsoft.AspNetCore.App.Runtime.win-x64 , VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22410.1 -> To Version 7.0.0-rc.1.22412.1

Dependency coherency updates

Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22408.9 -> To Version 7.0.0-rc.1.22410.9 (parent: Microsoft.AspNetCore.App.Runtime.win-x64

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
06168d8 
…0220812.22 (dotnet#2304)

[main] Update dependencies from dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rc.1.22410.9 to 7.0.0-rc.1.22411.12 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22410.9 to 7.0.0-rc.1.22411.12 (parent: VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
0ff4d2b 
…0220813.3 (dotnet#2308)

[main] Update dependencies from dotnet/aspnetcore
@dotnet-maestro
Update dependencies from https://github.com/dotnet/diagnostics build …
fb27a6b 
…20220812.1 (dotnet#2309)

[main] Update dependencies from dotnet/diagnostics
@dotnet-maestro
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
8d791c9 
…0220814.2 (dotnet#2310)

[main] Update dependencies from dotnet/aspnetcore
@jander-msft
Update comments (dotnet#2311)
b8c2ce1
@kkeirstead
Miscellaneous Fixes (dotnet#2313)
9773050
@dotnet-maestro
Update dependencies from https://github.com/dotnet/symstore build 202…
c710d8f 
…20815.1 (dotnet#2319)

[main] Update dependencies from dotnet/symstore
@dotnet-maestro
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
b013900 
…0220815.25 (dotnet#2320)

[main] Update dependencies from dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rc.1.22411.12 to 7.0.0-rc.1.22414.6 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22411.12 to 7.0.0-rc.1.22414.6 (parent: VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/diagnostics build …
529d19d 
…20220815.1 (dotnet#2318)

[main] Update dependencies from dotnet/diagnostics
@schmittjoseph
Fix broken markdown links and add automation to validate new links (d…
7171835 
…otnet#2298)
@schmittjoseph
Support restrictive sas tokens (dotnet#2322)
730459e
@jander-msft
Update runtimes and SDK to latest (dotnet#2284)
c6215f4
@schmittjoseph
Add GitHub Codespaces integration (dotnet#2294)
97119b5
@dotnet-maestro
Update dependencies from https://github.com/dotnet/diagnostics build …
76a2aef 
…20220816.1 (dotnet#2328)

[main] Update dependencies from dotnet/diagnostics
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
5c83e3d 
…816.5 (dotnet#2329)

[main] Update dependencies from dotnet/arcade
@dotnet-maestro
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
100c522 
…0220817.1 (dotnet#2330)

[main] Update dependencies from dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rc.1.22414.6 to 7.0.0-rc.1.22416.3 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22414.6 to 7.0.0-rc.1.22416.3 (parent: VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0)
kkeirstead and others added 14 commits October 11, 2022 07:03
@kkeirstead
Add "Was This Helpful" Buttons (Part 3) (dotnet#2597)
7f15ce9
@kkeirstead
Add "Was This Helpful" Actions (Part 2) (dotnet#2569)
c9d6cca
@kkeirstead
Merged main into egress extension; builds, but not tested
bc6aa8b
@dotnet-maestro
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
fd2eedd 
…0221010.6 (dotnet#2653)

[main] Update dependencies from dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rtm.22504.4 to 7.0.0-rtm.22507.1 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22504.4 to 7.0.0-rtm.22507.1 (parent: VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/diagnostics build …
196d12c 
…20221010.1 (dotnet#2652)

[main] Update dependencies from dotnet/diagnostics
@schmittjoseph
Update release versions (dotnet#2656)
9b28b70
@dependabot
Bump actions/github-script from 6.3.1 to 6.3.2 (dotnet#2659)
fefea42
@schmittjoseph
Add support for a StoppingEvent on CollectTrace action (dotnet#2557)
1449f49
@schmittjoseph
Enable docker-in-docker support in codespaces (dotnet#2660)
fecad8a
@schmittjoseph
Add automation to generate release notes (dotnet#2608)
8da92f0
@schmittjoseph
Add automation to manage release version information (dotnet#2624)
6baccb5
@schmittjoseph
Update release process documentation (dotnet#2650)
2eabe2e
@dotnet-maestro
Update dependencies from https://github.com/dotnet/diagnostics build …
d0ec314 
…20221011.1 (dotnet#2668)

[main] Update dependencies from dotnet/diagnostics
@kkeirstead
Some merge fixes to get dotnet monitor building and working again
5b1d370
@kkeirstead kkeirstead requested review from a team and IEvangelist as code owners October 12, 2022 15:31
jander-msft
jander-msft previously approved these changes Oct 12, 2022
View reviewed changes
@kkeirstead kkeirstead merged commit f83894c into dotnet:feature/egressExtension Oct 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jander-msft jander-msft jander-msft approved these changes

@IEvangelist IEvangelist Awaiting requested review from IEvangelist

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@kkeirstead @jander-msft @schmittjoseph @wiktork @MattGal @michellemcdaniel