Fixing package references (#3175)

Fixes #3097
OrchardCMS · Feb 10, 2019 · 9612a3c · 9612a3c
1 parent 4faa0de
commit 9612a3c
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/src/OrchardCore.Build/Dependencies.AspNetCore.props b/src/OrchardCore.Build/Dependencies.AspNetCore.props
@@ -177,5 +177,14 @@
     <PackageManagement Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Version="2.2.0" />
     <PackageManagement Include="System.ComponentModel.Annotations" Version="4.5.0" />
     <PackageManagement Include="System.Security.Cryptography.Cng" Version="4.5.0" />
+
+    <!-- These definitions are are used in projects that incur package downgrades. -->
+    <PackageManagement Include="System.Collections" Version="4.3.0" />
+    <PackageManagement Include="System.Diagnostics.Debug" Version="4.3.0" />
+    <PackageManagement Include="System.Globalization" Version="4.3.0" />
+    <PackageManagement Include="System.IO" Version="4.3.0" />
+    <PackageManagement Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
+    <PackageManagement Include="System.Net.Primitives" Version="4.3.0" />
+    <PackageManagement Include="System.Resources.ResourceManager" Version="4.3.0" />
   </ItemGroup>
 </Project>
diff --git a/src/OrchardCore/OrchardCore.Abstractions/OrchardCore.Abstractions.csproj b/src/OrchardCore/OrchardCore.Abstractions/OrchardCore.Abstractions.csproj
@@ -17,8 +17,6 @@
     <PackageReference Include="Microsoft.Extensions.Localization" />
     <PackageReference Include="Microsoft.Extensions.Logging" />
     <PackageReference Include="Newtonsoft.Json" />
-    <PackageReference Include="ncrontab" />
-    <PackageReference Include="NodaTime" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/OrchardCore.Navigation.Core.csproj b/src/OrchardCore/OrchardCore.Navigation.Core/OrchardCore.Navigation.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -14,4 +14,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Routing" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.IO.FileSystem.Primitives" />
+  </ItemGroup>
+
 </Project>
diff --git a/...ackgroundTasks/BackgroundTaskScheduler.cs → ...ackgroundTasks/BackgroundTaskScheduler.cs b/...ackgroundTasks/BackgroundTaskScheduler.cs → ...ackgroundTasks/BackgroundTaskScheduler.cs
diff --git a/src/OrchardCore/OrchardCore/OrchardCore.csproj b/src/OrchardCore/OrchardCore/OrchardCore.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -22,12 +22,25 @@
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Localization" />
     <PackageReference Include="Microsoft.Extensions.Logging" />
+    <PackageReference Include="ncrontab" />
     <PackageReference Include="NodaTime" />
+
+    <!-- Remove this dependency in RC -->
     <PackageReference Include="YamlDotNet" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\OrchardCore.Abstractions\OrchardCore.Abstractions.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Remove these references once ncrontab targets netstandard2.0-->
+    <PackageReference Include="System.Collections" />
+    <PackageReference Include="System.Diagnostics.Debug" />
+    <PackageReference Include="System.Globalization" />
+    <PackageReference Include="System.IO" />
+    <PackageReference Include="System.Net.Primitives" />
+    <PackageReference Include="System.Resources.ResourceManager" />
+  </ItemGroup>
+
 </Project>