Merge pull request #219 from skomis-mm/reduceGraph

Reduce search graph for auto discovery

Author: Sergey Komisarchik

.travis.yml

@@ -20,7 +20,7 @@ foreach ($src in dir src/*) {
 
 	echo "build: Packaging project in $src"
 
-    & dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix
+    & dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix -p:ContinuousIntegrationBuild=true
     if ($LASTEXITCODE -ne 0) { exit 1 }
 
     Pop-Location
@@ -42,10 +42,25 @@ foreach ($test in dir test/*.Tests) {
 
 	echo "build: Testing project in $test"
 
-    & dotnet test -c Release
+    if ($PSVersionTable.Platform -eq "Unix") {
+        & dotnet test -c Release -f netcoreapp2.0
+        & dotnet test -c Release -f netcoreapp3.1
+    } else {
+        & dotnet test -c Release
+    }
+
     if ($LASTEXITCODE -ne 0) { exit 3 }
 
     Pop-Location
 }
 
+if ($PSVersionTable.Platform -eq "Unix") {
+    Push-Location sample/Sample
+
+    & dotnet run -f netcoreapp2.0 -c Release --run-once
+    if ($LASTEXITCODE -ne 0) { exit 4 }
+
+    Pop-Location
+}
+
 Pop-Location

Build.ps1

@@ -1,9 +1,18 @@
 version: '{build}'
 skip_tags: true
-image: Visual Studio 2019
+image:
+  - Visual Studio 2019
+  - Ubuntu1604
 configuration: Release
 build_script:
 - ps: ./Build.ps1
+for:
+-
+  matrix:
+    only:
+      - image: Ubuntu1604
+  build_script:
+  - pwsh ./Build.ps1
 test: off
 artifacts:
 - path: artifacts/Serilog.*.nupkg
@@ -12,7 +21,6 @@ deploy:
 - provider: NuGet
   api_key:
     secure: b7jxRe5kR3kuxMrmdDuN0jvaaWWHwtFRnAwFZZV6MdaorwUhASR/Ey1gPn6vXwND
-  skip_symbols: true
   on:
     branch: /^(master|dev)$/
 - provider: GitHub

appveyor.yml

@@ -15,7 +15,7 @@
     <PackageId>Serilog.Settings.Configuration</PackageId>
     <PackageTags>serilog;json</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
-    <PackageProjectUrl>https://serilog.net/</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/serilog/serilog-settings-configuration/</PackageProjectUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <RootNamespace>Serilog</RootNamespace>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

build.sh

@@ -18,11 +18,17 @@ public DependencyContextAssemblyFinder(DependencyContext dependencyContext)
         public override IReadOnlyList<AssemblyName> FindAssembliesContainingName(string nameToFind)
         {
             var query = from library in _dependencyContext.RuntimeLibraries
+                        where IsReferencingSerilog(library)
                         from assemblyName in library.GetDefaultAssemblyNames(_dependencyContext)
                         where IsCaseInsensitiveMatch(assemblyName.Name, nameToFind)
                         select assemblyName;
 
             return query.ToList().AsReadOnly();
+            
+            static bool IsReferencingSerilog(Library library)
+            {
+                return library.Dependencies.Any(dependency => dependency.Name.Equals("serilog", StringComparison.OrdinalIgnoreCase));
+            }
         }
     }
 }

src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.csproj

@@ -264,7 +264,8 @@ internal static IConfigurationArgumentValue GetArgumentValue(IConfigurationSecti
 
         static IReadOnlyCollection<Assembly> LoadConfigurationAssemblies(IConfigurationSection section, AssemblyFinder assemblyFinder)
         {
-            var assemblies = new Dictionary<string, Assembly>();
+            var serilogAssembly = typeof(ILogger).Assembly;
+            var assemblies = new Dictionary<string, Assembly> { [serilogAssembly.FullName] = serilogAssembly };
 
             var usingSection = section.GetSection("Using");
             if (usingSection.GetChildren().Any())