Revert "Merge pull request icsharpcode#1223 from GrahamTheCoder/master"

This reverts commit 63c7a2a, reversing
changes made to 763a24b.

Author: eansmith

.github/scripts/update-testdata-targetframework.ps1

@@ -19,6 +19,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
@@ -29,19 +30,11 @@ jobs:
       with:
         vs-version: ${{ inputs.vs-version }}
 
-    - name: Build
-      run: dotnet build DotNetBuildable.slnf /p:Configuration=Release
-
-    - name: Create global.json to enforce .NET 8 for MSBuild and update Tests/TestData projects
-      if: inputs.dotnet-version == '8.0.x'
-      shell: pwsh
-      run: ./.github/scripts/update-testdata-targetframework.ps1
-
     - name: Log MSBuild version
       run: msbuild -version
 
-    - name: Log .NET version
-      run: dotnet --info
+    - name: Build
+      run: dotnet build DotNetBuildable.slnf /p:Configuration=Release
 
     - name: Execute unit tests
-      run: dotnet test Tests/Tests.csproj -c Release --framework net${{ inputs.dotnet-version == '8.0.x' && '8.0' || '10.0' }} --no-build
+      run: dotnet test Tests/bin/Release/ICSharpCode.CodeConverter.Tests.dll

.github/workflows/dotnet-tests.yml

@@ -7,7 +7,7 @@ on:
     branches: [ master, main ]
 
 env:
-  BuildVersion: '10.0.1'
+  BuildVersion: '10.0.0'
 
 jobs:
   build:

.github/workflows/dotnet.yml

