switched PackageReference versions to Directory.Packages.Props

vpenades · Jan 10, 2025 · 5a16934 · 5a16934
1 parent 8a033fb
commit 5a16934
Show file tree

Hide file tree

Showing 17 changed files with 76 additions and 35 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+ <PropertyGroup>
+     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+     <EnablePackageVersionOverride>true</EnablePackageVersionOverride>
+ </PropertyGroup>
+
+ <ItemGroup>
+   <PackageVersion Include="System.Text.Json" Version="9.0.0" />
+   <PackageVersion Include="System.Drawing.Common" Version="9.0.0" />
+   <PackageVersion Include="OneOf" Version="3.0.271" />   
+   <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+   <PackageVersion Include="NJsonSchema.CodeGeneration.CSharp" Version="11.1.0" />
+   <PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="11.1.0" />   
+ </ItemGroup>
+
+ <ItemGroup>
+   <PackageVersion Include="Plotly.Sharp" Version="0.0.8196" />
+   <PackageVersion Include="LibGit2Sharp" Version="0.31.0" />
+   <PackageVersion Include="MonoGame.Framework.DesktopGL" Version="3.8.2.1105" />
+   <PackageVersion Include="GltfValidator" Version="2.0.0-dev.3.10.202411282031" />
+   <PackageVersion Include="ErrorProne.NET.Structs" Version="0.6.1-beta.1" />
+   <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
+   <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+   <PackageVersion Include="NUnit" Version="4.3.2" />
+   <PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
+   <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
+   <PackageVersion Include="TestAttachments.NUnit" Version="4.0.0-preview-20241018-1255" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net6.0'))">
+    <PackageVersion Update="LibGit2Sharp" Version="0.30.0" />
+    <PackageVersion Update="System.Text.Json" Version="8.0.5" />
+    <PackageVersion Update="System.Drawing.Common" Version="8.0.11" />
+    <PackageVersion Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
+  </ItemGroup>
+
+
+</Project>
diff --git a/SharpGLTF.sln b/SharpGLTF.sln
@@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		.github\actions\Build\action.yml = .github\actions\Build\action.yml
 		.github\workflows\BuildPackages.yml = .github\workflows\BuildPackages.yml
+		Directory.Packages.props = Directory.Packages.props
 		.github\workflows\IncrementAlpha.yml = .github\workflows\IncrementAlpha.yml
 		.github\workflows\IncrementVersion.yml = .github\workflows\IncrementVersion.yml
 		.github\workflows\PublishMainToNuget.yml = .github\workflows\PublishMainToNuget.yml

diff --git a/build/Directory.Build.props b/build/Directory.Build.props
@@ -38,7 +38,7 @@
 
     <AdditionalFiles Include="$(MsBuildThisFileDirectory)..\stylecop.json" />
 
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/build/SharpGLTF.CodeGen/SharpGLTF.CodeGen.csproj b/build/SharpGLTF.CodeGen/SharpGLTF.CodeGen.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibGit2Sharp" Version="0.30.0" />    
-    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="11.1.0" />
-    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.1.0" />
+    <PackageReference Include="LibGit2Sharp" />    
+    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" />
+    <PackageReference Include="NJsonSchema.NewtonsoftJson" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/SharpGLTF.Plotly/SharpGLTF.Plotly.csproj b/examples/SharpGLTF.Plotly/SharpGLTF.Plotly.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>    
-    <PackageReference Include="Plotly.Sharp" Version="0.0.8196" />
+    <PackageReference Include="Plotly.Sharp" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/SharpGLTF.Runtime.MonoGame/SharpGLTF.Runtime.MonoGame.csproj b/examples/SharpGLTF.Runtime.MonoGame/SharpGLTF.Runtime.MonoGame.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.2.1105" />    
+    <PackageReference Include="MonoGame.Framework.DesktopGL" />    
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -24,16 +24,16 @@
     <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
-  <Import Project="$(MsBuildThisFileDirectory)Shared\SharpGLTF.PublicKey.props"/>
+  <Import Project="$(MsBuildThisFileDirectory)Shared\SharpGLTF.PublicKey.props" />
 
   <!-- Testing & Analysers =================================================================================== -->
 
   <!-- Condition=" '$(Configuration)' == 'Debug' " -->
 
   <ItemGroup>
