Merge pull request #60 from jaredpar/extra

Include extra references
jaredpar · Aug 23, 2024 · 928dffc · 928dffc
2 parents be61769 + 17e73a8
commit 928dffc
Show file tree

Hide file tree

Showing 28 changed files with 47,356 additions and 46,820 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,37 +1,39 @@
 {
-	"version": "2.0.0",
-	"tasks": [
-		{            
-			"label": "build",
+    "version": "2.0.0",
+    "tasks": [
+        {            
+            "label": "build",
             "command": "dotnet",
             "type": "process",
             "args": [
                 "build",
                 "${workspaceFolder}/Basic.Reference.Assemblies.sln",
                 "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "/consoleloggerparameters:NoSummary",
+                "/tl:off"
             ],
             "problemMatcher": "$msCompile",
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			},
-		},
-		{            
-			"label": "build generate",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+        },
+        {            
+            "label": "build generate",
             "command": "dotnet",
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/Generate/Generate.csproj",
+                "${workspaceFolder}/Src/Generate/Generate.csproj",
                 "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "/consoleloggerparameters:NoSummary",
+                "/tl:off"
             ],
             "problemMatcher": "$msCompile",
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			},
-		}
-	]
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+        }
+    ]
 }
diff --git a/Src/Basic.Reference.Assemblies.AspNet80/Generated.cs b/Src/Basic.Reference.Assemblies.AspNet80/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.AspNet90/Generated.cs b/Src/Basic.Reference.Assemblies.AspNet90/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.Net20/Generated.cs b/Src/Basic.Reference.Assemblies.Net20/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.Net35/Generated.cs b/Src/Basic.Reference.Assemblies.Net35/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.Net40/Generated.cs b/Src/Basic.Reference.Assemblies.Net40/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.Net461/Basic.Reference.Assemblies.Net461.csproj b/Src/Basic.Reference.Assemblies.Net461/Basic.Reference.Assemblies.Net461.csproj
@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.3" IncludeAssets="none" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" IncludeAssets="none" PrivateAssets="all" GeneratePathProperty="true" />
   </ItemGroup>
 
   <Import Project="Generated.targets" />

diff --git a/Src/Basic.Reference.Assemblies.Net461/Generated.cs b/Src/Basic.Reference.Assemblies.Net461/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.Net461/Generated.targets b/Src/Basic.Reference.Assemblies.Net461/Generated.targets
@@ -736,5 +736,9 @@
             <LogicalName>net461.System.Xml.XmlSerializer</LogicalName>
             <Link>Resources\net461\System.Xml.XmlSerializer.dll</Link>
         </EmbeddedResource>
+        <EmbeddedResource Include="$(NuGetPackageRoot)\system.threading.tasks.extensions\4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll" WithCulture="false">
+            <LogicalName>net461.System.Threading.Tasks.Extensions</LogicalName>
+            <Link>Resources\net461\System.Threading.Tasks.Extensions.dll</Link>
+        </EmbeddedResource>
     </ItemGroup>
 </Project>
diff --git a/Src/Basic.Reference.Assemblies.Net472/Generated.cs b/Src/Basic.Reference.Assemblies.Net472/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.Net50/Generated.cs b/Src/Basic.Reference.Assemblies.Net50/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.Net60/Generated.cs b/Src/Basic.Reference.Assemblies.Net60/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.Net60Windows/Generated.cs b/Src/Basic.Reference.Assemblies.Net60Windows/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.Net70/Generated.cs b/Src/Basic.Reference.Assemblies.Net70/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.Net80/Generated.cs b/Src/Basic.Reference.Assemblies.Net80/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.Net80Windows/Generated.cs b/Src/Basic.Reference.Assemblies.Net80Windows/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.Net90/Generated.cs b/Src/Basic.Reference.Assemblies.Net90/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.NetCoreApp31/Generated.cs b/Src/Basic.Reference.Assemblies.NetCoreApp31/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.NetStandard13/Generated.cs b/Src/Basic.Reference.Assemblies.NetStandard13/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.NetStandard20/Basic.Reference.Assemblies.NetStandard20.csproj b/Src/Basic.Reference.Assemblies.NetStandard20/Basic.Reference.Assemblies.NetStandard20.csproj
@@ -5,6 +5,12 @@
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" IncludeAssets="none" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" IncludeAssets="none" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" IncludeAssets="none" PrivateAssets="all" GeneratePathProperty="true" />
+  </ItemGroup>
+
   <Import Project="Generated.targets" />
 
 </Project>
