Rename some obsolete TargetFrameworkMoniker names to RuntimeMoniker

dotnet · Oct 22, 2019 · a08062f · a08062f · AndreyAkinshin · Oct 22, 2019
1 parent f86e130
commit a08062f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/BenchmarkDotNet/Environments/Runtimes/ClrRuntime.cs b/src/BenchmarkDotNet/Environments/Runtimes/ClrRuntime.cs
@@ -16,8 +16,8 @@ public class ClrRuntime : Runtime, IEquatable<ClrRuntime>
 
         public string Version { get; }
 
-        private ClrRuntime(RuntimeMoniker targetFrameworkMoniker, string msBuildMoniker, string displayName, string version = null)
-            : base(targetFrameworkMoniker, msBuildMoniker, displayName)
+        private ClrRuntime(RuntimeMoniker runtimeMoniker, string msBuildMoniker, string displayName, string version = null)
+            : base(runtimeMoniker, msBuildMoniker, displayName)
         {
             Version = version;
         }

diff --git a/src/BenchmarkDotNet/Environments/Runtimes/CoreRtRuntime.cs b/src/BenchmarkDotNet/Environments/Runtimes/CoreRtRuntime.cs
@@ -32,8 +32,8 @@ public class CoreRtRuntime : Runtime
         /// </summary>
         public static readonly CoreRtRuntime CoreRt50 = new CoreRtRuntime(RuntimeMoniker.CoreRt50, "netcoreapp5.0", "CoreRt 5.0");
 
-        private CoreRtRuntime(RuntimeMoniker targetFrameworkMoniker, string msBuildMoniker, string displayName)
-            : base(targetFrameworkMoniker, msBuildMoniker, displayName)
+        private CoreRtRuntime(RuntimeMoniker runtimeMoniker, string msBuildMoniker, string displayName)
+            : base(runtimeMoniker, msBuildMoniker, displayName)
         {
         }
 

diff --git a/src/BenchmarkDotNet/Environments/Runtimes/CoreRuntime.cs b/src/BenchmarkDotNet/Environments/Runtimes/CoreRuntime.cs
@@ -18,8 +18,8 @@ public class CoreRuntime : Runtime
         public static readonly CoreRuntime Core31 = new CoreRuntime(RuntimeMoniker.NetCoreApp31, "netcoreapp3.1", ".NET Core 3.1");
         public static readonly CoreRuntime Core50 = new CoreRuntime(RuntimeMoniker.NetCoreApp50, "netcoreapp5.0", ".NET Core 5.0");
 
-        private CoreRuntime(RuntimeMoniker targetFrameworkMoniker, string msBuildMoniker, string displayName)
-            : base(targetFrameworkMoniker, msBuildMoniker, displayName)
+        private CoreRuntime(RuntimeMoniker runtimeMoniker, string msBuildMoniker, string displayName)
+            : base(runtimeMoniker, msBuildMoniker, displayName)
         {
         }
 

diff --git a/src/BenchmarkDotNet/Toolchains/ToolchainExtensions.cs b/src/BenchmarkDotNet/Toolchains/ToolchainExtensions.cs
@@ -62,9 +62,9 @@ internal static IToolchain GetToolchain(this Runtime runtime, Descriptor descrip
             }
         }
 
-        private static IToolchain GetToolchain(RuntimeMoniker targetFrameworkMoniker)
+        private static IToolchain GetToolchain(RuntimeMoniker runtimeMoniker)
         {
-            switch (targetFrameworkMoniker)
+            switch (runtimeMoniker)
             {
                 case RuntimeMoniker.Net461:
                     return CsProjClassicNetToolchain.Net461;
@@ -103,7 +103,7 @@ private static IToolchain GetToolchain(RuntimeMoniker targetFrameworkMoniker)
                 case RuntimeMoniker.CoreRt50:
                     return CoreRtToolchain.Core50;
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(targetFrameworkMoniker), targetFrameworkMoniker, "Target Framework Moniker not supported");
+                    throw new ArgumentOutOfRangeException(nameof(runtimeMoniker), runtimeMoniker, "RuntimeMoniker not supported");
             }
         }
     }

diff --git a/tests/BenchmarkDotNet.Tests/RuntimeVersionDetectionTests.cs b/tests/BenchmarkDotNet.Tests/RuntimeVersionDetectionTests.cs
@@ -117,13 +117,13 @@ public void CurrentRuntimeIsProperlyRecognized()
 #elif NETCOREAPP2_1
             Assert.True(runtime is CoreRuntime coreRuntime && coreRuntime.RuntimeMoniker == RuntimeMoniker.NetCoreApp21);
 #elif NETCOREAPP2_2
-            Assert.True(runtime is CoreRuntime coreRuntime && coreRuntime.RuntimeMoniker == TargetFrameworkMoniker.NetCoreApp22);
+            Assert.True(runtime is CoreRuntime coreRuntime && coreRuntime.RuntimeMoniker == RuntimeMoniker.NetCoreApp22);
 #elif NETCOREAPP3_0
-            Assert.True(runtime is CoreRuntime coreRuntime && coreRuntime.RuntimeMoniker == TargetFrameworkMoniker.NetCoreApp30);
+            Assert.True(runtime is CoreRuntime coreRuntime && coreRuntime.RuntimeMoniker == RuntimeMoniker.NetCoreApp30);
 #elif NETCOREAPP3_1
-            Assert.True(runtime is CoreRuntime coreRuntime && coreRuntime.RuntimeMoniker == TargetFrameworkMoniker.NetCoreApp31);
+            Assert.True(runtime is CoreRuntime coreRuntime && coreRuntime.RuntimeMoniker == RuntimeMoniker.NetCoreApp31);
 #elif NETCOREAPP5_0
-            Assert.True(runtime is CoreRuntime coreRuntime && coreRuntime.RuntimeMoniker == TargetFrameworkMoniker.NetCoreApp50);
+            Assert.True(runtime is CoreRuntime coreRuntime && coreRuntime.RuntimeMoniker == RuntimeMoniker.NetCoreApp50);
 #endif
         }
     }