Changes to make main branch become 8.1 #4695

joperezr · 2023-11-09T05:29:50Z

This PR is switching main to become the next 8.1 branch. Before this change, main branch used to be our 9.0 branch, but given this repo intends to ship monthly releases and wants those monthly releases the main target of development work, we decided to switch main branch to become 8.1, and to create a new dev branch which would become our 9.0 branch. In order to do all this, I followed this process:

First we merged all of the changes that were made in release/8.0 branch back to main.
Then we created a new dev branch from the tip of main, which will become our new 9.0 branch. Work that is 9.0-specific will go into this branch going forward. Here is a link to that branch: https://github.com/dotnet/extensions/tree/dev
Make it so main branch is the new 8.1 branch by having its contents completely match what we have in release/8.0 branch as we prepared for the release. This is the work included in this PR. To do this, I basically checked out main locally, deleted all of its contents and then did copy paste of all of the contents of a fresh clone of extensions release/8.0 branch. Doing so generated the changes (diff between main and release/8.0) included in this PR. Given we started of with step 1 above, it means that the diff generated on this PR is strictly changes that were done in main which were not in release/8.0 (either intentionally by making changes into main, or issues when resolving merge conflicts). The intention is to merge this PR as is, as this is the state we want for release/8.1. We can also use the diffs generated by this PR to fix bad merges that may have happened in dev branch.
Added one more commit here to do branding updates for 8.1.
Once this is merged, we will want to update dependency flow and subscriptions so that they match the new branching scheme we plan to use.

cc: @RussKie @Tratcher @sebastienros @geeknoid @martintmk @xakep139

Microsoft Reviewers: Open in CodeFlow

RussKie · 2023-11-09T06:58:11Z

.github/fabricbot.json

+    {
+      "taskType": "trigger",
+      "capabilityId": "ReleaseAnnouncement",
+      "subCapability": "ReleaseAnnouncement",
+      "version": "1.0",
+      "config": {
+        "taskName": "Release announcement",
+        "prReply": "The fix is included in ${pkgName} ${version}.",
+        "issueReply": "Fixed in ${pkgName} ${version}."
+      }
+    },


This should go, per #4688 #Resolved

RussKie · 2023-11-09T06:58:44Z

.github/fabricbot.json

-              "milestoneName": "9.0-preview1"
+              "milestoneName": "8.0 RC1"


This is not correct; it should be "8.1". #Resolved

RussKie · 2023-11-09T06:59:24Z

.github/workflows/backport.yml

@@ -1,35 +0,0 @@
-name: Backport PR to branch


Why is this removed? #Resolved

RussKie · 2023-11-09T06:59:41Z

.gitignore

@@ -38,7 +38,6 @@ bld/
 .vs/
 .build/
 .vscode
-!.vscode/settings.json


Why is this removed? #Resolved

RussKie · 2023-11-09T07:00:39Z

docs/building.md

@@ -45,8 +45,8 @@ Here are few commands that you will likely use the most:
    - `build.sh --restore`: to install the required .NET SDK, .NET tools and the toolset. This is equivalent to running `./restore.sh`.
    - `build.sh --build`: to build the solution<sup>1</sup>.
    - `build.sh --test`: to run all unit tests in the solution<sup>1</sup>.
-    - `build.sh --vs <keywords>`: to generate a "filtered" solution and save it as `SDK.sln`. It also performs the "restore" operation. Keywords can be any part of the name or path of project files you want to include. For example: `./build.sh --vs Http,Fakes,AspNetCore`.<br />


This line should be reverted #Resolved

RussKie · 2023-11-09T07:12:13Z

test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/LegacyLoggingTests.Extra.cs

@@ -92,7 +92,7 @@ static partial class Log
            new CallAnalyzer(),
            new LegacyLoggingFixer(),
            new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
-            new[] { OriginalSource, OriginalTarget });
+            new[] { OriginalSource, OriginalTarget }).ConfigureAwait(false);


revert all of these #Resolved

RussKie · 2023-11-09T07:12:41Z

test/Analyzers/Microsoft.Analyzers.Extra.Tests/Resources/RoslynTestUtils.cs

-            Assert.Fail($"Unexpected warning {actual}");
+            Assert.True(false, $"Unexpected warning {actual}");


revert #Resolved

RussKie · 2023-11-09T07:13:14Z

test/Libraries/Microsoft.AspNetCore.HeaderParsing.Tests/ParserTests.cs

        Assert.Equal(1, result.Count);
-#pragma warning restore xUnit2013 // Do not use equality check to check for collection size.


revert all these

If we are not using the new tooling though, I'm guessing these are not needed? Especially since they are just trying to silence an analyzer.

RussKie · 2023-11-09T07:13:24Z

test/Libraries/Microsoft.Extensions.Diagnostics.Testing.Tests/Metrics/MetricCollectorTests.cs

@@ -413,6 +413,6 @@ public static void Snapshot()

        snap = collector.GetMeasurementSnapshot(true);
        Assert.Equal(3, snap.Count);
-        Assert.Empty(collector.GetMeasurementSnapshot());
+        Assert.Equal(0, collector.GetMeasurementSnapshot().Count);


revert #Resolved

RussKie · 2023-11-09T07:13:47Z

...braries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LoggerMessageStateTests.cs

