From a2330f20faa656989d48439c78ebb95f6010626a Mon Sep 17 00:00:00 2001
From: Marty Tippin <120425148+tippmar-nr@users.noreply.github.com>
Date: Wed, 15 Jan 2025 09:15:00 -0600
Subject: [PATCH 1/4] chore: Typo in packageInfo.json

---
 .../scripts/nugetSlackNotifications/packageInfo.json          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/scripts/nugetSlackNotifications/packageInfo.json b/.github/workflows/scripts/nugetSlackNotifications/packageInfo.json
index 006f0b7b7..86c95ad43 100644
--- a/.github/workflows/scripts/nugetSlackNotifications/packageInfo.json
+++ b/.github/workflows/scripts/nugetSlackNotifications/packageInfo.json
@@ -122,10 +122,10 @@
         "packageName": "nservicebus"
     },
     {
-        "packageName": "orcacle.manageddataaccess"
+        "packageName": "oracle.manageddataaccess"
     },
     {
-        "packageName": "orcacle.manageddataaccess.core"
+        "packageName": "oracle.manageddataaccess.core"
     },
     {
         "packageName": "rabbitmq.client",

From c951f3a0b659b884786928a639a6daff24c0048b Mon Sep 17 00:00:00 2001
From: Marty Tippin <120425148+tippmar-nr@users.noreply.github.com>
Date: Wed, 15 Jan 2025 09:24:09 -0600
Subject: [PATCH 2/4] Logic update, WIP

---
 .../scripts/nugetSlackNotifications/Program.cs        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/scripts/nugetSlackNotifications/Program.cs b/.github/workflows/scripts/nugetSlackNotifications/Program.cs
index dfacde909..721e090e3 100644
--- a/.github/workflows/scripts/nugetSlackNotifications/Program.cs
+++ b/.github/workflows/scripts/nugetSlackNotifications/Program.cs
@@ -238,10 +238,14 @@ static async Task<string> CreateGithubPullRequestForNewVersions(IEnumerable<Proj
                 var tokenAuth = new Credentials(_githubToken);
                 ghClient.Credentials = tokenAuth;
 
+                // create a new branch
                 var masterReference = await ghClient.Git.Reference.Get(Owner, Repo, "heads/main");
                 var branchName = $"dotty/test-updates-{DateTime.Now.ToString("yyyy-MMM-dd")}";
                 var newBranch = new NewReference($"refs/heads/{branchName}", masterReference.Object.Sha);
                 await ghClient.Git.Reference.Create(Owner, Repo, newBranch);
+                Log.Information($"Successfully created {branchName} branch.");
+
+                // commit changes to the branch
                 var latestCommit = await ghClient.Git.Commit.Get(Owner, Repo, masterReference.Object.Sha);
                 var nt = new NewTree { BaseTree = latestCommit.Tree.Sha };
                 foreach (var projectInfo in projectInfos)
@@ -255,10 +259,13 @@ static async Task<string> CreateGithubPullRequestForNewVersions(IEnumerable<Proj
                         Content = string.Join('\n', await File.ReadAllLinesAsync(Path.Combine(_searchRootPath, projectInfo.ProjectFile)))
                     });
                 }
-
                 var commitMessage = "test: Dotty instrumentation library updates for " + DateTime.Now.ToString("yyyy-MMM-dd");
-                Log.Information($"Successfully created {branchName} branch.");
+                var newTree = await ghClient.Git.Tree.Create(Owner, Repo, nt);
+                var newCommit = new NewCommit(commitMessage, newTree.Sha, masterReference.Object.Sha);
+                var commit = await ghClient.Git.Commit.Create(Owner, Repo, newCommit);
+                await ghClient.Git.Reference.Update(Owner, Repo, $"heads/{branchName}", new ReferenceUpdate(commit.Sha));
 
+                // create PR
                 var newPr = new NewPullRequest(commitMessage, branchName, "main");
                 newPr.Body = "Dotty updated the following for your convenience.\n\n" + updateLog + "\n\n**Don't forget to update the .NET Compatibility docs:docs: with the new versions!**\n";
                 var pullRequest = await ghClient.PullRequest.Create(Owner, Repo, newPr);

From 9c13a945c4c621d1460f2713e44d68bdeee50b18 Mon Sep 17 00:00:00 2001
From: Marty Tippin <120425148+tippmar-nr@users.noreply.github.com>
Date: Wed, 15 Jan 2025 09:49:24 -0600
Subject: [PATCH 3/4] * added ignoreTFMs config for packageInfo * fixed bug in
 creating new PR, probably related to OctoKit major version bump

