Add static proxy generator based on Stunts.StaticProxy

Cleanup CodeAnalysis with just the stuff we need, move CodeFix stuff
over to Moq.StaticProxy. Add tests for the codegen too.

Moq.sln

@@ -25,6 +25,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.DynamicProxy", "src\Moq
 EndProject
 Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Moq.Package", "src\Moq\Moq.Package\Moq.Package.msbuildproj", "{D486033C-1CCF-47BB-BDA6-28EA08018CDE}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.StaticProxy", "src\Moq\Moq.StaticProxy\Moq.StaticProxy.csproj", "{0580AEDE-7661-4311-9A40-EAD4CD485742}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.CodeAnalysis", "src\Moq\Moq.CodeAnalysis\Moq.CodeAnalysis.csproj", "{1D05F2B9-B67D-4EFE-B4FF-D7F6907C2701}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.StaticProxy.UnitTests", "src\Moq\Moq.StaticProxy.UnitTests\Moq.StaticProxy.UnitTests.csproj", "{36A3DD24-4B67-4A9E-83F8-C4794336460F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +61,18 @@ Global
 		{D486033C-1CCF-47BB-BDA6-28EA08018CDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D486033C-1CCF-47BB-BDA6-28EA08018CDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D486033C-1CCF-47BB-BDA6-28EA08018CDE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0580AEDE-7661-4311-9A40-EAD4CD485742}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0580AEDE-7661-4311-9A40-EAD4CD485742}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0580AEDE-7661-4311-9A40-EAD4CD485742}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0580AEDE-7661-4311-9A40-EAD4CD485742}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D05F2B9-B67D-4EFE-B4FF-D7F6907C2701}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D05F2B9-B67D-4EFE-B4FF-D7F6907C2701}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D05F2B9-B67D-4EFE-B4FF-D7F6907C2701}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D05F2B9-B67D-4EFE-B4FF-D7F6907C2701}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36A3DD24-4B67-4A9E-83F8-C4794336460F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36A3DD24-4B67-4A9E-83F8-C4794336460F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36A3DD24-4B67-4A9E-83F8-C4794336460F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36A3DD24-4B67-4A9E-83F8-C4794336460F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Directory.Build.props

@@ -46,6 +46,9 @@
 
     <!-- Generate satellite assemblies using csc.exe to avoid some al.exe issues. See https://github.com/dotnet/msbuild/pull/2726 -->
     <GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
+
+    <!-- Since we use Moq4 in many projects, not necessarily v5... -->
+    <EnablePackCleanup>false</EnablePackCleanup>
   </PropertyGroup>
 
   <PropertyGroup Label="Preview - To be removed by .NET 5.0 RTW">

src/Directory.Build.targets

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <UpToDateCheck Include="@(PackageFile);@(None);@(Content);@(EmbeddedResource)" />
-    <EmbeddedResource Update="@(EmbeddedResource)" Generator="ResXFileCodeGenerator" />
+    <EmbeddedResource Update="@(EmbeddedResource)" />
     <!--<None Include="$(MSBuildThisFileDirectory)../docs/img/icon.png" Pack="true" Visible="false" />-->
   </ItemGroup>
 

src/Directory.Packages.props

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <NuGetizerVersion>0.4.7</NuGetizerVersion>
     <NuGetizerVersion Condition="Exists('$(MSBuildThisFileDirectory)..\..\nugetizer\bin\')">42.42.42</NuGetizerVersion>
-    <StuntsVersion>42.42.42-main.129</StuntsVersion>
+    <StuntsVersion>42.42.42-main.140</StuntsVersion>
     <StuntsVersion Condition="Exists('$(MSBuildThisFileDirectory)..\..\stunts\bin\')">42.42.42</StuntsVersion>
   </PropertyGroup>
 

src/Moq/Moq.CodeAnalysis/MockNamingConvention.cs

@@ -1,5 +1,5 @@
 using Moq.Sdk;
-using Stunts;
+using Stunts.CodeAnalysis;
 
 namespace Moq
 {

src/Moq/Moq.CodeAnalysis/MockUnsupportedNestedTypeAnalyzer.cs → src/Moq/Moq.CodeAnalysis/MockNestedTypeAnalyzer.cs

@@ -11,12 +11,12 @@ namespace Stunts
     /// </summary>
     // TODO: F#
     [DiagnosticAnalyzer(LanguageNames.CSharp, LanguageNames.VisualBasic)]
-    public class MockUnsupportedNestedTypeAnalyzer : UnsupportedNestedTypeAnalyzer
+    public class MockUnsupportedNestedTypeAnalyzer : NestedTypeAnalyzer
     {
         /// <summary>
         /// Instantiates the analyzer with the default <see cref="NamingConvention"/> and 
         /// for method invocations annotated with <see cref="StuntGeneratorAttribute"/>.
         /// </summary>
-        public MockUnsupportedNestedTypeAnalyzer() : base(new MockNamingConvention(), typeof(MockGeneratorAttribute)) { }
+        public MockUnsupportedNestedTypeAnalyzer() : base(typeof(MockGeneratorAttribute)) { }
     }
 }

