From 1b4693d06fd025445cfc23797b4edc0d482141fa Mon Sep 17 00:00:00 2001 From: Christy Henriksson Date: Mon, 5 Nov 2018 17:16:32 -0800 Subject: [PATCH 1/2] Add more SQL AAD diagnostics --- src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj | 6 +++--- .../NuGet.Services.Revalidate.csproj | 4 ++-- src/PackageLagMonitor/Monitoring.PackageLag.csproj | 6 +++--- .../Stats.RefreshClientDimension.csproj | 3 --- src/Validation.Common.Job/Validation.Common.Job.csproj | 8 ++++---- src/Validation.Common/Validation.Common.csproj | 3 --- .../Validation.Symbols.Core.csproj | 6 ------ .../SymbolValidationMessageHandlerFacts.cs | 2 ++ .../ValidationMessageHandlerFacts.cs | 2 ++ .../StatusAggregator.Tests/StatusAggregator.Tests.csproj | 9 --------- 10 files changed, 16 insertions(+), 33 deletions(-) diff --git a/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj b/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj index aba9aeda0..380b602be 100644 --- a/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj +++ b/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj @@ -105,13 +105,13 @@ all - 2.29.0 + 2.33.0-chenriks-sql-2183245 - 2.29.0 + 2.33.0-chenriks-sql-2183245 - 2.29.0 + 2.33.0-chenriks-sql-2183245 4.3.3 diff --git a/src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj b/src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj index 27e4c5257..5bd0ae363 100644 --- a/src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj +++ b/src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj @@ -122,10 +122,10 @@ all - 2.29.0 + 2.33.0-chenriks-sql-2183245 - 2.29.0 + 2.33.0-chenriks-sql-2183245 diff --git a/src/PackageLagMonitor/Monitoring.PackageLag.csproj b/src/PackageLagMonitor/Monitoring.PackageLag.csproj index 152701eb1..863cc5e19 100644 --- a/src/PackageLagMonitor/Monitoring.PackageLag.csproj +++ b/src/PackageLagMonitor/Monitoring.PackageLag.csproj @@ -111,13 +111,13 @@ 0.5.0-CI-20180510-012541 - 2.27.0 + 2.33.0-chenriks-sql-2183245 - 2.27.0 + 2.33.0-chenriks-sql-2183245 - 2.27.0 + 2.33.0-chenriks-sql-2183245 4.3.3 diff --git a/src/Stats.RefreshClientDimension/Stats.RefreshClientDimension.csproj b/src/Stats.RefreshClientDimension/Stats.RefreshClientDimension.csproj index 72088a8a0..009f6564b 100644 --- a/src/Stats.RefreshClientDimension/Stats.RefreshClientDimension.csproj +++ b/src/Stats.RefreshClientDimension/Stats.RefreshClientDimension.csproj @@ -83,9 +83,6 @@ 9.0.1 - - 2.29.0 - 1.2.0 diff --git a/src/Validation.Common.Job/Validation.Common.Job.csproj b/src/Validation.Common.Job/Validation.Common.Job.csproj index 1687e1990..db5460887 100644 --- a/src/Validation.Common.Job/Validation.Common.Job.csproj +++ b/src/Validation.Common.Job/Validation.Common.Job.csproj @@ -103,16 +103,16 @@ 4.8.0-preview4.5289 - 2.29.0 + 2.33.0-chenriks-sql-2183245 - 2.29.0 + 2.33.0-chenriks-sql-2183245 - 2.29.0 + 2.33.0-chenriks-sql-2183245 - 2.29.0 + 2.33.0-chenriks-sql-2183245 4.4.4-dev-42523 diff --git a/src/Validation.Common/Validation.Common.csproj b/src/Validation.Common/Validation.Common.csproj index cfad84b30..b229a5777 100644 --- a/src/Validation.Common/Validation.Common.csproj +++ b/src/Validation.Common/Validation.Common.csproj @@ -107,9 +107,6 @@ 4.1.0 - - 2.27.0 - 3.2.0 diff --git a/src/Validation.Symbols.Core/Validation.Symbols.Core.csproj b/src/Validation.Symbols.Core/Validation.Symbols.Core.csproj index 5e2e39d44..c7c1dbabb 100644 --- a/src/Validation.Symbols.Core/Validation.Symbols.Core.csproj +++ b/src/Validation.Symbols.Core/Validation.Symbols.Core.csproj @@ -67,12 +67,6 @@ runtime; build; native; contentfiles; analyzers all - - 2.29.0 - - - 2.29.0 - 0.3.0 runtime; build; native; contentfiles; analyzers diff --git a/tests/NuGet.Services.Validation.Orchestrator.Tests/SymbolValidationMessageHandlerFacts.cs b/tests/NuGet.Services.Validation.Orchestrator.Tests/SymbolValidationMessageHandlerFacts.cs index 304d64624..4c0518170 100644 --- a/tests/NuGet.Services.Validation.Orchestrator.Tests/SymbolValidationMessageHandlerFacts.cs +++ b/tests/NuGet.Services.Validation.Orchestrator.Tests/SymbolValidationMessageHandlerFacts.cs @@ -124,6 +124,8 @@ public MessageWithCustomDeliveryCount(IBrokeredMessage inner, int deliveryCount) public DateTimeOffset ExpiresAtUtc => throw new NotImplementedException(); public DateTimeOffset EnqueuedTimeUtc => throw new NotImplementedException(); + public string MessageId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } + public Task AbandonAsync() => throw new NotImplementedException(); public IBrokeredMessage Clone() => throw new NotImplementedException(); public Task CompleteAsync() => throw new NotImplementedException(); diff --git a/tests/NuGet.Services.Validation.Orchestrator.Tests/ValidationMessageHandlerFacts.cs b/tests/NuGet.Services.Validation.Orchestrator.Tests/ValidationMessageHandlerFacts.cs index 2825e47d7..f6f8d254a 100644 --- a/tests/NuGet.Services.Validation.Orchestrator.Tests/ValidationMessageHandlerFacts.cs +++ b/tests/NuGet.Services.Validation.Orchestrator.Tests/ValidationMessageHandlerFacts.cs @@ -147,6 +147,8 @@ public MessageWithCustomDeliveryCount(IBrokeredMessage inner, int deliveryCount) public DateTimeOffset ExpiresAtUtc => throw new NotImplementedException(); public DateTimeOffset EnqueuedTimeUtc => throw new NotImplementedException(); + public string MessageId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } + public Task AbandonAsync() => throw new NotImplementedException(); public IBrokeredMessage Clone() => throw new NotImplementedException(); public Task CompleteAsync() => throw new NotImplementedException(); diff --git a/tests/StatusAggregator.Tests/StatusAggregator.Tests.csproj b/tests/StatusAggregator.Tests/StatusAggregator.Tests.csproj index 50c01abf1..b9ff9308a 100644 --- a/tests/StatusAggregator.Tests/StatusAggregator.Tests.csproj +++ b/tests/StatusAggregator.Tests/StatusAggregator.Tests.csproj @@ -105,15 +105,6 @@ 4.7.145 - - 2.29.0 - - - 2.29.0 - - - 2.29.0 - 4.3.0 From 3ba9252366a41a468287896caa3f4445fb7ae5db Mon Sep 17 00:00:00 2001 From: Christy Henriksson Date: Tue, 6 Nov 2018 12:45:48 -0800 Subject: [PATCH 2/2] Update to master build --- src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj | 6 +++--- .../NuGet.Services.Revalidate.csproj | 5 +---- src/PackageLagMonitor/Monitoring.PackageLag.csproj | 8 +------- src/Validation.Common.Job/Validation.Common.Job.csproj | 8 ++++---- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj b/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj index 380b602be..29d291748 100644 --- a/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj +++ b/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj @@ -105,13 +105,13 @@ all - 2.33.0-chenriks-sql-2183245 + 2.33.0 - 2.33.0-chenriks-sql-2183245 + 2.33.0 - 2.33.0-chenriks-sql-2183245 + 2.33.0 4.3.3 diff --git a/src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj b/src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj index 5bd0ae363..cc346109f 100644 --- a/src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj +++ b/src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj @@ -122,10 +122,7 @@ all - 2.33.0-chenriks-sql-2183245 - - - 2.33.0-chenriks-sql-2183245 + 2.33.0 diff --git a/src/PackageLagMonitor/Monitoring.PackageLag.csproj b/src/PackageLagMonitor/Monitoring.PackageLag.csproj index 863cc5e19..051bb522e 100644 --- a/src/PackageLagMonitor/Monitoring.PackageLag.csproj +++ b/src/PackageLagMonitor/Monitoring.PackageLag.csproj @@ -111,13 +111,7 @@ 0.5.0-CI-20180510-012541 - 2.33.0-chenriks-sql-2183245 - - - 2.33.0-chenriks-sql-2183245 - - - 2.33.0-chenriks-sql-2183245 + 2.33.0 4.3.3 diff --git a/src/Validation.Common.Job/Validation.Common.Job.csproj b/src/Validation.Common.Job/Validation.Common.Job.csproj index db5460887..56c8abf3c 100644 --- a/src/Validation.Common.Job/Validation.Common.Job.csproj +++ b/src/Validation.Common.Job/Validation.Common.Job.csproj @@ -103,16 +103,16 @@ 4.8.0-preview4.5289 - 2.33.0-chenriks-sql-2183245 + 2.33.0 - 2.33.0-chenriks-sql-2183245 + 2.33.0 - 2.33.0-chenriks-sql-2183245 + 2.33.0 - 2.33.0-chenriks-sql-2183245 + 2.33.0 4.4.4-dev-42523