@@ -14,17 +14,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### C# -> VB
 
 
-## [10.0.1] - 2026-02-28
-
-* Reintroduce tentative legacy support for dotnet 8 and VS2022
-* Support slnx format [1195](https://github.com/icsharpcode/CodeConverter/issues/1195)
-
-### VB -> C#
-* Fix for ReDim Preserve of array property - [#1156](https://github.com/icsharpcode/CodeConverter/issues/1156)
-* Fix for with block conversion with null conditional [#1174](https://github.com/icsharpcode/CodeConverter/issues/1174)
-Fixes #1195
-
-
 ## [10.0.0] - 2026-02-06
 
 * Support for net framework dropped. Please use an older version if you are converting projects that still use it.

CHANGELOG.md

@@ -320,18 +320,8 @@ private async Task<SyntaxList<StatementSyntax>> ConvertRedimClauseAsync(VBSyntax
         var csTargetArrayExpression = await node.Expression.AcceptAsync<ExpressionSyntax>(_expressionVisitor);
         var convertedBounds = (await CommonConversions.ConvertArrayBoundsAsync(node.ArrayBounds)).Sizes.ToList();
         if (preserve && convertedBounds.Count == 1) {
-            bool isProperty = _semanticModel.GetSymbolInfo(node.Expression).Symbol?.IsKind(SymbolKind.Property) == true;
-            var arrayToResize = isProperty ? CreateLocalVariableWithUniqueName(node.Expression, "arg" + csTargetArrayExpression.ToString().Split('.').Last(), csTargetArrayExpression) : default;
-            var resizeArg = isProperty ? (ExpressionSyntax)arrayToResize.Reference : csTargetArrayExpression;
-
-            var argumentList = new[] { resizeArg, convertedBounds.Single() }.CreateCsArgList(SyntaxKind.RefKeyword);
+            var argumentList = new[] { csTargetArrayExpression, convertedBounds.Single() }.CreateCsArgList(SyntaxKind.RefKeyword);
             var arrayResize = SyntaxFactory.InvocationExpression(ValidSyntaxFactory.MemberAccess(nameof(Array), nameof(Array.Resize)), argumentList);
-
-            if (isProperty) {
-                var assignment = SyntaxFactory.AssignmentExpression(SyntaxKind.SimpleAssignmentExpression, csTargetArrayExpression, arrayToResize.Reference);
-                return SyntaxFactory.List(new StatementSyntax[] { arrayToResize.Declaration, SyntaxFactory.ExpressionStatement(arrayResize), SyntaxFactory.ExpressionStatement(assignment) });
-            }
-
             return SingleStatement(arrayResize);
         }
         var newArrayAssignment = CreateNewArrayAssignment(node.Expression, csTargetArrayExpression, convertedBounds);

CodeConverter/CSharp/MethodBodyExecutableStatementVisitor.cs

@@ -1,4 +1,4 @@
-using System.Data;
+using System.Data;
 using System.Globalization;
 using ICSharpCode.CodeConverter.CSharp.Replacements;
 using ICSharpCode.CodeConverter.Util.FromRoslyn;
@@ -688,19 +688,14 @@ private static QualifiedNameSyntax Qualify(string qualification, ExpressionSynta
 
     private static bool IsSubPartOfConditionalAccess(VBasic.Syntax.MemberAccessExpressionSyntax node)
     {
-        static bool IsMemberAccessChain(SyntaxNode exp) =>
-            exp?.IsKind(VBasic.SyntaxKind.InvocationExpression,
-                VBasic.SyntaxKind.SimpleMemberAccessExpression,
-                VBasic.SyntaxKind.ParenthesizedExpression,
-                VBasic.SyntaxKind.ConditionalAccessExpression) == true;
-
-        for (SyntaxNode child = node, parent = node.Parent; IsMemberAccessChain(parent); child = parent, parent = parent.Parent) {
-            if (parent is VBSyntax.ConditionalAccessExpressionSyntax cae && cae.WhenNotNull == child) {
-                return true; // On right hand side of a ?. conditional access
-            }
+        var firstPossiblyConditionalAncestor = node.Parent;
+        while (firstPossiblyConditionalAncestor != null &&
+               firstPossiblyConditionalAncestor.IsKind(VBasic.SyntaxKind.InvocationExpression,
+                   VBasic.SyntaxKind.SimpleMemberAccessExpression)) {
+            firstPossiblyConditionalAncestor = firstPossiblyConditionalAncestor.Parent;
         }
 
-        return false;
+        return firstPossiblyConditionalAncestor?.IsKind(VBasic.SyntaxKind.ConditionalAccessExpression) == true;
     }
 
     private static CSharpSyntaxNode ReplaceRightmostIdentifierText(CSharpSyntaxNode expr, SyntaxToken idToken, string overrideIdentifier)

CodeConverter/CSharp/NameExpressionNodeVisitor.cs

@@ -15,21 +15,9 @@ public class SolutionFileTextEditor : ISolutionFileTextEditor
         var projectReferenceReplacements = new List<(string Find, string Replace, bool FirstOnly)>();
         foreach (var relativeProjPath in relativeProjPaths)
         {
-            // Add replacements for both backslash and forward-slash variants so .slnx files using either separator are handled
-            var nativeVariant = relativeProjPath;
-            var altVariant = relativeProjPath.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
-
-            // native (likely backslashes on Windows)
-            var escapedNative = Regex.Escape(nativeVariant);
-            var newNative = PathConverter.TogglePathExtension(nativeVariant);
-            projectReferenceReplacements.Add((escapedNative, newNative, false));
-
-            // alternate (forward slashes)
-            if (altVariant != nativeVariant) {
-                var escapedAlt = Regex.Escape(altVariant);
-                var newAlt = PathConverter.TogglePathExtension(altVariant);
-                projectReferenceReplacements.Add((escapedAlt, newAlt, false));
-            }
+            var escapedProjPath = Regex.Escape(relativeProjPath);
+            var newProjPath = PathConverter.TogglePathExtension(relativeProjPath);
+            projectReferenceReplacements.Add((escapedProjPath, newProjPath, false));
         }
 
         return projectReferenceReplacements;

CodeConverter/Common/SolutionFileTextEditor.cs

@@ -8,9 +8,9 @@
     <WarningLevel>4</WarningLevel>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <LangVersion Condition="'$(LangVersion)' == ''">14.0</LangVersion>
-    <AssemblyVersion>10.0.1.0</AssemblyVersion>
-    <FileVersion>10.0.1.0</FileVersion>
-    <Version>10.0.1</Version>
+    <AssemblyVersion>10.0.0.0</AssemblyVersion>
+    <FileVersion>10.0.0.0</FileVersion>
+    <Version>10.0.0</Version>
     <Authors>ICSharpCode</Authors>
     <Copyright>Copyright (c) 2017-2023 AlphaSierraPapa for the CodeConverter team</Copyright>
     <Company>ICSharpCode</Company>

Directory.Build.props

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using ICSharpCode.CodeConverter.Tests.TestRunners;
 using Xunit;
 
@@ -1673,44 +1673,4 @@ public object Func()
     }
 }");
     }
-
-    [Fact]
-    public async Task WithBlockWithNullConditionalAccessAsync()
-    {
-        await TestConversionVisualBasicToCSharpAsync(@"
-Public Class Class1
-    Public Property x As Class1
-    Public Property Name As String
-End Class
-
-Public Class TestClass
-    Private _Data As Class1
-    Private x As String
-
-    Public Sub TestMethod()
-        With _Data
-            x = .x?.Name
-        End With
-    End Sub
-End Class", @"
-public partial class Class1
-{
-    public Class1 x { get; set; }
-    public string Name { get; set; }
-}
-
-public partial class TestClass
-{
-    private Class1 _Data;
-    private string x;
-
-    public void TestMethod()
-    {
-        {
-            ref var withBlock = ref _Data;
-            x = withBlock.x?.Name;
-        }
-    }
-}");
-    }
-}
+}