From c0998a785f995a0d501bad55a2053e03a9ef7622 Mon Sep 17 00:00:00 2001 From: Paul M Cohen Date: Tue, 16 Feb 2021 16:08:11 -0800 Subject: [PATCH] Fix issue #72 --- CSharpToVB.Tests/Test/CSharpToVB/ExpressionTests.vb | 4 ++-- CodeConverter/CodeConverter.vbproj | 6 +++--- CodeConverter/Extensions/ExpressionSyntaxExtensions.vb | 2 +- ReadMe.MD | 5 ++++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CSharpToVB.Tests/Test/CSharpToVB/ExpressionTests.vb b/CSharpToVB.Tests/Test/CSharpToVB/ExpressionTests.vb index 04887c47..50589fdf 100644 --- a/CSharpToVB.Tests/Test/CSharpToVB/ExpressionTests.vb +++ b/CSharpToVB.Tests/Test/CSharpToVB/ExpressionTests.vb @@ -560,7 +560,7 @@ End Class") DoSomething() End If - If s1 Is object2 Then + If s1 = object2 Then DoSomething() End If @@ -568,7 +568,7 @@ End Class") DoSomething() End If - If object1 Is s2 Then + If object1 = s2 Then DoSomething() End If diff --git a/CodeConverter/CodeConverter.vbproj b/CodeConverter/CodeConverter.vbproj index 6872b437..70eddfd6 100644 --- a/CodeConverter/CodeConverter.vbproj +++ b/CodeConverter/CodeConverter.vbproj @@ -16,9 +16,9 @@ VB Core Code Converter https://github.com/paul1956/CSharpToVB git - 5.0.1.8 - 5.0.1.8 - 5.0.1.8 + 5.0.1.9 + 5.0.1.9 + 5.0.1.9 Copyright (c) .NET Foundation and Contributors true true diff --git a/CodeConverter/Extensions/ExpressionSyntaxExtensions.vb b/CodeConverter/Extensions/ExpressionSyntaxExtensions.vb index 808d70e2..f17ae747 100644 --- a/CodeConverter/Extensions/ExpressionSyntaxExtensions.vb +++ b/CodeConverter/Extensions/ExpressionSyntaxExtensions.vb @@ -305,7 +305,7 @@ Namespace CSharpToVBConverter Friend Function IsReferenceComparison(Expression1 As CSS.ExpressionSyntax, Expression2 As CSS.ExpressionSyntax, Model As SemanticModel) As Boolean Dim typeSymbol1 As (IsRefType As Boolean, IsString As Boolean) = IsReferenceTypeOrString(Expression1, Model) Dim typeSymbol2 As (IsRefType As Boolean, IsString As Boolean) = IsReferenceTypeOrString(Expression2, Model) - Return typeSymbol1.IsRefType AndAlso typeSymbol2.IsRefType AndAlso Not (typeSymbol1.IsString AndAlso typeSymbol2.IsString) + Return typeSymbol1.IsRefType AndAlso typeSymbol2.IsRefType AndAlso Not (typeSymbol1.IsString OrElse typeSymbol2.IsString) End Function diff --git a/ReadMe.MD b/ReadMe.MD index be99f608..4d0d3696 100644 --- a/ReadMe.MD +++ b/ReadMe.MD @@ -27,7 +27,7 @@ description: "C# to VB Converter" - Code Converter ## Updated -- 1/21/2021 +- 2/16/2021 ## Description This application will convert C# to VB while trying to preserve comments, formatting and as many Directives @@ -64,6 +64,9 @@ Microsoft.Dotnet.XUnitExtensions which provides ConditionalFact and PlatformSpec Any changes to CSharpToVB application needs to change the version information in the project file **AND** in MyProject/AssemblyInfo.vb until Visual Studio is able to general file automatically for a WinForms application. ## What's New in this release + New in 5.0.2.6/5.0.1.9 + - Fix issue #72 + New in 5.0.2.6/5.0.1.8 - Fix messages for issue #70