Skip to content
This repository has been archived by the owner on Jul 30, 2024. It is now read-only.
/ NuGet.Jobs Public archive

Commit

Permalink
Merge NuGet.Indexing into NuGet.Services.AzureSearch (#739)
Browse files Browse the repository at this point in the history
Also, remove ILoader abstraction since it is no longer needed
Progress on NuGet/NuGetGallery#7822
  • Loading branch information
joelverhagen committed Jan 29, 2020
1 parent 6222d1a commit 2342616
Show file tree
Hide file tree
Showing 32 changed files with 85 additions and 759 deletions.
28 changes: 0 additions & 28 deletions NuGet.Services.Metadata.sln
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CatalogTests", "tests\Catal
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ng", "src\Ng\Ng.csproj", "{5234D86F-2C0E-4181-AAB7-BBDA3253B4E1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Indexing", "src\NuGet.Indexing\NuGet.Indexing.csproj", "{DDB34145-870F-42C3-9663-A9390CEE1E35}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.IndexingTests", "tests\NuGet.IndexingTests\NuGet.IndexingTests.csproj", "{43665489-01F0-4F35-8A33-258F2231B2D8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NgTests", "tests\NgTests\NgTests.csproj", "{05C1C78A-9966-4922-9065-A099023E7366}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{97E23323-BA7A-48F0-A578-858B82B6D8FB}"
Expand Down Expand Up @@ -117,28 +113,6 @@ Global
{5234D86F-2C0E-4181-AAB7-BBDA3253B4E1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{5234D86F-2C0E-4181-AAB7-BBDA3253B4E1}.Release|x64.ActiveCfg = Release|Any CPU
{5234D86F-2C0E-4181-AAB7-BBDA3253B4E1}.Release|x64.Build.0 = Release|Any CPU
{DDB34145-870F-42C3-9663-A9390CEE1E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DDB34145-870F-42C3-9663-A9390CEE1E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DDB34145-870F-42C3-9663-A9390CEE1E35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{DDB34145-870F-42C3-9663-A9390CEE1E35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{DDB34145-870F-42C3-9663-A9390CEE1E35}.Debug|x64.ActiveCfg = Debug|Any CPU
{DDB34145-870F-42C3-9663-A9390CEE1E35}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DDB34145-870F-42C3-9663-A9390CEE1E35}.Release|Any CPU.Build.0 = Release|Any CPU
{DDB34145-870F-42C3-9663-A9390CEE1E35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{DDB34145-870F-42C3-9663-A9390CEE1E35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{DDB34145-870F-42C3-9663-A9390CEE1E35}.Release|x64.ActiveCfg = Release|Any CPU
{43665489-01F0-4F35-8A33-258F2231B2D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43665489-01F0-4F35-8A33-258F2231B2D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43665489-01F0-4F35-8A33-258F2231B2D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{43665489-01F0-4F35-8A33-258F2231B2D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{43665489-01F0-4F35-8A33-258F2231B2D8}.Debug|x64.ActiveCfg = Debug|Any CPU
{43665489-01F0-4F35-8A33-258F2231B2D8}.Debug|x64.Build.0 = Debug|Any CPU
{43665489-01F0-4F35-8A33-258F2231B2D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43665489-01F0-4F35-8A33-258F2231B2D8}.Release|Any CPU.Build.0 = Release|Any CPU
{43665489-01F0-4F35-8A33-258F2231B2D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{43665489-01F0-4F35-8A33-258F2231B2D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{43665489-01F0-4F35-8A33-258F2231B2D8}.Release|x64.ActiveCfg = Release|Any CPU
{43665489-01F0-4F35-8A33-258F2231B2D8}.Release|x64.Build.0 = Release|Any CPU
{05C1C78A-9966-4922-9065-A099023E7366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{05C1C78A-9966-4922-9065-A099023E7366}.Debug|Any CPU.Build.0 = Debug|Any CPU
{05C1C78A-9966-4922-9065-A099023E7366}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -387,8 +361,6 @@ Global
{E97F23B8-ECB0-4AFA-B00C-015C39395FEF} = {5DE01C58-D5F7-482F-8256-A8333064384C}
{4D0B6BAB-5A33-4A7F-B007-93194FC2E2E3} = {F1C83FD9-A498-483E-ADFA-B55D82A14965}
{5234D86F-2C0E-4181-AAB7-BBDA3253B4E1} = {C86C6DEE-84E1-4E4E-8868-6755D7A8E0E4}
{DDB34145-870F-42C3-9663-A9390CEE1E35} = {5DE01C58-D5F7-482F-8256-A8333064384C}
{43665489-01F0-4F35-8A33-258F2231B2D8} = {F1C83FD9-A498-483E-ADFA-B55D82A14965}
{05C1C78A-9966-4922-9065-A099023E7366} = {F1C83FD9-A498-483E-ADFA-B55D82A14965}
{717E9A81-75C5-418E-92ED-18CAC55BC345} = {5DE01C58-D5F7-482F-8256-A8333064384C}
{1745A383-D0BE-484B-81EB-27B20F6AC6C5} = {5DE01C58-D5F7-482F-8256-A8333064384C}
Expand Down
2 changes: 0 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ Invoke-BuildStep 'Restoring solution packages' { `

Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' {
$assemblyInfos = `
"src\NuGet.Indexing\Properties\AssemblyInfo.g.cs", `
"src\Catalog\Properties\AssemblyInfo.g.cs", `
"src\NuGet.ApplicationInsights.Owin\Properties\AssemblyInfo.g.cs", `
"src\Ng\Properties\AssemblyInfo.g.cs", `
Expand Down Expand Up @@ -115,7 +114,6 @@ Invoke-BuildStep 'Signing the binaries' {

Invoke-BuildStep 'Creating artifacts' {
$csprojPackages = `
"src\NuGet.Indexing\NuGet.Indexing.csproj", `
"src\Catalog\NuGet.Services.Metadata.Catalog.csproj", `
"src\NuGet.ApplicationInsights.Owin\NuGet.ApplicationInsights.Owin.csproj", `
"src\NuGet.Services.Metadata.Catalog.Monitoring\NuGet.Services.Metadata.Catalog.Monitoring.csproj", `
Expand Down
1 change: 0 additions & 1 deletion src/Catalog/Helpers/Retry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace NuGet.Services.Metadata.Catalog.Helpers
/// Can (and probably should) be replaced with Polly library if the project is updated to target .netfx 4.7.2.
/// In current state Polly pulls a ton of System.* dependencies which we previously didn't have.
/// </remarks>
/// <seealso cref="NuGet.Indexing.Retry"/>
public class Retry
{
/// <summary>
Expand Down
4 changes: 0 additions & 4 deletions src/Ng/Ng.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,6 @@
<Project>{e97f23b8-ecb0-4afa-b00c-015c39395fef}</Project>
<Name>NuGet.Services.Metadata.Catalog</Name>
</ProjectReference>
<ProjectReference Include="..\NuGet.Indexing\NuGet.Indexing.csproj">
<Project>{ddb34145-870f-42c3-9663-a9390cee1e35}</Project>
<Name>NuGet.Indexing</Name>
</ProjectReference>
<ProjectReference Include="..\NuGet.Jobs.Catalog2Registration\NuGet.Jobs.Catalog2Registration.csproj">
<Project>{5ABE8807-2209-4948-9FC5-1980A507C47A}</Project>
<Name>NuGet.Jobs.Catalog2Registration</Name>
Expand Down
148 changes: 0 additions & 148 deletions src/NuGet.Indexing/Downloads.cs

This file was deleted.

52 changes: 0 additions & 52 deletions src/NuGet.Indexing/DownloadsByVersion.cs

This file was deleted.

13 changes: 0 additions & 13 deletions src/NuGet.Indexing/ILoader.cs

This file was deleted.

Loading

0 comments on commit 2342616

Please sign in to comment.