some more adjustments

src/Meta.Packages/Sdk/Sdk.targets

@@ -20,19 +20,11 @@
   <PropertyGroup>
     <!-- This list needs to be in reverse order of the dependencies (leaf first) so that the changes cascade correctly. -->
     <IncludeRocketSurgeryHosting Condition="'$(IncludeRocketSurgeryHosting)' == 'false' and '$(IncludeRocketSurgeryAspNetCore)' == 'true'">true</IncludeRocketSurgeryHosting>
-
-    <!--
-    <IncludeRocketSurgery Condition="'$(IncludeRocketSurgery)' == 'false' and '$(IncludeRocketSurgeryFunctions)' == 'true'">true</IncludeRocketSurgery>
-    <IncludeRocketSurgery Condition="'$(IncludeRocketSurgery)' == 'false' and '$(IncludeRocketSurgeryHosting)' == 'true'">true</IncludeRocketSurgery>
-    <IncludeRocketSurgery Condition="'$(IncludeRocketSurgery)' == 'false' and '$(IncludeRocketSurgeryAspNetCore)' == 'true'">true</IncludeRocketSurgery>
-    -->
-
-    <!-- <IncludeRocketSurgeryAbstractions Condition="'$(IncludeRocketSurgeryAbstractions)' == 'false' and '$(IncludeRocketSurgery)' == 'true'">true</IncludeRocketSurgeryAbstractions> -->
   </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)\abstractions.targets" />
   <Import Project="$(MSBuildThisFileDirectory)\aspnetcore.targets" />
   <Import Project="$(MSBuildThisFileDirectory)\core.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)\extensions.targets" />
   <Import Project="$(MSBuildThisFileDirectory)\functions.targets" />
   <Import Project="$(MSBuildThisFileDirectory)\hosting.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\library.targets" />
 </Project>

src/Meta.Packages/Sdk/abstractions.targets

@@ -1,11 +1,8 @@
 <Project>
     <ItemGroup Condition="'$(IncludeRocketSurgeryAbstractions)' == 'true'">
-        <PackageReference Include="Rocket.Surgery.Extensions.App.Metrics.Abstractions" Condition="'$(EnableAppMetrics)' == 'true'" />
-        <PackageReference Include="Rocket.Surgery.Extensions.Autofac.Abstractions" Condition="'$(EnableAutofac)' == 'true'" />
         <PackageReference Include="Rocket.Surgery.Extensions.CommandLine.Abstractions" Condition="'$(EnableCommandLine)' == 'true'" />
         <PackageReference Include="Rocket.Surgery.Extensions.Configuration.Abstractions" />
         <PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection.Abstractions" />
         <PackageReference Include="Rocket.Surgery.Extensions.Logging.Abstractions" />
-        <PackageReference Include="Rocket.Surgery.Extensions.Serilog.Abstractions" Condition="'$(EnableSerilog)' == 'true'" />
     </ItemGroup>
 </Project>

src/Meta.Packages/Sdk/aspnetcore.targets

@@ -2,9 +2,5 @@
     <ItemGroup Condition="'$(IncludeRocketSurgeryAspNetCore)' == 'true'">
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Condition="'$(EnableNewtonsoftJson)' == 'true'" />
         <PackageReference Include="Rocket.Surgery.AspNetCore" />
-        <PackageReference Include="Rocket.Surgery.AspNetCore.FluentValidation" Condition="'$(EnableFluentValidation)' == 'true'" />
-        <PackageReference Include="Rocket.Surgery.AspNetCore.FluentValidation.MediatR" Condition="'$(EnableFluentValidation)' == 'true' AND '$(EnableMediatR)' == 'true'" />
-        <PackageReference Include="Rocket.Surgery.AspNetCore.FluentValidation.NewtonsoftJson" Condition="'$(EnableFluentValidation)' == 'true' AND '$(EnableNewtonsoftJson)' == 'true'" />
-        <PackageReference Include="Rocket.Surgery.AspNetCore.Serilog" Condition="'$(EnableSerilog)' == 'true'" />
     </ItemGroup>
 </Project>

src/Meta.Packages/Sdk/core.targets

@@ -1,16 +1,9 @@
 <Project>
     <ItemGroup Condition="'$(IncludeRocketSurgery)' == 'true'">
         <PackageReference Include="Rocket.Surgery.Conventions.Diagnostics" Condition="('$(EnableDiagnostics)' == 'true' and '$(EnableCommandLine)' == 'true') and ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' or '$(TargetFrameworkIdentifier)' == '.NETFramework')" />
-        <PackageReference Include="Rocket.Surgery.Extensions.App.Metrics" Condition="'$(EnableAppMetrics)' == 'true'" />
-        <PackageReference Include="Rocket.Surgery.Extensions.Autofac" Condition="'$(EnableAutofac)' == 'true'" />
-        <PackageReference Include="Rocket.Surgery.Extensions.AutoMapper" Condition="'$(EnableAutoMapper)' == 'true'" />
         <PackageReference Include="Rocket.Surgery.Extensions.CommandLine" Condition="'$(EnableCommandLine)' == 'true'" />
         <PackageReference Include="Rocket.Surgery.Extensions.Configuration" />
         <PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" />
