Merge pull request #1221 from icsharpcode/reference-assemblies

Cross platform experimentation - reference assemblies

Author: GrahamTheCoder

CodeConverter/CSharp/NameExpressionNodeVisitor.cs

@@ -52,7 +52,7 @@ public async Task<CSharpSyntaxNode> ConvertMemberAccessExpressionAsync(VBasic.Sy
 
         var simpleNameSyntax = await node.Name.AcceptAsync<SimpleNameSyntax>(TriviaConvertingExpressionVisitor);
 
-        var isDefaultProperty = nodeSymbol is IPropertySymbol p && VBasic.VisualBasicExtensions.IsDefault(p);
+        var isDefaultProperty = nodeSymbol is IPropertySymbol p && VBasic.VisualBasicExtensions.IsDefault(p) && p.Parameters.Any();
         ExpressionSyntax left = null;
         if (node.Expression is VBasic.Syntax.MyClassExpressionSyntax && nodeSymbol != null) {
             if (nodeSymbol.IsStatic) {

Tests/CSharp/ExpressionTests/ExpressionTests.cs

@@ -578,7 +578,7 @@ public VisualBasicClass()
     }
 }
 1 target compilation errors:
-CS1503: Argument 1: cannot convert from 'object' to 'string'");
+CS1503: Argument 1: cannot convert from 'object' to 'System.ReadOnlySpan<char>'");
     }
 
     [Fact]

Tests/CSharp/MemberTests/DefaultMemberAttributeTests.cs

