Minor fixes and code style improvements

pergerch · pergerch · commit c6a6788f304d · 2020-11-05T16:56:06.000+01:00
diff --git a/SpatialFocus.MethodCache.Fody.sln.DotSettings b/SpatialFocus.MethodCache.Fody.sln.DotSettings
@@ -159,6 +159,7 @@
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">&lt;copyright file="$FILENAME$" company="Spatial Focus GmbH"&gt;
 Copyright (c) Spatial Focus GmbH. All rights reserved.
 &lt;/copyright&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
@@ -207,4 +208,5 @@ Copyright (c) Spatial Focus GmbH. All rights reserved.
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Fody/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>
diff --git a/src/SpatialFocus.MethodCache.Sample.Library/BasicSample.cs b/src/SpatialFocus.MethodCache.Sample.Library/BasicSample.cs
@@ -18,9 +18,11 @@ public BasicSample(IMemoryCache memoryCache)
 		// MethodCache.Fody will look for a property implementing the IMemoryCache
 		protected IMemoryCache MemoryCache { get; }
 
+#pragma warning disable CA1822 // Mark members as static
 		public int Add(int a, int b)
 		{
 			return a + b;
 		}
+#pragma warning restore CA1822 // Mark members as static
 	}
 }
diff --git a/src/SpatialFocus.MethodCache.Sample.Library/GenericSample.cs b/src/SpatialFocus.MethodCache.Sample.Library/GenericSample.cs
@@ -7,6 +7,7 @@ namespace SpatialFocus.MethodCache.Sample.Library
 	using Microsoft.Extensions.Caching.Memory;
 
 	// MethodCache.Fody will look for classes and methods decorated with the Cache attribute
+	[Cache]
 	public class GenericSample<TClass1, TClass2>
 	{
 		public GenericSample(IMemoryCache memoryCache)
diff --git a/src/SpatialFocus.MethodCache.Sample.Library/GenericSampleWeaved.cs b/src/SpatialFocus.MethodCache.Sample.Library/GenericSampleWeaved.cs
@@ -18,8 +18,6 @@ public GenericSampleWeaved(IMemoryCache memoryCache)
 
 		public int Add<TMethod1, TMethod2>(int a, int b, int c, int d)
 		{
-			int value;
-
 			// Create a unique cache key, based on namespace, class name and method name as first parameter and corresponding
 			// generic class parameters,generic method parameters and method parameters
 			Tuple<string, Type, Type, Type, Type, int, int, Tuple<int, int>> key =
@@ -28,7 +26,7 @@ public int Add<TMethod1, TMethod2>(int a, int b, int c, int d)
 					typeof(TMethod2), a, b, new Tuple<int, int>(c, d));
 
 			// Check and return if a cached value exists for key
-			if (MemoryCache.TryGetValue(key, out value))
+			if (MemoryCache.TryGetValue(key, out int value))
 			{
 				return value;
 			}
diff --git a/src/SpatialFocus.MethodCache.SmokeTest/Class1.cs b/src/SpatialFocus.MethodCache.SmokeTest/Class1.cs
@@ -17,6 +17,9 @@ public Class1(IMemoryCache memoryCache)
 
 		public IMemoryCache MemoryCache { get; }
 
+#pragma warning disable CA1801 // Review unused parameters
+#pragma warning disable CA1822 // Mark members as static
+#pragma warning disable IDE0060 // Remove unused parameter
 		public int Method1(int a, int b)
 		{
 			return a + b;
@@ -26,5 +29,8 @@ public int Method2<TMethod>(int a, string b, double c, float d, object e, Type f
 		{
 			return 2;
 		}
+#pragma warning restore CA1801 // Review unused parameters
+#pragma warning restore CA1822 // Mark members as static
+#pragma warning restore IDE0060 // Remove unused parameter
 	}
 }
diff --git a/src/SpatialFocus.MethodCache.TestAssembly/BasicTestClass.cs b/src/SpatialFocus.MethodCache.TestAssembly/BasicTestClass.cs
@@ -16,9 +16,11 @@ public BasicTestClass(IMemoryCache memoryCache)
 
 		public IMemoryCache MemoryCache { get; }
 
+#pragma warning disable CA1822 // Mark members as static
 		public int Add(int a, int b)
 		{
 			return a + b;
 		}
+#pragma warning restore CA1822 // Mark members as static
 	}
 }
