Revert "Migrate src subdirectory to new codegen (dotnet#5360)" (dotne…

…t#5361) This reverts commit 9c4a0ce.
st0le · Feb 12, 2019 · 1466359 · 1466359
1 parent 9c4a0ce
commit 1466359
Show file tree

Hide file tree

Showing 13 changed files with 245 additions and 135 deletions.
diff --git a/Build.cmd b/Build.cmd
@@ -13,7 +13,6 @@ set Platform=
 set DOTNET_MULTILEVEL_LOOKUP=0 
 
 call Ensure-DotNetSdk.cmd
-SET DotNetHost=%_dotnet%
 
 SET SOLUTION=%CMDHOME%\Orleans.sln
 

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,32 +1,24 @@
-<Project>
+<Project Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' ">
   <!-- Begin Orleans: Without these lines the project won't build properly -->
   <!-- Set path to code generator -->
-  <PropertyGroup>
-    <OrleansGenerateCodeDependsOn Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' ">$(OrleansGenerateCodeDependsOn)</OrleansGenerateCodeDependsOn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' ">
-    <DotNetHost Condition="'$(DotNetHost)' == ''">dotnet</DotNetHost>
-    <Asm>Orleans.CodeGenerator.MSBuild.Bootstrap</Asm>
-    <OrleansCodeGenCoreAssembly>$(MSBuildThisFileDirectory)src/BootstrapBuild/$(Asm)/bin/$(Configuration)/publish/netcoreapp2.0/$(Asm).dll</OrleansCodeGenCoreAssembly>
-    <OrleansCodeGenTasksAssembly>$(MSBuildThisFileDirectory)src/BootstrapBuild/$(Asm)/bin/$(Configuration)/publish/netcoreapp2.0/Orleans.CodeGenerator.MSBuild.Tasks.dll</OrleansCodeGenTasksAssembly>
-    <OrleansBootstrapBuildProject>$(MSBuildThisFileDirectory)src/BootstrapBuild/Orleans.CodeGenerator.MSBuild.Bootstrap/Orleans.CodeGenerator.MSBuild.Bootstrap.csproj</OrleansBootstrapBuildProject>
-  </PropertyGroup>
-
   <ItemGroup>
-    <ProjectReference Include="$(OrleansBootstrapBuildProject)" Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' ">
-      <Project>{CB36EF45-6E90-443F-AEE4-394677068147}</Project>
-      <Name>Orleans.CodeGenerator.MSBuild.Bootstrap</Name>
+    <ProjectReference Include="$(SourceRoot)/src/BootstrapBuild/Orleans.CodeGeneration.Build/Orleans.CodeGeneration.Build.Bootstrap.csproj" Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' ">
+      <Project>{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}</Project>
+      <Name>Orleans.CodeGeneration.Build.Bootstrap</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <AssetTargetFallback>netcoreapp2.0</AssetTargetFallback>
       <!-- Workaround. See: https://github.com/dotnet/sdk/issues/939#issuecomment-284641613 -->
       <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
       <UndefineProperties>TargetFramework</UndefineProperties>
       <!-- /Workaround -->
     </ProjectReference>
   </ItemGroup>
-
-  <Import Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' " Project="$(MSBuildThisFileDirectory)src/Orleans.CodeGenerator.MSBuild/build/Microsoft.Orleans.CodeGenerator.MSBuild.targets" /><!--End Orleans -->
+  <PropertyGroup Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' ">
+    <OrleansCodeGeneratorAssembly>$(SourceRoot)Bootstrap/$(Configuration)/Orleans.CodeGeneration.Build.exe</OrleansCodeGeneratorAssembly>
+    <!-- For non-windows OS we force .Net Core  -->
+    <OrleansCodeGeneratorAssembly Condition=" '$(OS)' != 'Windows_NT' ">$(SourceRoot)Bootstrap/$(Configuration)/Orleans.CodeGeneration.Build.dll</OrleansCodeGeneratorAssembly>
+  </PropertyGroup>
+  <Import Project="$(SourceRoot)src/Orleans.CodeGeneration.Build/build/Microsoft.Orleans.OrleansCodeGenerator.Build.targets" Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' " />
+  <!--End Orleans -->
 
   <!-- Set InformationVersion here, since $(Version) is already set at this point. -->
   <PropertyGroup>

diff --git a/Orleans.sln b/Orleans.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28531.58
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4CD3AA9E-D937-48CA-BB6C-158E12257D23}"
 EndProject
