From 5a16934a3fa185291bc156fd86798783518e43a6 Mon Sep 17 00:00:00 2001 From: vpenades <5433822+vpenades@users.noreply.github.com> Date: Fri, 10 Jan 2025 16:57:06 +0100 Subject: [PATCH] switched PackageReference versions to Directory.Packages.Props --- Directory.Packages.props | 40 +++++++++++++++++++ SharpGLTF.sln | 1 + build/Directory.Build.props | 2 +- .../SharpGLTF.CodeGen.csproj | 6 +-- .../SharpGLTF.Plotly/SharpGLTF.Plotly.csproj | 2 +- .../SharpGLTF.Runtime.MonoGame.csproj | 2 +- src/Directory.Build.props | 12 +++--- src/SharpGLTF.Core/SharpGLTF.Core.csproj | 2 +- .../SharpGLTF.Ext.3DTiles.csproj | 2 +- tests/Directory.Build.props | 6 +-- .../SharpGLTF.Core.Tests.csproj | 4 +- .../SharpGLTF.DownloadTestFiles.csproj | 2 +- .../SharpGLTF.Ext.3DTiles.Tests.csproj | 4 +- tests/SharpGLTF.NUnit/SharpGLTF.NUnit.csproj | 8 ++-- .../SharpGLTF.Runtime.Tests.csproj | 6 +-- .../SharpGLTF.ThirdParty.Tests.csproj | 8 ++-- .../SharpGLTF.Toolkit.Tests.csproj | 4 +- 17 files changed, 76 insertions(+), 35 deletions(-) create mode 100644 Directory.Packages.props diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..214c0fb1 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,40 @@ + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SharpGLTF.sln b/SharpGLTF.sln index 17fa9568..845fcc94 100644 --- 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 index ae4780ba..8ba2c2a1 100644 --- a/build/Directory.Build.props +++ b/build/Directory.Build.props @@ -38,7 +38,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/build/SharpGLTF.CodeGen/SharpGLTF.CodeGen.csproj b/build/SharpGLTF.CodeGen/SharpGLTF.CodeGen.csproj index 7f9e4353..3226b66f 100644 --- a/build/SharpGLTF.CodeGen/SharpGLTF.CodeGen.csproj +++ b/build/SharpGLTF.CodeGen/SharpGLTF.CodeGen.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/examples/SharpGLTF.Plotly/SharpGLTF.Plotly.csproj b/examples/SharpGLTF.Plotly/SharpGLTF.Plotly.csproj index e8220aa3..d54ef295 100644 --- a/examples/SharpGLTF.Plotly/SharpGLTF.Plotly.csproj +++ b/examples/SharpGLTF.Plotly/SharpGLTF.Plotly.csproj @@ -5,7 +5,7 @@ - + diff --git a/examples/SharpGLTF.Runtime.MonoGame/SharpGLTF.Runtime.MonoGame.csproj b/examples/SharpGLTF.Runtime.MonoGame/SharpGLTF.Runtime.MonoGame.csproj index a8665cb0..64444ed4 100644 --- a/examples/SharpGLTF.Runtime.MonoGame/SharpGLTF.Runtime.MonoGame.csproj +++ b/examples/SharpGLTF.Runtime.MonoGame/SharpGLTF.Runtime.MonoGame.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 05f908ba..814f3c25 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -24,16 +24,16 @@ true - + - - - + + + @@ -54,7 +54,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -66,7 +66,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/SharpGLTF.Core/SharpGLTF.Core.csproj b/src/SharpGLTF.Core/SharpGLTF.Core.csproj index d926afbf..bf9395b3 100644 --- a/src/SharpGLTF.Core/SharpGLTF.Core.csproj +++ b/src/SharpGLTF.Core/SharpGLTF.Core.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/SharpGLTF.Ext.3DTiles/SharpGLTF.Ext.3DTiles.csproj b/src/SharpGLTF.Ext.3DTiles/SharpGLTF.Ext.3DTiles.csproj index 7a3e76cd..b1671c10 100644 --- a/src/SharpGLTF.Ext.3DTiles/SharpGLTF.Ext.3DTiles.csproj +++ b/src/SharpGLTF.Ext.3DTiles/SharpGLTF.Ext.3DTiles.csproj @@ -21,7 +21,7 @@ - + diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 369c8906..82285f2a 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -16,7 +16,7 @@ false - + @@ -38,12 +38,12 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/SharpGLTF.Core.Tests/SharpGLTF.Core.Tests.csproj b/tests/SharpGLTF.Core.Tests/SharpGLTF.Core.Tests.csproj index ffd8f5c0..0ce159f4 100644 --- a/tests/SharpGLTF.Core.Tests/SharpGLTF.Core.Tests.csproj +++ b/tests/SharpGLTF.Core.Tests/SharpGLTF.Core.Tests.csproj @@ -12,11 +12,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file diff --git a/tests/SharpGLTF.DownloadTestFiles/SharpGLTF.DownloadTestFiles.csproj b/tests/SharpGLTF.DownloadTestFiles/SharpGLTF.DownloadTestFiles.csproj index d8b17926..32cfc9fa 100644 --- a/tests/SharpGLTF.DownloadTestFiles/SharpGLTF.DownloadTestFiles.csproj +++ b/tests/SharpGLTF.DownloadTestFiles/SharpGLTF.DownloadTestFiles.csproj @@ -7,7 +7,7 @@ - + diff --git a/tests/SharpGLTF.Ext.3DTiles.Tests/SharpGLTF.Ext.3DTiles.Tests.csproj b/tests/SharpGLTF.Ext.3DTiles.Tests/SharpGLTF.Ext.3DTiles.Tests.csproj index 90b6c912..3516aacd 100644 --- 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 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/SharpGLTF.NUnit/SharpGLTF.NUnit.csproj b/tests/SharpGLTF.NUnit/SharpGLTF.NUnit.csproj index 615b8a2a..1e3f076f 100644 --- a/tests/SharpGLTF.NUnit/SharpGLTF.NUnit.csproj +++ b/tests/SharpGLTF.NUnit/SharpGLTF.NUnit.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/tests/SharpGLTF.Runtime.Tests/SharpGLTF.Runtime.Tests.csproj b/tests/SharpGLTF.Runtime.Tests/SharpGLTF.Runtime.Tests.csproj index 890d3ab6..eccbe24d 100644 --- a/tests/SharpGLTF.Runtime.Tests/SharpGLTF.Runtime.Tests.csproj +++ b/tests/SharpGLTF.Runtime.Tests/SharpGLTF.Runtime.Tests.csproj @@ -1,4 +1,4 @@ - + net471;net6.0;net8.0 @@ -12,11 +12,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/SharpGLTF.ThirdParty.Tests/SharpGLTF.ThirdParty.Tests.csproj b/tests/SharpGLTF.ThirdParty.Tests/SharpGLTF.ThirdParty.Tests.csproj index 0f518c74..8d9e736e 100644 --- a/tests/SharpGLTF.ThirdParty.Tests/SharpGLTF.ThirdParty.Tests.csproj +++ b/tests/SharpGLTF.ThirdParty.Tests/SharpGLTF.ThirdParty.Tests.csproj @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/tests/SharpGLTF.Toolkit.Tests/SharpGLTF.Toolkit.Tests.csproj b/tests/SharpGLTF.Toolkit.Tests/SharpGLTF.Toolkit.Tests.csproj index e6adde13..d0739db3 100644 --- a/tests/SharpGLTF.Toolkit.Tests/SharpGLTF.Toolkit.Tests.csproj +++ b/tests/SharpGLTF.Toolkit.Tests/SharpGLTF.Toolkit.Tests.csproj @@ -13,11 +13,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file