Some code clean up (#243)

* Some code clean up * Enabled centralized package management Updated NuGets Fixed issue with NUnit test generator. * Role back compiler NuGets Also disabling dependabot for them. We need the old version for net6
moq · Jan 8, 2024 · 09ba0b5 · 09ba0b5
1 parent bf635a0
commit 09ba0b5
Show file tree

Hide file tree

Showing 18 changed files with 84 additions and 79 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,6 +9,9 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+    ignore:
+      - dependency-name: "Microsoft.CodeAnalysis.Common"
+      - dependency-name: "Microsoft.CodeAnalysis.CSharp"
 
   - package-ecosystem: "github-actions" # See documentation for possible values
     directory: "/" # Location of package manifests

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,21 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="coverlet.collector" Version="6.0.0"/>
+    <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.3.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="Moq" Version="4.20.70" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageVersion Include="NonBlocking" Version="2.1.2" />
+    <PackageVersion Include="NUnit" Version="4.0.1" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageVersion Include="xunit" Version="2.6.5" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
+  </ItemGroup>
+</Project>
diff --git a/...rTests/Moq.AutoMock.Generator.Example.MSTest/Moq.AutoMock.Generator.Example.MSTest.csproj b/...rTests/Moq.AutoMock.Generator.Example.MSTest/Moq.AutoMock.Generator.Example.MSTest.csproj
@@ -9,10 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="MSTest.TestAdapter" />
+    <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Include="coverlet.collector">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...torTests/Moq.AutoMock.Generator.Example.NUnit/Moq.AutoMock.Generator.Example.NUnit.csproj b/...torTests/Moq.AutoMock.Generator.Example.NUnit/Moq.AutoMock.Generator.Example.NUnit.csproj
@@ -9,10 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="coverlet.collector" >
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...torTests/Moq.AutoMock.Generator.Example.xUnit/Moq.AutoMock.Generator.Example.xUnit.csproj b/...torTests/Moq.AutoMock.Generator.Example.xUnit/Moq.AutoMock.Generator.Example.xUnit.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.5" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/Generators/CombineGenerator.cs b/Generators/CombineGenerator.cs
@@ -52,10 +52,14 @@ private MemberDeclarationSyntax Combine(int count)
                     "Combines all given types so that they are mocked by the same",
                     @"mock. Some IoC containers call this ""Forwarding"" one type to",
                     "other interfaces. In the end, this just means that all given",
-                    "types will be implemnted by the same instance.",
-            }.SelectMany(text => new[] { XmlNewLine(Environment.NewLine), XmlText($" {text}") })
-            .Concat(new[] { XmlNewLine(Environment.NewLine), XmlText(" ") })
+                    "types will be implemented by the same instance.",
+            }.SelectMany(text => new[] { XmlNewLine(NewLine), XmlText($" {text}") })
+            .Concat(new[] { XmlNewLine(NewLine), XmlText(" ") })
             .ToArray()
         ),
-        XmlText($"{Environment.NewLine}        "));
+        XmlText($"{NewLine}        "));
+
+    //A new line that will respect the checked out state of auto.crlf
+    private const string NewLine = @"
+";
 }
diff --git a/Generators/Generators.csproj b/Generators/Generators.csproj
@@ -3,10 +3,12 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/Moq.AutoMock.Tests/DescribeCreateInstance.cs b/Moq.AutoMock.Tests/DescribeCreateInstance.cs
@@ -35,7 +35,7 @@ public void It_creates_mock_objects_for_internal_ctor_parameters()
     {
         var mocker = new AutoMocker();
         var instance = mocker.CreateInstance<WithServiceInternal>(true);
-        Assert.IsNotNull(Mock.Get(instance.Service));
+        Assert.IsNotNull(Mock.Get(instance.Service!));
     }
 
     [TestMethod]

diff --git a/Moq.AutoMock.Tests/DescribeSetups.cs b/Moq.AutoMock.Tests/DescribeSetups.cs
@@ -2,7 +2,7 @@
 using Moq.AutoMock.Tests.Util;
 
 namespace Moq.AutoMock.Tests;
