From b303afb9bb8e3c2563bb8b7927114942409aed41 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Wed, 25 May 2016 20:41:10 -0700 Subject: [PATCH] Remove optimizationdata subdirectory from optimizationdata path (#3242) PR #3208 moved optimizationdata to a new root directory called optimizationdata. The leaf-node directory optimizationdata is therefore redundant. --- src/dotnet/MulticoreJitProfilePathCalculator.cs | 2 +- test/dotnet.Tests/GivenThatIWantToManageMulticoreJIT.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dotnet/MulticoreJitProfilePathCalculator.cs b/src/dotnet/MulticoreJitProfilePathCalculator.cs index 2f69c58e1..28f683fd1 100644 --- a/src/dotnet/MulticoreJitProfilePathCalculator.cs +++ b/src/dotnet/MulticoreJitProfilePathCalculator.cs @@ -34,7 +34,7 @@ namespace Microsoft.DotNet.Cli var rid = PlatformServices.Default.Runtime.GetRuntimeIdentifier(); - _multicoreJitProfilePath = Path.Combine(profileRoot, "optimizationdata", version, rid, "optimizationdata"); + _multicoreJitProfilePath = Path.Combine(profileRoot, "optimizationdata", version, rid); } private string GetRuntimeDataRootPathString() diff --git a/test/dotnet.Tests/GivenThatIWantToManageMulticoreJIT.cs b/test/dotnet.Tests/GivenThatIWantToManageMulticoreJIT.cs index 6dc20c11b..cfdfe158a 100644 --- a/test/dotnet.Tests/GivenThatIWantToManageMulticoreJIT.cs +++ b/test/dotnet.Tests/GivenThatIWantToManageMulticoreJIT.cs @@ -108,8 +108,8 @@ namespace Microsoft.DotNet.Tests var rid = PlatformServices.Default.Runtime.GetRuntimeIdentifier(); return RuntimeInformation.IsOSPlatform(OSPlatform.Windows) - ? $@"Microsoft\dotnet\optimizationdata\{version}\{rid}\optimizationdata" - : $@".dotnet/optimizationdata/{version}/{rid}/optimizationdata"; + ? $@"Microsoft\dotnet\optimizationdata\{version}\{rid}" + : $@".dotnet/optimizationdata/{version}/{rid}"; } private static string GetDotnetVersion()