Fix SDK packaging (#8071)

Directory.Build.targets

@@ -35,7 +35,7 @@
 
   <Import Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' " Project="$(MSBuildThisFileDirectory)src/Orleans.CodeGenerator/build/Microsoft.Orleans.CodeGenerator.props" />
   <Import Condition=" '$(OrleansBuildTimeCodeGen)' == 'msbuild' " Project="$(MSBuildThisFileDirectory)src/Orleans.CodeGenerator.MSBuild/build/Microsoft.Orleans.CodeGenerator.MSBuild.targets" />
-
+  <Import Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' or '$(OrleansBuildTimeCodeGen)' == 'msbuild' " Project="$(MSBuildThisFileDirectory)src/Orleans.Sdk/build/Microsoft.Orleans.Sdk.targets" />
   <ItemGroup>
     <!-- Enable code generator -->
     <ProjectReference

src/Orleans.CodeGenerator.MSBuild/Orleans.CodeGenerator.MSBuild.csproj

@@ -21,11 +21,6 @@
     <IsOrleansFrameworkPart>false</IsOrleansFrameworkPart>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="buildMultiTargeting\Orleans.CodeGenerator.MSBuild.props" />
-    <None Remove="build\Orleans.CodeGenerator.MSBuild.props" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Orleans.CodeGenerator\Orleans.CodeGenerator.csproj" PrivateAssets="all" />
   </ItemGroup>

src/Orleans.CodeGenerator.MSBuild/buildMultiTransitive/Microsoft.Orleans.CodeGenerator.MSBuild.targets

@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\build\Microsoft.Orleans.CodeGenerator.MSBuild.targets" />
+</Project>

src/Orleans.CodeGenerator/buildTransitive/Microsoft.Orleans.CodeGenerator.props

@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\build\Microsoft.Orleans.CodeGenerator.props" />
+</Project>

src/Orleans.Sdk/Orleans.Sdk.csproj

@@ -12,6 +12,24 @@
     <NoWarn>MSB3277</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Content Include="buildTransitive\Microsoft.Orleans.Sdk.targets">
+      <PackagePath>%(Identity)</PackagePath>
+      <Visible>true</Visible>
+      <Pack>true</Pack>
+    </Content>
+    <Content Include="build\Microsoft.Orleans.Sdk.targets">
+      <Pack>true</Pack>
+      <PackagePath>%(Identity)</PackagePath>
+      <Visible>true</Visible>
+    </Content>
+    <Content Include="buildMultiTargeting\Microsoft.Orleans.Sdk.targets">
+      <Pack>true</Pack>
+      <PackagePath>%(Identity)</PackagePath>
+      <Visible>true</Visible>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Orleans.Core\Orleans.Core.csproj" />
     <ProjectReference Include="..\Orleans.Analyzers\Orleans.Analyzers.csproj" PrivateAssets="None" />

src/Orleans.Sdk/buildTransitive/Microsoft.Orleans.Sdk.targets

@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\build\Microsoft.Orleans.Sdk.targets" />
+</Project>

test/Directory.Build.props

@@ -10,6 +10,7 @@
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);FS2003;1591</NoWarn>
     <ServerGarbageCollection>true</ServerGarbageCollection>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <!-- For test project we still need to target various desktop .Net versions instead of .Net Standard -->

test/Orleans.Serialization.UnitTests/Orleans.Serialization.UnitTests.csproj

@@ -6,6 +6,7 @@
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <OrleansBuildTimeCodeGen>true</OrleansBuildTimeCodeGen>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>