-    <InternalsVisibleTo Include="SharpGLTF.Core.Tests" Key="$(StrongName_PublicKey)"/>
-    <InternalsVisibleTo Include="SharpGLTF.Toolkit.Tests" Key="$(StrongName_PublicKey)"/>
-    <InternalsVisibleTo Include="SharpGLTF.Ext.3DTiles.Tests" Key="$(StrongName_PublicKey)"/>
+    <InternalsVisibleTo Include="SharpGLTF.Core.Tests" Key="$(StrongName_PublicKey)" />
+    <InternalsVisibleTo Include="SharpGLTF.Toolkit.Tests" Key="$(StrongName_PublicKey)" />
+    <InternalsVisibleTo Include="SharpGLTF.Ext.3DTiles.Tests" Key="$(StrongName_PublicKey)" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -54,7 +54,7 @@
 
     <AdditionalFiles Include="$(MsBuildThisFileDirectory)..\stylecop.json" />
 
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -66,7 +66,7 @@
     <!-- Optimization analysis only makes sense on platforms that will be actually ran -->
 
     <!-- https://devblogs.microsoft.com/premier-developer/avoiding-struct-and-readonly-reference-performance-pitfalls-with-errorprone-net/ -->
-    <PackageReference Include="ErrorProne.NET.Structs" Version="0.6.1-beta.1">
+    <PackageReference Include="ErrorProne.NET.Structs">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/SharpGLTF.Core/SharpGLTF.Core.csproj b/src/SharpGLTF.Core/SharpGLTF.Core.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>  
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">    
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SharpGLTF.Ext.3DTiles/SharpGLTF.Ext.3DTiles.csproj b/src/SharpGLTF.Ext.3DTiles/SharpGLTF.Ext.3DTiles.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OneOf" Version="3.0.271" />
+    <PackageReference Include="OneOf" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -16,7 +16,7 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <Import Project="$(MsBuildThisFileDirectory)..\src\Shared\SharpGLTF.PublicKey.props"/>
+  <Import Project="$(MsBuildThisFileDirectory)..\src\Shared\SharpGLTF.PublicKey.props" />
 
   <!-- Testing & Analysers =================================================================================== -->  
 
@@ -38,12 +38,12 @@
 
     <AdditionalFiles Include="$(MsBuildThisFileDirectory)..\stylecop.json" />
 
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
+    <PackageReference Include="NUnit.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/tests/SharpGLTF.Core.Tests/SharpGLTF.Core.Tests.csproj b/tests/SharpGLTF.Core.Tests/SharpGLTF.Core.Tests.csproj
@@ -12,11 +12,11 @@
   </ItemGroup>  
 
   <ItemGroup>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
+    <PackageReference Include="NUnit3TestAdapter">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />    
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />    
   </ItemGroup>
 
 </Project>
diff --git a/tests/SharpGLTF.DownloadTestFiles/SharpGLTF.DownloadTestFiles.csproj b/tests/SharpGLTF.DownloadTestFiles/SharpGLTF.DownloadTestFiles.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibGit2Sharp" Version="0.30.0" />    
+    <PackageReference Include="LibGit2Sharp" />    
   </ItemGroup>
 
 </Project>
diff --git a/tests/SharpGLTF.Ext.3DTiles.Tests/SharpGLTF.Ext.3DTiles.Tests.csproj b/tests/SharpGLTF.Ext.3DTiles.Tests/SharpGLTF.Ext.3DTiles.Tests.csproj
@@ -13,11 +13,11 @@
   </ItemGroup>  
 
   <ItemGroup>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
+    <PackageReference Include="NUnit3TestAdapter">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />    
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />    
   </ItemGroup>
 
 </Project>
diff --git a/tests/SharpGLTF.NUnit/SharpGLTF.NUnit.csproj b/tests/SharpGLTF.NUnit/SharpGLTF.NUnit.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="4.2.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="GltfValidator" Version="2.0.0-dev.3.10.202411282031" />    
-    <PackageReference Include="TestAttachments.NUnit" Version="4.0.0-Preview-20240102-0955" />    
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="GltfValidator" />    
+    <PackageReference Include="TestAttachments.NUnit" />    
   </ItemGroup>
 
   <ItemGroup>    

diff --git a/tests/SharpGLTF.Runtime.Tests/SharpGLTF.Runtime.Tests.csproj b/tests/SharpGLTF.Runtime.Tests/SharpGLTF.Runtime.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net471;net6.0;net8.0</TargetFrameworks>
@@ -12,11 +12,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
+    <PackageReference Include="NUnit3TestAdapter">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />    
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />    
   </ItemGroup>
 
 </Project>
diff --git a/tests/SharpGLTF.ThirdParty.Tests/SharpGLTF.ThirdParty.Tests.csproj b/tests/SharpGLTF.ThirdParty.Tests/SharpGLTF.ThirdParty.Tests.csproj
@@ -12,10 +12,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="4.2.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.10" />    
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="System.Drawing.Common" />    
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/SharpGLTF.Toolkit.Tests/SharpGLTF.Toolkit.Tests.csproj b/tests/SharpGLTF.Toolkit.Tests/SharpGLTF.Toolkit.Tests.csproj
@@ -13,11 +13,11 @@
 
   <ItemGroup>    
 
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
+    <PackageReference Include="NUnit3TestAdapter">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />    
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />    
   </ItemGroup>
 
 </Project>