Browse Source

v9.0 RC Designation (#3357)

* v9.0 RC designation
* Ambiguous reference errors fixed
pull/3358/head
Christoph Wille 6 months ago committed by GitHub
parent
commit
8373ac752e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 13
      Directory.Packages.props
  2. 6
      ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs
  3. 2
      ICSharpCode.Decompiler.Tests/UglyTestRunner.cs
  4. 2
      ICSharpCode.Decompiler/Properties/DecompilerVersionInfo.template.cs
  5. 2
      doc/copyright.txt
  6. 2
      doc/license.txt

13
Directory.Packages.props

@ -5,14 +5,14 @@ @@ -5,14 +5,14 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AvalonEdit" Version="6.3.0.90" />
<PackageVersion Include="CliWrap" Version="3.6.7" />
<PackageVersion Include="CliWrap" Version="3.7.0" />
<PackageVersion Include="DataGridExtensions" Version="2.6.0" />
<PackageVersion Include="DiffLib" Version="2017.7.26.1241" />
<PackageVersion Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.72.1" />
<PackageVersion Include="FluentAssertions" Version="6.12.2" />
<PackageVersion Include="FluentAssertions" Version="7.0.0" />
<PackageVersion Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="9.0.1-rtm.24557.9" />
<PackageVersion Include="Iced" Version="1.21.0" />
<PackageVersion Include="JunitXml.TestLogger" Version="4.1.0" />
<PackageVersion Include="JunitXml.TestLogger" Version="5.0.0" />
<PackageVersion Include="K4os.Compression.LZ4" Version="1.3.8" />
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
<PackageVersion Include="McMaster.Extensions.Hosting.CommandLine" Version="4.1.1" />
@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="Microsoft.NETCore.ILAsm" Version="9.0.0" />
<PackageVersion Include="Microsoft.NETCore.ILDAsm" Version="9.0.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
<PackageVersion Include="NaturalSort.Extension" Version="4.3.0" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
<PackageVersion Include="NUnit" Version="4.2.2" />
<PackageVersion Include="NUnit" Version="4.3.2" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageVersion Include="NuGet.Protocol" Version="6.12.1" />
<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
@ -48,8 +48,7 @@ @@ -48,8 +48,7 @@
<PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.20.0" />
<PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.21.0" />
<PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.21.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.3" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />

6
ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs

@ -409,7 +409,7 @@ namespace ICSharpCode.Decompiler.Tests @@ -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 @@ -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 @@ -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);

2
ICSharpCode.Decompiler.Tests/UglyTestRunner.cs

@ -146,7 +146,7 @@ namespace ICSharpCode.Decompiler.Tests @@ -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);

2
ICSharpCode.Decompiler/Properties/DecompilerVersionInfo.template.cs

@ -4,7 +4,7 @@ @@ -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$";

2
doc/copyright.txt

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
Copyright 2011-2023 for the ILSpy team
Copyright 2011-2025 for the ILSpy team
by
AlphaSierraPapa, Christoph Wille

2
doc/license.txt

@ -1,6 +1,6 @@ @@ -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

Loading…
Cancel
Save