Get build working on linux via dotnet CLI

AArnott · AArnott · commit 48f73d054132 · 2017-03-21T20:53:29.000-07:00
This required upgrading NB.GV and CodeGeneration.Roslyn to their CoreCLR-compatible latest versions.
diff --git a/CodeGeneration/CodeGeneration.csproj b/CodeGeneration/CodeGeneration.csproj
@@ -6,8 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CodeGeneration.Roslyn" Version="0.2.10" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="1.6.19-beta" />
+    <PackageReference Include="CodeGeneration.Roslyn" Version="$(CodeGenerationRoslynVersion)" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.548" />
   </ItemGroup>
 </Project>
diff --git a/CodeGeneration/OfferFriendlyInteropOverloadsGenerator.cs b/CodeGeneration/OfferFriendlyInteropOverloadsGenerator.cs
@@ -30,7 +30,7 @@ public OfferFriendlyInteropOverloadsGenerator(AttributeData data)
         {
         }
 
-        public async Task<SyntaxList<MemberDeclarationSyntax>> GenerateAsync(MemberDeclarationSyntax applyTo, Document document, IProgress<Diagnostic> progress, CancellationToken cancellationToken)
+        public Task<SyntaxList<MemberDeclarationSyntax>> GenerateAsync(MemberDeclarationSyntax applyTo, CSharpCompilation compilation, IProgress<Diagnostic> progress, CancellationToken cancellationToken)
         {
             Func<ParameterSyntax, AttributeListSyntax, MarshaledParameter> findMarshalAttribute = (p, al) =>
             {
@@ -47,7 +47,7 @@ public async Task<SyntaxList<MemberDeclarationSyntax>> GenerateAsync(MemberDecla
                 return new MarshaledParameter(p, customMarshaler, friendlyType);
             };
 
-            var semanticModel = await document.GetSemanticModelAsync(cancellationToken);
+            var semanticModel = compilation.GetSemanticModel(applyTo.SyntaxTree);
             var type = (ClassDeclarationSyntax)applyTo;
             var generatedType = type
                 .WithMembers(SyntaxFactory.List<MemberDeclarationSyntax>())
@@ -87,7 +87,7 @@ from al in p.AttributeLists
                 }
             }
 
-            return SyntaxFactory.List<MemberDeclarationSyntax>().Add(generatedType);
+            return Task.FromResult(SyntaxFactory.List<MemberDeclarationSyntax>().Add(generatedType));
         }
 
         private static SyntaxTokenList RemoveModifier(SyntaxTokenList list, params SyntaxKind[] modifiers)
diff --git a/CodeGenerationAttributes/CodeGenerationAttributes.csproj b/CodeGenerationAttributes/CodeGenerationAttributes.csproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CodeGeneration.Roslyn.Attributes" Version="0.2.10" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="1.6.19-beta" />
+    <PackageReference Include="CodeGeneration.Roslyn.Attributes" Version="$(CodeGenerationRoslynVersion)" />
   </ItemGroup>
 </Project>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+  <PropertyGroup>
+    <CodeGenerationRoslynVersion>0.3.4</CodeGenerationRoslynVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="1.6.25" PrivateAssets="all" />
+  </ItemGroup>
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <PublicSign Condition=" '$(AssemblyOriginatorKeyFile)' != '' and '$(MSBuildRuntimeType)' == 'Core' ">true</PublicSign>
+  </PropertyGroup>
+</Project>
+
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -32,8 +32,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[1.0.165]" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="1.6.19-beta" PrivateAssets="all" />
-    <PackageReference Include="CodeGeneration.Roslyn.BuildTime" Version="0.2.10" PrivateAssets="all" />
+    <PackageReference Include="CodeGeneration.Roslyn.BuildTime" Version="$(CodeGenerationRoslynVersion)" PrivateAssets="all" />
     <PackageReference Include="System.Security.SecureString" Version="4.0.0" Condition=" '$(TargetFramework)' == 'netstandard1.3' " />
     <PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.0.1" Condition=" '$(TargetFramework)' == 'netstandard1.3' " />
     <PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" Condition=" '$(TargetFramework)' == 'netstandard1.3' " />

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public OfferFriendlyInteropOverloadsGenerator(AttributeData data)`
`30`	`30`	`{`
`31`	`31`	`}`
`32`	`32`
`33`		`- public async Task<SyntaxList<MemberDeclarationSyntax>> GenerateAsync(MemberDeclarationSyntax applyTo, Document document, IProgress<Diagnostic> progress, CancellationToken cancellationToken)`
	`33`	`+ public Task<SyntaxList<MemberDeclarationSyntax>> GenerateAsync(MemberDeclarationSyntax applyTo, CSharpCompilation compilation, IProgress<Diagnostic> progress, CancellationToken cancellationToken)`
`34`	`34`	`{`
`35`	`35`	`Func<ParameterSyntax, AttributeListSyntax, MarshaledParameter> findMarshalAttribute = (p, al) =>`
`36`	`36`	`{`
`@@ -47,7 +47,7 @@ public async Task<SyntaxList<MemberDeclarationSyntax>> GenerateAsync(MemberDecla`
`47`	`47`	`return new MarshaledParameter(p, customMarshaler, friendlyType);`
`48`	`48`	`};`
`49`	`49`
`50`		`- var semanticModel = await document.GetSemanticModelAsync(cancellationToken);`
	`50`	`+ var semanticModel = compilation.GetSemanticModel(applyTo.SyntaxTree);`
`51`	`51`	`var type = (ClassDeclarationSyntax)applyTo;`
`52`	`52`	`var generatedType = type`
`53`	`53`	`.WithMembers(SyntaxFactory.List<MemberDeclarationSyntax>())`
`@@ -87,7 +87,7 @@ from al in p.AttributeLists`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`- return SyntaxFactory.List<MemberDeclarationSyntax>().Add(generatedType);`
	`90`	`+ return Task.FromResult(SyntaxFactory.List<MemberDeclarationSyntax>().Add(generatedType));`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`private static SyntaxTokenList RemoveModifier(SyntaxTokenList list, params SyntaxKind[] modifiers)`