src/Moq/Moq.CodeAnalysis/Moq.CodeAnalysis.csproj

@@ -3,45 +3,48 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>Moq</RootNamespace>
-    <IncludeRoslyn>true</IncludeRoslyn>
-    <PrimaryOutputKind Condition="'$(PrimaryOutputKind)' == ''">Analyzers</PrimaryOutputKind>
-    <PrimaryOutputFrameworkSpecific>true</PrimaryOutputFrameworkSpecific>
+    <PackFolder>analyzers\dotnet</PackFolder>
   </PropertyGroup>
 
-  <ItemDefinitionGroup>
-    <ProjectReference>
-      <!-- This causes the output of the referenced projects to be packaged into the analyzer folder too -->
-      <AdditionalProperties>PrimaryOutputKind=$(PrimaryOutputKind)</AdditionalProperties>
-    </ProjectReference>
-  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Compile Remove="MockValidateTypesAnalyzer.cs" />
+    <Compile Remove="RecursiveMockAnalyzer.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="MockValidateTypesAnalyzer.cs" />
+    <None Include="RecursiveMockAnalyzer.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Stunts" />
+    <PackageReference Include="Stunts.CodeAnalysis" />
+    <PackageReference Include="Superpower" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Pack="false" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Pack="false" />
+
+    <!-- Workaround for revision mismatch with public versions -->
+    <PackageReference Include="System.Collections.Immutable" Pack="false" />
+    <PackageReference Include="System.Reflection.Metadata" Pack="false" />
+  </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Stunts\Stunts\Stunts.csproj" Pack="false" />
-    <ProjectReference Include="..\..\Stunts\Stunts.CodeAnalysis\Stunts.CodeAnalysis.csproj" Pack="false" />
     <ProjectReference Include="..\Moq.Sdk\Moq.Sdk.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
+    <Compile Update="Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+    <EmbeddedResource Update="@(EmbeddedResource)" Generator="ResXFileCodeGenerator" />
+    <EmbeddedResource Update="Resources.resx">
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-
-  <Target Name="IncludeRoslynVisualBasic" AfterTargets="ResolveAssemblyReferences" BeforeTargets="GetPackageContents" DependsOnTargets="ResolveAssemblyReferences">
-    <ItemGroup>
-      <_RoslynVisualBasic Include="@(ReferencePath -> WithMetadataValue('NuGetPackageId', 'Microsoft.CodeAnalysis.VisualBasic'))" />
-      <PackageFile Include="@(_RoslynVisualBasic -> '%(FullPath)')" Kind="Analyzer" FrameworkSpecific="true" TargetFramework="$(TargetFramework)" />
-    </ItemGroup>
-  </Target>
-
+
 </Project>

src/Moq/Moq.Package/Mock.StaticFactory.cs

@@ -4,7 +4,7 @@ partial class Mock
     {
         static Mock()
         {
-            MockFactory.Default = new Sdk.StaticMockFactory();
+            Sdk.MockFactory.Default = new Sdk.StaticMockFactory();
             OnInitialized();
         }
 

src/Moq/Moq.Package/Moq.Package.msbuildproj

@@ -8,8 +8,8 @@
         <PackageTags>moq mocking mock</PackageTags>
     </PropertyGroup>
     <ItemGroup>
-        <Content Include="*.cs" CodeLanguage="cs" TargetFramework="netstandard2.0" BuildAction="Compile" />
-        <Content Include="*.vb" CodeLanguage="vb" TargetFramework="netstandard2.0" BuildAction="Compile" />
+        <Content Include="*.cs" Exclude="Mock.StaticFactory.*" CodeLanguage="cs" TargetFramework="netstandard2.0" BuildAction="Compile" />
+        <Content Include="*.vb" Exclude="Mock.StaticFactory.*" CodeLanguage="vb" TargetFramework="netstandard2.0" BuildAction="Compile" />
         <None Include="Mock.StaticFactory.*" PackFolder="build\netstandard2.0" />
         <None Include="Moq.props" PackFolder="build\netstandard2.0" />
         <None Include="Moq.targets" PackFolder="build\netstandard2.0" />

src/Moq/Moq.Sdk/Moq.Sdk.csproj

@@ -18,8 +18,4 @@
     <PackageReference Include="ThisAssembly" PrivateAssets="all" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="Resources.resx" Generator="" />
-  </ItemGroup>
-
 </Project>