small rename +semver:major

RocketSurgeonsGuild · Oct 19, 2019 · b50ae5d · b50ae5d
1 parent e6a9c24
commit b50ae5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Meta.Packages/Sdk/Sdk.targets b/src/Meta.Packages/Sdk/Sdk.targets
@@ -2,20 +2,20 @@
   <PropertyGroup>
     <IncludeRocketSurgeryAbstractions Condition="'$(IncludeRocketSurgeryAbstractions)' == ''">false</IncludeRocketSurgeryAbstractions>
     <IncludeRocketSurgeryAspNetCore Condition="'$(IncludeRocketSurgeryAspNetCore)' == ''">false</IncludeRocketSurgeryAspNetCore>
-    <IncludeRocketSurgeryAspNetCoreNewtonsoftJson Condition="'$(IncludeRocketSurgeryAspNetCoreNewtonsoftJson)' == ''">false</IncludeRocketSurgeryAspNetCoreNewtonsoftJson>
     <IncludeRocketSurgery Condition="'$(IncludeRocketSurgery)' == ''">false</IncludeRocketSurgery>
     <IncludeRocketSurgeryFunctions Condition="'$(IncludeRocketSurgeryFunctions)' == ''">false</IncludeRocketSurgeryFunctions>
     <IncludeRocketSurgeryHosting Condition="'$(IncludeRocketSurgeryHosting)' == ''">false</IncludeRocketSurgeryHosting>
 
-    <EnableDiagnostics Condition="'$(EnableDiagnostics)' == ''">true</EnableDiagnostics>
     <EnableAppMetrics Condition="'$(EnableAppMetrics)' == ''">false</EnableAppMetrics>
     <EnableAutofac Condition="'$(EnableAutofac)' == ''">false</EnableAutofac>
     <EnableAutoMapper Condition="'$(EnableAutoMapper)' == ''">true</EnableAutoMapper>
     <EnableCommandLine Condition="'$(EnableCommandLine)' == ''">false</EnableCommandLine>
+    <EnableDiagnostics Condition="'$(EnableDiagnostics)' == ''">true</EnableDiagnostics>
+    <EnableExtensions Condition="'$(EnableExtensions)' == ''">true</EnableExtensions>
     <EnableFluentValidation Condition="'$(EnableFluentValidation)' == ''">true</EnableFluentValidation>
     <EnableMediatR Condition="'$(EnableMediatR)' == ''">true</EnableMediatR>
+    <EnableNewtonsoftJson Condition="'$(EnableNewtonsoftJson)' == ''">true</EnableNewtonsoftJson>
     <EnableSerilog Condition="'$(EnableSerilog)' == ''">true</EnableSerilog>
-    <EnableExtensions Condition="'$(EnableExtensions)' == ''">true</EnableExtensions>
   </PropertyGroup>
   <PropertyGroup>
     <!-- This list needs to be in reverse order of the dependencies (leaf first) so that the changes cascade correctly. -->

diff --git a/src/Meta.Packages/Sdk/aspnetcore.targets b/src/Meta.Packages/Sdk/aspnetcore.targets
@@ -1,9 +1,10 @@
 <Project>
     <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 '$(IncludeRocketSurgeryAspNetCoreNewtonsoftJson)' == '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>