diff --git a/src/SpatialFocus.MethodCache.TestAssembly/Class1.cs b/src/SpatialFocus.MethodCache.TestAssembly/Class1.cs
@@ -17,6 +17,9 @@ public Class1(IMemoryCache memoryCache)
 
 		public IMemoryCache MemoryCache { get; }
 
+#pragma warning disable CA1801 // Review unused parameters
+#pragma warning disable CA1822 // Mark members as static
+#pragma warning disable IDE0060 // Remove unused parameter
 		public int Method1(int a, int b)
 		{
 			return a + b;
@@ -26,5 +29,8 @@ public int Method2<TMethod>(int a, string b, double c, float d, object e, Type f
 		{
 			return 2;
 		}
+#pragma warning restore CA1801 // Review unused parameters
+#pragma warning restore CA1822 // Mark members as static
+#pragma warning restore IDE0060 // Remove unused parameter
 	}
 }
diff --git a/src/SpatialFocus.MethodCache.TestAssembly/GenericMethodTestClass.cs b/src/SpatialFocus.MethodCache.TestAssembly/GenericMethodTestClass.cs
@@ -16,6 +16,7 @@ public GenericMethodTestClass(IMemoryCache memoryCache)
 
 		public IMemoryCache MemoryCache { get; }
 
+#pragma warning disable CA1822 // Mark members as static
 		public T GenericReturn<T>(T a)
 		{
 			return a;
@@ -25,5 +26,6 @@ public int NonGenericReturn(int a)
 		{
 			return a;
 		}
+#pragma warning restore CA1822 // Mark members as static
 	}
 }
diff --git a/src/SpatialFocus.MethodCache.TestAssembly/GenericTestClass.cs b/src/SpatialFocus.MethodCache.TestAssembly/GenericTestClass.cs
@@ -16,14 +16,16 @@ public GenericTestClass(IMemoryCache memoryCache)
 
 		public IMemoryCache MemoryCache { get; }
 
+#pragma warning disable CA1801 // Review unused parameters
+#pragma warning disable IDE0060 // Remove unused parameter
 		public TClass GenericTClassReturn(TClass a)
 		{
 			return a;
 		}
 
 		public TClass GenericTClassTMethodReturn<TMethod>(TMethod a)
 		{
-			return default(TClass);
+			return default;
 		}
 
 		public TMethod GenericTMethodReturn<TMethod>(TMethod a)
@@ -35,5 +37,7 @@ public int NonGenericReturn(int a)
 		{
 			return a;
 		}
+#pragma warning restore CA1801 // Review unused parameters
+#pragma warning restore IDE0060 // Remove unused parameter
 	}
 }
diff --git a/src/SpatialFocus.MethodCache.Tests/SpatialFocus.MethodCache.Tests.csproj b/src/SpatialFocus.MethodCache.Tests/SpatialFocus.MethodCache.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
 		<DisableFody>true</DisableFody>
 	</PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,11 @@ public BasicSample(IMemoryCache memoryCache)`
`18`	`18`	`// MethodCache.Fody will look for a property implementing the IMemoryCache`
`19`	`19`	`protected IMemoryCache MemoryCache { get; }`
`20`	`20`
	`21`	`+#pragma warning disable CA1822 // Mark members as static`
`21`	`22`	`public int Add(int a, int b)`
`22`	`23`	`{`
`23`	`24`	`return a + b;`
`24`	`25`	`}`
	`26`	`+#pragma warning restore CA1822 // Mark members as static`
`25`	`27`	`}`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ namespace SpatialFocus.MethodCache.Sample.Library`
`7`	`7`	`using Microsoft.Extensions.Caching.Memory;`
`8`	`8`
`9`	`9`	`// MethodCache.Fody will look for classes and methods decorated with the Cache attribute`
	`10`	`+ [Cache]`
