Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Commit eecbf64

Browse files
joelverhagenjoelverhagen
committed
Add Validation.Common.Job because there is too much duplicated code (#339)
Progress on NuGet/Engineering#1168
1 parent 4cf9df1 commit eecbf64

22 files changed

Lines changed: 355 additions & 462 deletions

File tree

‎NuGet.Jobs.sln‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.H
109109
EndProject
110110
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.Core.Tests", "tests\Validation.PackageSigning.Core.Tests\Validation.PackageSigning.Core.Tests.csproj", "{B4B7564A-965B-447B-927F-6749E2C08880}"
111111
EndProject
112+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.Common.Job", "src\Validation.Common.Job\Validation.Common.Job.csproj", "{FA87D075-A934-4443-8D0B-5DB32640B6D7}"
113+
EndProject
112114
Global
113115
GlobalSection(SolutionConfigurationPlatforms) = preSolution
114116
Debug|Any CPU = Debug|Any CPU
@@ -277,6 +279,10 @@ Global
277279
{B4B7564A-965B-447B-927F-6749E2C08880}.Debug|Any CPU.Build.0 = Debug|Any CPU
278280
{B4B7564A-965B-447B-927F-6749E2C08880}.Release|Any CPU.ActiveCfg = Release|Any CPU
279281
{B4B7564A-965B-447B-927F-6749E2C08880}.Release|Any CPU.Build.0 = Release|Any CPU
282+
{FA87D075-A934-4443-8D0B-5DB32640B6D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
283+
{FA87D075-A934-4443-8D0B-5DB32640B6D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
284+
{FA87D075-A934-4443-8D0B-5DB32640B6D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
285+
{FA87D075-A934-4443-8D0B-5DB32640B6D7}.Release|Any CPU.Build.0 = Release|Any CPU
280286
EndGlobalSection
281287
GlobalSection(SolutionProperties) = preSolution
282288
HideSolutionNode = FALSE
@@ -312,6 +318,7 @@ Global
312318
{147A757D-864B-4C74-B8CF-14DFF9793605} = {6A776396-02B1-475D-A104-26940ADB04AB}
313319
{FC0CEF12-D501-46D1-B1BF-D4134BD8D478} = {B9D03824-A9CA-43AC-86D6-8BB399B9A228}
314320
{0C887292-C5AB-4107-946C-A53B18A38D22} = {6A776396-02B1-475D-A104-26940ADB04AB}
321+
{E6D094FB-9068-4578-B176-116F97E7506B} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
315322
{A3B0B15D-22D9-4F1F-94C4-B24B28ECF632} = {6A776396-02B1-475D-A104-26940ADB04AB}
316323
{F9690B52-3C92-42A0-B41F-1A6040C2D2EE} = {6A776396-02B1-475D-A104-26940ADB04AB}
317324
{91C060DA-736F-4DA9-A57F-CB3AC0E6CB10} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
@@ -321,6 +328,7 @@ Global
321328
{5ACE7756-F8D0-4D90-9957-872DE4A1381E} = {6A776396-02B1-475D-A104-26940ADB04AB}
322329
{2C5BE067-ADFD-49E3-BA9F-13A74436E5DB} = {6A776396-02B1-475D-A104-26940ADB04AB}
323330
{B4B7564A-965B-447B-927F-6749E2C08880} = {6A776396-02B1-475D-A104-26940ADB04AB}
331+
{FA87D075-A934-4443-8D0B-5DB32640B6D7} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
324332
EndGlobalSection
325333
GlobalSection(ExtensibilityGlobals) = postSolution
326334
SolutionGuid = {284A7AC3-FB43-4F1F-9C9C-2AF0E1F46C2B}

‎src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj‎

Lines changed: 4 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -99,81 +99,22 @@
9999
</None>
100100
</ItemGroup>
101101
<ItemGroup>
102-
<PackageReference Include="Autofac">
103-
<Version>4.6.1</Version>
104-
</PackageReference>
105-
<PackageReference Include="Autofac.Extensions.DependencyInjection">
106-
<Version>4.2.0</Version>
107-
</PackageReference>
108-
<PackageReference Include="EntityFramework">
109-
<Version>6.1.3</Version>
110-
</PackageReference>
111-
<PackageReference Include="Microsoft.ApplicationInsights">
112-
<Version>2.2.0</Version>
113-
</PackageReference>
114-
<PackageReference Include="Microsoft.Extensions.Configuration">
115-
<Version>1.1.2</Version>
116-
</PackageReference>
117-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder">
118-
<Version>1.1.2</Version>
119-
</PackageReference>
120-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions">
121-
<Version>1.1.2</Version>
122-
</PackageReference>
123-
<PackageReference Include="Microsoft.Extensions.DependencyInjection">
124-
<Version>1.1.1</Version>
125-
</PackageReference>
126-
<PackageReference Include="Microsoft.Extensions.Logging">
127-
<Version>1.1.2</Version>
128-
</PackageReference>
129-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
130-
<Version>1.1.2</Version>
131-
</PackageReference>
132-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions">
133-
<Version>1.1.2</Version>
134-
</PackageReference>
135-
<PackageReference Include="NuGet.Services.Configuration">
136-
<Version>2.14.0</Version>
137-
</PackageReference>
138-
<PackageReference Include="NuGet.Services.Contracts">
139-
<Version>2.14.0</Version>
140-
</PackageReference>
141-
<PackageReference Include="NuGet.Services.KeyVault">
142-
<Version>2.14.0</Version>
143-
</PackageReference>
144-
<PackageReference Include="NuGet.Services.Logging">
145-
<Version>2.14.0</Version>
146-
</PackageReference>
147-
<PackageReference Include="NuGet.Services.ServiceBus">
148-
<Version>2.14.0</Version>
149-
</PackageReference>
150-
<PackageReference Include="NuGet.Services.Validation">
151-
<Version>2.14.0</Version>
152-
</PackageReference>
153102
<PackageReference Include="NuGet.Services.Validation.Issues">
154103
<Version>2.14.0</Version>
155104
</PackageReference>
156105
<PackageReference Include="NuGet.Versioning">
157106
<Version>4.3.0</Version>
158107
</PackageReference>
159-
<PackageReference Include="NuGetGallery.Core">
160-
<Version>4.4.4-dev-19677</Version>
161-
</PackageReference>
162-
<PackageReference Include="Serilog">
163-
<Version>2.5.0</Version>
164-
</PackageReference>
165-
<PackageReference Include="System.Net.Http">
166-
<Version>4.3.3</Version>
167-
</PackageReference>
168-
<PackageReference Include="WindowsAzure.Storage">
169-
<Version>7.1.2</Version>
170-
</PackageReference>
171108
</ItemGroup>
172109
<ItemGroup>
173110
<ProjectReference Include="..\NuGet.Jobs.Common\NuGet.Jobs.Common.csproj">
174111
<Project>{4b4b1efb-8f33-42e6-b79f-54e7f3293d31}</Project>
175112
<Name>NuGet.Jobs.Common</Name>
176113
</ProjectReference>
114+
<ProjectReference Include="..\Validation.Common.Job\Validation.Common.Job.csproj">
115+
<Project>{fa87d075-a934-4443-8d0b-5db32640b6d7}</Project>
116+
<Name>Validation.Common.Job</Name>
117+
</ProjectReference>
177118
<ProjectReference Include="..\Validation.Common\Validation.Common.csproj">
178119
<Project>{2539ddf3-0cc5-4a03-b5f9-39b47744a7bd}</Project>
179120
<Name>Validation.Common</Name>

src/Validation.PackageSigning.Core/Error.cs renamed to src/Validation.Common.Job/Error.cs

File renamed without changes.

src/Validation.PackageSigning.Core/ExceptionExtensions.cs renamed to src/Validation.Common.Job/ExceptionExtensions.cs

File renamed without changes.

‎src/Validation.Common.Job/Properties/AssemblyInfo.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
4+
using System.Reflection;
5+
using System.Runtime.InteropServices;
6+
7+
[assembly: AssemblyTitle("Validation.Common.Job")]
8+
[assembly: AssemblyDescription("Common logic for validation jobs.")]
9+
[assembly: ComVisible(false)]
10+
[assembly: Guid("fa87d075-a934-4443-8d0b-5db32640b6d7")]

src/Validation.PackageSigning.Core/Storage/AddStatusResult.cs renamed to src/Validation.Common.Job/Storage/AddStatusResult.cs

File renamed without changes.

src/Validation.PackageSigning.Core/Storage/IValidatorStateService.cs renamed to src/Validation.Common.Job/Storage/IValidatorStateService.cs

File renamed without changes.

src/Validation.PackageSigning.Core/Storage/SaveStatusResult.cs renamed to src/Validation.Common.Job/Storage/SaveStatusResult.cs

File renamed without changes.

src/Validation.PackageSigning.Core/Storage/SerializedValidationIssue.cs renamed to src/Validation.Common.Job/Storage/SerializedValidationIssue.cs

File renamed without changes.

src/Validation.PackageSigning.Core/Storage/ValidatorStateService.cs renamed to src/Validation.Common.Job/Storage/ValidatorStateService.cs

File renamed without changes.

0 commit comments

Comments
 (0)