---
 .../scripts/nugetSlackNotifications/CsprojHandler.cs   |  4 ++--
 .../nugetSlackNotifications/NugetVersionData.cs        |  5 ++++-
 .../scripts/nugetSlackNotifications/PackageInfo.cs     |  2 ++
 .../nugetSlackNotifications/PackageReference.cs        |  5 +----
 .../scripts/nugetSlackNotifications/Program.cs         | 10 +++++-----
 .../scripts/nugetSlackNotifications/packageInfo.json   |  4 +++-
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/scripts/nugetSlackNotifications/CsprojHandler.cs b/.github/workflows/scripts/nugetSlackNotifications/CsprojHandler.cs
index b4aa59eb5..ec4d67ad0 100644
--- a/.github/workflows/scripts/nugetSlackNotifications/CsprojHandler.cs
+++ b/.github/workflows/scripts/nugetSlackNotifications/CsprojHandler.cs
@@ -36,9 +36,9 @@ public static async Task<List<string>> UpdatePackageReferences(string csprojPath
 
                 foreach (var package in matchingPackages)
                 {
-                    if (package.VersionAsVersion < versionData.NewVersionAsVersion && package.Pin)
+                    if (package.VersionAsVersion < versionData.NewVersionAsVersion && !string.IsNullOrEmpty(versionData.IgnoreTfMs) && versionData.IgnoreTfMs.Split(",").Contains(package.TargetFramework))
                     {
-                        Log.Warning($"Not updating {package.Include} for {package.TargetFramework}, it is pinned to {package.Version}.  Manual verification recommended.");
+                        Log.Warning($"Not updating {package.Include} for {package.TargetFramework}, this TFM is ignored.  Manual verification recommended.");
                         continue;
                     }
 
diff --git a/.github/workflows/scripts/nugetSlackNotifications/NugetVersionData.cs b/.github/workflows/scripts/nugetSlackNotifications/NugetVersionData.cs
index 1ac092872..30b624fb8 100644
--- a/.github/workflows/scripts/nugetSlackNotifications/NugetVersionData.cs
+++ b/.github/workflows/scripts/nugetSlackNotifications/NugetVersionData.cs
@@ -10,8 +10,10 @@ public class NugetVersionData
         public Version NewVersionAsVersion { get; set; }
         public string Url { get; set; }
         public DateTime PublishDate { get; set; }
+        public string IgnoreTfMs { get; }
 
-        public NugetVersionData(string packageName, string oldVersion, string newVersion, string url, DateTime publishDate)
+        public NugetVersionData(string packageName, string oldVersion, string newVersion, string url,
+            DateTime publishDate, string ignoreTfMs)
         {
             PackageName = packageName;
             OldVersion = oldVersion;
@@ -19,6 +21,7 @@ public NugetVersionData(string packageName, string oldVersion, string newVersion
             NewVersionAsVersion = new Version(newVersion);
             Url = url;
             PublishDate = publishDate;
+            IgnoreTfMs = ignoreTfMs;
         }
     }
 }
diff --git a/.github/workflows/scripts/nugetSlackNotifications/PackageInfo.cs b/.github/workflows/scripts/nugetSlackNotifications/PackageInfo.cs
index dc0c93556..572a513f1 100644
--- a/.github/workflows/scripts/nugetSlackNotifications/PackageInfo.cs
+++ b/.github/workflows/scripts/nugetSlackNotifications/PackageInfo.cs
@@ -14,5 +14,7 @@ public class PackageInfo
         public bool IgnoreMajor { get; set; }
         [JsonPropertyName("ignoreReason")]
         public string IgnoreReason {get; set;}
+        [JsonPropertyName("ignoreTFMs")]
+        public string IgnoreTFMs { get; set; }
     }
 }
diff --git a/.github/workflows/scripts/nugetSlackNotifications/PackageReference.cs b/.github/workflows/scripts/nugetSlackNotifications/PackageReference.cs
index 06235055f..bdec52593 100644
--- a/.github/workflows/scripts/nugetSlackNotifications/PackageReference.cs
+++ b/.github/workflows/scripts/nugetSlackNotifications/PackageReference.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text.RegularExpressions;
 using System.Xml.Serialization;
 
@@ -33,8 +33,5 @@ public string TargetFramework
                 return match.Success ? match.Value : null;
             }
         }
-
-        [XmlAttribute]
-        public bool Pin { get; set; }
     }
 }
