From b3f3c6ab3d42606d1ec84471b9a526801925b9a9 Mon Sep 17 00:00:00 2001
From: Mark Ridgwell <credfeto@users.noreply.github.com>
Date: Wed, 3 Jan 2024 08:29:50 +0000
Subject: [PATCH 1/2] Test

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5f9c406..00984821 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
 - Dependencies - Updated FunFair.Test.Common to 6.1.27.296
 - Dependencies - Updated Meziantou.Analyzer to 2.0.132
 ### Removed
+- Nothing
 ### Deployment Changes
 
 <!--

From 8e271e015a2be7384b4d7c35d03f7e49a24c417a Mon Sep 17 00:00:00 2001
From: Mark Ridgwell <credfeto@users.noreply.github.com>
Date: Mon, 15 Jan 2024 14:34:21 +0000
Subject: [PATCH 2/2] Fixed code analysis issues

---
 CHANGELOG.md                                  |  2 ++
 .../Implementations/HashedContentOptimizer.cs | 24 ++++---------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00984821..4b2d1b13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
 - Dependencies - Updated Nullable.Extended.Analyzer to 1.15.6169
 - Dependencies - Updated FunFair.Test.Common to 6.1.27.296
 - Dependencies - Updated Meziantou.Analyzer to 2.0.132
+- SDK - Updated DotNet SDK to 8.0.101
+### Removed
 ### Removed
 - Nothing
 ### Deployment Changes
diff --git a/src/Experiments/Implementations/HashedContentOptimizer.cs b/src/Experiments/Implementations/HashedContentOptimizer.cs
index 17193b4a..aede9df4 100644
--- a/src/Experiments/Implementations/HashedContentOptimizer.cs
+++ b/src/Experiments/Implementations/HashedContentOptimizer.cs
@@ -167,9 +167,7 @@ private static void EnsureFolderExists(string destinationPath)
         }
     }
 
-    private void ChangeReferencesInNonRenamableTextFiles(IReadOnlyList<StrippedFile> fixedNameTextFiles,
-                                                         Dictionary<string, string> textFiles,
-                                                         Dictionary<string, string> fileHashes)
+    private void ChangeReferencesInNonRenamableTextFiles(IReadOnlyList<StrippedFile> fixedNameTextFiles, Dictionary<string, string> textFiles, Dictionary<string, string> fileHashes)
     {
         this._logger.LogInformation("Changing references in non-renamable text files");
 
@@ -289,7 +287,7 @@ private void ReplaceTextFilesInRenamableTextFiles(IReadOnlyList<StrippedFile> re
 
                 foreach (StrippedFile referencedFile in renamableTextFiles)
                 {
-                    if (referencedFile.Path == file.Path)
+                    if (StringComparer.Ordinal.Equals(x: referencedFile.Path, y: file.Path))
                     {
                         continue;
                     }
@@ -349,11 +347,7 @@ private void AddRemainingRenamableFiles(IReadOnlyList<StrippedFile> renamableTex
         }
     }
 
-    private void MakeReplacement(IReadOnlyList<StrippedFile> renamableTextFiles,
-                                 Dictionary<string, string> fileHashes,
-                                 Dictionary<string, string> textFiles,
-                                 StrippedFile file,
-                                 string newHashedPath)
+    private void MakeReplacement(IReadOnlyList<StrippedFile> renamableTextFiles, Dictionary<string, string> fileHashes, Dictionary<string, string> textFiles, StrippedFile file, string newHashedPath)
     {
         foreach (StrippedFile referencing in renamableTextFiles)
         {
@@ -366,11 +360,7 @@ private void MakeReplacement(IReadOnlyList<StrippedFile> renamableTextFiles,
             string newRelative = PathHelpers.GetRelativePath(documentFullPath: referencing.Path, referencedFileFullPath: newHashedPath);
             string referencingContent = textFiles[referencing.Path];
 
-            bool changed = this.ChangeContent(relative: relativeInReferencing,
-                                              newRelative: newRelative,
-                                              hashedFilePath: file.Path,
-                                              newHashedPath: newHashedPath,
-                                              content: ref referencingContent);
+            bool changed = this.ChangeContent(relative: relativeInReferencing, newRelative: newRelative, hashedFilePath: file.Path, newHashedPath: newHashedPath, content: ref referencingContent);
 
             if (changed)
             {
@@ -426,11 +416,7 @@ private void ReplaceBinaryFilesInTextFiles(IReadOnlyList<StrippedFile> renamable
                     string relative = PathHelpers.GetRelativePath(documentFullPath: file.Path, referencedFileFullPath: binaryFile.Path);
                     string newRelative = string.Concat(relative.AsSpan(start: 0, relative.Length - binaryFile.FileName.Length), str1: hashedBinary);
 
-                    hasChange |= this.ChangeContent(relative: relative,
-                                                    newRelative: newRelative,
-                                                    hashedFilePath: binaryFile.Path,
-                                                    newHashedPath: hashedBinary,
-                                                    content: ref content);
+                    hasChange |= this.ChangeContent(relative: relative, newRelative: newRelative, hashedFilePath: binaryFile.Path, newHashedPath: hashedBinary, content: ref content);
                 }
 
                 if (hasChange)