add dotnet build support

Fody · Jan 8, 2018 · 5e48155 · 5e48155
1 parent b639908
commit 5e48155
Show file tree

Hide file tree

Showing 32 changed files with 244 additions and 416 deletions.
diff --git a/AssemblyToProcess/AssemblyInfo.cs b/AssemblyToProcess/AssemblyInfo.cs
diff --git a/AssemblyToProcess/ClassWithObsoleteOnGetSet.cs b/AssemblyToProcess/ClassWithObsoleteOnGetSet.cs
@@ -1,4 +1,4 @@
 public class ClassWithObsoleteOnGetSet
 {
-    public string PropertyToMark { [ObsoleteEx]get; [ObsoleteEx]set; }
+    public string PropertyToMark { [ObsoleteEx] get; [ObsoleteEx] set; }
 }
diff --git a/AssemblyToProcess/InterfaceToMark.cs b/AssemblyToProcess/InterfaceToMark.cs
@@ -1,14 +1,30 @@
 using System;
 
-[ObsoleteEx(TreatAsErrorFromVersion = "2.0", RemoveInVersion = "4.0", Message = "Custom message.", ReplacementTypeOrMember = "NewThing")]
+[ObsoleteEx(
+    TreatAsErrorFromVersion = "2.0",
+    RemoveInVersion = "4.0",
+    Message = "Custom message.",
+    ReplacementTypeOrMember = "NewThing")]
 public interface InterfaceToMark
 {
-    [ObsoleteEx(TreatAsErrorFromVersion = "2.0", RemoveInVersion = "4.0", Message = "Custom message.", ReplacementTypeOrMember = "NewThing")]
+    [ObsoleteEx(
+        TreatAsErrorFromVersion = "2.0",
+        RemoveInVersion = "4.0",
+        Message = "Custom message.",
+        ReplacementTypeOrMember = "NewThing")]
     string PropertyToMark { get; set; }
 
-    [ObsoleteEx(TreatAsErrorFromVersion = "2.0", RemoveInVersion = "4.0", Message = "Custom message.", ReplacementTypeOrMember = "NewThing")]
+    [ObsoleteEx(
+        TreatAsErrorFromVersion = "2.0",
+        RemoveInVersion = "4.0",
+        Message = "Custom message.",
+        ReplacementTypeOrMember = "NewThing")]
     void MethodToMark();
 
-    [ObsoleteEx(TreatAsErrorFromVersion = "2.0", RemoveInVersion = "4.0", Message = "Custom message.", ReplacementTypeOrMember = "NewThing")]
+    [ObsoleteEx(
+        TreatAsErrorFromVersion = "2.0",
+        RemoveInVersion = "4.0",
+        Message = "Custom message.",
+        ReplacementTypeOrMember = "NewThing")]
     event EventHandler EventToMark;
 }
diff --git a/AssemblyToProcess/Sample.cs b/AssemblyToProcess/Sample.cs
@@ -2,7 +2,11 @@
 
 namespace Before
 {
-    [ObsoleteEx(Message = "Custom message.", ReplacementTypeOrMember = "NewClass", TreatAsErrorFromVersion = "2.0", RemoveInVersion = "3.0")]
+    [ObsoleteEx(
+        Message = "Custom message.",
+        ReplacementTypeOrMember = "NewClass",
+        TreatAsErrorFromVersion = "2.0",
+        RemoveInVersion = "3.0")]
     public class ClassToMark
     {
     }

diff --git a/AssemblyToProcess/StructToMark.cs b/AssemblyToProcess/StructToMark.cs
@@ -1,18 +1,38 @@
 using System;
 #pragma warning disable 67
 
-[ObsoleteEx(TreatAsErrorFromVersion = "2.0", RemoveInVersion = "4.0", Message = "Custom message.", ReplacementTypeOrMember = "NewThing")]
+[ObsoleteEx(
+    TreatAsErrorFromVersion = "2.0",
+    RemoveInVersion = "4.0",
+    Message = "Custom message.",
+    ReplacementTypeOrMember = "NewThing")]
 public struct StructToMark
 {
-    [ObsoleteEx(TreatAsErrorFromVersion = "2.0", RemoveInVersion = "4.0", Message = "Custom message.", ReplacementTypeOrMember = "NewThing")]
+    [ObsoleteEx(
+        TreatAsErrorFromVersion = "2.0",
+        RemoveInVersion = "4.0",
+        Message = "Custom message.",
+        ReplacementTypeOrMember = "NewThing")]
     public string PropertyToMark { get; set; }
 
-    [ObsoleteEx(TreatAsErrorFromVersion = "2.0", RemoveInVersion = "4.0", Message = "Custom message.", ReplacementTypeOrMember = "NewThing")]
+    [ObsoleteEx(
+        TreatAsErrorFromVersion = "2.0",
+        RemoveInVersion = "4.0",
+        Message = "Custom message.",
+        ReplacementTypeOrMember = "NewThing")]
     public string FieldToMark;
 
-   [ObsoleteEx(TreatAsErrorFromVersion = "2.0", RemoveInVersion = "4.0", Message = "Custom message.", ReplacementTypeOrMember = "NewThing")]
+   [ObsoleteEx(
+       TreatAsErrorFromVersion = "2.0",
+       RemoveInVersion = "4.0",
+       Message = "Custom message.",
+       ReplacementTypeOrMember = "NewThing")]
     public void MethodToMark() { }
 
-    [ObsoleteEx(TreatAsErrorFromVersion = "2.0", RemoveInVersion = "4.0", Message = "Custom message.", ReplacementTypeOrMember = "NewThing")]
+    [ObsoleteEx(
+        TreatAsErrorFromVersion = "2.0",
+        RemoveInVersion = "4.0",
+        Message = "Custom message.",
+        ReplacementTypeOrMember = "NewThing")]
     public event EventHandler EventToMark;
 }
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,6 +2,7 @@
 <Project>
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <PackageVersion>4.3.5</PackageVersion>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 </Project>
diff --git a/Obsolete.Fody/AttributeFixer.cs b/Obsolete.Fody/AttributeFixer.cs
@@ -29,12 +29,9 @@ void InnerProcess(IMemberDefinition memberDefinition)
                 LogError(error);
             }
         }
