Update packages in attempt to fix weird config issue (#189)

* Update packages in attempt to fix weird config issue * Fix test * Bump System.CommandLine * Remove command line lib workaround
cognitedata · Aug 19, 2022 · e95e85b · e95e85b
1 parent eb9bc99
commit e95e85b
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 41 deletions.
diff --git a/Cognite.Common/Cognite.Common.csproj b/Cognite.Common/Cognite.Common.csproj
@@ -22,7 +22,7 @@
     <None Include="..\LICENSE" Pack="true" Visible="false" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="6.0.4" />
+    <PackageReference Include="System.Text.Json" Version="6.0.5" />
     <PackageReference Include="Cronos" Version="0.7.1" />
   </ItemGroup>
 

diff --git a/Cognite.Config/Cognite.Configuration.csproj b/Cognite.Config/Cognite.Configuration.csproj
@@ -25,7 +25,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="YamlDotNet" Version="11.2.1" />
+    <PackageReference Include="YamlDotNet" Version="12.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Cognite.Extensions/Cognite.Extensions.csproj b/Cognite.Extensions/Cognite.Extensions.csproj
@@ -24,11 +24,11 @@
     <ProjectReference Include="..\Cognite.Common\Cognite.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.44.0" />
-    <PackageReference Include="CogniteSdk" Version="3.4.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.46.1" />
+    <PackageReference Include="CogniteSdk" Version="3.4.1" />
     <PackageReference Include="prometheus-net" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.8" />
     <PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
   </ItemGroup>
 </Project>
diff --git a/Cognite.Metrics/Cognite.Metrics.csproj b/Cognite.Metrics/Cognite.Metrics.csproj
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.8" />
     <PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
     <PackageReference Include="prometheus-net" Version="6.0.0" />
   </ItemGroup>

diff --git a/Cognite.StateStorage/Cognite.StateStorage.csproj b/Cognite.StateStorage/Cognite.StateStorage.csproj
@@ -22,7 +22,7 @@
     <None Include="..\LICENSE" Pack="true" Visible="false" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LiteDB" Version="5.0.11" />
+    <PackageReference Include="LiteDB" Version="5.0.12" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Cognite.Testing/Cognite.Testing.csproj b/Cognite.Testing/Cognite.Testing.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit.assert" Version="2.4.1" />
-    <PackageReference Include="xunit.core" Version="2.4.1" />
+    <PackageReference Include="xunit.assert" Version="2.4.2" />
+    <PackageReference Include="xunit.core" Version="2.4.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ExtractorUtils.Test/ExtractorUtils.Test.csproj b/ExtractorUtils.Test/ExtractorUtils.Test.csproj
@@ -5,8 +5,8 @@
     <EnableNETAnalyzers>false</EnableNETAnalyzers>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -19,7 +19,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Moq" Version="4.18.1" />
+    <PackageReference Include="Moq" Version="4.18.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ExtractorUtils\ExtractorUtils.csproj" />

diff --git a/ExtractorUtils.Test/unit/CommandLineTest.cs b/ExtractorUtils.Test/unit/CommandLineTest.cs
@@ -44,22 +44,5 @@ public void TestSimpleCliType()
 
             Assert.Equal(0, command.Invoke("--string-type stringvalue -b -i 123"));
         }
-
-        [Fact]
-        public void LibBugTest()
-        {
-            // This shows a bug in System.CommandLine, once this fails we can remove the workaround from AttributeBinder
-
-            var arg = new Option<bool>(new[] { "-b" }, "Some description");
-
-            var cmd = new RootCommand
-            {
-                arg
-            };
-
-            var res = cmd.Parse("-b");
-
-            Assert.False((bool)res.GetValueForOption((Option)arg));
-        }
     }
 }
diff --git a/ExtractorUtils.Test/unit/ConfigurationTest.cs b/ExtractorUtils.Test/unit/ConfigurationTest.cs
@@ -135,6 +135,15 @@ public static void TestInvalidString(string yaml)
             Assert.IsType<YamlDotNet.Core.YamlException>(e.InnerException);
         }
 
+        [Fact]
+        public static void TestCleanException()
+        {
+            var yaml = "version: 0\nbad: foo";
+            var e = Assert.Throws<ConfigurationException>(() => ConfigurationUtils.TryReadConfigFromString<TestBaseConfig>(yaml, 0));
+            var ye = Assert.IsType<YamlDotNet.Core.YamlException>(e.InnerException);
+            Assert.Equal("Failed to load config string at Line: 2, Col: 1, Idx: 11: Property 'bad' not found on type 'ExtractorUtils.Test.Unit.TestBaseConfig'.", e.Message);
+        }
+
         [Fact]
         public static void TestValidString()
         {

diff --git a/ExtractorUtils.Test/unit/SanitationTest.cs b/ExtractorUtils.Test/unit/SanitationTest.cs
@@ -648,7 +648,7 @@ public void TestVerifySequenceData()
         }
 
         [Theory]
-        [InlineData(0)]
+        [InlineData(0.0)]
         [InlineData(321.321)]
         [InlineData(null)]
         public void TestSanitizeDataPoints(double? nanRepl)

diff --git a/ExtractorUtils/CommandLine/AttributeBinder.cs b/ExtractorUtils/CommandLine/AttributeBinder.cs
@@ -89,16 +89,8 @@ protected override T GetBoundValue(BindingContext bindingContext)
                 if (!prop.CanWrite) continue;
                 if (!Options.TryGetValue(prop.Name, out var option)) continue;
 
-                if (option.GetType() == typeof(Option<>).MakeGenericType(typeof(bool)))
-                {
-                    prop.SetValue(result, bindingContext.ParseResult.GetValueForOption((Option<bool>)option));
-                }
-                else
-                {
-                    var res = bindingContext.ParseResult.GetValueForOption(option);
-                    prop.SetValue(result, res);
-                }
-
+                var res = bindingContext.ParseResult.GetValueForOption(option);
+                prop.SetValue(result, res);
             }
 
             return (T)result;

diff --git a/ExtractorUtils/ExtractorUtils.csproj b/ExtractorUtils/ExtractorUtils.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="StackExchange.Redis" Version="2.6.48" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cognite.Config\Cognite.Configuration.csproj" />