WIP toward fixing build breaks in test project

AArnott · AArnott · commit 822096ab31a5 · 2018-10-04T21:05:35.000-07:00
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <CodeGenerationRoslynVersion>0.4.42</CodeGenerationRoslynVersion>
+    <CodeGenerationRoslynVersion>0.4.74</CodeGenerationRoslynVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Update="CodeGeneration.Roslyn.Attributes" Version="$(CodeGenerationRoslynVersion)" />
diff --git a/src/ImmutableObjectGraph.Generation.Attributes/ImmutableObjectGraph.Generation.Attributes.csproj b/src/ImmutableObjectGraph.Generation.Attributes/ImmutableObjectGraph.Generation.Attributes.csproj
@@ -1,9 +1,9 @@
 ﻿<Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
     <RootNamespace>ImmutableObjectGraph.Generation</RootNamespace>
-    <TargetFrameworks>netstandard1.0;portable-net45+win8+wpa81+wp8</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0</TargetFrameworks>
     <Description>The runtime components behind the types generated with the ImmutableObjectGraph.Generation package.</Description>
-    
+
     <!-- This gets included in ImmutableObjectGraph.Generation -->
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -12,4 +12,4 @@
     <PackageReference Include="System.Collections.Immutable" />
     <PackageReference Include="CodeGeneration.Roslyn.Attributes" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/ImmutableObjectGraph.Generation.Tests/ImmutableObjectGraph.Generation.Tests.csproj b/src/ImmutableObjectGraph.Generation.Tests/ImmutableObjectGraph.Generation.Tests.csproj
@@ -76,6 +76,11 @@
     <PackageReference Include="Microsoft.Build" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
+    <PackageReference Include="CodeGeneration.Roslyn" PrivateAssets="all" />
+  </ItemGroup>
+  <ItemGroup>
+    <DotNetCliToolReference Include="dotnet-codegen" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ImmutableObjectGraph.Generation.Attributes\ImmutableObjectGraph.Generation.Attributes.csproj" />
diff --git a/src/ImmutableObjectGraph.Generation/CodeGen+DeltaGen.cs b/src/ImmutableObjectGraph.Generation/CodeGen+DeltaGen.cs
@@ -451,7 +451,7 @@ protected MethodDeclarationSyntax CreateDiffPropertiesMethod()
                                                 SyntaxFactory.InvocationExpression(
                                                     Syntax.ThisDot(SyntaxFactory.IdentifierName(nameof(GetType))),
                                                     SyntaxFactory.ArgumentList()),