-        else
+        else if (memberDefinition is PropertyDefinition propertyDefinition)
         {
-            if (memberDefinition is PropertyDefinition propertyDefinition)
-            {
-                throwsNotImplemented = ThrowsNotImplemented(propertyDefinition);
-            }
+            throwsNotImplemented = ThrowsNotImplemented(propertyDefinition);
         }
 
         customAttributes.Remove(obsoleteExAttribute);

diff --git a/Obsolete.Fody/BrowsableAttributeAdder.cs b/Obsolete.Fody/BrowsableAttributeAdder.cs
@@ -10,8 +10,7 @@ public void AddEditorBrowsableAttribute(Collection<CustomAttribute> customAttrib
         {
             return;
         }
-        var customAttribute = new CustomAttribute(EditorBrowsableConstructor);
-        customAttribute.ConstructorArguments.Add(new CustomAttributeArgument(EditorBrowsableStateType, AdvancedStateConstant));
+        var customAttribute = new CustomAttribute(EditorBrowsableConstructor);        var customAttributeArgument = new CustomAttributeArgument(EditorBrowsableStateType, AdvancedStateConstant);        customAttribute.ConstructorArguments.Add(customAttributeArgument);
         customAttributes.Add(customAttribute);
     }
 }

diff --git a/Obsolete.Fody/EditorBrowsableAttributeFinder.cs b/Obsolete.Fody/EditorBrowsableAttributeFinder.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Linq;
 using Mono.Cecil;
 
@@ -8,23 +7,15 @@ public partial class ModuleWeaver
     public TypeDefinition EditorBrowsableStateType;
     public int AdvancedStateConstant;
 
-    void FindEditorBrowsableTypes(List<TypeDefinition> typeDefinitions)
+    void FindEditorBrowsableTypes()
     {
         if (!HideObsoleteMembers)
         {
             return;
         }
-        var attributeType = typeDefinitions.FirstOrDefault(x => x.Name == "EditorBrowsableAttribute");
-        if (attributeType == null)
-        {
-            throw new WeavingException("Could not find EditorBrowsableAttribute");
-        }
+        var attributeType = FindType("System.ComponentModel.EditorBrowsableAttribute");
         EditorBrowsableConstructor = ModuleDefinition.ImportReference(attributeType.Methods.First(IsDesiredConstructor));
-        EditorBrowsableStateType = typeDefinitions.FirstOrDefault(x => x.Name == "EditorBrowsableState");
-        if (EditorBrowsableStateType == null)
-        {
-            throw new WeavingException("Could not find EditorBrowsableAttribute");
-        }
+        EditorBrowsableStateType = FindType("System.ComponentModel.EditorBrowsableState");
         var fieldDefinition = EditorBrowsableStateType.Fields.First(x => x.Name == "Advanced");
         AdvancedStateConstant = (int) fieldDefinition.Constant;
     }

diff --git a/Obsolete.Fody/ModuleWeaver.cs b/Obsolete.Fody/ModuleWeaver.cs
@@ -1,32 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-using Mono.Cecil;
+using System.Collections.Generic;
+using Fody;
 
-public partial class ModuleWeaver
+public partial class ModuleWeaver:BaseModuleWeaver
 {
     public SemanticVersion assemblyVersion;
-    public Action<string> LogInfo { get; set; }
-    public Action<string> LogWarning { get; set; }
-    public Action<string> LogError { get; set; }
-    public ModuleDefinition ModuleDefinition { get; set; }
-    public IAssemblyResolver AssemblyResolver { get; set; }
-    public XElement Config { get; set; }
 
-    public ModuleWeaver()
-    {
-        LogInfo = s => { };
-        LogWarning = s => { };
-        LogError = s => { };
-    }
-
-    public void Execute()
+    public override void Execute()
     {
         ReadConfig();
-        var systemTypes = FindSystemTypes();
-        FindEditorBrowsableTypes(systemTypes);
-        FindObsoleteType(systemTypes);
+        FindEditorBrowsableTypes();
+        FindObsoleteType();
 
         var version = ModuleDefinition.Assembly.Name.Version;
         assemblyVersion = new SemanticVersion
@@ -37,38 +20,15 @@ public void Execute()
         };
 
         ProcessAssembly();
-
-        CleanReferences();
     }
 
