Browse Source

updated nugets
fixed test assets

Vicente Penades 3 years ago
parent
commit
ff01bc9be0

+ 1 - 1
build/SharpGLTF.CodeGen/SharpGLTF.CodeGen.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="LibGit2Sharp" Version="0.26.2" />    
-    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="10.6.8" />
+    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="10.6.10" />
   </ItemGroup>
 
 </Project>

+ 2 - 1
src/Analyzers.props

@@ -2,7 +2,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <CodeAnalysisRuleSet>$(MsBuildThisFileDirectory)..\SharpGLTF.ruleset</CodeAnalysisRuleSet>
+    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+    <CodeAnalysisRuleSet>$(MsBuildThisFileDirectory)..\SharpGLTF.ruleset</CodeAnalysisRuleSet>    
   </PropertyGroup>
 
   <ItemGroup>

+ 0 - 0
tests/SharpGLTF.ThirdParty.Tests/Assets/texture.png → tests/Assets/texture.png


+ 1 - 1
tests/SharpGLTF.Core.Tests/SharpGLTF.Core.Tests.csproj

@@ -26,7 +26,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />    
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />    
   </ItemGroup>    
 
 </Project>

+ 11 - 14
tests/SharpGLTF.ThirdParty.Tests/AceCebovTests.cs

@@ -1,24 +1,21 @@
-using NUnit.Framework;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Numerics;
+
+using NUnit.Framework;
+
 using SharpGLTF.Geometry;
 using SharpGLTF.Geometry.VertexTypes;
 using SharpGLTF.Materials;
 using SharpGLTF.Memory;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Numerics;
-using VBColor1 = SharpGLTF.Geometry.VertexBuilder<SharpGLTF.Geometry.VertexTypes.VertexPosition,
-    SharpGLTF.Geometry.VertexTypes.VertexColor1,
-    SharpGLTF.Geometry.VertexTypes.VertexEmpty>;
-using VBColor1Texture1 = SharpGLTF.Geometry.VertexBuilder<SharpGLTF.Geometry.VertexTypes.VertexPosition,
-    SharpGLTF.Geometry.VertexTypes.VertexColor1Texture1,
-    SharpGLTF.Geometry.VertexTypes.VertexEmpty>;
-using VBTexture1 = SharpGLTF.Geometry.VertexBuilder<SharpGLTF.Geometry.VertexTypes.VertexPosition,
-    SharpGLTF.Geometry.VertexTypes.VertexTexture1,
-    SharpGLTF.Geometry.VertexTypes.VertexEmpty>;
 
 namespace SharpGLTF.ThirdParty
 {
+    using VBColor1 = VertexBuilder<VertexPosition,VertexColor1,VertexEmpty>;
+    using VBColor1Texture1 = VertexBuilder<VertexPosition,VertexColor1Texture1,VertexEmpty>;
+    using VBTexture1 = VertexBuilder<VertexPosition,VertexTexture1,VertexEmpty>;
+
     internal class AceCebovTests
     {
         private static string AssetsPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "Assets");

+ 1 - 1
tests/SharpGLTF.ThirdParty.Tests/SharpGLTF.ThirdParty.Tests.csproj

@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />    
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />    
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 1
tests/SharpGLTF.Toolkit.Tests/SharpGLTF.Toolkit.Tests.csproj

@@ -26,7 +26,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />    
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />    
   </ItemGroup>  
 
 </Project>