[NuGet] Switch to NuGet 5.0

stride3d · May 4, 2019 · d552c97 · d552c97
1 parent bbb42da
commit d552c97
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/sources/assets/Xenko.Core.Assets.CompilerApp/Xenko.Core.Assets.CompilerApp.csproj b/sources/assets/Xenko.Core.Assets.CompilerApp/Xenko.Core.Assets.CompilerApp.csproj
@@ -35,6 +35,7 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <None Include="build\**\*.targets" PackagePath="build\" Pack="true" />
+    <None Include="build\**\*.targets" PackagePath="buildTransitive\" Pack="true" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\engine\Xenko.Assets.Models\Xenko.Assets.Models.csproj" />

diff --git a/sources/assets/Xenko.Core.Packages/Xenko.Core.Packages.csproj b/sources/assets/Xenko.Core.Packages/Xenko.Core.Packages.csproj
@@ -8,8 +8,8 @@
     <XenkoAssemblyProcessorOptions>--auto-module-initializer --serialization</XenkoAssemblyProcessorOptions>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NuGet.Protocol" Version="4.9.1" />
-    <PackageReference Include="NuGet.PackageManagement" Version="4.9.1" />
+    <PackageReference Include="NuGet.Protocol" Version="5.0.0" />
+    <PackageReference Include="NuGet.PackageManagement" Version="5.0.0" />
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
     <Reference Include="System.Core" />
     <Reference Include="System.ComponentModel.DataAnnotations" />

diff --git a/sources/core/Xenko.Core.Design/Xenko.Core.Design.csproj b/sources/core/Xenko.Core.Design/Xenko.Core.Design.csproj
@@ -33,7 +33,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
-    <PackageReference Include="NuGet.Configuration" Version="4.9.1" />
+    <PackageReference Include="NuGet.Configuration" Version="5.0.0" />
     <PackageReference Include="SharpDX" Version="4.0.1" />
     <PackageReference Include="System.Management" Version="4.5.0" />
     <Reference Include="System.Windows.Forms" />

diff --git a/sources/core/Xenko.Core/Xenko.Core.csproj b/sources/core/Xenko.Core/Xenko.Core.csproj
@@ -58,6 +58,8 @@
     </Compile>
     <None Include="build\**\*.targets" PackagePath="build\" Pack="true" />
     <None Include="build\**\*.props" PackagePath="build\" Pack="true" />
+    <None Include="build\**\*.targets" PackagePath="buildTransitive\" Pack="true" />
+    <None Include="build\**\*.props" PackagePath="buildTransitive\" Pack="true" />
     <None Include="..\..\..\deps\AssemblyProcessor\*.*" PackagePath="tools\AssemblyProcessor\" Pack="true" />
   </ItemGroup>
 

diff --git a/...itor/Xenko.Assets.Presentation/Templates/Core/ProjectLibrary.Game/$ProjectName$.csproj.t4 b/...itor/Xenko.Assets.Presentation/Templates/Core/ProjectLibrary.Game/$ProjectName$.csproj.t4
@@ -10,14 +10,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xenko.Engine" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Engine" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" />
 
-    <PackageReference Include="Xenko.Video" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Physics" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Navigation" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Video" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" />
+    <PackageReference Include="Xenko.Physics" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" />
+    <PackageReference Include="Xenko.Navigation" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" />
+    <PackageReference Include="Xenko.Particles" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" />
+    <PackageReference Include="Xenko.UI" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" />
 
     <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
   </ItemGroup>