-    public List<TypeDefinition> FindSystemTypes()
+    public override IEnumerable<string> GetAssembliesForScanning()
     {
-        var types = new List<TypeDefinition>();
-
-        AddAssemblyIfExists("mscorlib", types);
-        AddAssemblyIfExists("System", types);
-        AddAssemblyIfExists("System.Runtime", types);
-        AddAssemblyIfExists("netstandard", types);
-
-        return types;
+        yield return "mscorlib";
+        yield return "System";
+        yield return "System.Runtime";
+        yield return "netstandard";
     }
 
-    void AddAssemblyIfExists(string name, List<TypeDefinition> types)
-    {
-        try
-        {
-            var msCoreLibDefinition = AssemblyResolver.Resolve(new AssemblyNameReference(name, null));
-
-            if (msCoreLibDefinition != null)
-            {
-                var module = msCoreLibDefinition.MainModule;
-                types.AddRange(module.Types);
-                types.AddRange(module.ExportedTypes.Select(x => x.Resolve()).Where(x => x != null));
-            }
-        }
-        catch (AssemblyResolutionException)
-        {
-            LogInfo($"Failed to resolve '{name}'. So skipping its types.");
-        }
-    }
+    public override bool ShouldCleanReference => true;
 }
diff --git a/Obsolete.Fody/Obsolete.Fody.csproj b/Obsolete.Fody/Obsolete.Fody.csproj
@@ -1,27 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="FodyCecil" Version="2.*" />
-    <PackageReference Include="PepitaPackage" Version="*" />
+    <PackageReference Include="FodyHelpers" Version="2.*" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    <Compile Include="..\CommonAssemblyInfo.cs" />
   </ItemGroup>
-  <Target Name="BuildNugets" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <FilesToDelete Include="$(SolutionDir)nugets\**\*.*" />
-    </ItemGroup>
-    <Delete Files="@(FilesToDelete)" />
-    <MakeDir Directories="$(SolutionDir)nugets" />
-    <Copy SourceFiles="$(SolutionDir)Obsolete\bin\$(ConfigurationName)\net452\Obsolete.dll" DestinationFolder="$(SolutionDir)nugets\lib\net452" />
-    <Copy SourceFiles="$(SolutionDir)Obsolete\bin\$(ConfigurationName)\netstandard1.4\Obsolete.dll" DestinationFolder="$(SolutionDir)nugets\lib\netstandard1.4" />
-    <Copy SourceFiles="$(ProjectDir)Obsolete.Fody.nuspec" DestinationFolder="$(SolutionDir)nugets" />
-    <Copy SourceFiles="$(ProjectDir)bin\$(ConfigurationName)\net452\Obsolete.Fody.dll" DestinationFolder="$(SolutionDir)nugets" />
-    <Copy SourceFiles="$(ProjectDir)bin\$(ConfigurationName)\net452\Obsolete.Fody.pdb" DestinationFolder="$(SolutionDir)nugets" />
-    <PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)nugets" MetadataAssembly="$(ProjectDir)bin\$(ConfigurationName)\net452\Obsolete.Fody.dll" />
-  </Target>
 </Project>
diff --git a/Obsolete.Fody/Obsolete.Fody.nuspec b/Obsolete.Fody/Obsolete.Fody.nuspec
diff --git a/Obsolete.Fody/ObsoleteTypeFinder.cs b/Obsolete.Fody/ObsoleteTypeFinder.cs
@@ -1,19 +1,13 @@
-using System.Collections.Generic;
 using System.Linq;
 using Mono.Cecil;
 
 public partial class ModuleWeaver
 {
     public MethodReference ObsoleteConstructorReference;
 
-    public void FindObsoleteType(List<TypeDefinition> systemTypes)
+    public void FindObsoleteType()
     {
-        var obsoleteDefinition = systemTypes
-            .FirstOrDefault(x => x.Name == "ObsoleteAttribute");
-        if (obsoleteDefinition == null)
-        {
-            throw new WeavingException("Could not find ObsoleteAttribute");
-        }
+        var obsoleteDefinition = FindType("System.ObsoleteAttribute");
         var constructor = obsoleteDefinition.Methods.First(x =>
             x.Parameters.Count == 2
             && x.Parameters[0].ParameterType.Name == "String"

diff --git a/Obsolete.Fody/ReferenceCleaner.cs b/Obsolete.Fody/ReferenceCleaner.cs
diff --git a/Obsolete.Fody/WeavingException.cs b/Obsolete.Fody/WeavingException.cs
@@ -5,6 +5,5 @@ public class WeavingException : Exception
     public WeavingException(string message)
         : base(message)
     {
-
     }
 }
diff --git a/Obsolete.Fody/packages.config b/Obsolete.Fody/packages.config
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,5 @@ public class WeavingException : Exception @@
         public WeavingException(string message)
             : base(message)
         {
         }
     }