Support for net6.0 p7 (#14)

jaredpar · web-flow · commit 5ffd8c8dd736 · 2021-08-24T22:24:07.000Z
This adds support for the .NET 6 Preview 7 reference assemblies.
diff --git a/Basic.Reference.Assemblies.Net472/Generated.cs b/Basic.Reference.Assemblies.Net472/Generated.cs
@@ -1,4 +1,4 @@
-﻿  // This is a generated file, please edit Generate.ps1 to change the contents
+  // This is a generated file, please edit Generate.ps1 to change the contents
 
   using System.Collections.Generic;
   using Microsoft.CodeAnalysis;
diff --git a/Basic.Reference.Assemblies.Net472/Generated.targets b/Basic.Reference.Assemblies.Net472/Generated.targets
@@ -1,4 +1,4 @@
-﻿  <Project>
+  <Project>
       <ItemGroup>
         <EmbeddedResource Include="$(NuGetPackageRoot)\microsoft.netframework.referenceassemblies.net472\1.0.0\build\.NETFramework\v4.7.2\Accessibility.dll">
           <LogicalName>net472.Accessibility</LogicalName>
diff --git a/Basic.Reference.Assemblies.Net50/Generated.cs b/Basic.Reference.Assemblies.Net50/Generated.cs
@@ -1,4 +1,4 @@
-﻿  // This is a generated file, please edit Generate.ps1 to change the contents
+  // This is a generated file, please edit Generate.ps1 to change the contents
 
   using System.Collections.Generic;
   using Microsoft.CodeAnalysis;
diff --git a/Basic.Reference.Assemblies.Net50/Generated.targets b/Basic.Reference.Assemblies.Net50/Generated.targets
@@ -1,4 +1,4 @@
-﻿  <Project>
+  <Project>
       <ItemGroup>
         <EmbeddedResource Include="$(NuGetPackageRoot)\microsoft.netcore.app.ref\5.0.0\ref\net5.0\Microsoft.CSharp.dll">
           <LogicalName>net50.Microsoft.CSharp</LogicalName>
diff --git a/Basic.Reference.Assemblies.Net60/Basic.Reference.Assemblies.Net60.csproj b/Basic.Reference.Assemblies.Net60/Basic.Reference.Assemblies.Net60.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <IsPackable>true</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21377.19" IncludeAssets="none" PrivateAssets="all" GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <Import Project="Generated.targets" />
+</Project>
diff --git a/Basic.Reference.Assemblies.Net60/Generated.cs b/Basic.Reference.Assemblies.Net60/Generated.cs
diff --git a/Basic.Reference.Assemblies.Net60/Generated.targets b/Basic.Reference.Assemblies.Net60/Generated.targets
diff --git a/Basic.Reference.Assemblies.NetCoreApp31/Generated.cs b/Basic.Reference.Assemblies.NetCoreApp31/Generated.cs
@@ -1,4 +1,4 @@
-﻿  // This is a generated file, please edit Generate.ps1 to change the contents
+  // This is a generated file, please edit Generate.ps1 to change the contents
 
   using System.Collections.Generic;
   using Microsoft.CodeAnalysis;
diff --git a/Basic.Reference.Assemblies.NetCoreApp31/Generated.targets b/Basic.Reference.Assemblies.NetCoreApp31/Generated.targets
@@ -1,4 +1,4 @@
-﻿  <Project>
+  <Project>
       <ItemGroup>
         <EmbeddedResource Include="$(NuGetPackageRoot)\microsoft.netcore.app.ref\3.1.0\ref\netcoreapp3.1\Microsoft.CSharp.dll">
           <LogicalName>netcoreapp31.Microsoft.CSharp</LogicalName>
diff --git a/Basic.Reference.Assemblies.NetStandard20/Generated.cs b/Basic.Reference.Assemblies.NetStandard20/Generated.cs
@@ -1,4 +1,4 @@
-﻿  // This is a generated file, please edit Generate.ps1 to change the contents
+  // This is a generated file, please edit Generate.ps1 to change the contents
 
   using System.Collections.Generic;
   using Microsoft.CodeAnalysis;
diff --git a/Basic.Reference.Assemblies.NetStandard20/Generated.targets b/Basic.Reference.Assemblies.NetStandard20/Generated.targets
@@ -1,4 +1,4 @@
-﻿  <Project>
+  <Project>
       <ItemGroup>
         <EmbeddedResource Include="$(NuGetPackageRoot)\netstandard.library\2.0.3\build\netstandard2.0\ref\Microsoft.Win32.Primitives.dll">
           <LogicalName>netstandard20.Microsoft.Win32.Primitives</LogicalName>
diff --git a/Basic.Reference.Assemblies.UnitTests/Basic.Reference.Assemblies.UnitTests.csproj b/Basic.Reference.Assemblies.UnitTests/Basic.Reference.Assemblies.UnitTests.csproj
@@ -17,6 +17,9 @@
     <ProjectReference Include="..\Basic.Reference.Assemblies.Net50\Basic.Reference.Assemblies.Net50.csproj">
       <Aliases>RefNet50</Aliases>
     </ProjectReference>
+    <ProjectReference Include="..\Basic.Reference.Assemblies.Net60\Basic.Reference.Assemblies.Net60.csproj">
+      <Aliases>RefNet60</Aliases>
+    </ProjectReference>
     <ProjectReference Include="..\Basic.Reference.Assemblies.NetCoreApp31\Basic.Reference.Assemblies.NetCoreApp31.csproj">
       <Aliases>RefNetCoreApp31</Aliases>
     </ProjectReference>
diff --git a/Basic.Reference.Assemblies.UnitTests/SpecificSanityUnitTests.cs b/Basic.Reference.Assemblies.UnitTests/SpecificSanityUnitTests.cs
@@ -1,5 +1,6 @@
 extern alias RefNetCoreApp31;
 extern alias RefNet50;
+extern alias RefNet60;
 extern alias RefNetStandard20;
 extern alias RefNet472;
 
@@ -12,6 +13,7 @@
 namespace Basic.Reference.Assemblies.UnitTests
 {
     using Net50 = RefNet50::Basic.Reference.Assemblies.Net50;
+    using Net60 = RefNet60::Basic.Reference.Assemblies.Net60;
     using NetCoreApp31 = RefNetCoreApp31::Basic.Reference.Assemblies.NetCoreApp31;
     using NetStandard20 = RefNetStandard20::Basic.Reference.Assemblies.NetStandard20;
     using Net472 = RefNet472::Basic.Reference.Assemblies.Net472;
@@ -90,6 +92,42 @@ static void Main()
             Assert.Empty(emitResult.Diagnostics);
         }
 
+        [Fact]
+        public void Net60Tests()
+        {
+            foreach (var portableRef in Net60.All)
+            {
+                Assert.NotNull(portableRef);
+            }
+            Assert.True(Net60.All.Count() > 60);
+            Assert.Equal("Basic.Reference.Assemblies.Net60", typeof(Net60).Assembly.GetName().Name);
+        }
+
+        [Fact]
+        public void Net60Compilation()
+        {
+            var source = @"
+using System;
+
+class Program
+{
+    static void Main() 
+    {
+        Console.WriteLine(""Hello World"");
+    }
+}";
+            var compilation = CSharpCompilation.Create(
+                "Example",
+                new[] { CSharpSyntaxTree.ParseText(source) },
+                references: Net60.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 NetStandard20Tests()
         {
diff --git a/Basic.Reference.Assemblies.sln b/Basic.Reference.Assemblies.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30907.101
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31612.314
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Basic.Reference.Assemblies.NetCoreApp31", "Basic.Reference.Assemblies.NetCoreApp31\Basic.Reference.Assemblies.NetCoreApp31.csproj", "{23924D94-13B5-48E4-B90D-E55ADB6E5404}"
 EndProject
@@ -20,6 +20,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Scripts\Generate.ps1 = Scripts\Generate.ps1
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Basic.Reference.Assemblies.Net60", "Basic.Reference.Assemblies.Net60\Basic.Reference.Assemblies.Net60.csproj", "{E2269796-09B5-40C8-85ED-476B5E71B29D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -102,6 +104,18 @@ Global
 		{6F49C153-3DB0-4286-AA66-51B1603D84AC}.Release|x64.Build.0 = Release|Any CPU
 		{6F49C153-3DB0-4286-AA66-51B1603D84AC}.Release|x86.ActiveCfg = Release|Any CPU
 		{6F49C153-3DB0-4286-AA66-51B1603D84AC}.Release|x86.Build.0 = Release|Any CPU
+		{E2269796-09B5-40C8-85ED-476B5E71B29D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2269796-09B5-40C8-85ED-476B5E71B29D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2269796-09B5-40C8-85ED-476B5E71B29D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E2269796-09B5-40C8-85ED-476B5E71B29D}.Debug|x64.Build.0 = Debug|Any CPU
+		{E2269796-09B5-40C8-85ED-476B5E71B29D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E2269796-09B5-40C8-85ED-476B5E71B29D}.Debug|x86.Build.0 = Debug|Any CPU
+		{E2269796-09B5-40C8-85ED-476B5E71B29D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2269796-09B5-40C8-85ED-476B5E71B29D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2269796-09B5-40C8-85ED-476B5E71B29D}.Release|x64.ActiveCfg = Release|Any CPU
+		{E2269796-09B5-40C8-85ED-476B5E71B29D}.Release|x64.Build.0 = Release|Any CPU
+		{E2269796-09B5-40C8-85ED-476B5E71B29D}.Release|x86.ActiveCfg = Release|Any CPU
+		{E2269796-09B5-40C8-85ED-476B5E71B29D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Basic.Reference.Assemblies/Basic.Reference.Assemblies.csproj b/Basic.Reference.Assemblies/Basic.Reference.Assemblies.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <Import Project="Generated.Net50.targets" />
+  <Import Project="Generated.Net60.targets" />
   <Import Project="Generated.NetCoreApp31.targets" />
   <Import Project="Generated.NetStandard20.targets" />
   <Import Project="Generated.Net472.targets" />
diff --git a/Basic.Reference.Assemblies/BasicReferenceAssemblies.cs b/Basic.Reference.Assemblies/BasicReferenceAssemblies.cs
@@ -10,13 +10,15 @@ public static class ReferenceAssemblies
     {
         public static IEnumerable<PortableExecutableReference> NetCoreApp31 => Basic.Reference.Assemblies.NetCoreApp31.All;
         public static IEnumerable<PortableExecutableReference> Net50 => Basic.Reference.Assemblies.Net50.All;
+        public static IEnumerable<PortableExecutableReference> Net60 => Basic.Reference.Assemblies.Net60.All;
         public static IEnumerable<PortableExecutableReference> NetStandard20 => Basic.Reference.Assemblies.NetStandard20.All;
         public static IEnumerable<PortableExecutableReference> Net472 => Basic.Reference.Assemblies.Net472.All;
 
         public static IEnumerable<PortableExecutableReference> Get(ReferenceAssemblyKind kind) => kind switch
         {
             ReferenceAssemblyKind.NetCoreApp31 => NetCoreApp31,
             ReferenceAssemblyKind.Net50 => Net50,
+            ReferenceAssemblyKind.Net60 => Net60,
             ReferenceAssemblyKind.NetStandard20 => NetStandard20,
             ReferenceAssemblyKind.Net472 => Net472,
             _ => throw new Exception($"Invalid kind: {kind}")
@@ -27,6 +29,7 @@ public enum ReferenceAssemblyKind
     {
         NetCoreApp31,
         Net50,
+        Net60,
         NetStandard20,
         Net472,
     }
diff --git a/Basic.Reference.Assemblies/Generated.Net472.cs b/Basic.Reference.Assemblies/Generated.Net472.cs
@@ -1,4 +1,4 @@
-﻿  // This is a generated file, please edit Generate.ps1 to change the contents
+  // This is a generated file, please edit Generate.ps1 to change the contents
 
   using System.Collections.Generic;
   using Microsoft.CodeAnalysis;
diff --git a/Basic.Reference.Assemblies/Generated.Net472.targets b/Basic.Reference.Assemblies/Generated.Net472.targets
@@ -1,4 +1,4 @@
-﻿  <Project>
+  <Project>
       <ItemGroup>
         <EmbeddedResource Include="$(NuGetPackageRoot)\microsoft.netframework.referenceassemblies.net472\1.0.0\build\.NETFramework\v4.7.2\Accessibility.dll">
           <LogicalName>net472.Accessibility</LogicalName>
diff --git a/Basic.Reference.Assemblies/Generated.Net50.cs b/Basic.Reference.Assemblies/Generated.Net50.cs
@@ -1,4 +1,4 @@
-﻿  // This is a generated file, please edit Generate.ps1 to change the contents
+  // This is a generated file, please edit Generate.ps1 to change the contents
 
   using System.Collections.Generic;
   using Microsoft.CodeAnalysis;
diff --git a/Basic.Reference.Assemblies/Generated.Net50.targets b/Basic.Reference.Assemblies/Generated.Net50.targets
@@ -1,4 +1,4 @@
-﻿  <Project>
+  <Project>
       <ItemGroup>
         <EmbeddedResource Include="$(NuGetPackageRoot)\microsoft.netcore.app.ref\5.0.0\ref\net5.0\Microsoft.CSharp.dll">
           <LogicalName>net50.Microsoft.CSharp</LogicalName>
diff --git a/Basic.Reference.Assemblies/Generated.Net60.cs b/Basic.Reference.Assemblies/Generated.Net60.cs
diff --git a/Basic.Reference.Assemblies/Generated.Net60.targets b/Basic.Reference.Assemblies/Generated.Net60.targets
diff --git a/Basic.Reference.Assemblies/Generated.NetCoreApp31.cs b/Basic.Reference.Assemblies/Generated.NetCoreApp31.cs
diff --git a/Basic.Reference.Assemblies/Generated.NetCoreApp31.targets b/Basic.Reference.Assemblies/Generated.NetCoreApp31.targets
diff --git a/Basic.Reference.Assemblies/Generated.NetStandard20.cs b/Basic.Reference.Assemblies/Generated.NetStandard20.cs
diff --git a/Basic.Reference.Assemblies/Generated.NetStandard20.targets b/Basic.Reference.Assemblies/Generated.NetStandard20.targets
diff --git a/Scripts/Generate.ps1 b/Scripts/Generate.ps1

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`- // This is a generated file, please edit Generate.ps1 to change the contents`
	`1`	`+ // This is a generated file, please edit Generate.ps1 to change the contents`
`2`	`2`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using Microsoft.CodeAnalysis;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`- <Project>`
	`1`	`+ <Project>`
`2`	`2`	`<ItemGroup>`
`3`	`3`	`<EmbeddedResource Include="$(NuGetPackageRoot)\microsoft.netframework.referenceassemblies.net472\1.0.0\build\.NETFramework\v4.7.2\Accessibility.dll">`
`4`	`4`	`<LogicalName>net472.Accessibility</LogicalName>`