Fixed an issue with Trinity on Mac

RockerUrBiz · Dec 13, 2019 · 95391a9 · 95391a9
1 parent f6c8289
commit 95391a9
Show file tree

Hide file tree

Showing 15 changed files with 72 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,6 @@ Build/**
 **/obj/**
 packages/**
 Documentation/log.txt
-*.zip
+*.zip
+*.user
+**/.vs/**
diff --git a/Examples/Asp.Net Core Example/Ontologies/Ontologies.g.cs b/Examples/Asp.Net Core Example/Ontologies/Ontologies.g.cs
@@ -1,5 +1,5 @@
 // Attention: This file is generated. Any modifications will eventually be overwritten.
-// Date: 23.10.2019 13:30:27
+// Date: 11.12.2019 10:14:26
 
 using System;
 using System.Collections.Generic;

diff --git a/Examples/Examples.sln b/Examples/Examples.sln
@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29324.140
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Asp.Net Core Example", "Asp.Net Core Example\Asp.Net Core Example.csproj", "{67A0DDF4-8EFF-48E1-9433-E592E69C0D56}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FirstSteps", "FirstSteps\FirstSteps.csproj", "{EA3998E0-44F3-43A3-A994-7A1706280759}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleVirtuoso", "SimpleVirtuoso\SimpleVirtuoso.csproj", "{3440F467-E8C7-4EA0-A30C-3836F830D391}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{67A0DDF4-8EFF-48E1-9433-E592E69C0D56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67A0DDF4-8EFF-48E1-9433-E592E69C0D56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67A0DDF4-8EFF-48E1-9433-E592E69C0D56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67A0DDF4-8EFF-48E1-9433-E592E69C0D56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA3998E0-44F3-43A3-A994-7A1706280759}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA3998E0-44F3-43A3-A994-7A1706280759}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA3998E0-44F3-43A3-A994-7A1706280759}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA3998E0-44F3-43A3-A994-7A1706280759}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3440F467-E8C7-4EA0-A30C-3836F830D391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3440F467-E8C7-4EA0-A30C-3836F830D391}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3440F467-E8C7-4EA0-A30C-3836F830D391}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3440F467-E8C7-4EA0-A30C-3836F830D391}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {73018661-373B-4B3C-8158-78EAE0770223}
+	EndGlobalSection
+EndGlobal
diff --git a/Examples/FirstSteps/Ontologies/Ontologies.g.cs b/Examples/FirstSteps/Ontologies/Ontologies.g.cs
@@ -1,5 +1,5 @@
 // Attention: This file is generated. Any modifications will eventually be overwritten.
-// Date: 11.11.2019 10:53:38
+// Date: 11.12.2019 10:14:26
 
 using System;
 using System.Collections.Generic;

diff --git a/Examples/SimpleVirtuoso/Ontologies/Ontologies.g.cs b/Examples/SimpleVirtuoso/Ontologies/Ontologies.g.cs
@@ -1,5 +1,5 @@
 // Attention: This file is generated. Any modifications will eventually be overwritten.
-// Date: 11.11.2019 10:53:38
+// Date: 11.12.2019 10:14:23
 
 using System;
 using System.Collections.Generic;

diff --git a/Semiodesk.Trinity.sln b/Semiodesk.Trinity.sln
@@ -25,18 +25,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Trinity.Virtuoso", "Trinity
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Documentation", "Documentation\Documentation.csproj", "{A96B8568-4967-44BE-B58E-BBF5CDBC4D0C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{C03B571D-B545-4384-849B-A1CD4CC145AA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FirstSteps", "Examples\FirstSteps\FirstSteps.csproj", "{FCD5CA84-CDFB-4826-9C56-CA722091B935}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8F810E3F-1005-4D95-BF82-E903B9DF4F5E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Trinity.Tests.Stardog", "tests\Trinity.Tests.Stardog\Trinity.Tests.Stardog.csproj", "{6F9E0B39-3076-4CE4-8E58-97C688EE2C6B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Trinity.Tests.Virtuoso", "tests\Trinity.Tests.Virtuoso\Trinity.Tests.Virtuoso.csproj", "{47A2749D-25BB-4C4D-BAFD-E0B02549A016}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleVirtuoso", "Examples\SimpleVirtuoso\SimpleVirtuoso.csproj", "{0DAB5D8D-4589-428A-9995-0B5D970C46BC}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -92,14 +86,6 @@ Global
 		{A96B8568-4967-44BE-B58E-BBF5CDBC4D0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A96B8568-4967-44BE-B58E-BBF5CDBC4D0C}.Release|x86.ActiveCfg = Release|Any CPU
 		{A96B8568-4967-44BE-B58E-BBF5CDBC4D0C}.Release|x86.Build.0 = Release|Any CPU
-		{FCD5CA84-CDFB-4826-9C56-CA722091B935}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FCD5CA84-CDFB-4826-9C56-CA722091B935}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FCD5CA84-CDFB-4826-9C56-CA722091B935}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FCD5CA84-CDFB-4826-9C56-CA722091B935}.Debug|x86.Build.0 = Debug|Any CPU
-		{FCD5CA84-CDFB-4826-9C56-CA722091B935}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FCD5CA84-CDFB-4826-9C56-CA722091B935}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FCD5CA84-CDFB-4826-9C56-CA722091B935}.Release|x86.ActiveCfg = Release|Any CPU
-		{FCD5CA84-CDFB-4826-9C56-CA722091B935}.Release|x86.Build.0 = Release|Any CPU
 		{6F9E0B39-3076-4CE4-8E58-97C688EE2C6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6F9E0B39-3076-4CE4-8E58-97C688EE2C6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6F9E0B39-3076-4CE4-8E58-97C688EE2C6B}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -116,24 +102,14 @@ Global
 		{47A2749D-25BB-4C4D-BAFD-E0B02549A016}.Release|Any CPU.Build.0 = Release|Any CPU
 		{47A2749D-25BB-4C4D-BAFD-E0B02549A016}.Release|x86.ActiveCfg = Release|Any CPU
 		{47A2749D-25BB-4C4D-BAFD-E0B02549A016}.Release|x86.Build.0 = Release|Any CPU
-		{0DAB5D8D-4589-428A-9995-0B5D970C46BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DAB5D8D-4589-428A-9995-0B5D970C46BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DAB5D8D-4589-428A-9995-0B5D970C46BC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0DAB5D8D-4589-428A-9995-0B5D970C46BC}.Debug|x86.Build.0 = Debug|Any CPU
-		{0DAB5D8D-4589-428A-9995-0B5D970C46BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DAB5D8D-4589-428A-9995-0B5D970C46BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0DAB5D8D-4589-428A-9995-0B5D970C46BC}.Release|x86.ActiveCfg = Release|Any CPU
-		{0DAB5D8D-4589-428A-9995-0B5D970C46BC}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{5E1FCE3C-9436-44F8-8DB6-18F6282DE70C} = {8F810E3F-1005-4D95-BF82-E903B9DF4F5E}
-		{FCD5CA84-CDFB-4826-9C56-CA722091B935} = {C03B571D-B545-4384-849B-A1CD4CC145AA}
 		{6F9E0B39-3076-4CE4-8E58-97C688EE2C6B} = {8F810E3F-1005-4D95-BF82-E903B9DF4F5E}
 		{47A2749D-25BB-4C4D-BAFD-E0B02549A016} = {8F810E3F-1005-4D95-BF82-E903B9DF4F5E}
-		{0DAB5D8D-4589-428A-9995-0B5D970C46BC} = {C03B571D-B545-4384-849B-A1CD4CC145AA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {01F0E2D7-A253-4F8E-9D8D-8C6EFF35CCF5}

diff --git a/Trinity.CilGenerator/Resolver/AssemblyReferences.cs b/Trinity.CilGenerator/Resolver/AssemblyReferences.cs
@@ -38,7 +38,7 @@ public AssemblyResolutionException(IAssemblyReference reference)
 		}
 
 		public AssemblyResolutionException(IAssemblyReference reference, Exception innerException)
-			: base($"Failed to resolve assembly: '{reference}'", innerException)
+			: base($"Failed to resolve assembly: '{reference.FullName}'", innerException)
 		{
 			this.Reference = reference;
 		}

diff --git a/Trinity.CilGenerator/Resolver/DotNetCorePathFinder.cs b/Trinity.CilGenerator/Resolver/DotNetCorePathFinder.cs
@@ -77,7 +77,8 @@ public DotNetCorePathFinder(string parentAssemblyFileName, string targetFramewor
 				foreach (var pk in packages) {
 					foreach (var item in pk.Value.RuntimeComponents) {
 						var itemPath = Path.GetDirectoryName(item);
-						var fullPath = Path.Combine(path, pk.Value.Name, pk.Value.Version, itemPath).ToLowerInvariant();
+                        // Support for case sensitive file systems
+						var fullPath = Path.Combine(path, Path.Combine(pk.Value.Name, pk.Value.Version, itemPath).ToLowerInvariant());
 						if (Directory.Exists(fullPath))
 							packageBasePaths.Add(fullPath);
 					}

diff --git a/Trinity.OntologyGenerator/Program.cs b/Trinity.OntologyGenerator/Program.cs
@@ -81,6 +81,9 @@ private Program(string[] args, ILogger logger)
                 }
                 else
                 {
+                    LoadLegacyConfigFile();
+                    if (_configuration == null)
+                        LoadConfigFile();
                     Run();
                 }
             }
@@ -110,15 +113,12 @@ public Program(ILogger logger)
         static int Main(string[] args)
         {
             Program p = new Program(args, new ConsoleLogger());
-
+      
             return 0;
         }
 
         public int Run()
         {
-            LoadLegacyConfigFile();
-            if (_configuration == null)
-                LoadConfigFile();
 
             if (_configuration == null)
             {
@@ -210,7 +210,7 @@ public bool LoadConfigFile()
         /// This method loads the legacy configuration from app.config/web.config
         /// </summary>
         /// <returns></returns>
-        private bool LoadLegacyConfigFile()
+        public bool LoadLegacyConfigFile()
         {
             if (_configFile.Exists)
             {

diff --git a/Trinity.OntologyGenerator/Task/GenerateOntologyTask.cs b/Trinity.OntologyGenerator/Task/GenerateOntologyTask.cs
@@ -42,8 +42,8 @@ public bool Execute()
                 IEnumerable<string> allFiles = Directory.GetFiles(projectFile.DirectoryName);
 #else
                 IEnumerable<string> allFiles = Directory.EnumerateFiles(projectFile.DirectoryName);
- #endif
-
+#endif
+                bool legacy = false;
                 foreach (string file in allFiles)
                 {
                     string filename = file.ToLowerInvariant();
@@ -54,6 +54,7 @@ public bool Execute()
                         if (contents.Contains("TrinitySettings namespace=\"Semiodesk.Trinity.Test\")"))
                         {
                             configFile = new FileInfo(file);
+                            legacy = true;
                             break;
                         }
                     }
@@ -68,7 +69,10 @@ public bool Execute()
                 {
                     Program program = new Program(logger);
                     program.SetConfig(configFile);
-                    program.LoadConfigFile();
+                    if (!legacy)
+                        program.LoadConfigFile();
+                    else
+                        program.LoadLegacyConfigFile();
 
                     // TODO: Make ontologies folder configurable in Trinity settings.
                     if (string.IsNullOrEmpty(IntermediatePath))

diff --git a/Trinity.Virtuoso/Trinity.Virtuoso.csproj b/Trinity.Virtuoso/Trinity.Virtuoso.csproj
@@ -6,9 +6,9 @@
     <Copyright>Copyright © Semiodesk GmbH 2015-2019</Copyright>
     <Description>This library allows Semiodesk.Trinity to use the OpenLink Virtuoso store directly through the ODBC interface.</Description>
     <Company>Semiodesk GmbH</Company>
-    <Version>1.0.0</Version>
-    <AssemblyVersion>1.0.0.10</AssemblyVersion>
-    <FileVersion>1.0.0.10</FileVersion>
+    <Version>1.0.2</Version>
+    <AssemblyVersion>1.0.2.10</AssemblyVersion>
+    <FileVersion>1.0.2.10</FileVersion>
     <AssemblyName>Semiodesk.Trinity.Virtuoso</AssemblyName>
     <RootNamespace>Semiodesk.Trinity.Store.Virtuoso</RootNamespace>
   </PropertyGroup>

diff --git a/Trinity/Trinity.csproj b/Trinity/Trinity.csproj
@@ -6,9 +6,9 @@
 	<Copyright>Copyright © Semiodesk GmbH 2015-2019</Copyright>
 	<Description>Enterprise ready object mapper for developing RDF knowledge graph applications with .NET</Description>
 	<Company>Semiodesk GmbH</Company>
-	<Version>1.0.0</Version>
-	<AssemblyVersion>1.0.0.10</AssemblyVersion>
-	<FileVersion>1.0.0.10</FileVersion>
+	<Version>1.0.2</Version>
+	<AssemblyVersion>1.0.2.10</AssemblyVersion>
+	<FileVersion>1.0.2.10</FileVersion>
 	<AssemblyName>Semiodesk.Trinity</AssemblyName>
 	<RootNamespace>Semiodesk.Trinity</RootNamespace>
   </PropertyGroup>
@@ -25,7 +25,7 @@
   <PropertyGroup>
     <DocumentationFile>..\Build\$(Configuration)\$(TargetFramework)\Semiodesk.Trinity.xml</DocumentationFile>
     <NeutralLanguage>en-001</NeutralLanguage>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageId>Semiodesk.Trinity</PackageId>
     <Authors>Semiodesk GmbH</Authors>
     <Product>Semiodesk.Trinity</Product>

diff --git a/appveyor.yml b/appveyor.yml
@@ -11,5 +11,7 @@ cache:
   - '%LocalAppData%\NuGet\v3-cache'
 configuration: Release
 
+before_build:
+  - nuget restore
 build:
   project: Semiodesk.Trinity.sln
diff --git a/sign.ps1 b/sign.ps1
@@ -1,3 +1,3 @@
-nuget sign Build\Release\Semiodesk.Trinity.*.nupkg -Timestamper http://sha256timestamp.ws.symantec.com/sha256/timestamp  -CertificateFingerprint 6b12d450f8d15289c2ada6a2ae86db12b1d73f84
+nuget sign Build\Release\Semiodesk.Trinity.*.nupkg -Timestamper http://sha256timestamp.ws.symantec.com/sha256/timestamp  -CertificateFingerprint 0b5f624d32cb7e5549405b32a8a0a9aebfd1859a
 
-nuget sign Build\Release\stores\virtuoso\Semiodesk.Trinity.Virtuoso.*.nupkg -Timestamper http://sha256timestamp.ws.symantec.com/sha256/timestamp  -CertificateFingerprint 6b12d450f8d15289c2ada6a2ae86db12b1d73f84
+nuget sign Build\Release\stores\virtuoso\Semiodesk.Trinity.Virtuoso.*.nupkg -Timestamper http://sha256timestamp.ws.symantec.com/sha256/timestamp  -CertificateFingerprint 0b5f624d32cb7e5549405b32a8a0a9aebfd1859a
diff --git a/tests/Trinity.Tests.Virtuoso/ModelTest.cs b/tests/Trinity.Tests.Virtuoso/ModelTest.cs
@@ -349,6 +349,9 @@ public void LiteralWithLangTagTest()
             Assert.AreEqual(typeof(Tuple<string, CultureInfo>), o.GetType());
             var val = o as Tuple<string, CultureInfo>;
             Assert.AreEqual("in the jungle", val.Item1);
+
+            var x = r.ListValues(property);
+
         }
 
         [Test]