From 8373ac752e26df0046751ed7f789a788416f83b6 Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Wed, 1 Jan 2025 09:57:11 +0100 Subject: [PATCH] v9.0 RC Designation (#3357) * v9.0 RC designation * Ambiguous reference errors fixed --- Directory.Packages.props | 13 ++++++------- .../CorrectnessTestRunner.cs | 6 +++--- ICSharpCode.Decompiler.Tests/UglyTestRunner.cs | 2 +- .../Properties/DecompilerVersionInfo.template.cs | 2 +- doc/copyright.txt | 2 +- doc/license.txt | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 72b5cb578..5c5711fea 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,14 +5,14 @@ - + - + - + @@ -25,7 +25,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -48,8 +48,7 @@ - - + diff --git a/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs b/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs index 2b877d110..a0901f255 100644 --- a/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs +++ b/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs @@ -409,7 +409,7 @@ namespace ICSharpCode.Decompiler.Tests options |= CompilerOptions.UseTestRunner; string testFileName = testName + ".cs"; string testOutputFileName = TestsAssemblyOutput.GetFilePath(TestCasePath, testName, Tester.GetSuffix(options) + ".exe"); - CompilerResults outputFile = null, decompiledOutputFile = null; + Helpers.CompilerResults outputFile = null, decompiledOutputFile = null; try { @@ -453,7 +453,7 @@ namespace ICSharpCode.Decompiler.Tests options |= CompilerOptions.UseTestRunner; string testFileName = testName + ".vb"; string testOutputFileName = TestsAssemblyOutput.GetFilePath(TestCasePath, testName, Tester.GetSuffix(options) + ".exe"); - CompilerResults outputFile = null, decompiledOutputFile = null; + Helpers.CompilerResults outputFile = null, decompiledOutputFile = null; try { @@ -477,7 +477,7 @@ namespace ICSharpCode.Decompiler.Tests async Task RunIL(string testFileName, CompilerOptions options = CompilerOptions.UseDebug, AssemblerOptions asmOptions = AssemblerOptions.None) { string outputFile = null; - CompilerResults decompiledOutputFile = null; + Helpers.CompilerResults decompiledOutputFile = null; bool optionsForce32Bit = options.HasFlag(CompilerOptions.Force32Bit); bool asmOptionsForce32Bit = asmOptions.HasFlag(AssemblerOptions.Force32Bit); diff --git a/ICSharpCode.Decompiler.Tests/UglyTestRunner.cs b/ICSharpCode.Decompiler.Tests/UglyTestRunner.cs index 620424ca8..bc60f38c9 100644 --- a/ICSharpCode.Decompiler.Tests/UglyTestRunner.cs +++ b/ICSharpCode.Decompiler.Tests/UglyTestRunner.cs @@ -146,7 +146,7 @@ namespace ICSharpCode.Decompiler.Tests if (!File.Exists(ilFile)) { // re-create .il file if necessary - CompilerResults output = null; + Helpers.CompilerResults output = null; try { output = await Tester.CompileCSharp(csFile, cscOptions).ConfigureAwait(false); diff --git a/ICSharpCode.Decompiler/Properties/DecompilerVersionInfo.template.cs b/ICSharpCode.Decompiler/Properties/DecompilerVersionInfo.template.cs index 947188ef1..8810b7e16 100644 --- a/ICSharpCode.Decompiler/Properties/DecompilerVersionInfo.template.cs +++ b/ICSharpCode.Decompiler/Properties/DecompilerVersionInfo.template.cs @@ -4,7 +4,7 @@ public const string Minor = "0"; public const string Build = "0"; public const string Revision = "$INSERTREVISION$"; - public const string VersionName = "preview3"; + public const string VersionName = "RC"; public const string FullVersion = Major + "." + Minor + "." + Build + ".$INSERTREVISION$$INSERTBRANCHPOSTFIX$$INSERTVERSIONNAMEPOSTFIX$"; public const string FullVersionWithShortCommitHash = FullVersion + "+$INSERTSHORTCOMMITHASH$"; diff --git a/doc/copyright.txt b/doc/copyright.txt index de4935037..979e262b9 100644 --- a/doc/copyright.txt +++ b/doc/copyright.txt @@ -1,4 +1,4 @@ -Copyright 2011-2023 for the ILSpy team +Copyright 2011-2025 for the ILSpy team by AlphaSierraPapa, Christoph Wille diff --git a/doc/license.txt b/doc/license.txt index 52c20debd..22e1b4257 100644 --- a/doc/license.txt +++ b/doc/license.txt @@ -1,6 +1,6 @@ MIT license -Copyright (c) 2011-2023 AlphaSierraPapa for the ILSpy team +Copyright (c) 2011-2025 AlphaSierraPapa for the ILSpy team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software