-        <PackageReference Include="Rocket.Surgery.Extensions.FluentValidation" Condition="'$(EnableFluentValidation)' == 'true'" />
-        <PackageReference Include="Rocket.Surgery.Extensions.FluentValidation.MediatR" Condition="'$(EnableFluentValidation)' == 'true' and '$(EnableMediatR)' == 'true'" />
         <PackageReference Include="Rocket.Surgery.Extensions.Logging" />
-        <PackageReference Include="Rocket.Surgery.Extensions.MediatR" Condition="'$(EnableMediatR)' == 'true'" />
-        <PackageReference Include="Rocket.Surgery.Extensions.Serilog" Condition="'$(EnableSerilog)' == 'true'" />
     </ItemGroup>
 </Project>

src/Meta.Packages/Sdk/hosting.targets

@@ -1,7 +1,5 @@
 <Project>
     <ItemGroup Condition="'$(IncludeRocketSurgeryHosting)' == 'true'">
         <PackageReference Include="Rocket.Surgery.Hosting" />
-        <PackageReference Include="Rocket.Surgery.Hosting.Autofac" Condition="'$(EnableAutofac)' == 'true'" />
-        <PackageReference Include="Rocket.Surgery.Hosting.Serilog" Condition="'$(EnableSerilog)' == 'true'" />
     </ItemGroup>
 </Project>

src/Meta.Packages/Sdk/library.targets

@@ -0,0 +1,36 @@
+<Project>
+    <ItemGroup Condition="'$(EnableAppMetrics)' == 'true'">
+        <PackageReference Include="Rocket.Surgery.Extensions.App.Metrics.Abstractions" Condition="'$(IncludeRocketSurgeryAbstractions)' == 'true'" />
+        <PackageReference Include="Rocket.Surgery.Extensions.App.Metrics" Condition="'$(IncludeRocketSurgeryHosting)' != 'true'" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(EnableAutofac)' == 'true'">
+        <PackageReference Include="Rocket.Surgery.Extensions.Autofac.Abstractions" Condition="'$(IncludeRocketSurgeryAbstractions)' == 'true'" />
+        <PackageReference Include="Rocket.Surgery.Extensions.Autofac" Condition="'$(IncludeRocketSurgeryHosting)' != 'true'" />
+        <PackageReference Include="Rocket.Surgery.Hosting.Autofac" Condition="'$(IncludeRocketSurgeryHosting)' == 'true'" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(EnableAutoMapper)' == 'true'">
+        <PackageReference Include="Rocket.Surgery.Extensions.AutoMapper" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(EnableExtensions)' == 'true'">
+        <PackageReference Include="Rocket.Surgery.Extensions" />
+        <PackageReference Include="Rocket.Surgery.Linq.Extensions" />
+        <PackageReference Include="Rocket.Surgery.Reactive.Extensions" />
+        <PackageReference Include="Rocket.Surgery.Task.Extensions" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(EnableFluentValidation)' == 'true'">
+        <PackageReference Include="Rocket.Surgery.AspNetCore.FluentValidation" Condition="'$(IncludeRocketSurgeryAspNetCore)' == 'true'" />
+        <PackageReference Include="Rocket.Surgery.AspNetCore.FluentValidation.MediatR" Condition="'$(IncludeRocketSurgeryAspNetCore)' == 'true' AND '$(EnableMediatR)' == 'true'" />
+        <PackageReference Include="Rocket.Surgery.AspNetCore.FluentValidation.NewtonsoftJson" Condition="'$(IncludeRocketSurgeryAspNetCore)' == 'true' AND '$(EnableNewtonsoftJson)' == 'true'" />
+        <PackageReference Include="Rocket.Surgery.Extensions.FluentValidation" Condition="'$(IncludeRocketSurgeryAspNetCore)' != 'true'" />
+        <PackageReference Include="Rocket.Surgery.Extensions.FluentValidation.MediatR" Condition="'$(IncludeRocketSurgeryAspNetCore)' != 'true' AND '$(EnableMediatR)' == 'true'" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(EnableMediatR)' == 'true'">
+        <PackageReference Include="Rocket.Surgery.Extensions.MediatR" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(EnableSerilog)' == 'true'">
+        <PackageReference Include="Rocket.Surgery.AspNetCore.Serilog" Condition="'$(IncludeRocketSurgeryAspNetCore)' == 'true'" />
+        <PackageReference Include="Rocket.Surgery.Extensions.Serilog.Abstractions" Condition="'$(IncludeRocketSurgeryAbstractions)' == 'true'" />
+        <PackageReference Include="Rocket.Surgery.Extensions.Serilog" Condition="'$(IncludeRocketSurgeryHosting)' != 'true' AND '$(IncludeRocketSurgeryAspNetCore)' != 'true'" />
+        <PackageReference Include="Rocket.Surgery.Hosting.Serilog" Condition="'$(IncludeRocketSurgeryHosting)' == 'true'" />
+    </ItemGroup>
+</Project>