Getting closer to proper packaging

Author: AArnott

.gitignore

@@ -66,6 +66,7 @@ UpgradeLog*htm
 .builds
 *.dotCover
 *.log
+*.binlog
 
 packages/
 *.nuget.props

src/Directory.Build.targets

@@ -1,12 +1,19 @@
 <Project>
+  <PropertyGroup>
+    <CodeGenerationRoslynVersion>0.4.42</CodeGenerationRoslynVersion>
+  </PropertyGroup>
   <ItemGroup>
-    <PackageReference Update="CodeGeneration.Roslyn.Attributes" Version="0.4.42" />
-    <PackageReference Update="CodeGeneration.Roslyn" Version="0.4.42" />
+    <PackageReference Update="CodeGeneration.Roslyn.Attributes" Version="$(CodeGenerationRoslynVersion)" />
+    <PackageReference Update="CodeGeneration.Roslyn" Version="$(CodeGenerationRoslynVersion)" />
+    <PackageReference Update="CodeGeneration.Roslyn.BuildTime" Version="$(CodeGenerationRoslynVersion)" />
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.2.0" />
     <PackageReference Update="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Update="Validation" Version="2.4.18" />
     <PackageReference Update="Microsoft.Build" Version="14.3.0" />
     <PackageReference Update="xunit" Version="2.3.1" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
+  <ItemGroup>
+    <DotNetCliToolReference Update="dotnet-codegen" Version="$(CodeGenerationRoslynVersion)" />
+  </ItemGroup>
 </Project>

src/ImmutableObjectGraph.Generation.Attributes/ImmutableObjectGraph.Generation.Attributes.csproj

@@ -3,6 +3,9 @@
     <RootNamespace>ImmutableObjectGraph.Generation</RootNamespace>
     <TargetFrameworks>netstandard1.0;portable-net45+win8+wpa81+wp8</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>
   <ItemGroup>
     <PackageReference Include="Validation" />

src/ImmutableObjectGraph.Generation/ImmutableObjectGraph.Generation.csproj

@@ -27,15 +27,20 @@
     </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" />
-    <ProjectReference Include="..\ImmutableObjectGraph\ImmutableObjectGraph.csproj" />
+    <ProjectReference Include="..\ImmutableObjectGraph.Generation.Attributes\ImmutableObjectGraph.Generation.Attributes.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\ImmutableObjectGraph\ImmutableObjectGraph.csproj" PrivateAssets="none" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CodeGeneration.Roslyn" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
+    <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" />
   </ItemGroup>
   <Target Name="PackBuildOutputs" DependsOnTargets="SatelliteDllsProjectOutputGroup;DebugSymbolsProjectOutputGroup">
     <ItemGroup>