Feature/use more fody helpers (#5)

* refactory

* MoreFodyHelpers

* fix nuget

* revert

---------

Co-authored-by: jeremyli <[email protected]>

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
  - name: Setup dotnet
  uses: actions/setup-dotnet@v3
  with:
- dotnet-version: | 
+ dotnet-version: |
  6.0.x
  7.0.x
 

InterfaceBaseInvoke.sln

@@ -23,10 +23,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{41D4FE14
  ProjectSection(SolutionItems) = preProject
  .github\workflows\build.yml = .github\workflows\build.yml
  build\incre_ver.ps1 = build\incre_ver.ps1
+ NuGet.Config = NuGet.Config
  build\pack.ps1 = build\pack.ps1
  build\pkg.version = build\pkg.version
  README.md = README.md
- build\test_all.ps1 = build\test_all.ps1
  EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "example", "example", "{BBD57099-9025-40DB-9A1E-5094DE6736A9}"
@@ -42,6 +42,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CFB3FFC9-C653-4830-A696-CE150BECC295}"
  ProjectSection(SolutionItems) = preProject
  src\Directory.Build.props = src\Directory.Build.props
+ src\MoreFodyHelpers.props = src\MoreFodyHelpers.props
  EndProjectSection
 EndProject
 Global

NuGet.config → NuGet.Config

@@ -8,5 +8,6 @@
  <!--To inherit the global NuGet package sources remove the <clear/> line below -->
  <clear />
  <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+ <!--<add key="local" value="D:\projects\MoreFodyHelpers\build" />-->
  </packageSources>
 </configuration>

build/pkg.version

@@ -1 +1 @@
-0.1.1
+0.1.2

src/InterfaceBaseInvoke.Example/InterfaceBaseInvoke.Example.csproj

@@ -10,7 +10,6 @@
  </ItemGroup>
 
  <ItemGroup>
- <ProjectReference Include="..\InterfaceBaseInvoke.Fody\InterfaceBaseInvoke.Fody.csproj" />
  <ProjectReference Include="..\InterfaceBaseInvoke\InterfaceBaseInvoke.csproj" />
  </ItemGroup>
 

src/InterfaceBaseInvoke.Example/Program.cs

@@ -1,62 +1,61 @@
 using System;
 
-namespace InterfaceBaseInvoke.Example
+namespace InterfaceBaseInvoke.Example;
+
+public interface IService
 {
- public interface IService
- {
- int Property { get; }
- void Method();
- }
+ int Property { get; }
+ void Method();
+}
 
- public interface IService1 : IService
- {
-  public const string Name = nameof(IService1) + "." + nameof(Method);
-  int IService.Property => 1;
-  void IService.Method() => Console.WriteLine(Name);
- }
+public interface IService1 : IService
+{
+ public const string Name = nameof(IService1) + "." + nameof(Method);
+ int IService.Property => 1;
+ void IService.Method() => Console.WriteLine(Name);
+}
 
- public interface IService2 : IService
- {
-  public const string Name = nameof(IService2) + "." + nameof(Method);
-  int IService.Property => 2;
-  void IService.Method() => Console.WriteLine(Name);
- }
+public interface IService2 : IService
+{
+ public const string Name = nameof(IService2) + "." + nameof(Method);
+ int IService.Property => 2;
+ void IService.Method() => Console.WriteLine(Name);
+}
 
- public interface IService3
- {
-  void Method<T>() => Console.WriteLine(typeof(T).Name);
- }
+public interface IService3
+{
+ void Method<T>() => Console.WriteLine(typeof(T).Name);
+}
 
- public interface IService4<T>
- {
- void Method() => Console.WriteLine(typeof(T).Name);
- }
+public interface IService4<T>
+{
+ void Method() => Console.WriteLine(typeof(T).Name);
+}
+
+public class Service : IService1, IService2, IService3, IService4<string>
+{
+ public void Method() => throw new InvalidOperationException();
+ public int Property => throw new InvalidOperationException();
 
- public class Service : IService1, IService2, IService3, IService4<string>
+ public void Invoke()
  {
- public void Method() => throw new InvalidOperationException();
- public int Property => throw new InvalidOperationException();
-
- public void Invoke()
- {
- Console.WriteLine("Start invoking...");
- this.Base<IService1>().Method();
- this.Base<IService2>().Method();
- this.Base<IService3>().Method<int>();
- this.Base<IService4<string>>().Method();
- Console.WriteLine(this.Base<IService1>().Property);
- Console.WriteLine(this.Base<IService2>().Property);
- Console.WriteLine("End invoking.");
- }
+ Console.WriteLine("Start invoking...");
+ this.Base<IService1>().Method();
+ this.Base<IService2>().Method();
+ this.Base<IService3>().Method<int>();
+ this.Base<IService4<string>>().Method();
+ Console.WriteLine(this.Base<IService1>().Property);
+ Console.WriteLine(this.Base<IService2>().Property);
+ Console.WriteLine("End invoking.");
  }
+}
 
- internal class Program
+internal class Program
+{
+ private static void Main(string[] args)
  {
- private static void Main(string[] args)
- {
- var service = new Service();
- service.Invoke();
- Console.Read();
- }
+ var service = new Service();
+ service.Invoke();
+ Console.Read();
  }
 }