Upgrade glTFLoader to Net.Standard package (#4)

* Added Net Standard concept project. * made main glTFLoader project a net.standard project. Removed Shared project, and linked directly to ArrayConverter at GeneratorLib * Removed unneccesary Package.nuspec, since it's automatically generated Updated/Consolidated NUnit and Newtonsoft packages * removed unnecessary file * Removed InstallerNuget since it's no longer needed. Nuget package generation can be done by right clicking in glTFloader project in VS project explorer, and selecting "Pack" from the context menu.
KhronosGroup · Aug 17, 2017 · 43860bd · 43860bd
1 parent 41d0bcf
commit 43860bd
Show file tree

Hide file tree

Showing 22 changed files with 363 additions and 680 deletions.
diff --git a/CSharp.sln b/CSharp.sln
@@ -1,58 +1,49 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.12
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator", "Generator\Generator.csproj", "{DDD005C7-D63D-4707-9464-1BCB9FD00454}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeneratorLib", "GeneratorLib\GeneratorLib.csproj", "{ED3BEBD3-A9B9-42D9-A778-43E8CFB3B359}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeneratorUnitTests", "GeneratorUnitTests\GeneratorUnitTests.csproj", "{722A7321-13D5-42D2-9E10-EC337BBEDA92}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "glTFLoader", "glTFLoader\glTFLoader.csproj", "{C2F2E13B-594F-4592-A2D4-F44BBCE65F90}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "glTFLoaderUnitTests", "glTFLoaderUnitTests\glTFLoaderUnitTests.csproj", "{55C01A0A-61C6-478C-9AAC-874709AEA393}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "glTFLoader_Shared", "glTFLoader_Shared\glTFLoader_Shared.csproj", "{976EF0AA-4835-4B60-88B8-BF2FA02B571C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InstallerNuget", "InstallerNuget\InstallerNuget.csproj", "{1438AFD1-D3CA-4F00-AFB5-4804AFF5FF00}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DDD005C7-D63D-4707-9464-1BCB9FD00454}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DDD005C7-D63D-4707-9464-1BCB9FD00454}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DDD005C7-D63D-4707-9464-1BCB9FD00454}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DDD005C7-D63D-4707-9464-1BCB9FD00454}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED3BEBD3-A9B9-42D9-A778-43E8CFB3B359}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED3BEBD3-A9B9-42D9-A778-43E8CFB3B359}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED3BEBD3-A9B9-42D9-A778-43E8CFB3B359}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED3BEBD3-A9B9-42D9-A778-43E8CFB3B359}.Release|Any CPU.Build.0 = Release|Any CPU
-		{722A7321-13D5-42D2-9E10-EC337BBEDA92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{722A7321-13D5-42D2-9E10-EC337BBEDA92}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{722A7321-13D5-42D2-9E10-EC337BBEDA92}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{722A7321-13D5-42D2-9E10-EC337BBEDA92}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2F2E13B-594F-4592-A2D4-F44BBCE65F90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2F2E13B-594F-4592-A2D4-F44BBCE65F90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2F2E13B-594F-4592-A2D4-F44BBCE65F90}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2F2E13B-594F-4592-A2D4-F44BBCE65F90}.Release|Any CPU.Build.0 = Release|Any CPU
-		{55C01A0A-61C6-478C-9AAC-874709AEA393}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55C01A0A-61C6-478C-9AAC-874709AEA393}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55C01A0A-61C6-478C-9AAC-874709AEA393}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{55C01A0A-61C6-478C-9AAC-874709AEA393}.Release|Any CPU.Build.0 = Release|Any CPU
-		{976EF0AA-4835-4B60-88B8-BF2FA02B571C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{976EF0AA-4835-4B60-88B8-BF2FA02B571C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{976EF0AA-4835-4B60-88B8-BF2FA02B571C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{976EF0AA-4835-4B60-88B8-BF2FA02B571C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1438AFD1-D3CA-4F00-AFB5-4804AFF5FF00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1438AFD1-D3CA-4F00-AFB5-4804AFF5FF00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1438AFD1-D3CA-4F00-AFB5-4804AFF5FF00}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1438AFD1-D3CA-4F00-AFB5-4804AFF5FF00}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.16
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator", "Generator\Generator.csproj", "{DDD005C7-D63D-4707-9464-1BCB9FD00454}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeneratorLib", "GeneratorLib\GeneratorLib.csproj", "{ED3BEBD3-A9B9-42D9-A778-43E8CFB3B359}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeneratorUnitTests", "GeneratorUnitTests\GeneratorUnitTests.csproj", "{722A7321-13D5-42D2-9E10-EC337BBEDA92}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "glTFLoader", "glTFLoader\glTFLoader.csproj", "{C2F2E13B-594F-4592-A2D4-F44BBCE65F90}"
+	ProjectSection(ProjectDependencies) = postProject
+		{DDD005C7-D63D-4707-9464-1BCB9FD00454} = {DDD005C7-D63D-4707-9464-1BCB9FD00454}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "glTFLoaderUnitTests", "glTFLoaderUnitTests\glTFLoaderUnitTests.csproj", "{55C01A0A-61C6-478C-9AAC-874709AEA393}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DDD005C7-D63D-4707-9464-1BCB9FD00454}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDD005C7-D63D-4707-9464-1BCB9FD00454}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDD005C7-D63D-4707-9464-1BCB9FD00454}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDD005C7-D63D-4707-9464-1BCB9FD00454}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED3BEBD3-A9B9-42D9-A778-43E8CFB3B359}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED3BEBD3-A9B9-42D9-A778-43E8CFB3B359}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED3BEBD3-A9B9-42D9-A778-43E8CFB3B359}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED3BEBD3-A9B9-42D9-A778-43E8CFB3B359}.Release|Any CPU.Build.0 = Release|Any CPU
+		{722A7321-13D5-42D2-9E10-EC337BBEDA92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{722A7321-13D5-42D2-9E10-EC337BBEDA92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{722A7321-13D5-42D2-9E10-EC337BBEDA92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{722A7321-13D5-42D2-9E10-EC337BBEDA92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2F2E13B-594F-4592-A2D4-F44BBCE65F90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2F2E13B-594F-4592-A2D4-F44BBCE65F90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2F2E13B-594F-4592-A2D4-F44BBCE65F90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2F2E13B-594F-4592-A2D4-F44BBCE65F90}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55C01A0A-61C6-478C-9AAC-874709AEA393}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55C01A0A-61C6-478C-9AAC-874709AEA393}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55C01A0A-61C6-478C-9AAC-874709AEA393}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55C01A0A-61C6-478C-9AAC-874709AEA393}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Generator/Generator.csproj b/Generator/Generator.csproj
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DDD005C7-D63D-4707-9464-1BCB9FD00454}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Generator</RootNamespace>
-    <AssemblyName>Generator</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\GeneratorLib\GeneratorLib.csproj">
-      <Project>{ed3bebd3-a9b9-42d9-a778-43e8cfb3b359}</Project>
-      <Name>GeneratorLib</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<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>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{DDD005C7-D63D-4707-9464-1BCB9FD00454}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Generator</RootNamespace>
+    <AssemblyName>Generator</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GeneratorLib\GeneratorLib.csproj">
+      <Project>{ed3bebd3-a9b9-42d9-a778-43e8cfb3b359}</Project>
+      <Name>GeneratorLib</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.-->
-  <Target Name="AfterBuild">
-    <Exec WorkingDirectory="$(OutputPath)" Command="Generator.exe" />
-  </Target>
+       Other similar extension points exist, see Microsoft.Common.targets.-->
+  <Target Name="AfterBuild">
+    <Exec WorkingDirectory="$(OutputPath)" Command="Generator.exe" />
+  </Target>
 </Project>
diff --git a/Generator/packages.config b/Generator/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
 </packages>
diff --git a/GeneratorLib/CodeGenerator.cs b/GeneratorLib/CodeGenerator.cs
@@ -317,6 +317,9 @@ public static CodeTypeReference GetCodegenType(CodeTypeDeclaration target, Schem
 
         public void CSharpCodeGen(string outputDirectory)
         {
+            // make sure the output directory exists
+            System.IO.Directory.CreateDirectory(outputDirectory);
+
             GeneratedClasses = new Dictionary<string, CodeTypeDeclaration>();
             foreach (var schema in FileSchemas)
             {