From 39580031568361991beedcbe0d85bbac16992aa1 Mon Sep 17 00:00:00 2001
From: Phillip Hoff <phillip@orst.edu>
Date: Wed, 17 Nov 2021 16:11:05 -0800
Subject: [PATCH] Pull Tye dependencies forward (#1220)

* Initial pass at pulling dependencies forward.

* Include 3rd party signing for additional dependencies.
---
 eng/Signing.props                                      |  3 +++
 src/Microsoft.Tye.Core/Microsoft.Tye.Core.csproj       | 10 +++++-----
 .../Logging/LogObject.cs                               |  2 +-
 .../Microsoft.Tye.Hosting.Diagnostics.csproj           |  4 ++--
 src/Microsoft.Tye.Hosting/Microsoft.Tye.Hosting.csproj |  2 +-
 src/tye/tye.csproj                                     |  2 +-
 test/Test.Infrastructure/EqualityYamlNodeVisitor.cs    |  2 +-
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/eng/Signing.props b/eng/Signing.props
index 04f9e585..0f073238 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -14,6 +14,8 @@
     <FileSignInfo Include="OpenTelemetry.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="OpenTelemetry.Api.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="OpenTelemetry.Exporter.Zipkin.dll" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="Prometheus.NetCore.dll" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="Prometheus.NetStandard.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Semver.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Serilog.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Serilog.Extensions.Hosting.dll" CertificateName="3PartySHA2" />
@@ -27,6 +29,7 @@
     <FileSignInfo Include="Serilog.Sinks.Seq.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Sln.dll" CertificateName="3PartySHA2" />
     <!-- Despite the System. nomenclature, this is a non-MSFT .NET foundation project.-->
+    <FileSignInfo Include="System.IO.Abstractions.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="System.Reactive.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="YamlDotNet.dll" CertificateName="3PartySHA2" />
   </ItemGroup>
diff --git a/src/Microsoft.Tye.Core/Microsoft.Tye.Core.csproj b/src/Microsoft.Tye.Core/Microsoft.Tye.Core.csproj
index 8568bcfc..052d373c 100644
--- a/src/Microsoft.Tye.Core/Microsoft.Tye.Core.csproj
+++ b/src/Microsoft.Tye.Core/Microsoft.Tye.Core.csproj
@@ -8,17 +8,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KubernetesClient" Version="4.0.10" />
+    <PackageReference Include="KubernetesClient" Version="6.0.25" />
     
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
     <PackageReference Include="semver" Version="2.0.6" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20071.2" />
     <PackageReference Include="System.Commandline.Rendering" Version="0.3.0-alpha.20070.2" />
-    <PackageReference Include="System.Security.Cryptography.Cng" Version="4.7.0" />
+    <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
     <!-- Hoisted to avoid a conflict with Microsoft.Build -->
-    <PackageReference Include="System.Security.Principal.Windows" Version="4.7.0" />
-    <PackageReference Include="YamlDotNet" Version="8.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.5" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
+    <PackageReference Include="YamlDotNet" Version="11.2.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Tye.Hosting.Diagnostics/Logging/LogObject.cs b/src/Microsoft.Tye.Hosting.Diagnostics/Logging/LogObject.cs
index 3a70e25a..29d46e61 100644
--- a/src/Microsoft.Tye.Hosting.Diagnostics/Logging/LogObject.cs
+++ b/src/Microsoft.Tye.Hosting.Diagnostics/Logging/LogObject.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Tye.Hosting.Diagnostics.Logging
 {
     internal class LogObject : IReadOnlyList<KeyValuePair<string, object?>>
     {
-        internal static readonly Func<object, Exception, string> Callback = (state, exception) => ((LogObject)state).ToString();
+        internal static readonly Func<object, Exception?, string> Callback = (state, exception) => ((LogObject)state).ToString();
 
         private readonly string? _formattedMessage;
         private List<KeyValuePair<string, object?>> _items = new List<KeyValuePair<string, object?>>();
diff --git a/src/Microsoft.Tye.Hosting.Diagnostics/Microsoft.Tye.Hosting.Diagnostics.csproj b/src/Microsoft.Tye.Hosting.Diagnostics/Microsoft.Tye.Hosting.Diagnostics.csproj
index d46381fc..7836b4f0 100644
--- a/src/Microsoft.Tye.Hosting.Diagnostics/Microsoft.Tye.Hosting.Diagnostics.csproj
+++ b/src/Microsoft.Tye.Hosting.Diagnostics/Microsoft.Tye.Hosting.Diagnostics.csproj
@@ -25,8 +25,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.49" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.61701" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.12.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.19.0" />
     <PackageReference Include="OpenTelemetry" Version="0.2.0-alpha.179" />
     <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="0.2.0-alpha.179" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.0" />
diff --git a/src/Microsoft.Tye.Hosting/Microsoft.Tye.Hosting.csproj b/src/Microsoft.Tye.Hosting/Microsoft.Tye.Hosting.csproj
index e2c1ac63..47adc57c 100644
--- a/src/Microsoft.Tye.Hosting/Microsoft.Tye.Hosting.csproj
+++ b/src/Microsoft.Tye.Hosting/Microsoft.Tye.Hosting.csproj
@@ -25,7 +25,7 @@
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
     <PackageReference Include="System.Reactive" Version="4.3.2" />
-    <PackageReference Include="YamlDotNet" Version="8.1.2" />
+    <PackageReference Include="YamlDotNet" Version="11.2.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/tye/tye.csproj b/src/tye/tye.csproj
index fbc3ad9c..b0d5214b 100644
--- a/src/tye/tye.csproj
+++ b/src/tye/tye.csproj
@@ -27,7 +27,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20104.2" />
-    <PackageReference Include="YamlDotNet" Version="8.1.2" />
+    <PackageReference Include="YamlDotNet" Version="11.2.1" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Test.Infrastructure/EqualityYamlNodeVisitor.cs b/test/Test.Infrastructure/EqualityYamlNodeVisitor.cs
index 25c17e5e..7aa5f179 100644
--- a/test/Test.Infrastructure/EqualityYamlNodeVisitor.cs
+++ b/test/Test.Infrastructure/EqualityYamlNodeVisitor.cs
@@ -39,7 +39,7 @@ namespace Test.Infrastructure
                     $"Actual: {node.NodeType} at ({otherNode.Start.Line}, {otherNode.Start.Column}).");
             }
 
-            if (node.Tag?.Equals(otherNode.Tag) == false)
+            if (node.Tag.Equals(otherNode.Tag) == false)
             {
                 throw new TyeYamlException($"Expected tags to be equal. " +
                     $"Expected: ({node.Start.Line}, {node.Start.Column}). Actual: ({otherNode.Start.Line}, {otherNode.Start.Column}).");