Skip to content

Commit 23f9958

Browse files
1 parent 9216a77 commit 23f9958

File tree

34 files changed

+54
-54
lines changed

34 files changed

+54
-54
lines changed

samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66
<PropertyGroup>
77
<OutputType>Exe</OutputType>
8-
<TargetFrameworks>net461;net6.0</TargetFrameworks>
8+
<TargetFrameworks>net462;net6.0</TargetFrameworks>
99
</PropertyGroup>
1010
<ItemGroup>
1111
<Compile Include="Program.fs" />

samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\build\common.props" />
33
<PropertyGroup>
44
<AssemblyTitle>BenchmarkDotNet.Samples</AssemblyTitle>
5-
<TargetFrameworks>net461;net6.0</TargetFrameworks>
5+
<TargetFrameworks>net462;net6.0</TargetFrameworks>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<AssemblyName>BenchmarkDotNet.Samples</AssemblyName>
88
<OutputType>Exe</OutputType>

samples/BenchmarkDotNet.Samples/IntroDisassemblyAllJits.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ public MultipleJits()
1616
AddJob(Job.ShortRun.WithPlatform(Platform.X86).WithRuntime(new MonoRuntime(name: "Mono x86", customPath: @"C:\Program Files (x86)\Mono\bin\mono.exe")));
1717
AddJob(Job.ShortRun.WithPlatform(Platform.X64).WithRuntime(new MonoRuntime(name: "Mono x64", customPath: @"C:\Program Files\Mono\bin\mono.exe")));
1818

19-
AddJob(Job.ShortRun.WithJit(Jit.LegacyJit).WithPlatform(Platform.X86).WithRuntime(ClrRuntime.Net461));
20-
AddJob(Job.ShortRun.WithJit(Jit.LegacyJit).WithPlatform(Platform.X64).WithRuntime(ClrRuntime.Net461));
19+
AddJob(Job.ShortRun.WithJit(Jit.LegacyJit).WithPlatform(Platform.X86).WithRuntime(ClrRuntime.Net462));
20+
AddJob(Job.ShortRun.WithJit(Jit.LegacyJit).WithPlatform(Platform.X64).WithRuntime(ClrRuntime.Net462));
2121

22-
AddJob(Job.ShortRun.WithJit(Jit.RyuJit).WithPlatform(Platform.X64).WithRuntime(ClrRuntime.Net461));
22+
AddJob(Job.ShortRun.WithJit(Jit.RyuJit).WithPlatform(Platform.X64).WithRuntime(ClrRuntime.Net462));
2323

2424
// RyuJit for .NET Core 5.0
2525
AddJob(Job.ShortRun.WithJit(Jit.RyuJit).WithPlatform(Platform.X64).WithRuntime(CoreRuntime.Core50));

samples/BenchmarkDotNet.Samples/IntroFluentConfigBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static void Run()
3737
BenchmarkRunner
3838
.Run<Algo_Md5VsSha256>(
3939
DefaultConfig.Instance
40-
.AddJob(Job.Default.WithRuntime(ClrRuntime.Net461))
40+
.AddJob(Job.Default.WithRuntime(ClrRuntime.Net462))
4141
.AddJob(Job.Default.WithRuntime(CoreRuntime.Core21))
4242
.AddValidator(ExecutionValidator.FailOnError));
4343
}

