Polish packaging dependencies

devlooped · Jul 30, 2024 · f89795a · f89795a
1 parent cf8f16a
commit f89795a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/CloudActors.CodeAnalysis/CloudActors.CodeAnalysis.csproj b/src/CloudActors.CodeAnalysis/CloudActors.CodeAnalysis.csproj
@@ -26,15 +26,13 @@
     <PackageReference Include="PolySharp" PrivateAssets="All" Version="1.14.1" />
 
     <PackageReference Include="Scriban" Version="5.10.0" Pack="false" IncludeAssets="build" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" PrivateAssets="all" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" PrivateAssets="all" />
     <PackageReference Include="ThisAssembly.AssemblyInfo" Version="1.4.3" PrivateAssets="all" />
     <PackageReference Include="ThisAssembly.Resources" Version="1.4.3" PrivateAssets="all" Pack="false" />
   </ItemGroup>
 
   <ItemGroup>
     <Reference Include="$(PkgMicrosoft_Orleans_CodeGenerator)\analyzers\dotnet\cs\Orleans.CodeGenerator.dll" />
-    <PackageFile Include="$(PkgMicrosoft_Orleans_CodeGenerator)\analyzers\dotnet\cs\Orleans.CodeGenerator.dll" PackagePath="$(PackFolder)" />
+    <PackageFile Include="$(PkgMicrosoft_Orleans_CodeGenerator)\analyzers\dotnet\cs\Orleans.CodeGenerator.dll" PackFolder="$(PackFolder)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CloudActors.Server.CodeAnalysis/CloudActors.Server.CodeAnalysis.csproj b/src/CloudActors.Server.CodeAnalysis/CloudActors.Server.CodeAnalysis.csproj
@@ -26,15 +26,13 @@
     <PackageReference Include="PolySharp" PrivateAssets="All" Version="1.14.1" />
 
     <PackageReference Include="Scriban" Version="5.10.0" Pack="false" IncludeAssets="build" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" PrivateAssets="all" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" PrivateAssets="all" />
     <PackageReference Include="ThisAssembly.AssemblyInfo" Version="1.4.3" PrivateAssets="all" />
     <PackageReference Include="ThisAssembly.Resources" Version="1.4.3" PrivateAssets="all" Pack="false" />
   </ItemGroup>
 
   <ItemGroup>
     <Reference Include="$(PkgMicrosoft_Orleans_CodeGenerator)\analyzers\dotnet\cs\Orleans.CodeGenerator.dll" />
-    <PackageFile Include="$(PkgMicrosoft_Orleans_CodeGenerator)\analyzers\dotnet\cs\Orleans.CodeGenerator.dll" PackagePath="$(PackFolder)" />
+    <PackageFile Include="$(PkgMicrosoft_Orleans_CodeGenerator)\analyzers\dotnet\cs\Orleans.CodeGenerator.dll" PackFolder="$(PackFolder)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CloudActors.Server.CodeAnalysis/Devlooped.CloudActors.Server.targets b/src/CloudActors.Server.CodeAnalysis/Devlooped.CloudActors.Server.targets
@@ -1,5 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <!-- We don't use buildTransitive even though analyzers propagate outside the referencing project, because 
+       we want to detect projects that are *directly* referencing the Server package. -->
   <PropertyGroup>
     <IsCloudActorsServer>true</IsCloudActorsServer>
   </PropertyGroup>

diff --git a/src/CloudActors.Server/CloudActors.Server.csproj b/src/CloudActors.Server/CloudActors.Server.csproj
@@ -14,7 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\CloudActors\CloudActors.csproj" />
+    <ProjectReference Include="..\CloudActors\CloudActors.csproj" Pack="false" />
+    <ProjectReference Include="..\CloudActors.Package\CloudActors.Package.msbuildproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\CloudActors.Server.CodeAnalysis\CloudActors.Server.CodeAnalysis.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>