Updated version, added some documentation

RockerUrBiz · Jun 12, 2018 · 50076ac · 50076ac
1 parent 97e7017
commit 50076ac
Show file tree

Hide file tree

Showing 16 changed files with 218 additions and 293 deletions.
diff --git a/.hgignore b/.hgignore
@@ -35,3 +35,4 @@ tests/cilg-integration/build/*
 tests/nuget-integration/work/*
 **/.vs/**
 tests/nuget-integration/blueprint/net35/packages.config
+_site/**
diff --git a/Trinity.CilGenerator/Trinity.CilGenerator.csproj b/Trinity.CilGenerator/Trinity.CilGenerator.csproj
@@ -47,8 +47,18 @@
     <Reference Include="ICSharpCode.Decompiler, Version=3.1.0.3652, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
       <HintPath>..\packages\ICSharpCode.Decompiler.3.1.0.3652\lib\net46\ICSharpCode.Decompiler.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
+    <Reference Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Build.Framework.15.7.179\lib\net46\Microsoft.Build.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Build.Utilities.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Build.Utilities.Core.15.7.179\lib\net46\Microsoft.Build.Utilities.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Setup.Configuration.Interop.1.16.30\lib\net35\Microsoft.VisualStudio.Setup.Configuration.Interop.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
     <Reference Include="Mono.Cecil, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
       <HintPath>..\packages\Mono.Cecil.0.10.0\lib\net40\Mono.Cecil.dll</HintPath>
     </Reference>
@@ -70,10 +80,16 @@
       <HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.5.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
     </Reference>
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

diff --git a/Trinity.CilGenerator/packages.config b/Trinity.CilGenerator/packages.config
@@ -2,8 +2,12 @@
 <packages>
   <package id="Humanizer.Core" version="2.2.0" targetFramework="net461" />
   <package id="ICSharpCode.Decompiler" version="3.1.0.3652" targetFramework="net461" />
+  <package id="Microsoft.Build.Framework" version="15.7.179" targetFramework="net461" />
+  <package id="Microsoft.Build.Utilities.Core" version="15.7.179" targetFramework="net461" />
+  <package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="1.16.30" targetFramework="net461" developmentDependency="true" />
   <package id="Mono.Cecil" version="0.10.0" targetFramework="net40" />
   <package id="NUnit" version="3.6.1" targetFramework="net40" requireReinstallation="true" />
   <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net461" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net40" requireReinstallation="true" />
 </packages>
diff --git a/Trinity.OntologyGenerator/App.config b/Trinity.OntologyGenerator/App.config
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="TrinitySettings" type="Semiodesk.Trinity.Configuration.TrinitySettings, Semiodesk.Trinity" />
+    <section name="TrinitySettings" type="Semiodesk.Trinity.Configuration.TrinitySettings, Semiodesk.Trinity"/>
   </configSections>
   <connectionStrings>
-    <add name="virt0" providerName="Semiodesk.Trinity" connectionString="provider=virtuoso;host=localhost;port=1117;uid=dba;pw=dba" />
+    <add name="virt0" providerName="Semiodesk.Trinity" connectionString="provider=virtuoso;host=localhost;port=1117;uid=dba;pw=dba"/>
   </connectionStrings>
   <TrinitySettings namespace="Semiodesk.Trinity.Ontologies">
     <OntologySettings>
 
       <!--http://www.w3.org/1999/02/22-rdf-syntax-ns#-->
       <Ontology Uri="http://www.w3.org/1999/02/22-rdf-syntax-ns#" Prefix="rdf">
-        <FileSource Location="Ontologies\22-rdf-syntax-ns.rdf" />
+        <FileSource Location="Ontologies\22-rdf-syntax-ns.rdf"/>
       </Ontology>
 
       <!--http://www.w3.org/2000/01/rdf-schema#-->
       <Ontology Uri="http://www.w3.org/2000/01/rdf-schema#" MetadataUri="http://www.w3.org/2000/01/rdf-schema-metadata">
-        <FileSource Location="Ontologies\rdfs.trig" />
+        <FileSource Location="Ontologies\rdfs.trig"/>
       </Ontology>
 
       <Ontology Uri="http://www.w3.org/2002/07/owl#" Prefix="owl">
-        <FileSource Location="Ontologies\owl.n3" />
+        <FileSource Location="Ontologies\owl.n3"/>
       </Ontology>
 
       <!--http://purl.org/dc/terms/-->
       <Ontology Uri="http://purl.org/dc/terms/" Prefix="dcterms">
-        <FileSource Location="Ontologies\dcterms.ttl" />
+        <FileSource Location="Ontologies\dcterms.ttl"/>
       </Ontology>
 
       <!--http://purl.org/dc/terms/-->
       <Ontology Uri="http://topbraid.org/schema/" Prefix="so">
-        <FileSource Location="Ontologies\schema.ttl" />
+        <FileSource Location="Ontologies\schema.ttl"/>
       </Ontology>
     </OntologySettings>
 
     <VirtuosoStoreSettings>
       <RuleSets>
         <RuleSet Uri="urn:semiodesk/ruleset">
             <Graphs>
-              <Graph Uri="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
-              <Graph Uri="http://www.w3.org/2000/01/rdf-schema#" />
-              <Graph Uri="http://www.w3.org/2002/07/owl#" />
+              <Graph Uri="http://www.w3.org/1999/02/22-rdf-syntax-ns#"/>
+              <Graph Uri="http://www.w3.org/2000/01/rdf-schema#"/>
+              <Graph Uri="http://www.w3.org/2002/07/owl#"/>
             </Graphs>
         </RuleSet>
       </RuleSets>
@@ -49,14 +49,13 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="dotNetRDF" publicKeyToken="6055ffe4c97cc780" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.0.9.3683" newVersion="1.0.9.3683" />
+        <assemblyIdentity name="dotNetRDF" publicKeyToken="6055ffe4c97cc780" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.9.3683" newVersion="1.0.9.3683"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
-
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/Trinity.OntologyGenerator/Properties/Resources.Designer.cs b/Trinity.OntologyGenerator/Properties/Resources.Designer.cs
diff --git a/Trinity.OntologyGenerator/Trinity.OntologyGenerator.csproj b/Trinity.OntologyGenerator/Trinity.OntologyGenerator.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Semiodesk.Trinity.OntologyGenerator</RootNamespace>
     <AssemblyName>OntologyGenerator</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -23,6 +23,7 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>
     </DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,18 +32,25 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>Semiodesk.Trinity.OntologyGenerator.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
+    <Reference Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Build.Framework.15.7.179\lib\net46\Microsoft.Build.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Build.Utilities.Core">
+      <HintPath>..\packages\Microsoft.Build.Utilities.Core.15.7.179\lib\net46\Microsoft.Build.Utilities.Core.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -79,6 +87,7 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Trinity\Trinity.csproj">

diff --git a/Trinity/Trinity.csproj b/Trinity/Trinity.csproj
@@ -6,9 +6,9 @@
 	<Copyright>Copyright © Semiodesk GmbH 2018</Copyright>
 	<Description>This library is an enterprise ready platform for developing knowlege-based applications. Trinity offers superior modelling and querying flexibility combined with extreme scalability when compared with traditional ORM solutions. Supporting the powerful RDF metadata standard Trinity offers a sustainable foundation for your desktop, mobile or web applications.</Description>
 	<Company>Semiodesk GmbH</Company>
-	<Version>1.0.0-rc003</Version>
-	<AssemblyVersion>1.0.0.3</AssemblyVersion>
-	<FileVersion>1.0.0.3</FileVersion>
+	<Version>1.0.0-rc004</Version>
+	<AssemblyVersion>1.0.0.4</AssemblyVersion>
+	<FileVersion>1.0.0.4</FileVersion>
 	<AssemblyName>Semiodesk.Trinity</AssemblyName>
 	<RootNamespace>Semiodesk.Trinity</RootNamespace>
   </PropertyGroup>

diff --git a/build.cake b/build.cake
@@ -2,8 +2,7 @@
 //#addin "Cake.XdtTransform"
 //#addin "Cake.SemVer"
 #tool nuget:?package=NUnit.ConsoleRunner&version=3.7.0
-#addin "Cake.DocFx"
-#tool "docfx.msbuild"
+
 
 var configuration = Argument("configuration", "Release");
 
@@ -53,7 +52,7 @@ void Build(FilePath solution)
     NuGetRestore(solution);
 
     Section("Build");
-    DotNetBuild(solution, settings => settings
+    MSBuild(solution, settings => settings
             .SetConfiguration(configuration)
             .WithTarget("Rebuild")
             .SetVerbosity(Verbosity.Quiet));
@@ -129,7 +128,7 @@ Task("Documentation")
     .IsDependentOn("Test")
     .Does(()=>{
 
-        DocFxBuild("./doc/docfx_project/docfx.json");
+        //DocFxBuild("./doc/docfx_project/docfx.json");
     });
 
 Task("Integration-Test-Build")