diff --git a/.github/workflows/scripts/nugetSlackNotifications/Program.cs b/.github/workflows/scripts/nugetSlackNotifications/Program.cs
index 721e090e3..9b959d239 100644
--- a/.github/workflows/scripts/nugetSlackNotifications/Program.cs
+++ b/.github/workflows/scripts/nugetSlackNotifications/Program.cs
@@ -168,7 +168,7 @@ static async Task CheckPackage(PackageInfo package, PackageMetadataResource meta
                 var previousVersionDescription = previous?.Identity.Version.ToNormalizedString() ?? "Unknown";
                 var latestVersionDescription = latest.Identity.Version.ToNormalizedString();
                 Log.Information($"Package {packageName} was updated from {previousVersionDescription} to {latestVersionDescription}.");
-                _newVersions.Add(new NugetVersionData(packageName, previousVersionDescription, latestVersionDescription, latest.PackageDetailsUrl.ToString(), latest.Published.Value.Date));
+                _newVersions.Add(new NugetVersionData(packageName, previousVersionDescription, latestVersionDescription, latest.PackageDetailsUrl.ToString(), latest.Published.Value.Date, package.IgnoreTFMs));
             }
             else
             {
@@ -242,11 +242,11 @@ static async Task<string> CreateGithubPullRequestForNewVersions(IEnumerable<Proj
                 var masterReference = await ghClient.Git.Reference.Get(Owner, Repo, "heads/main");
                 var branchName = $"dotty/test-updates-{DateTime.Now.ToString("yyyy-MMM-dd")}";
                 var newBranch = new NewReference($"refs/heads/{branchName}", masterReference.Object.Sha);
-                await ghClient.Git.Reference.Create(Owner, Repo, newBranch);
+                var newBranchRef = await ghClient.Git.Reference.Create(Owner, Repo, newBranch);
                 Log.Information($"Successfully created {branchName} branch.");
 
-                // commit changes to the branch
-                var latestCommit = await ghClient.Git.Commit.Get(Owner, Repo, masterReference.Object.Sha);
+                // commit changes to the newly created branch
+                var latestCommit = await ghClient.Git.Commit.Get(Owner, Repo, newBranchRef.Object.Sha);
                 var nt = new NewTree { BaseTree = latestCommit.Tree.Sha };
                 foreach (var projectInfo in projectInfos)
                 {
@@ -261,7 +261,7 @@ static async Task<string> CreateGithubPullRequestForNewVersions(IEnumerable<Proj
                 }
                 var commitMessage = "test: Dotty instrumentation library updates for " + DateTime.Now.ToString("yyyy-MMM-dd");
                 var newTree = await ghClient.Git.Tree.Create(Owner, Repo, nt);
-                var newCommit = new NewCommit(commitMessage, newTree.Sha, masterReference.Object.Sha);
+                var newCommit = new NewCommit(commitMessage, newTree.Sha, newBranchRef.Object.Sha);
                 var commit = await ghClient.Git.Commit.Create(Owner, Repo, newCommit);
                 await ghClient.Git.Reference.Update(Owner, Repo, $"heads/{branchName}", new ReferenceUpdate(commit.Sha));
 
diff --git a/.github/workflows/scripts/nugetSlackNotifications/packageInfo.json b/.github/workflows/scripts/nugetSlackNotifications/packageInfo.json
index 86c95ad43..21dc56102 100644
--- a/.github/workflows/scripts/nugetSlackNotifications/packageInfo.json
+++ b/.github/workflows/scripts/nugetSlackNotifications/packageInfo.json
@@ -119,7 +119,9 @@
         "packageName": "nlog.extensions.logging"
     },
     {
-        "packageName": "nservicebus"
+        "packageName": "nservicebus",
+        "ignoreTFMs": "net481",
+        "ignoreReason": "net481 doesn't support v9.x"
     },
     {
         "packageName": "oracle.manageddataaccess"

From 4fa257b4038cdfe1aa172f8091b0837b6aae6cd6 Mon Sep 17 00:00:00 2001
From: Marty Tippin <120425148+tippmar-nr@users.noreply.github.com>
Date: Wed, 15 Jan 2025 10:17:43 -0600
Subject: [PATCH 4/4] emoji

---
 .github/workflows/scripts/nugetSlackNotifications/Program.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scripts/nugetSlackNotifications/Program.cs b/.github/workflows/scripts/nugetSlackNotifications/Program.cs
index 9b959d239..717b48661 100644
--- a/.github/workflows/scripts/nugetSlackNotifications/Program.cs
+++ b/.github/workflows/scripts/nugetSlackNotifications/Program.cs
@@ -267,7 +267,7 @@ static async Task<string> CreateGithubPullRequestForNewVersions(IEnumerable<Proj
 
                 // create PR
                 var newPr = new NewPullRequest(commitMessage, branchName, "main");
-                newPr.Body = "Dotty updated the following for your convenience.\n\n" + updateLog + "\n\n**Don't forget to update the .NET Compatibility docs:docs: with the new versions!**\n";
+                newPr.Body = "Dotty updated the following for your convenience.\n\n" + updateLog + "\n\n**Don't forget to update the .NET Compatibility docs:memo: with the new versions!**\n";
                 var pullRequest = await ghClient.PullRequest.Create(Owner, Repo, newPr);
                 Log.Information($"Successfully created PR for {branchName} at {pullRequest.HtmlUrl}");