From 3753c334a3e31727458591c6d8e61d992e698093 Mon Sep 17 00:00:00 2001
From: madalynrose <madparker@microsoft.com>
Date: Wed, 23 Aug 2023 10:52:22 -0400
Subject: [PATCH 1/2] pin moq to 4.18.4

---
 src/ActionsTests/ActionsTests.csproj                   |  2 +-
 src/AutomationTests/AutomationTests.csproj             |  2 +-
 src/CLITests/CLITests.csproj                           |  2 +-
 src/CoreTests/CoreTests.csproj                         |  2 +-
 src/DesktopTests/DesktopTests.csproj                   |  4 ++--
 src/MsiFileTests/MsiFileTests.csproj                   |  2 +-
 .../OldFileVersionCompatibilityTests.csproj            |  2 +-
 src/RulesTest/RulesTests.csproj                        |  2 +-
 .../SystemAbstractionsTests.csproj                     | 10 ++++------
 src/TelemetryTests/TelemetryTests.csproj               |  2 +-
 src/Win32Tests/Win32Tests.csproj                       |  2 +-
 11 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/ActionsTests/ActionsTests.csproj b/src/ActionsTests/ActionsTests.csproj
index 4fbd41745..3c5625318 100644
--- a/src/ActionsTests/ActionsTests.csproj
+++ b/src/ActionsTests/ActionsTests.csproj
@@ -12,7 +12,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
diff --git a/src/AutomationTests/AutomationTests.csproj b/src/AutomationTests/AutomationTests.csproj
index 86eace919..0d9ffcbd6 100644
--- a/src/AutomationTests/AutomationTests.csproj
+++ b/src/AutomationTests/AutomationTests.csproj
@@ -12,7 +12,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
diff --git a/src/CLITests/CLITests.csproj b/src/CLITests/CLITests.csproj
index e807a695b..4f3823a5b 100644
--- a/src/CLITests/CLITests.csproj
+++ b/src/CLITests/CLITests.csproj
@@ -16,7 +16,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
   </ItemGroup>
diff --git a/src/CoreTests/CoreTests.csproj b/src/CoreTests/CoreTests.csproj
index 856093a1a..1ff6d49e2 100644
--- a/src/CoreTests/CoreTests.csproj
+++ b/src/CoreTests/CoreTests.csproj
@@ -12,7 +12,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
diff --git a/src/DesktopTests/DesktopTests.csproj b/src/DesktopTests/DesktopTests.csproj
index 616252706..8e32a1fa7 100644
--- a/src/DesktopTests/DesktopTests.csproj
+++ b/src/DesktopTests/DesktopTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
diff --git a/src/MsiFileTests/MsiFileTests.csproj b/src/MsiFileTests/MsiFileTests.csproj
index bf6cee825..44b69e967 100644
--- a/src/MsiFileTests/MsiFileTests.csproj
+++ b/src/MsiFileTests/MsiFileTests.csproj
@@ -11,7 +11,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
diff --git a/src/OldFileVersionCompatibilityTests/OldFileVersionCompatibilityTests.csproj b/src/OldFileVersionCompatibilityTests/OldFileVersionCompatibilityTests.csproj
index 075a8b813..972dcb965 100644
--- a/src/OldFileVersionCompatibilityTests/OldFileVersionCompatibilityTests.csproj
+++ b/src/OldFileVersionCompatibilityTests/OldFileVersionCompatibilityTests.csproj
@@ -12,7 +12,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
diff --git a/src/RulesTest/RulesTests.csproj b/src/RulesTest/RulesTests.csproj
index 7b5d6f32e..3fee0ff0b 100644
--- a/src/RulesTest/RulesTests.csproj
+++ b/src/RulesTest/RulesTests.csproj
@@ -12,7 +12,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
diff --git a/src/SystemAbstractionsTests/SystemAbstractionsTests.csproj b/src/SystemAbstractionsTests/SystemAbstractionsTests.csproj
index b025482d9..b916deee4 100644
--- a/src/SystemAbstractionsTests/SystemAbstractionsTests.csproj
+++ b/src/SystemAbstractionsTests/SystemAbstractionsTests.csproj
@@ -12,7 +12,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
   </ItemGroup>
@@ -27,14 +27,12 @@
     <!-- This target could be placed in any project which references the CodeCov package -->
     
     <ItemGroup>
-      <ReferenceToCodeCovPackage Include="@(PackageReference)"
-                                 Condition="'%(Identity)' == 'Codecov'" />
+      <ReferenceToCodeCovPackage Include="@(PackageReference)" Condition="'%(Identity)' == 'Codecov'" />
     </ItemGroup>
 
-    <Error Condition="'@(ReferenceToCodeCovPackage->Count())' != '1'"  />
+    <Error Condition="'@(ReferenceToCodeCovPackage-&gt;Count())' != '1'" />
 
-    <Message Importance="high"
-             Text="##vso[task.setvariable variable=CODECOV_VERSION]%(ReferenceToCodeCovPackage.Version)" />
+    <Message Importance="high" Text="##vso[task.setvariable variable=CODECOV_VERSION]%(ReferenceToCodeCovPackage.Version)" />
   </Target>
 
 </Project>
diff --git a/src/TelemetryTests/TelemetryTests.csproj b/src/TelemetryTests/TelemetryTests.csproj
index 711df8889..38309ec6c 100644
--- a/src/TelemetryTests/TelemetryTests.csproj
+++ b/src/TelemetryTests/TelemetryTests.csproj
@@ -12,7 +12,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
diff --git a/src/Win32Tests/Win32Tests.csproj b/src/Win32Tests/Win32Tests.csproj
index 725aa84f8..68fa2ea3c 100644
--- a/src/Win32Tests/Win32Tests.csproj
+++ b/src/Win32Tests/Win32Tests.csproj
@@ -12,7 +12,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">

From 99b72c506b570df71346a8eb49f513606e38479d Mon Sep 17 00:00:00 2001
From: Bill Dengler <codeofdusk@gmail.com>
Date: Wed, 23 Aug 2023 12:59:17 -0700
Subject: [PATCH 2/2] Update Dependabot configuration

---
 .github/dependabot.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c4dc9d5de..9accb36e8 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -42,3 +42,6 @@ updates:
   - dependency-name: MSTest.TestAdapter
     versions:
     - 2.2.2
+  - dependency-name: Moq
+    versions:
+    - ">= 4.20"  # moq/moq#1372