Update to latest CG.R

Author: AArnott

src/Directory.Build.targets

@@ -1,13 +1,14 @@
 <Project>
   <PropertyGroup>
-    <CodeGenerationRoslynVersion>0.4.88</CodeGenerationRoslynVersion>
+    <CodeGenerationRoslynVersion>0.6.1</CodeGenerationRoslynVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Update="CodeGeneration.Roslyn.Attributes" Version="$(CodeGenerationRoslynVersion)" />
     <PackageReference Update="CodeGeneration.Roslyn.BuildTime" Version="$(CodeGenerationRoslynVersion)" />
     <PackageReference Update="CodeGeneration.Roslyn" Version="$(CodeGenerationRoslynVersion)" />
+    <PackageReference Update="CodeGeneration.Roslyn.Engine" Version="$(CodeGenerationRoslynVersion)" />
     <PackageReference Update="Microsoft.Build" Version="14.3.0" />
-    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.9.0" />
+    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.1.0" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.2.0" />
     <PackageReference Update="System.Collections.Immutable" Version="1.5.0" />
     <PackageReference Update="System.Diagnostics.Contracts" Version="4.3.0" />

src/ImmutableObjectGraph.Generation.Attributes/GenerateImmutableAttribute.cs

@@ -6,7 +6,7 @@
 
     [AttributeUsage(AttributeTargets.Class)]
     [Conditional("CodeGeneration")]
-    [CodeGenerationAttribute("ImmutableObjectGraph.Generation.CodeGenerator, ImmutableObjectGraph.Generation, Version=" + ThisAssembly.AssemblyVersion + ", Culture=neutral, PublicKeyToken=bfd91f1bd601e0d7")]
+    [CodeGenerationAttribute("ImmutableObjectGraph.Generation.CodeGenerator, ImmutableObjectGraph.Generation, Version=" + ThisAssembly.AssemblyVersion + ", Culture=neutral, PublicKeyToken=" + ThisAssembly.PublicKeyToken)]
     public class GenerateImmutableAttribute : Attribute
     {
         public GenerateImmutableAttribute()

src/ImmutableObjectGraph.Generation.Tests/CodeGenTests.cs

@@ -9,7 +9,9 @@
     using System.Text;
     using System.Threading;
     using System.Threading.Tasks;
+    using CodeGeneration.Roslyn.Engine;
     using global::CodeGeneration.Roslyn;
+    using ImmutableObjectGraph.Generation.Roslyn;
     using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.Diagnostics;

src/ImmutableObjectGraph.Generation.Tests/ImmutableObjectGraph.Generation.Tests.csproj

@@ -79,11 +79,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Build" />
+    <PackageReference Include="Validation" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="CodeGeneration.Roslyn" PrivateAssets="all" />
+    <PackageReference Include="CodeGeneration.Roslyn.Engine" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="dotnet-codegen" />

src/ImmutableObjectGraph.Generation/CodeGen.cs

@@ -12,6 +12,7 @@
     using System.Threading;
     using System.Threading.Tasks;
     using global::CodeGeneration.Roslyn;
+    using ImmutableObjectGraph.Generation.Roslyn;
     using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.CSharp.Syntax;

src/ImmutableObjectGraph.Generation/ImmutableObjectGraph.Generation.csproj

@@ -36,6 +36,7 @@
     <PackageReference Include="CodeGeneration.Roslyn" PrivateAssets="all" />
     <PackageReference Include="CodeGeneration.Roslyn.BuildTime" PrivateAssets="none" />
     <PackageReference Include="System.Diagnostics.Contracts" PrivateAssets="all" />
+    <PackageReference Include="Validation" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="dotnet-codegen" />

src/ImmutableObjectGraph.Generation/Roslyn/CSharpDeclarationComputer.cs

@@ -13,7 +13,7 @@
 
 namespace ImmutableObjectGraph.Generation.Roslyn
 {
-    internal class CSharpDeclarationComputer : DeclarationComputer
+    public class CSharpDeclarationComputer : DeclarationComputer
     {
         public static ImmutableArray<DeclarationInfo> GetDeclarationsInSpan(SemanticModel model, TextSpan span, bool getSymbol, CancellationToken cancellationToken)
         {

src/ImmutableObjectGraph.Generation/Roslyn/DeclarationComputer.cs

@@ -10,7 +10,7 @@ namespace ImmutableObjectGraph.Generation.Roslyn
     using System.Threading;
     using Microsoft.CodeAnalysis;
 
-    internal class DeclarationComputer
+    public class DeclarationComputer
     {
         internal static DeclarationInfo GetDeclarationInfo(SemanticModel model, SyntaxNode node, bool getSymbol, IEnumerable<SyntaxNode> executableCodeBlocks, CancellationToken cancellationToken)
         {

src/ImmutableObjectGraph.Generation/Roslyn/DeclarationInfo.cs

@@ -12,7 +12,7 @@ namespace ImmutableObjectGraph.Generation.Roslyn
     /// <summary>
     /// Struct containing information about a source declaration.
     /// </summary>
-    internal struct DeclarationInfo
+    public struct DeclarationInfo
     {
         private readonly SyntaxNode _declaredNode;
         private readonly ImmutableArray<SyntaxNode> _executableCodeBlocks;

src/ImmutableObjectGraph.Generation/Syntax.cs

@@ -8,6 +8,7 @@
     using System.Text;
     using System.Threading;
     using System.Threading.Tasks;
+    using ImmutableObjectGraph.Generation.Roslyn;
     using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.CSharp.Syntax;