diff --git a/Src/Basic.Reference.Assemblies.NetStandard20/Generated.cs b/Src/Basic.Reference.Assemblies.NetStandard20/Generated.cs
diff --git a/Src/Basic.Reference.Assemblies.NetStandard20/Generated.targets b/Src/Basic.Reference.Assemblies.NetStandard20/Generated.targets
@@ -452,5 +452,17 @@
             <LogicalName>netstandard20.System.Xml.XPath.XDocument</LogicalName>
             <Link>Resources\netstandard20\System.Xml.XPath.XDocument.dll</Link>
         </EmbeddedResource>
+        <EmbeddedResource Include="$(NuGetPackageRoot)\microsoft.csharp\4.7.0\lib\netstandard2.0\Microsoft.CSharp.dll" WithCulture="false">
+            <LogicalName>netstandard20.Microsoft.CSharp</LogicalName>
+            <Link>Resources\netstandard20\Microsoft.CSharp.dll</Link>
+        </EmbeddedResource>
+        <EmbeddedResource Include="$(NuGetPackageRoot)\microsoft.visualbasic\10.3.0\lib\netstandard2.0\Microsoft.VisualBasic.dll" WithCulture="false">
+            <LogicalName>netstandard20.Microsoft.VisualBasic</LogicalName>
+            <Link>Resources\netstandard20\Microsoft.VisualBasic.dll</Link>
+        </EmbeddedResource>
+        <EmbeddedResource Include="$(NuGetPackageRoot)\system.threading.tasks.extensions\4.5.4\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll" WithCulture="false">
+            <LogicalName>netstandard20.System.Threading.Tasks.Extensions</LogicalName>
+            <Link>Resources\netstandard20\System.Threading.Tasks.Extensions.dll</Link>
+        </EmbeddedResource>
     </ItemGroup>
 </Project>
diff --git a/Src/Basic.Reference.Assemblies.UnitTests/SanityUnitTests.cs b/Src/Basic.Reference.Assemblies.UnitTests/SanityUnitTests.cs
@@ -116,4 +116,64 @@ public void ReferencesLazyInit()
         Assert.NotEmpty(Net461.References.All);
         Assert.NotEmpty(Net472.References.All);
     }
+
+    [Fact]
+    public void ExtraNetStandard20()
+    {
+        var source = """
+            using System;
+
+            public class C
+            {
+                public System.Threading.Tasks.ValueTask Field1;
+                public dynamic Field2;
+                public Microsoft.VisualBasic.CompilerServices.NewLateBinding Field3;
+
+                static void Main() 
+                {
+                    Console.WriteLine("");
+                }
+            }
+            """;
+
+        var compilation = CSharpCompilation.Create(
+            "Example",
+            [CSharpSyntaxTree.ParseText(source)],
+            [.. NetStandard20.References.All, .. NetStandard20.ExtraReferences.All]);
+
+        Assert.Empty(compilation.GetDiagnostics());
+        using var stream = new MemoryStream();
+        var emitResult = compilation.Emit(stream);
+        Assert.True(emitResult.Success);
+        Assert.Empty(emitResult.Diagnostics);
+    }
+
+    [Fact]
+    public void ExtraNetStandardNet461()
+    {
+        var source = """
+            using System;
+
+            public class C
+            {
+                public System.Threading.Tasks.ValueTask Field1;
+
+                static void Main() 
+                {
+                    Console.WriteLine("");
+                }
+            }
+            """;
+
+        var compilation = CSharpCompilation.Create(
+            "Example",
+            [CSharpSyntaxTree.ParseText(source)],
+            [.. Net461.References.All, .. Net461.ExtraReferences.All]);
+
+        Assert.Empty(compilation.GetDiagnostics());
+        using var stream = new MemoryStream();
+        var emitResult = compilation.Emit(stream);
+        Assert.True(emitResult.Success);
+        Assert.Empty(emitResult.Diagnostics);
+    }
 }