`10`	`11`	`public class GenericSample<TClass1, TClass2>`
`11`	`12`	`{`
`12`	`13`	`public GenericSample(IMemoryCache memoryCache)`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@ public GenericSampleWeaved(IMemoryCache memoryCache)`
`18`	`18`
`19`	`19`	`public int Add<TMethod1, TMethod2>(int a, int b, int c, int d)`
`20`	`20`	`{`
`21`		`- int value;`
`22`		`-`
`23`	`21`	`// Create a unique cache key, based on namespace, class name and method name as first parameter and corresponding`
`24`	`22`	`// generic class parameters,generic method parameters and method parameters`
`25`	`23`	`Tuple<string, Type, Type, Type, Type, int, int, Tuple<int, int>> key =`
`@@ -28,7 +26,7 @@ public int Add<TMethod1, TMethod2>(int a, int b, int c, int d)`
`28`	`26`	`typeof(TMethod2), a, b, new Tuple<int, int>(c, d));`
`29`	`27`
`30`	`28`	`// Check and return if a cached value exists for key`
`31`		`- if (MemoryCache.TryGetValue(key, out value))`
	`29`	`+ if (MemoryCache.TryGetValue(key, out int value))`
`32`	`30`	`{`
`33`	`31`	`return value;`
`34`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ public Class1(IMemoryCache memoryCache)`
`17`	`17`
`18`	`18`	`public IMemoryCache MemoryCache { get; }`
`19`	`19`
	`20`	`+#pragma warning disable CA1801 // Review unused parameters`
	`21`	`+#pragma warning disable CA1822 // Mark members as static`
	`22`	`+#pragma warning disable IDE0060 // Remove unused parameter`
`20`	`23`	`public int Method1(int a, int b)`
`21`	`24`	`{`
`22`	`25`	`return a + b;`
`@@ -26,5 +29,8 @@ public int Method2<TMethod>(int a, string b, double c, float d, object e, Type f`
`26`	`29`	`{`
`27`	`30`	`return 2;`
`28`	`31`	`}`
	`32`	`+#pragma warning restore CA1801 // Review unused parameters`
	`33`	`+#pragma warning restore CA1822 // Mark members as static`
	`34`	`+#pragma warning restore IDE0060 // Remove unused parameter`
`29`	`35`	`}`
`30`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,11 @@ public BasicTestClass(IMemoryCache memoryCache)`
`16`	`16`
`17`	`17`	`public IMemoryCache MemoryCache { get; }`
`18`	`18`
	`19`	`+#pragma warning disable CA1822 // Mark members as static`
`19`	`20`	`public int Add(int a, int b)`
`20`	`21`	`{`
`21`	`22`	`return a + b;`
`22`	`23`	`}`
	`24`	`+#pragma warning restore CA1822 // Mark members as static`
`23`	`25`	`}`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public GenericMethodTestClass(IMemoryCache memoryCache)`
`16`	`16`
`17`	`17`	`public IMemoryCache MemoryCache { get; }`
`18`	`18`
	`19`	`+#pragma warning disable CA1822 // Mark members as static`
`19`	`20`	`public T GenericReturn<T>(T a)`
`20`	`21`	`{`
`21`	`22`	`return a;`
`@@ -25,5 +26,6 @@ public int NonGenericReturn(int a)`
`25`	`26`	`{`
`26`	`27`	`return a;`
`27`	`28`	`}`
	`29`	`+#pragma warning restore CA1822 // Mark members as static`
`28`	`30`	`}`
`29`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,16 @@ public GenericTestClass(IMemoryCache memoryCache)`
`16`	`16`
`17`	`17`	`public IMemoryCache MemoryCache { get; }`
`18`	`18`
	`19`	`+#pragma warning disable CA1801 // Review unused parameters`
	`20`	`+#pragma warning disable IDE0060 // Remove unused parameter`
`19`	`21`	`public TClass GenericTClassReturn(TClass a)`
`20`	`22`	`{`
`21`	`23`	`return a;`
`22`	`24`	`}`
`23`	`25`
`24`	`26`	`public TClass GenericTClassTMethodReturn<TMethod>(TMethod a)`
`25`	`27`	`{`
`26`		`- return default(TClass);`
	`28`	`+ return default;`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`public TMethod GenericTMethodReturn<TMethod>(TMethod a)`
`@@ -35,5 +37,7 @@ public int NonGenericReturn(int a)`
`35`	`37`	`{`
`36`	`38`	`return a;`
`37`	`39`	`}`
	`40`	`+#pragma warning restore CA1801 // Review unused parameters`
	`41`	`+#pragma warning restore IDE0060 // Remove unused parameter`
`38`	`42`	`}`
`39`	`43`	`}`