|
|
|
|
@ -105,9 +105,9 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
@@ -105,9 +105,9 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
|
|
|
|
|
TesterPath = Path.GetDirectoryName(typeof(Tester).Assembly.Location); |
|
|
|
|
TestCasePath = Path.Combine(TesterPath, "../../../../TestCases"); |
|
|
|
|
#if DEBUG
|
|
|
|
|
testRunnerBasePath = Path.Combine(TesterPath, "../../../../../ICSharpCode.Decompiler.TestRunner/bin/Debug/net7.0"); |
|
|
|
|
testRunnerBasePath = Path.Combine(TesterPath, "../../../../../ICSharpCode.Decompiler.TestRunner/bin/Debug/net8.0"); |
|
|
|
|
#else
|
|
|
|
|
testRunnerBasePath = Path.Combine(TesterPath, "../../../../../ICSharpCode.Decompiler.TestRunner/bin/Release/net7.0"); |
|
|
|
|
testRunnerBasePath = Path.Combine(TesterPath, "../../../../../ICSharpCode.Decompiler.TestRunner/bin/Release/net8.0"); |
|
|
|
|
#endif
|
|
|
|
|
packagesPropsFile = Path.Combine(TesterPath, "../../../../../packages.props"); |
|
|
|
|
roslynLatestVersion = XDocument.Load(packagesPropsFile).XPathSelectElement("//RoslynVersion").Value; |
|
|
|
|
@ -270,8 +270,8 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
@@ -270,8 +270,8 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static readonly string coreRefAsmPath = new DotNetCorePathFinder(TargetFrameworkIdentifier.NET, |
|
|
|
|
new Version(7, 0), "Microsoft.NETCore.App") |
|
|
|
|
.GetReferenceAssemblyPath(".NETCoreApp,Version=v7.0"); |
|
|
|
|
new Version(8, 0), "Microsoft.NETCore.App") |
|
|
|
|
.GetReferenceAssemblyPath(".NETCoreApp,Version=v8.0"); |
|
|
|
|
|
|
|
|
|
public static readonly string RefAsmPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), |
|
|
|
|
@"Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2"); |
|
|
|
|
@ -309,7 +309,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
@@ -309,7 +309,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
|
|
|
|
|
|
|
|
|
|
const string targetFrameworkAttributeSnippet = @"
|
|
|
|
|
|
|
|
|
|
[assembly: System.Runtime.Versioning.TargetFramework("".NETCoreApp,Version=v7.0"", FrameworkDisplayName = """")] |
|
|
|
|
[assembly: System.Runtime.Versioning.TargetFramework("".NETCoreApp,Version=v8.0"", FrameworkDisplayName = """")] |
|
|
|
|
|
|
|
|
|
";
|
|
|
|
|
|
|
|
|
|
@ -345,6 +345,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
@@ -345,6 +345,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
|
|
|
|
|
preprocessorSymbols.Add("NETCORE"); |
|
|
|
|
preprocessorSymbols.Add("NET60"); |
|
|
|
|
preprocessorSymbols.Add("NET70"); |
|
|
|
|
preprocessorSymbols.Add("NET80"); |
|
|
|
|
} |
|
|
|
|
preprocessorSymbols.Add("ROSLYN"); |
|
|
|
|
preprocessorSymbols.Add("CS60"); |
|
|
|
|
@ -374,6 +375,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
@@ -374,6 +375,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
|
|
|
|
|
preprocessorSymbols.Add("ROSLYN4"); |
|
|
|
|
preprocessorSymbols.Add("CS100"); |
|
|
|
|
preprocessorSymbols.Add("CS110"); |
|
|
|
|
preprocessorSymbols.Add("CS120"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
else if ((flags & CompilerOptions.UseMcsMask) != 0) |
|
|
|
|
|