@@ -129,7 +129,6 @@ public static void CollectorContract()
    [Fact]
    public static void ReadOnlyListContract()
    {
-#pragma warning disable xUnit2013 // Do not use equality check to check for collection size.


revert #Resolved

joperezr · 2023-11-09T22:16:01Z

Thanks for all of the great feedback @RussKie 😃. The intent of this PR is to have it exactly match the current contents of release/8.0 (except for branding changes as we don't want builds to clash) so I'll go ahead and merge this PR as is, and will submit a follow up PR addressing all of your comments where those could be better looked at and reviewed individually. I hope that's okay with you 😃. The main rush for merging this is so that a) we don't block progress for 8.1, and b) we don't get more conflicts due to new changes coming into main branch. #Resolved

joperezr · 2023-11-10T04:55:12Z

Created #4705 which addresses the feedback from this PR.

This reverts commit 5e6ee76.

…future merges. (#4709) * Changes to make main branch become 8.1 (#4695) * Changes to make main branch become 8.1 * Branding changes for 8.1 * Revert "Changes to make main branch become 8.1 (#4695)" This reverts commit 5e6ee76.

This reverts commit 5e6ee76.

RussKie · 2023-11-13T04:51:26Z

@joperezr this doesn't look right to me:

PS> darc get-default-channels --source-repo "https://github.com/dotnet/extensions"  --verbose

(931)  https://github.com/dotnet/extensions @ release/3.1 -> .NET Core 3.1 Release
(5039) https://github.com/dotnet/extensions @ release/8.0 -> .NET 8
(5038) https://github.com/dotnet/extensions @ main -> .NET 9

The dev should be publishing to .NET 9. Should the main be publishing to .NET 8?

joperezr requested a review from RussKie November 9, 2023 05:29

ghost assigned joperezr Nov 9, 2023

RussKie requested changes Nov 9, 2023

View reviewed changes

ghost added the waiting-author-feedback 📭 The author of this issue needs to respond in order for us to continue investigating this issue. label Nov 9, 2023

joperezr added 2 commits November 9, 2023 14:11

Changes to make main branch become 8.1

bcc5930

Branding changes for 8.1

da02898

joperezr force-pushed the joperezr/Main81 branch from 1a43360 to da02898 Compare November 9, 2023 22:13

ghost removed the waiting-author-feedback 📭 The author of this issue needs to respond in order for us to continue investigating this issue. label Nov 9, 2023

geeknoid approved these changes Nov 9, 2023

View reviewed changes

joperezr merged commit 5e6ee76 into main Nov 9, 2023
6 checks passed

joperezr deleted the joperezr/Main81 branch November 9, 2023 22:36

joperezr mentioned this pull request Nov 10, 2023

Bringing back fixes that were done in main #4705

Merged

joperezr added a commit that referenced this pull request Nov 10, 2023

Revert "Changes to make main branch become 8.1 (#4695)"

adcf8b2

This reverts commit 5e6ee76.

joperezr added a commit that referenced this pull request Nov 10, 2023

Revert "Changes to make main branch become 8.1 (#4695)"

62c74d3

This reverts commit 5e6ee76.

github-actions bot locked and limited conversation to collaborators Dec 13, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Changes to make main branch become 8.1 #4695

Changes to make main branch become 8.1 #4695

joperezr commented Nov 9, 2023 •

edited

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023

joperezr Nov 10, 2023

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

joperezr commented Nov 9, 2023 •

edited

Loading

joperezr commented Nov 10, 2023

RussKie commented Nov 13, 2023

		Assert.Fail($"Unexpected warning {actual}");
		Assert.True(false, $"Unexpected warning {actual}");

		Assert.Equal(1, result.Count);
		#pragma warning restore xUnit2013 // Do not use equality check to check for collection size.

Changes to make main branch become 8.1 #4695

Changes to make main branch become 8.1 #4695

Conversation

joperezr commented Nov 9, 2023 • edited Loading

Microsoft Reviewers: Open in CodeFlow

RussKie Nov 9, 2023 • edited by joperezr Loading

Choose a reason for hiding this comment

RussKie Nov 9, 2023 • edited by joperezr Loading

Choose a reason for hiding this comment

RussKie Nov 9, 2023 • edited by joperezr Loading

Choose a reason for hiding this comment

RussKie Nov 9, 2023 • edited by joperezr Loading

Choose a reason for hiding this comment

RussKie Nov 9, 2023 • edited by joperezr Loading

Choose a reason for hiding this comment

RussKie Nov 9, 2023 • edited by joperezr Loading

Choose a reason for hiding this comment

RussKie Nov 9, 2023 • edited by joperezr Loading

Choose a reason for hiding this comment

RussKie Nov 9, 2023

Choose a reason for hiding this comment

joperezr Nov 10, 2023

Choose a reason for hiding this comment

RussKie Nov 9, 2023 • edited by joperezr Loading

Choose a reason for hiding this comment

RussKie Nov 9, 2023 • edited by joperezr Loading

Choose a reason for hiding this comment

joperezr commented Nov 9, 2023 • edited Loading

joperezr commented Nov 10, 2023

RussKie commented Nov 13, 2023

joperezr commented Nov 9, 2023 •

edited

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

RussKie Nov 9, 2023 •

edited by joperezr

Loading

joperezr commented Nov 9, 2023 •

edited

Loading