-
+
 [TestClass]
 public class DescribeSetups
 {

diff --git a/Moq.AutoMock.Tests/Moq.AutoMock.Tests.csproj b/Moq.AutoMock.Tests/Moq.AutoMock.Tests.csproj
@@ -27,10 +27,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" version="4.18.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="MSTest.TestAdapter" />
+    <PackageReference Include="MSTest.TestFramework" />
     <ProjectReference Include="..\Moq.AutoMock\Moq.AutoMock.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Moq.AutoMock.Tests/Util/CustomDefaultValueProvider.cs b/Moq.AutoMock.Tests/Util/CustomDefaultValueProvider.cs
@@ -1,14 +1,14 @@
-namespace Moq.AutoMock.Tests.Util;
-internal class CustomDefaultValueProvider : DefaultValueProvider
-{
-    public Dictionary<Type, object?> DefaultValues { get; } = new();
-
-    protected override object? GetDefaultValue(Type type, Mock mock)
-    {
-        if (DefaultValues.TryGetValue(type, out object? value))
-        {
-            return value;
-        }
-        return null;
-    }
-}
+namespace Moq.AutoMock.Tests.Util;
+internal class CustomDefaultValueProvider : DefaultValueProvider
+{
+    public Dictionary<Type, object> DefaultValues { get; } = new();
+
+    protected override object GetDefaultValue(Type type, Mock mock)
+    {
+        if (DefaultValues.TryGetValue(type, out object? value))
+        {
+            return value;
+        }
+        throw new NotImplementedException();
+    }
+}
diff --git a/Moq.AutoMock.sln b/Moq.AutoMock.sln
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
+		Directory.Packages.props = Directory.Packages.props
 		global.json = global.json
 		LICENSE.md = LICENSE.md
 		README.md = README.md

diff --git a/Moq.AutoMock/AutoMocker.cs b/Moq.AutoMock/AutoMocker.cs
@@ -7,9 +7,6 @@
 using Moq.AutoMock.Resolvers;
 using Moq.Language;
 using Moq.Language.Flow;
-#if NET45
-using Array = Moq.AutoMock.Resolvers.Array;
-#endif
 
 namespace Moq.AutoMock;
 
@@ -257,7 +254,7 @@ internal object CreateInstanceInternal(Type type, ObjectGraphContext context)
     /// </summary> 
     /// <typeparam name="T">The instance that you want to build</typeparam> 
     /// <returns>An instance with virtual and abstract members mocked</returns> 
-    public T CreateSelfMock<T>() where T : class?
+    public T CreateSelfMock<T>() where T : class
         => CreateSelfMock<T>(false);
 
     /// <summary>
@@ -269,7 +266,7 @@ public T CreateSelfMock<T>() where T : class?
     /// <typeparam name="T">The instance that you want to build</typeparam> 
     /// <param name="enablePrivate">When true, non-public constructors will also be used to create mocks.</param> 
     /// <returns>An instance with virtual and abstract members mocked</returns> 
-    public T CreateSelfMock<T>(bool enablePrivate) where T : class?
+    public T CreateSelfMock<T>(bool enablePrivate) where T : class
         => CreateSelfMock<T>(enablePrivate, MockBehavior, DefaultValue, null, CallBase);
 
     /// <summary>
@@ -281,7 +278,7 @@ public T CreateSelfMock<T>(bool enablePrivate) where T : class?
     /// <typeparam name="T">The instance that you want to build</typeparam> 
     /// <param name="enablePrivate">When true, non-public constructors will also be used to create mocks.</param>
     /// <param name="mockBehavior">Sets the Behavior property on the created Mock.</param>
-    /// <param name="defaultValue">Sets the DefaultValue propert on the created Mock.</param>
+    /// <param name="defaultValue">Sets the DefaultValue property on the created Mock.</param>
     /// <param name="defaultValueProvider">The instance that will be used to produce default return values for unexpected invocations.</param>
     /// <param name="callBase">Sets the CallBase property on the created Mock.</param>
     /// <returns>An instance with virtual and abstract members mocked</returns>
@@ -291,7 +288,7 @@ public T CreateSelfMock<T>(
         DefaultValue? defaultValue = null,
         DefaultValueProvider? defaultValueProvider = null,
         bool? callBase = null)
-        where T : class?
+        where T : class
     {
         return BuildSelfMock<T>(enablePrivate, mockBehavior ?? MockBehavior, defaultValue ?? DefaultValue, defaultValueProvider ?? DefaultValueProvider, callBase ?? CallBase).Object;
     }
@@ -428,7 +425,7 @@ public object WithSelfMock(
     }
 
     private Mock<T> BuildSelfMock<T>(bool enablePrivate, MockBehavior mockBehavior, DefaultValue defaultValue, DefaultValueProvider? defaultValueProvider, bool callBase)
-        where T : class?
+        where T : class
     {
         var context = new ObjectGraphContext(enablePrivate);
         return CreateMock(typeof(T), mockBehavior, defaultValue, defaultValueProvider, callBase, context) is Mock<T> mock

diff --git a/Moq.AutoMock/Moq.AutoMock.csproj b/Moq.AutoMock/Moq.AutoMock.csproj
@@ -29,22 +29,18 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+    <PackageReference Include="Microsoft.SourceLink.GitHub">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="NonBlocking" Version="2.1.2" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="NonBlocking" />
     <ProjectReference Include="../Generators/Generators.csproj">
       <OutputItemType>Analyzer</OutputItemType>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
     <ProjectReference Include="..\Moq.AutoMocker.TestGenerator\Moq.AutoMocker.TestGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(TargetFramework) == 'net461'">
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\LICENSE" Pack="true" PackagePath="" />
     <Compile Include="..\System.Diagnostics.CodeAnalysis.cs" />

diff --git a/Moq.AutoMock/Resolvers/Array.cs b/Moq.AutoMock/Resolvers/Array.cs
diff --git a/Moq.AutoMocker.TestGenerator.Tests/Moq.AutoMocker.TestGenerator.Tests.csproj b/Moq.AutoMocker.TestGenerator.Tests/Moq.AutoMocker.TestGenerator.Tests.csproj
@@ -9,11 +9,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest" Version="1.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="MSTest.TestAdapter" />
+    <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Include="Microsoft.CodeAnalysis" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Moq.AutoMocker.TestGenerator/Moq.AutoMocker.TestGenerator.csproj b/Moq.AutoMocker.TestGenerator/Moq.AutoMocker.TestGenerator.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,6 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/Moq.AutoMocker.TestGenerator/UnitTestSourceGenerator.cs b/Moq.AutoMocker.TestGenerator/UnitTestSourceGenerator.cs
@@ -96,7 +96,7 @@ public void Execute(GeneratorExecutionContext context)
                         break;
                     case TargetTestingFramework.NUnit:
                         builder.AppendLine($"            System.ArgumentNullException ex = global::NUnit.Framework.Assert.Throws<System.ArgumentNullException>(() => {constructorInvocation});");
-                        builder.AppendLine($"            global::NUnit.Framework.Assert.AreEqual(\"{test.NullParameterName}\", ex.ParamName);");
+                        builder.AppendLine($"            global::NUnit.Framework.Assert.That(\"{test.NullParameterName}\" == ex.ParamName);");
                         break;
                 }