samples/BenchmarkDotNet.Samples/IntroJobBaseline.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace BenchmarkDotNet.Samples
55
{
6-
[SimpleJob(runtimeMoniker: RuntimeMoniker.Net461, baseline: true)]
6+
[SimpleJob(runtimeMoniker: RuntimeMoniker.Net462, baseline: true)]
77
[SimpleJob(runtimeMoniker: RuntimeMoniker.Mono)]
88
[SimpleJob(runtimeMoniker: RuntimeMoniker.Net50)]
99
public class IntroJobBaseline

src/BenchmarkDotNet.Disassembler.x64/BenchmarkDotNet.Disassembler.x64.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\build\common.props" />
33
<PropertyGroup>
4-
<TargetFramework>net461</TargetFramework>
4+
<TargetFramework>net462</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<AssemblyTitle>BenchmarkDotNet.Disassembler.x64</AssemblyTitle>
77
<AssemblyName>BenchmarkDotNet.Disassembler.x64</AssemblyName>

src/BenchmarkDotNet.Disassembler.x86/BenchmarkDotNet.Disassembler.x86.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\build\common.props" />
33
<PropertyGroup>
4-
<TargetFramework>net461</TargetFramework>
4+
<TargetFramework>net462</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<AssemblyTitle>BenchmarkDotNet.Disassembler.x86</AssemblyTitle>
77
<AssemblyName>BenchmarkDotNet.Disassembler.x86</AssemblyName>

src/BenchmarkDotNet/BenchmarkDotNet.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
<ProjectReference Include="..\BenchmarkDotNet.Disassembler.x86\BenchmarkDotNet.Disassembler.x86.csproj">
3737
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
3838
</ProjectReference>
39-
<EmbeddedResource Include="Disassemblers\net461\win7-x86\BenchmarkDotNet.Disassembler.x86.exe" />
40-
<EmbeddedResource Include="Disassemblers\net461\win7-x64\BenchmarkDotNet.Disassembler.x64.exe" />
41-
<EmbeddedResource Include="Disassemblers\net461\win7-x64\Microsoft.Diagnostics.Runtime.dll" />
42-
<EmbeddedResource Include="Disassemblers\net461\win7-x64\Iced.dll" />
39+
<EmbeddedResource Include="Disassemblers\net462\win7-x86\BenchmarkDotNet.Disassembler.x86.exe" />
40+
<EmbeddedResource Include="Disassemblers\net462\win7-x64\BenchmarkDotNet.Disassembler.x64.exe" />
41+
<EmbeddedResource Include="Disassemblers\net462\win7-x64\Microsoft.Diagnostics.Runtime.dll" />
42+
<EmbeddedResource Include="Disassemblers\net462\win7-x64\Iced.dll" />
4343
</ItemGroup>
4444
<ItemGroup>
4545
<ProjectReference Include="..\BenchmarkDotNet.Annotations\BenchmarkDotNet.Annotations.csproj" />

src/BenchmarkDotNet/Disassemblers/WindowsDisassembler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private static string GetDisassemblerPath(string architectureName)
100100
// the disassembler has not been yet retrieved from the resources
101101
CopyFromResources(
102102
assemblyWithDisassemblersInResources,
103-
$"BenchmarkDotNet.Disassemblers.net461.win7_{architectureName}.{exeName}",
103+
$"BenchmarkDotNet.Disassemblers.net462.win7_{architectureName}.{exeName}",
104104
disassemblerPath);
105105

106106
CopyAllRequiredDependencies(assemblyWithDisassemblersInResources, Path.GetDirectoryName(disassemblerPath));
@@ -113,8 +113,8 @@ private static void CopyAllRequiredDependencies(Assembly assemblyWithDisassemble
113113
// ClrMD and Iced are also embedded in the resources, we need to copy them as well
114114
foreach (string dependency in assemblyWithDisassemblersInResources.GetManifestResourceNames().Where(name => name.EndsWith(".dll")))
115115
{
116-
// dependency is sth like "BenchmarkDotNet.Disassemblers.net461.win7_x64.Microsoft.Diagnostics.Runtime.dll"
117-
string fileName = dependency.Replace("BenchmarkDotNet.Disassemblers.net461.win7_x64.", string.Empty);
116+
// dependency is sth like "BenchmarkDotNet.Disassemblers.net462.win7_x64.Microsoft.Diagnostics.Runtime.dll"
117+
string fileName = dependency.Replace("BenchmarkDotNet.Disassemblers.net462.win7_x64.", string.Empty);
118118
string dllPath = Path.Combine(destinationFolder, fileName);
119119

120120
if (!File.Exists(dllPath))

src/BenchmarkDotNet/Environments/Runtimes/Runtime.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public abstract class Runtime : IEquatable<Runtime>
1818
public RuntimeMoniker RuntimeMoniker { get; }
1919

2020
/// <summary>
21-
/// MsBuild Target Framework Moniker, example: net461, netcoreapp2.1
21+
/// MsBuild Target Framework Moniker, example: net462, netcoreapp2.1
2222
/// </summary>
2323
public string MsBuildMoniker { get; }
2424

0 commit comments

Comments
 (0)