Browse Source

Pull Tye dependencies forward (#1220)

* Initial pass at pulling dependencies forward.

* Include 3rd party signing for additional dependencies.
sebros/macos
Phillip Hoff 5 years ago
committed by GitHub
parent
commit
3958003156
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      eng/Signing.props
  2. 10
      src/Microsoft.Tye.Core/Microsoft.Tye.Core.csproj
  3. 2
      src/Microsoft.Tye.Hosting.Diagnostics/Logging/LogObject.cs
  4. 4
      src/Microsoft.Tye.Hosting.Diagnostics/Microsoft.Tye.Hosting.Diagnostics.csproj
  5. 2
      src/Microsoft.Tye.Hosting/Microsoft.Tye.Hosting.csproj
  6. 2
      src/tye/tye.csproj
  7. 2
      test/Test.Infrastructure/EqualityYamlNodeVisitor.cs

3
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>

10
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>

2
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?>>();

4
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" />

2
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>

2
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>

2
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}).");

Loading…
Cancel
Save