@@ -0,0 +1,54 @@
+using System.Threading.Tasks;
+using ICSharpCode.CodeConverter.Tests.TestRunners;
+using Xunit;
+
+namespace ICSharpCode.CodeConverter.Tests.CSharp.MemberTests;
+
+public class DefaultMemberAttributeTests : ConverterTestBase
+{
+    [Fact]
+    public async Task TestDefaultMemberAttributeConversionAsync()
+    {
+        await TestConversionVisualBasicToCSharpAsync(
+            @"
+<System.Reflection.DefaultMember(""Caption"")>
+Public Class ClassWithReflectionDefaultMember
+    Public Property Caption As String
+End Class
+
+<System.Reflection.DefaultMember(NameOf(LoosingProperties.Caption))>
+Public Class LoosingProperties
+    Public Property Caption As String
+
+    Sub S()
+        Dim x = New LoosingProperties()
+        x.Caption = ""Hello""
+
+        Dim y = New ClassWithReflectionDefaultMember() 'from C#
+        y.Caption = ""World""
+    End Sub
+End Class", @"using System.Reflection;
+
+[DefaultMember(""Caption"")]
+public partial class ClassWithReflectionDefaultMember
+{
+    public string Caption { get; set; }
+}
+
+[DefaultMember(nameof(Caption))]
+public partial class LoosingProperties
+{
+    public string Caption { get; set; }
+
+    public void S()
+    {
+        var x = new LoosingProperties();
+        x.Caption = ""Hello"";
+
+        var y = new ClassWithReflectionDefaultMember(); // from C#
+        y.Caption = ""World"";
+    }
+}
+");
+    }
+}

Tests/CSharp/MissingSemanticModelInfo/ExpressionTests.cs

@@ -103,8 +103,7 @@ Sub Foo()
 
         Next
     End Sub
-End Class", @"using System.Linq;
-
+End Class", @"
 public partial class Class1
 {
     public void Foo()

Tests/DefaultReferences.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.CodeConverter.Common;
+
+/// <summary>
+/// Provides reference assemblies for use in Roslyn compilations during tests.
+/// Uses Basic.Reference.Assemblies packages to avoid platform-specific assembly loading.
+/// </summary>
+public static class DefaultReferences
+{
+    public static IReadOnlyCollection<PortableExecutableReference> NetStandard2 { get; } =
+        Basic.Reference.Assemblies.NetStandard20.References.All;
+
+    private static readonly IReadOnlyCollection<PortableExecutableReference> _net80All =
+        Basic.Reference.Assemblies.Net80.References.All
+            .Concat(Basic.Reference.Assemblies.Net80Windows.References.All)
+            .ToArray();
+
+    public static IReadOnlyCollection<PortableExecutableReference> With(params Assembly[] assemblies) =>
+        _net80All
+            .Concat(RefsFromAssemblies(assemblies))
+            .ToArray();
+
+    private static IEnumerable<PortableExecutableReference> RefsFromAssemblies(Assembly[] assemblies) =>
+        assemblies
+            .Where(a => !a.IsDynamic && !string.IsNullOrEmpty(a.Location) && File.Exists(a.Location))
+            .Select(a => MetadataReference.CreateFromFile(a.Location));
+}

Tests/TestRunners/ConverterTestBase.cs

@@ -48,8 +48,6 @@ public ConverterTestBase(string rootNamespace = null)
     }
 
     private static IReadOnlyCollection<PortableExecutableReference> References { get; } = DefaultReferences.With(
-        typeof(System.Windows.Forms.Form).Assembly,
-        typeof(Microsoft.VisualBasic.Devices.Computer).Assembly,
         typeof(System.Data.SqlClient.SqlConnection).Assembly
     );
 

Tests/Tests.csproj

@@ -1,13 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net10.0-windows</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Library</OutputType>
     <AssemblyName>ICSharpCode.CodeConverter.Tests</AssemblyName>
     <RootNamespace>ICSharpCode.CodeConverter.Tests</RootNamespace>
     <DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <UseWindowsForms>true</UseWindowsForms>
     <WarningsNotAsErrors>NU1510;NU1903</WarningsNotAsErrors>
   </PropertyGroup>
   <ItemGroup>
@@ -24,21 +21,18 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <!-- So we can reference commonly referenced assemblies in created compilations-->
+    <!-- Reference assemblies for use in created compilations during tests -->
+    <PackageReference Include="Basic.Reference.Assemblies.Net80" Version="1.8.4" />
+    <PackageReference Include="Basic.Reference.Assemblies.Net80Windows" Version="1.8.4" />
+    <PackageReference Include="Basic.Reference.Assemblies.NetStandard20" Version="1.8.4" />
+    <!-- SqlClient is not in the standard reference packs -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
-    <PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
-    <PackageReference Include="System.Memory" Version="4.5.5" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\CodeConverter\Common\DefaultReferences.cs" Link="DefaultReferences.cs" />
     <Compile Remove="TestData\**" />
     <EmbeddedResource Remove="TestData\**" />
     <None Include="TestData\**\*.*" />

Tests/VB/MemberTests.cs

@@ -1308,33 +1308,33 @@ End Class
 15 source compilation errors:
 CS1002: ; expected
 CS0535: 'TestClass' does not implement interface member 'IList.Add(object?)'
-CS0535: 'TestClass' does not implement interface member 'IList.Contains(object?)'
 CS0535: 'TestClass' does not implement interface member 'IList.Clear()'
+CS0535: 'TestClass' does not implement interface member 'IList.Contains(object?)'
 CS0535: 'TestClass' does not implement interface member 'IList.IndexOf(object?)'
 CS0535: 'TestClass' does not implement interface member 'IList.Insert(int, object?)'
 CS0535: 'TestClass' does not implement interface member 'IList.Remove(object?)'
 CS0535: 'TestClass' does not implement interface member 'IList.RemoveAt(int)'
-CS0535: 'TestClass' does not implement interface member 'IList.IsReadOnly'
 CS0535: 'TestClass' does not implement interface member 'IList.IsFixedSize'
+CS0535: 'TestClass' does not implement interface member 'IList.IsReadOnly'
 CS0535: 'TestClass' does not implement interface member 'ICollection.CopyTo(Array, int)'
 CS0535: 'TestClass' does not implement interface member 'ICollection.Count'
-CS0535: 'TestClass' does not implement interface member 'ICollection.SyncRoot'
 CS0535: 'TestClass' does not implement interface member 'ICollection.IsSynchronized'
+CS0535: 'TestClass' does not implement interface member 'ICollection.SyncRoot'
 CS0535: 'TestClass' does not implement interface member 'IEnumerable.GetEnumerator()'
 14 target compilation errors:
 BC30149: Class 'TestClass' must implement 'Function Add(value As Object) As Integer' for interface 'IList'.
-BC30149: Class 'TestClass' must implement 'Function Contains(value As Object) As Boolean' for interface 'IList'.
 BC30149: Class 'TestClass' must implement 'Sub Clear()' for interface 'IList'.
+BC30149: Class 'TestClass' must implement 'Function Contains(value As Object) As Boolean' for interface 'IList'.
 BC30149: Class 'TestClass' must implement 'Function IndexOf(value As Object) As Integer' for interface 'IList'.
 BC30149: Class 'TestClass' must implement 'Sub Insert(index As Integer, value As Object)' for interface 'IList'.
 BC30149: Class 'TestClass' must implement 'Sub Remove(value As Object)' for interface 'IList'.
 BC30149: Class 'TestClass' must implement 'Sub RemoveAt(index As Integer)' for interface 'IList'.
-BC30149: Class 'TestClass' must implement 'ReadOnly Property IsReadOnly As Boolean' for interface 'IList'.
 BC30149: Class 'TestClass' must implement 'ReadOnly Property IsFixedSize As Boolean' for interface 'IList'.
+BC30149: Class 'TestClass' must implement 'ReadOnly Property IsReadOnly As Boolean' for interface 'IList'.
 BC30149: Class 'TestClass' must implement 'Sub CopyTo(array As Array, index As Integer)' for interface 'ICollection'.
 BC30149: Class 'TestClass' must implement 'ReadOnly Property Count As Integer' for interface 'ICollection'.
-BC30149: Class 'TestClass' must implement 'ReadOnly Property SyncRoot As Object' for interface 'ICollection'.
 BC30149: Class 'TestClass' must implement 'ReadOnly Property IsSynchronized As Boolean' for interface 'ICollection'.
+BC30149: Class 'TestClass' must implement 'ReadOnly Property SyncRoot As Object' for interface 'ICollection'.
 BC30149: Class 'TestClass' must implement 'Function GetEnumerator() As IEnumerator' for interface 'IEnumerable'.");
     }
     [Fact]