Made the generator come before glTFLoader in the build order.

vizorvr · Dec 2, 2015 · 33b948f · 33b948f
1 parent b3051d6
commit 33b948f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/loaders/CSharp/GeneratorUnitTests/SchemaTest.cs b/loaders/CSharp/GeneratorUnitTests/SchemaTest.cs
@@ -79,7 +79,7 @@ public void AllPropertyNames()
             propertyNames = propertyNames.Select((p) => p.ToLower()).Distinct().ToList();
             var knownPropertyNames = typeof (Schema).GetProperties().Select((p) => p.Name.ToLower());
             propertyNames = propertyNames.Except(knownPropertyNames).Except(excludedNames)
-                .Except(new[] { "$schema", "__ref__", "additionalproperties", "gltf_webgl", "gltf_detaileddescription" }).ToList();
+                .Except(new[] { "$schema", "__ref__", "additionalproperties", "gltf_webgl", "gltf_detaileddescription", "gltf_enumnames", "gltf_uritype" }).ToList();
 
             CollectionAssert.AreEquivalent(new string[] {}, propertyNames);
         }

diff --git a/loaders/CSharp/InstallerNuget/InstallerNuget.csproj b/loaders/CSharp/InstallerNuget/InstallerNuget.csproj
@@ -38,6 +38,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="Build">
-    <Exec Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" WorkingDirectory=".\" Command="nuget.exe pack ..\glTFLoader\glTFLoader.csproj -IncludeReferencedProjects" />
+    <Exec Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"
+          WorkingDirectory=".\"
+          Command='nuget.exe pack ..\glTFLoader\glTFLoader.csproj -IncludeReferencedProjects -verbosity detailed -Exclude "**Generator**"' />
   </Target>
 </Project>
diff --git a/loaders/CSharp/glTFLoader/glTFLoader.csproj b/loaders/CSharp/glTFLoader/glTFLoader.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{C2F2E13B-594F-4592-A2D4-F44BBCE65F90}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -86,6 +86,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Generator\Generator.csproj">
+      <Project>{ddd005c7-d63d-4707-9464-1bcb9fd00454}</Project>
+      <Name>Generator</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\glTFLoader_Shared\glTFLoader_Shared.csproj">
       <Project>{976ef0aa-4835-4b60-88b8-bf2fa02b571c}</Project>
       <Name>glTFLoader_Shared</Name>