@@ -124,6 +124,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Core.Abstractions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.CodeGeneration.Build", "src\Orleans.CodeGeneration.Build\Orleans.CodeGeneration.Build.csproj", "{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Core.Bootstrap", "src\BootstrapBuild\Orleans.Core\Orleans.Core.Bootstrap.csproj", "{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.CodeGeneration.Build.Bootstrap", "src\BootstrapBuild\Orleans.CodeGeneration.Build\Orleans.CodeGeneration.Build.Bootstrap.csproj", "{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.CodeGeneration.Bootstrap", "src\BootstrapBuild\Orleans.CodeGeneration\Orleans.CodeGeneration.Bootstrap.csproj", "{9B07237D-651C-497D-9E8D-EADC8FAF26FF}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Transactions", "src\Orleans.Transactions\Orleans.Transactions.csproj", "{072B1B88-FE98-4354-86FA-AB6EF80EB9C4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Transactions.Tests", "test\Transactions\Orleans.Transactions.Tests\Orleans.Transactions.Tests.csproj", "{CFD22413-CB67-40D6-B389-F038C8C38365}"
@@ -888,6 +894,42 @@ Global
 		{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Release|x64.Build.0 = Release|Any CPU
 		{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Release|x86.ActiveCfg = Release|Any CPU
 		{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Release|x86.Build.0 = Release|Any CPU
+		{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Debug|x64.Build.0 = Debug|Any CPU
+		{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Debug|x86.Build.0 = Debug|Any CPU
+		{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Release|x64.ActiveCfg = Release|Any CPU
+		{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Release|x64.Build.0 = Release|Any CPU
+		{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Release|x86.ActiveCfg = Release|Any CPU
+		{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Release|x86.Build.0 = Release|Any CPU
+		{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Debug|x64.Build.0 = Debug|Any CPU
+		{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Debug|x86.Build.0 = Debug|Any CPU
+		{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Release|x64.ActiveCfg = Release|Any CPU
+		{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Release|x64.Build.0 = Release|Any CPU
+		{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Release|x86.ActiveCfg = Release|Any CPU
+		{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Release|x86.Build.0 = Release|Any CPU
+		{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Debug|x64.Build.0 = Debug|Any CPU
+		{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Debug|x86.Build.0 = Debug|Any CPU
+		{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Release|x64.ActiveCfg = Release|Any CPU
+		{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Release|x64.Build.0 = Release|Any CPU
+		{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Release|x86.ActiveCfg = Release|Any CPU
+		{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Release|x86.Build.0 = Release|Any CPU
 		{072B1B88-FE98-4354-86FA-AB6EF80EB9C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{072B1B88-FE98-4354-86FA-AB6EF80EB9C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{072B1B88-FE98-4354-86FA-AB6EF80EB9C4}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1383,6 +1425,9 @@ Global
 		{EBD697E3-91BE-4844-B3F0-6997300A8C12} = {2A128E88-B281-4BFB-ADEB-E515437F2385}
 		{73514686-D25D-478B-9943-A86F6B0F3A37} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
 		{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
+		{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B} = {DA143BBE-5D97-4792-8E36-44A3FA727C74}
+		{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1} = {DA143BBE-5D97-4792-8E36-44A3FA727C74}
+		{9B07237D-651C-497D-9E8D-EADC8FAF26FF} = {DA143BBE-5D97-4792-8E36-44A3FA727C74}
 		{072B1B88-FE98-4354-86FA-AB6EF80EB9C4} = {3189037B-208D-40A1-A561-169D77D9BB5A}
 		{CFD22413-CB67-40D6-B389-F038C8C38365} = {E4550469-BCFB-4F3E-B778-3769DE18F45A}
 		{BE7FB595-FA25-4D88-8504-E9D4F9D8183D} = {4C5D66BF-EE1C-4DD8-8551-D1B7F3768A34}

diff --git a/...BootstrapBuild/Orleans.CodeGeneration.Build/Orleans.CodeGeneration.Build.Bootstrap.csproj b/...BootstrapBuild/Orleans.CodeGeneration.Build/Orleans.CodeGeneration.Build.Bootstrap.csproj
@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Build;PostBuildPublish">
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+    <TargetFramework Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFramework>
+    <AssemblyName>Orleans.CodeGeneration.Build</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Microsoft.Orleans.CodeGeneration.Build</RootNamespace>
+    <SourceDir>$(SourceRoot)src/Orleans.CodeGeneration.Build/</SourceDir>
+    <PublishDir>$(SourceRoot)Bootstrap/$(Configuration)/</PublishDir>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <GenerateBindingRedirects>true</GenerateBindingRedirects>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SourceDir)**/*.cs" Exclude="$(SourceDir)obj/**/*.cs;$(SourceDir)bin/**/*.cs" Condition="'$(DesignTimeBuild)' != 'true'">
+      <!-- Hide the files and folder structure in the editor. -->
+      <Link>_%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Runtime" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingVersion)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Orleans.Core.Abstractions\Orleans.Core.Abstractions.csproj" />
+    <ProjectReference Include="..\Orleans.CodeGeneration\Orleans.CodeGeneration.Bootstrap.csproj" />
+    <ProjectReference Include="..\Orleans.Core\Orleans.Core.Bootstrap.csproj" />
+  </ItemGroup>
+
+  <Target Name="PostBuildPublish" AfterTargets="Build">
+    <CallTarget Targets="Publish" Condition="'$(DesignTimeBuild)' == ''" />
+  </Target>
+</Project>
diff --git a/src/BootstrapBuild/Orleans.CodeGeneration/Orleans.CodeGeneration.Bootstrap.csproj b/src/BootstrapBuild/Orleans.CodeGeneration/Orleans.CodeGeneration.Bootstrap.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyName>Orleans.CodeGeneration</AssemblyName>
+    <RootNamespace>OrleansCodeGenerator</RootNamespace>
+    <SourceDir>$(SourceRoot)src/Orleans.CodeGeneration/</SourceDir>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SourceDir)**/*.cs" Exclude="$(SourceDir)obj/**/*.cs;$(SourceDir)bin/**/*.cs" Condition="'$(DesignTimeBuild)' != 'true'">
+      <!-- Hide the files and folder structure in the editor. -->
+      <Link>_%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Orleans.Core.Abstractions\Orleans.Core.Abstractions.csproj" />
+    <ProjectReference Include="..\Orleans.Core\Orleans.Core.Bootstrap.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
+    <PackageReference Include="System.Reflection" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Runtime" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/...ld/Orleans.CodeGenerator.MSBuild.Bootstrap/Orleans.CodeGenerator.MSBuild.Bootstrap.csproj b/...ld/Orleans.CodeGenerator.MSBuild.Bootstrap/Orleans.CodeGenerator.MSBuild.Bootstrap.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Build;PostBuildPublish">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
@@ -50,39 +50,11 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
   </ItemGroup>
-
-  <!-- Start: PostBuildPublish -->
-  <!-- In order to support incremental builds, only call the Publish target if inputs have changed. -->
-  <PropertyGroup>
-    <PublishCacheFile>$(IntermediateOutputPath)$(MSBuildProjectFile).Publish.cache</PublishCacheFile>
-  </PropertyGroup>
 
-  <ItemGroup>
-    <PostBuildPublishInputs Include="@(Compile);@(ReferencePath)" />
-    <PostBuildPublishInputs Remove="@(GeneratedAssemblyInfoFile)" />
-  </ItemGroup>
-
-  <Target
-    Name="PostBuildPublish"
-    AfterTargets="Build"
-    DependsOnTargets="ResolveAssemblyReferences;Publish"
-    Inputs="@(PostBuildPublishInputs)"
-    Outputs="$(PublishCacheFile)"
-    Condition="'$(TargetFramework)' != '' and '$(DesignTimeBuild)' == ''" >
-
-    <Hash ItemsToHash="@(PostBuildPublishInputs)">
-      <Output TaskParameter="HashResult" PropertyName="Orleans_UpdatedInputPubCacheContents" />
-    </Hash>
-
-    <WriteLinesToFile
-      Overwrite="true"
-      File="$(PublishCacheFile)"
-      Lines="$(Orleans_UpdatedInputPubCacheContents)"
-      WriteOnlyWhenDifferent="True" />
-
-    <ItemGroup>
-      <FileWrites Include="$(PublishCacheFile)" />
-    </ItemGroup>
+  <Target Name="PostBuildPublish" AfterTargets="Build">
+    <!-- So that we can create a nuget package which includes all dependencies, we publish the build. -->
+    <!-- However, we cannot publish during the cross-targeting build, so we skip that. -->
+    <CallTarget Targets="Publish" Condition="'$(TargetFramework)' != '' and '$(DesignTimeBuild)' == ''" />
   </Target>
-  <!-- END: PostBuildPublish -->
+
 </Project>
diff --git a/src/BootstrapBuild/Orleans.Core/Orleans.Core.Bootstrap.csproj b/src/BootstrapBuild/Orleans.Core/Orleans.Core.Bootstrap.csproj
@@ -0,0 +1,52 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyName>Orleans.Core</AssemblyName>
+    <RootNamespace>Orleans</RootNamespace>
+    <SourceDir>$(SourceRoot)src/Orleans.Core/</SourceDir>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SourceDir)**/*.cs" Exclude="$(SourceDir)obj/**/*.cs;$(SourceDir)bin/**/*.cs" Condition="'$(DesignTimeBuild)' != 'true'">
+      <!-- Hide the files and folder structure in the editor. -->
+      <Link>_%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
+    </Compile>
+    <Compile Remove="$(SourceDir)Statistics\RuntimeStatisticsGroup.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsHostingAbstractionsVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
+    <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
+    <PackageReference Include="System.ComponentModel.TypeConverter" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Diagnostics.Process" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Diagnostics.TraceSource" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Linq.Expressions" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
+    <PackageReference Include="System.Net.NameResolution" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Net.NetworkInformation" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Reflection.Emit" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="$(SystemReflectionTypeExtensionsVersion)" />
+    <PackageReference Include="System.Runtime" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Security.Cryptography.Algorithms" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Threading.Thread" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Threading.ThreadPool" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Xml.XmlDocument" Version="$(SystemRuntimeVersion)" />
+    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="$(SystemRuntimeVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Orleans.Core.Abstractions\Orleans.Core.Abstractions.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -10,12 +10,12 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <GenerateDocumentationFile Condition="'$(Configuration)' != 'Debug'">true</GenerateDocumentationFile>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <!-- Configure source link: https://github.com/ctaggart/SourceLink -->
   <PropertyGroup>
-    <SourceLinkCreate Condition="'$(Configuration)' != 'Debug'">true</SourceLinkCreate>
+    <SourceLinkCreate>true</SourceLinkCreate>
     <SourceLinkOriginUrl>https://github.com/dotnet/orleans</SourceLinkOriginUrl>
   </PropertyGroup>
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -1,6 +1,6 @@
-<Project>  
+<Project>
   <PropertyGroup>
-    <_ParentDirectoryBuildTargetsPath Condition="'$(_DirectoryBuildTargetsFile)' != ''">$([System.IO.Path]::Combine('..', '$(_DirectoryBuildTargetsFile)'))</_ParentDirectoryBuildTargetsPath>
+    <_ParentDirectoryBuildTargetsPath Condition="'$(_DirectoryBuildPropsFile)' != ''">$([System.IO.Path]::Combine('..', '$(_DirectoryBuildTargetsFile)'))</_ParentDirectoryBuildTargetsPath>
   </PropertyGroup>
 
   <Import Project="$(_ParentDirectoryBuildTargetsPath)" Condition="Exists('$(_ParentDirectoryBuildTargetsPath)')"/>