-                                                SyntaxFactory.IdentifierName(nameof(Type.IsEquivalentTo)))).AddArgumentListArguments(
+                                                SyntaxFactory.IdentifierName("IsEquivalentTo"))).AddArgumentListArguments(
                                                     SyntaxFactory.Argument(
                                                         SyntaxFactory.InvocationExpression(
                                                             SyntaxFactory.MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression, otherParam, SyntaxFactory.IdentifierName(nameof(GetType))),
diff --git a/src/ImmutableObjectGraph.Generation/CodeGen.cs b/src/ImmutableObjectGraph.Generation/CodeGen.cs
@@ -81,7 +81,7 @@ private CodeGen(ClassDeclarationSyntax applyTo, SemanticModel semanticModel, IPr
             this.options = options ?? new Options();
             this.cancellationToken = cancellationToken;
 
-            this.PluralService = PluralizationService.CreateService(CultureInfo.GetCultureInfo("en-US"));
+            this.PluralService = PluralizationService.CreateService(new CultureInfo("en-US"));
         }
 
         public PluralizationService PluralService { get; set; }
diff --git a/src/ImmutableObjectGraph.Generation/DiagnosticsStrings.Designer.cs b/src/ImmutableObjectGraph.Generation/DiagnosticsStrings.Designer.cs
diff --git a/src/ImmutableObjectGraph.Generation/ImmutableObjectGraph.Generation.csproj b/src/ImmutableObjectGraph.Generation/ImmutableObjectGraph.Generation.csproj
@@ -1,7 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>ImmutableObjectGraph.Generation</RootNamespace>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81</PackageTargetFallback>
     <Description>MSBuild-based code generator to transform simple mutable type definitions into fully functional immutable types with persistent characteristics.</Description>
 
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -28,21 +29,18 @@
       <LastGenOutput>DiagnosticsStrings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <!-- TODO: Suppress this assembly from showing up as a frameworkAssembly dependency in our .nuspec file. -->
-    <Reference Include="System.Data.Entity.Design" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ImmutableObjectGraph.Generation.Attributes\ImmutableObjectGraph.Generation.Attributes.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\ImmutableObjectGraph\ImmutableObjectGraph.csproj" PrivateAssets="none" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="CG.Pluralization" Version="0.3000.5" PrivateAssets="all" />
     <PackageReference Include="CodeGeneration.Roslyn" PrivateAssets="all" />
     <PackageReference Include="CodeGeneration.Roslyn.BuildTime" PrivateAssets="none" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
-     <DotNetCliToolReference Include="dotnet-codegen" />
+    <DotNetCliToolReference Include="dotnet-codegen" />
   </ItemGroup>
   <Target Name="PackBuildOutputs" DependsOnTargets="SatelliteDllsProjectOutputGroup;DebugSymbolsProjectOutputGroup">
     <ItemGroup>
diff --git a/src/ImmutableObjectGraph.Generation/StyleCop.cs b/src/ImmutableObjectGraph.Generation/StyleCop.cs
@@ -4,6 +4,7 @@
     using System.Collections.Generic;
     using System.Collections.Immutable;
     using System.Linq;
+    using System.Reflection;
     using System.Text;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis;
@@ -74,7 +75,7 @@ private static int GetMemberDeclarationTypeOrder(MemberDeclarationSyntax member)
         {
             for (int i = 0; i < MemberDeclarationOrder.Length; i++)
             {
-                if (MemberDeclarationOrder[i].IsInstanceOfType(member))
+                if (MemberDeclarationOrder[i].GetTypeInfo().IsInstanceOfType(member))
                 {
                     return i;
                 }
diff --git a/src/ImmutableObjectGraph.Generation/Syntax.cs b/src/ImmutableObjectGraph.Generation/Syntax.cs
@@ -4,6 +4,7 @@
     using System.Collections.Generic;
     using System.Collections.Immutable;
     using System.Linq;
+    using System.Reflection;
     using System.Text;
     using System.Threading;
     using System.Threading.Tasks;
@@ -74,8 +75,8 @@ internal static NameSyntax GetTypeSyntax(Type type)
         {
             Requires.NotNull(type, nameof(type));
 
-            SimpleNameSyntax leafType = SyntaxFactory.IdentifierName(type.IsGenericType ? type.Name.Substring(0, type.Name.IndexOf('`')) : type.Name);
-            if (type.IsGenericType)
+            SimpleNameSyntax leafType = SyntaxFactory.IdentifierName(type.GetTypeInfo().IsGenericType ? type.Name.Substring(0, type.Name.IndexOf('`')) : type.Name);
+            if (type.GetTypeInfo().IsGenericType)
             {
                 leafType = SyntaxFactory.GenericName(
                     ((IdentifierNameSyntax)leafType).Identifier,
diff --git a/src/ImmutableObjectGraph.Generation/Utilities.cs b/src/ImmutableObjectGraph.Generation/Utilities.cs
@@ -11,7 +11,7 @@
 
     internal static class Utilities
     {
-        internal static readonly PluralizationService PluralizationService = PluralizationService.CreateService(CultureInfo.GetCultureInfo("en-US"));
+        internal static readonly PluralizationService PluralizationService = PluralizationService.CreateService(new CultureInfo("en-US"));
 
         internal static string ToPascalCase(this string name)
         {
diff --git a/src/ImmutableObjectGraph/ImmutableObjectGraph.csproj b/src/ImmutableObjectGraph/ImmutableObjectGraph.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.0;portable-net45+win8+wpa81+wp8</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Validation" />
diff --git a/src/NuGet.Config b/src/NuGet.Config
@@ -7,5 +7,6 @@
     <clear />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="myget.org/F/aarnott" value="https://www.myget.org/F/aarnott/api/v3/index.json" protocolVersion="3" />
+    <add key="local" value="d:\nugetpkgsrc\" />
   </packageSources>
 </configuration>
diff --git a/src/RoslynDemo/RoslynDemo.csproj b/src/RoslynDemo/RoslynDemo.csproj
@@ -11,10 +11,13 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <GeneratorAssemblySearchPaths Include="..\..\bin\$(Configuration)\ImmutableObjectGraph.Generation">
+    <GeneratorAssemblySearchPaths Include="..\..\bin\ImmutableObjectGraph.Generation\$(Configuration)\net461">
       <Visible>false</Visible>
     </GeneratorAssemblySearchPaths>
   </ItemGroup>
+  <ItemGroup>
+    <DotNetCliToolReference Include="dotnet-codegen" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ImmutableObjectGraph.Generation.Attributes\ImmutableObjectGraph.Generation.Attributes.csproj" />
     <ProjectReference Include="..\ImmutableObjectGraph.Generation\ImmutableObjectGraph.Generation.csproj" />
diff --git a/src/global.json b/src/global.json
@@ -1,5 +1,8 @@
 {
-    "msbuild-sdks": {
-        "MSBuild.Sdk.Extras": "1.2.2"
-    }
+  "sdk": {
+    "version": "2.1.300"
+  },
+  "msbuild-sdks": {
+    "MSBuild.Sdk.Extras": "1.5.4"
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ private CodeGen(ClassDeclarationSyntax applyTo, SemanticModel semanticModel, IPr`
`81`	`81`	`this.options = options ?? new Options();`
`82`	`82`	`this.cancellationToken = cancellationToken;`
`83`	`83`
`84`		`- this.PluralService = PluralizationService.CreateService(CultureInfo.GetCultureInfo("en-US"));`
	`84`	`+ this.PluralService = PluralizationService.CreateService(new CultureInfo("en-US"));`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`public PluralizationService PluralService { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`	`using System.Collections.Immutable;`
`6`	`6`	`using System.Linq;`
	`7`	`+ using System.Reflection;`
`7`	`8`	`using System.Text;`
`8`	`9`	`using System.Threading.Tasks;`
`9`	`10`	`using Microsoft.CodeAnalysis;`
`@@ -74,7 +75,7 @@ private static int GetMemberDeclarationTypeOrder(MemberDeclarationSyntax member)`
`74`	`75`	`{`
`75`	`76`	`for (int i = 0; i < MemberDeclarationOrder.Length; i++)`
`76`	`77`	`{`
`77`		`- if (MemberDeclarationOrder[i].IsInstanceOfType(member))`
	`78`	`+ if (MemberDeclarationOrder[i].GetTypeInfo().IsInstanceOfType(member))`
`78`	`79`	`{`
`79`	`80`	`return i;`
`80`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`internal static class Utilities`
`13`	`13`	`{`
`14`		`- internal static readonly PluralizationService PluralizationService = PluralizationService.CreateService(CultureInfo.GetCultureInfo("en-US"));`
	`14`	`+ internal static readonly PluralizationService PluralizationService = PluralizationService.CreateService(new CultureInfo("en-US"));`
`15`	`15`
`16`	`16`	`internal static string ToPascalCase(this string name)`
`17`	`17`	`{`