From 00edcad8492ad196c7a5ad25dae865bb3f319fbc Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Thu, 24 Feb 2022 19:28:02 +0100 Subject: [PATCH] Use .NET 4.7.2 assemblies for our type system tests. --- ICSharpCode.Decompiler.Tests/Helpers/Tester.cs | 8 ++++---- .../TypeSystem/TypeSystemLoaderTests.cs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs b/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs index 33ee1f616..40a6b474d 100644 --- a/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs +++ b/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs @@ -230,7 +230,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers new Version(6, 0), "Microsoft.NETCore.App") .GetReferenceAssemblyPath(".NETCoreApp,Version=v6.0"); - static readonly string refAsmPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), + public static readonly string RefAsmPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), @"Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2"); static readonly string[] defaultReferences = new[] { @@ -383,8 +383,8 @@ namespace ICSharpCode.Decompiler.Tests.Helpers } else { - libPath = "\"" + refAsmPath + "\",\"" + Path.Combine(refAsmPath, "Facades") + "\""; - references = defaultReferences.Select(r => "-r:\"" + Path.Combine(refAsmPath, r) + "\""); + libPath = "\"" + RefAsmPath + "\",\"" + Path.Combine(RefAsmPath, "Facades") + "\""; + references = defaultReferences.Select(r => "-r:\"" + Path.Combine(RefAsmPath, r) + "\""); } if (flags.HasFlag(CompilerOptions.ReferenceVisualBasic)) { @@ -689,7 +689,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers string targetFramework = module.Reader.DetectTargetFrameworkId(); var resolver = new UniversalAssemblyResolver(assemblyFileName, false, targetFramework, null, PEStreamOptions.PrefetchMetadata); - resolver.AddSearchDirectory(targetFramework.Contains(".NETFramework") ? refAsmPath : coreRefAsmPath); + resolver.AddSearchDirectory(targetFramework.Contains(".NETFramework") ? RefAsmPath : coreRefAsmPath); var typeSystem = new DecompilerTypeSystem(module, resolver, settings); CSharpDecompiler decompiler = new CSharpDecompiler(typeSystem, settings); decompiler.AstTransforms.Insert(0, new RemoveEmbeddedAttributes()); diff --git a/ICSharpCode.Decompiler.Tests/TypeSystem/TypeSystemLoaderTests.cs b/ICSharpCode.Decompiler.Tests/TypeSystem/TypeSystemLoaderTests.cs index 84b4252bd..38435f1d0 100644 --- a/ICSharpCode.Decompiler.Tests/TypeSystem/TypeSystemLoaderTests.cs +++ b/ICSharpCode.Decompiler.Tests/TypeSystem/TypeSystemLoaderTests.cs @@ -46,12 +46,12 @@ namespace ICSharpCode.Decompiler.Tests.TypeSystem static readonly Lazy mscorlib = new Lazy( delegate { - return LoadAssembly(typeof(object).Assembly.Location); + return LoadAssembly(Path.Combine(Helpers.Tester.RefAsmPath, "mscorlib.dll")); }); static readonly Lazy systemCore = new Lazy( delegate { - return LoadAssembly(typeof(System.Linq.Enumerable).Assembly.Location); + return LoadAssembly(Path.Combine(Helpers.Tester.RefAsmPath, "System.Core.dll")); }); static readonly Lazy testAssembly = new Lazy(