diff --git a/NuGet.Services.Metadata.sln b/NuGet.Services.Metadata.sln index 6f8904a53..71ac542df 100644 --- a/NuGet.Services.Metadata.sln +++ b/NuGet.Services.Metadata.sln @@ -18,8 +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}") = "MennoCopy", "src\Tools\MennoCopy\MennoCopy.csproj", "{7AE1E48A-9F7C-463D-ACAD-3312CB0B97CB}" -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.Services.BasicSearch", "src\NuGet.Services.BasicSearch\NuGet.Services.BasicSearch.csproj", "{1460DE86-6DF4-49A3-822C-E52F8DA834F5}" @@ -88,16 +86,6 @@ Global {5234D86F-2C0E-4181-AAB7-BBDA3253B4E1}.Release|Mixed Platforms.Build.0 = Release|Any CPU {5234D86F-2C0E-4181-AAB7-BBDA3253B4E1}.Release|x64.ActiveCfg = Release|x64 {5234D86F-2C0E-4181-AAB7-BBDA3253B4E1}.Release|x64.Build.0 = Release|x64 - {7AE1E48A-9F7C-463D-ACAD-3312CB0B97CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AE1E48A-9F7C-463D-ACAD-3312CB0B97CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AE1E48A-9F7C-463D-ACAD-3312CB0B97CB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {7AE1E48A-9F7C-463D-ACAD-3312CB0B97CB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7AE1E48A-9F7C-463D-ACAD-3312CB0B97CB}.Debug|x64.ActiveCfg = Debug|Any CPU - {7AE1E48A-9F7C-463D-ACAD-3312CB0B97CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7AE1E48A-9F7C-463D-ACAD-3312CB0B97CB}.Release|Any CPU.Build.0 = Release|Any CPU - {7AE1E48A-9F7C-463D-ACAD-3312CB0B97CB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7AE1E48A-9F7C-463D-ACAD-3312CB0B97CB}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7AE1E48A-9F7C-463D-ACAD-3312CB0B97CB}.Release|x64.ActiveCfg = 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 @@ -210,7 +198,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} - {7AE1E48A-9F7C-463D-ACAD-3312CB0B97CB} = {C86C6DEE-84E1-4E4E-8868-6755D7A8E0E4} {DDB34145-870F-42C3-9663-A9390CEE1E35} = {5DE01C58-D5F7-482F-8256-A8333064384C} {1460DE86-6DF4-49A3-822C-E52F8DA834F5} = {97E23323-BA7A-48F0-A578-858B82B6D8FB} {AF189F05-EFC3-4A98-91C7-2AF1E4B8B131} = {F1C83FD9-A498-483E-ADFA-B55D82A14965} diff --git a/build.ps1 b/build.ps1 index fe4c20e83..05d6fdc0c 100644 --- a/build.ps1 +++ b/build.ps1 @@ -9,7 +9,7 @@ param ( [string]$SemanticVersion = '1.0.0-zlocal', [string]$Branch, [string]$CommitSHA, - [string]$BuildBranch = '306fec22edac68336d7e32124d51248734c3a395' + [string]$BuildBranch = 'cb604c2cd1b2f7f71fb574cdda4c83ddb1464cc7' ) # For TeamCity - If any issue occurs, this script fails the build. - By default, TeamCity returns an exit code of 0 for all powershell scripts, even if they fail @@ -94,15 +94,21 @@ Invoke-BuildStep 'Building solution' { -ev +BuildErrors Invoke-BuildStep 'Creating artifacts' { - $projects = ` + $csprojPackages = ` "src\NuGet.Indexing\NuGet.Indexing.csproj", ` "src\Catalog\NuGet.Services.Metadata.Catalog.csproj", ` "src\NuGet.ApplicationInsights.Owin\NuGet.ApplicationInsights.Owin.csproj", ` - "src\Ng\Ng.csproj", ` "src\NuGet.Services.Metadata.Catalog.Monitoring\NuGet.Services.Metadata.Catalog.Monitoring.csproj" - - $projects | ForEach-Object { - New-Package (Join-Path $PSScriptRoot $_) -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -IncludeReferencedProjects -MSBuildVersion "15" + + $csprojPackages | ForEach-Object { + New-ProjectPackage (Join-Path $PSScriptRoot $_) -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch + } + + $nuspecPackages = ` + "src\Ng\Ng.nuspec" + + $nuspecPackages | ForEach-Object { + New-Package (Join-Path $PSScriptRoot $_) -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch } } ` -ev +BuildErrors diff --git a/src/Catalog/NuGet.Services.Metadata.Catalog.csproj b/src/Catalog/NuGet.Services.Metadata.Catalog.csproj index 067f16306..67bf8ca99 100644 --- a/src/Catalog/NuGet.Services.Metadata.Catalog.csproj +++ b/src/Catalog/NuGet.Services.Metadata.Catalog.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,9 +9,19 @@ Properties NuGet.Services.Metadata.Catalog NuGet.Services.Metadata.Catalog - v4.5.2 + v4.6.2 512 + true + win + + + .NET Foundation + https://github.com/NuGet/NuGet.Services.Metadata/blob/master/LICENSE + https://github.com/NuGet/NuGet.Services.Metadata + Create, edit, or read the package metadata catalog. + nuget;services;search;catalog;metadata;collector + Copyright .NET Foundation true @@ -49,102 +59,12 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\dotnetrdf.1.0.8.3533\lib\net40\dotNetRDF.dll - True - - - ..\..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll - True - - - ..\..\packages\NuGet.StrongName.json-ld.net.1.0.6\lib\net40-client\json-ld.net.StrongName.dll - - - ..\..\packages\Microsoft.ApplicationInsights.2.2.0\lib\net45\Microsoft.ApplicationInsights.dll - - - ..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True - - - ..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll - - - ..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll - - - ..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll - - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - ..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll - - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll - - - ..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - True - - - ..\..\packages\WindowsAzure.Storage.8.2.1\lib\net45\Microsoft.WindowsAzure.Storage.dll - - - ..\..\packages\Microsoft.Azure.Storage.DataMovement.0.6.0\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll - - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - - - ..\..\packages\NuGet.Common.4.3.0\lib\net45\NuGet.Common.dll - - - ..\..\packages\NuGet.Frameworks.4.3.0\lib\net45\NuGet.Frameworks.dll - - - ..\..\packages\NuGet.Packaging.Core.4.3.0\lib\net45\NuGet.Packaging.Core.dll - - - ..\..\packages\NuGet.Services.Contracts.2.25.0-master-30088\lib\net45\NuGet.Services.Contracts.dll - - - ..\..\packages\NuGet.Services.Logging.2.25.0-master-30088\lib\net452\NuGet.Services.Logging.dll - - - ..\..\packages\NuGet.Versioning.4.3.0\lib\net45\NuGet.Versioning.dll - - - ..\..\packages\Serilog.2.0.0\lib\net45\Serilog.dll - - - ..\..\packages\Serilog.Enrichers.Environment.2.1.0\lib\net45\Serilog.Enrichers.Environment.dll - - - ..\..\packages\Serilog.Enrichers.Process.2.0.0\lib\net45\Serilog.Enrichers.Process.dll - - - ..\..\packages\Serilog.Extensions.Logging.1.2.0\lib\net45\Serilog.Extensions.Logging.dll - - - ..\..\packages\Serilog.Sinks.ApplicationInsights.2.2.1\lib\net45\Serilog.Sinks.ApplicationInsights.dll - - - ..\..\packages\Serilog.Sinks.ColoredConsole.2.0.0\lib\net45\Serilog.Sinks.ColoredConsole.dll - - - ..\..\packages\SerilogTraceListener.2.0.10027\lib\net45\SerilogTraceListener.dll - - @@ -152,19 +72,12 @@ - - ..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll - - - ..\..\packages\VDS.Common.1.5.0\lib\net40-client\VDS.Common.dll - True - @@ -297,9 +210,6 @@ - - Designer - @@ -313,16 +223,46 @@ - - - Designer - + + + 1.0.8.3533 + + + 1.0.6 + + + 2.2.0 + + + 0.6.0 + + + 3.1.0 + + + 4.8.0 + runtime; build; native; contentfiles; analyzers + all + + + 4.3.0 + + + 2.25.0-master-30088 + + + 4.3.3 + + + 8.2.1 + + ..\..\build diff --git a/src/Catalog/NuGet.Services.Metadata.Catalog.nuspec b/src/Catalog/NuGet.Services.Metadata.Catalog.nuspec deleted file mode 100644 index 82a48d0fd..000000000 --- a/src/Catalog/NuGet.Services.Metadata.Catalog.nuspec +++ /dev/null @@ -1,17 +0,0 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - https://github.com/NuGet/NuGet.Services.Metadata/blob/master/LICENSE.txt - https://github.com/NuGet/NuGet.Services.Metadata - false - $description$ - - Copyright .NET Foundation - nuget services search catalog metadata collector - - \ No newline at end of file diff --git a/src/Catalog/app.config b/src/Catalog/app.config deleted file mode 100644 index f785a25e1..000000000 --- a/src/Catalog/app.config +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Catalog/packages.config b/src/Catalog/packages.config deleted file mode 100644 index 360bada51..000000000 --- a/src/Catalog/packages.config +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Ng/App.config b/src/Ng/App.config index b0c42c9ce..ef80b2368 100644 --- a/src/Ng/App.config +++ b/src/Ng/App.config @@ -1,83 +1,19 @@ - + -
+
- + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - \ No newline at end of file + diff --git a/src/Ng/Ng.csproj b/src/Ng/Ng.csproj index 20f84c4fe..f6822b317 100644 --- a/src/Ng/Ng.csproj +++ b/src/Ng/Ng.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,11 +9,13 @@ Properties Ng Ng - v4.5.2 + v4.6.2 512 + true + win AnyCPU @@ -58,245 +60,6 @@ - - ..\..\packages\dotnetrdf.1.0.8.3533\lib\net40\dotNetRDF.dll - True - - - ..\..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll - True - - - ..\..\packages\Hyak.Common.1.0.2\lib\net45\Hyak.Common.dll - True - - - ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - True - - - ..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Analyzers.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Core.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.FastVectorHighlighter.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Highlighter.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Memory.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Queries.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Regex.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SimpleFacetedSearch.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Snowball.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SpellChecker.dll - True - - - ..\..\packages\Lucene.Net.Store.Azure.StrongName.3.0.6262.31186\lib\net45\Lucene.Net.Store.Azure.dll - - - ..\..\packages\Microsoft.ApplicationInsights.2.2.0\lib\net45\Microsoft.ApplicationInsights.dll - - - ..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.dll - True - - - ..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.NetFramework.dll - True - - - ..\..\packages\Microsoft.Azure.KeyVault.1.0.0\lib\net45\Microsoft.Azure.KeyVault.dll - True - - - ..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True - - - ..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll - - - ..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll - - - ..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll - - - ..\..\packages\Microsoft.Extensions.Configuration.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Configuration.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Configuration.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.FileExtensions.1.0.0\lib\net451\Microsoft.Extensions.Configuration.FileExtensions.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.Json.1.0.0\lib\net451\Microsoft.Extensions.Configuration.Json.dll - True - - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.FileProviders.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.FileProviders.Physical.1.0.0\lib\net451\Microsoft.Extensions.FileProviders.Physical.dll - True - - - ..\..\packages\Microsoft.Extensions.FileSystemGlobbing.1.0.0\lib\net451\Microsoft.Extensions.FileSystemGlobbing.dll - True - - - ..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll - True - - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.Primitives.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll - True - - - ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.13.5\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll - True - - - ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.13.5\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - True - - - ..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - True - - - ..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - True - - - ..\..\packages\WindowsAzure.Storage.8.2.1\lib\net45\Microsoft.WindowsAzure.Storage.dll - - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - - - ..\..\packages\NuGet.Common.4.3.0\lib\net45\NuGet.Common.dll - - - ..\..\packages\NuGet.Configuration.4.3.0\lib\net45\NuGet.Configuration.dll - - - ..\..\packages\nuget.core.2.8.5\lib\net40-Client\NuGet.Core.dll - True - - - ..\..\packages\NuGet.Frameworks.4.3.0\lib\net45\NuGet.Frameworks.dll - - - ..\..\packages\NuGet.Packaging.4.3.0\lib\net45\NuGet.Packaging.dll - - - ..\..\packages\NuGet.Packaging.Core.4.3.0\lib\net45\NuGet.Packaging.Core.dll - - - ..\..\packages\NuGet.Protocol.4.3.0\lib\net45\NuGet.Protocol.dll - - - ..\..\packages\NuGet.Services.Configuration.2.2.2\lib\net452\NuGet.Services.Configuration.dll - - - ..\..\packages\NuGet.Services.Contracts.2.25.0-master-30088\lib\net45\NuGet.Services.Contracts.dll - - - ..\..\packages\NuGet.Services.KeyVault.2.2.2\lib\net45\NuGet.Services.KeyVault.dll - - - ..\..\packages\NuGet.Services.Logging.2.25.0-master-30088\lib\net452\NuGet.Services.Logging.dll - - - ..\..\packages\NuGet.Services.Storage.2.25.0-sb-queuesize-32353\lib\net452\NuGet.Services.Storage.dll - - - ..\..\packages\NuGet.Versioning.4.3.0\lib\net45\NuGet.Versioning.dll - - - ..\..\packages\Serilog.2.5.0\lib\net45\Serilog.dll - - - ..\..\packages\Serilog.Enrichers.Environment.2.1.0\lib\net45\Serilog.Enrichers.Environment.dll - True - - - ..\..\packages\Serilog.Enrichers.Process.2.0.0\lib\net45\Serilog.Enrichers.Process.dll - True - - - ..\..\packages\Serilog.Extensions.Logging.1.2.0\lib\net45\Serilog.Extensions.Logging.dll - True - - - ..\..\packages\Serilog.Sinks.ApplicationInsights.2.2.1\lib\net45\Serilog.Sinks.ApplicationInsights.dll - - - ..\..\packages\Serilog.Sinks.ColoredConsole.2.0.0\lib\net45\Serilog.Sinks.ColoredConsole.dll - True - - - ..\..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll - - - ..\..\packages\SerilogTraceListener.2.0.10027\lib\net45\SerilogTraceListener.dll - True - @@ -305,30 +68,14 @@ - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll - True - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll - True - - - ..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll - - - ..\..\packages\VDS.Common.1.5.0\lib\net40-client\VDS.Common.dll - True - @@ -371,9 +118,6 @@ Designer - - Designer - @@ -412,6 +156,37 @@ PreserveNewest + + + 2.2.0 + + + 3.1.0 + + + 4.8.0 + runtime; build; native; contentfiles; analyzers + all + + + 4.3.0 + + + 2.2.2 + + + 2.25.0-master-30088 + + + 2.25.0-sb-queuesize-32353 + + + 4.0.0 + + + 8.2.1 + + ..\..\build @@ -419,11 +194,4 @@ $(NuGetBuildPath) - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/src/Ng/Scripts/MonitoringProcessor.cmd b/src/Ng/Scripts/MonitoringProcessor.cmd index 3afd0b734..92d4bbe3d 100644 --- a/src/Ng/Scripts/MonitoringProcessor.cmd +++ b/src/Ng/Scripts/MonitoringProcessor.cmd @@ -9,6 +9,7 @@ title #{Jobs.monitoringprocessor.Title} start /w .\Ng.exe monitoringprocessor ^ -source #{Jobs.common.v3.Source} ^ + -requireSignature #{Jobs.endpointmonitoring.RequireSignature} ^ -index #{Jobs.common.v3.index} ^ -gallery #{Jobs.common.v3.f2c.Gallery} ^ -endpointsToTest "#{Jobs.endpointmonitoring.EndpointsToTest}" ^ diff --git a/src/Ng/packages.config b/src/Ng/packages.config deleted file mode 100644 index 1d6110aee..000000000 --- a/src/Ng/packages.config +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet.ApplicationInsights.Owin/NuGet.ApplicationInsights.Owin.csproj b/src/NuGet.ApplicationInsights.Owin/NuGet.ApplicationInsights.Owin.csproj index 7627ac366..77e7b9022 100644 --- a/src/NuGet.ApplicationInsights.Owin/NuGet.ApplicationInsights.Owin.csproj +++ b/src/NuGet.ApplicationInsights.Owin/NuGet.ApplicationInsights.Owin.csproj @@ -1,6 +1,5 @@  - - + Debug @@ -13,10 +12,20 @@ Properties NuGet.ApplicationInsights.Owin NuGet.ApplicationInsights.Owin - v4.5.2 + v4.6.2 + true + win + + + .NET Foundation + https://github.com/NuGet/NuGet.Services.Metadata/blob/master/LICENSE + https://github.com/NuGet/NuGet.Services.Metadata + OWIN Middleware that provides context to ApplicationInsights telemetry. + nuget;application;insights;owin + Copyright .NET Foundation true @@ -36,24 +45,10 @@ 4 - - ..\..\packages\Microsoft.ApplicationInsights.2.2.0\lib\net45\Microsoft.ApplicationInsights.dll - - - ..\..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll - True - - - True - False - - ..\..\packages\Owin.1.0\lib\net40\Owin.dll - True - @@ -62,10 +57,6 @@ - - - - @@ -75,20 +66,30 @@ - + + + 0.3.0 + runtime; build; native; contentfiles; analyzers + all + + + 2.2.0 + + + 3.0.1 + + + 4.8.0 + runtime; build; native; contentfiles; analyzers + all + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - ..\..\build $(BUILD_SOURCESDIRECTORY)\build @@ -96,6 +97,5 @@ - \ No newline at end of file diff --git a/src/NuGet.ApplicationInsights.Owin/NuGet.ApplicationInsights.Owin.nuspec b/src/NuGet.ApplicationInsights.Owin/NuGet.ApplicationInsights.Owin.nuspec deleted file mode 100644 index 2233af006..000000000 --- a/src/NuGet.ApplicationInsights.Owin/NuGet.ApplicationInsights.Owin.nuspec +++ /dev/null @@ -1,17 +0,0 @@ - - - - NuGet.ApplicationInsights.Owin - $version$ - NuGet.ApplicationInsights.Owin - .Net Foundation - .Net Foundation - https://github.com/NuGet/NuGet.Services.Metadata/blob/master/LICENSE - https://github.com/NuGet/NuGet.Services.Metadata - false - OWIN Middleware that provides context to ApplicationInsights telemetry. - - Copyright 2016 .NET Foundation - nuget application insights owin - - \ No newline at end of file diff --git a/src/NuGet.ApplicationInsights.Owin/packages.config b/src/NuGet.ApplicationInsights.Owin/packages.config deleted file mode 100644 index 06fdac5c7..000000000 --- a/src/NuGet.ApplicationInsights.Owin/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/NuGet.Indexing/DisposableAction.cs b/src/NuGet.Indexing/DisposableAction.cs new file mode 100644 index 000000000..726df2174 --- /dev/null +++ b/src/NuGet.Indexing/DisposableAction.cs @@ -0,0 +1,46 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Linq; + +namespace NuGet.Indexing +{ + /// + /// Source: + /// https://github.com/NuGet/NuGet2/blob/c3d1027a51b31fd0c41e9abbe90810cf1c924c9f/src/Core/Utility/DisposableAction.cs + /// + public sealed class DisposableAction : IDisposable + { + public static readonly DisposableAction NoOp = new DisposableAction(() => { }); + + private Action _action; + + public DisposableAction(Action action) + { + _action = action; + } + + public static IDisposable All(params IDisposable[] tokens) + { + return new DisposableAction(() => + { + foreach (var token in tokens) + { + token.Dispose(); + } + }); + } + + public static IDisposable All(IEnumerable tokens) + { + return All(tokens.ToArray()); + } + + public void Dispose() + { + _action(); + } + } +} diff --git a/src/NuGet.Indexing/Eula.htm b/src/NuGet.Indexing/Eula.htm deleted file mode 100644 index 4860f99d9..000000000 --- a/src/NuGet.Indexing/Eula.htm +++ /dev/null @@ -1,649 +0,0 @@ - - - - - - - - - - - - - - - - - -
- -
- -
- -

Azure Library for Lucene.Net

- -
- -
- -
- -
- - -
- -
- -

License: -Microsoft Public License (Ms-PL)

- - - - - -
-
-
-

Microsoft Public - License (Ms-PL)
-
- This license governs use of the accompanying software. If you use the - software, you accept this license. If you do not accept the license, do not - use the software.
-
- 1. Definitions
-
- The terms "reproduce," "reproduction," "derivative - works," and "distribution" have the same meaning here as under - U.S. copyright law.
-
- A "contribution" is the original software, - or any additions or changes to the software.
-
- A "contributor" is any person that distributes its contribution - under this license.
-
- "Licensed patents" are a contributor's patent claims that read - directly on its contribution.
-
- 2. Grant of Rights
-
- (A) Copyright Grant- Subject to the terms of this license, including the - license conditions and limitations in section 3, each contributor grants you - a non-exclusive, worldwide, royalty-free copyright license to reproduce its - contribution, prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create.
-
- (B) Patent Grant- Subject to the terms of this license, including the license - conditions and limitations in section 3, each contributor grants you a - non-exclusive, worldwide, royalty-free license under its licensed patents to - make, have made, use, sell, offer for sale, import, and/or otherwise dispose - of its contribution in the software or derivative works of the contribution in - the software.
-
- 3. Conditions and Limitations
-
- (A) No Trademark License- This license does not grant you rights to use any - contributors' name, logo, or trademarks.
-
- (B) If you bring a patent claim against any contributor over patents that you - claim are infringed by the software, your patent license from such - contributor to the software ends automatically.
-
- (C) If you distribute any portion of the software, you must retain all - copyright, patent, trademark, and attribution notices that are present in the - software.
-
- (D) If you distribute any portion of the software in source code form, you - may do so only under this license by including a complete copy of this - license with your distribution. If you distribute any portion of the software - in compiled or object code form, you may only do so under a license that - complies with this license.
-
- (E) The software is licensed "as-is." You bear the risk of using - it. The contributors give no express warranties, guarantees or conditions. - You may have additional consumer rights under your local laws which this - license cannot change. To the extent permitted under your local laws, the - contributors exclude the implied warranties of merchantability, fitness for a - particular purpose and non-infringement

-
-
-
- - - -

 

- -
- -
- - - - diff --git a/src/NuGet.Indexing/NuGet.Indexing.csproj b/src/NuGet.Indexing/NuGet.Indexing.csproj index d5584f388..4fb8ae79a 100644 --- a/src/NuGet.Indexing/NuGet.Indexing.csproj +++ b/src/NuGet.Indexing/NuGet.Indexing.csproj @@ -1,6 +1,5 @@  - - + Debug @@ -10,12 +9,22 @@ Properties NuGet.Indexing NuGet.Indexing - v4.5.2 + v4.6.2 512 true + true + win + + + .NET Foundation + https://github.com/NuGet/NuGet.Services.Metadata/blob/master/LICENSE + https://github.com/NuGet/NuGet.Services.Metadata + Lucene-based Search Indexing tools for NuGet + nuget;services;search;index;lucene + Copyright .NET Foundation true @@ -37,201 +46,6 @@ false - - ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\Hyak.Common.1.0.2\lib\net45\Hyak.Common.dll - True - - - ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - True - - - ..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Analyzers.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Core.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.FastVectorHighlighter.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Highlighter.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Memory.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Queries.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Regex.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SimpleFacetedSearch.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Snowball.dll - True - - - ..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SpellChecker.dll - True - - - ..\..\packages\Lucene.Net.Store.Azure.StrongName.3.0.6262.31186\lib\net45\Lucene.Net.Store.Azure.dll - - - ..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.dll - True - - - ..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.NetFramework.dll - True - - - ..\..\packages\Microsoft.Azure.KeyVault.1.0.0\lib\net45\Microsoft.Azure.KeyVault.dll - True - - - ..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True - - - ..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll - - - ..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll - - - ..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll - - - ..\..\packages\Microsoft.Extensions.Configuration.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Configuration.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Configuration.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.FileExtensions.1.0.0\lib\net451\Microsoft.Extensions.Configuration.FileExtensions.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.Json.1.0.0\lib\net451\Microsoft.Extensions.Configuration.Json.dll - True - - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.FileProviders.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.FileProviders.Physical.1.0.0\lib\net451\Microsoft.Extensions.FileProviders.Physical.dll - True - - - ..\..\packages\Microsoft.Extensions.FileSystemGlobbing.1.0.0\lib\net451\Microsoft.Extensions.FileSystemGlobbing.dll - True - - - ..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll - True - - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.Primitives.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll - True - - - ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.13.5\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll - True - - - ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.13.5\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - True - - - ..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - True - - - ..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - True - - - ..\..\packages\WindowsAzure.Storage.8.2.1\lib\net45\Microsoft.WindowsAzure.Storage.dll - - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - - - ..\..\packages\NuGet.Common.4.3.0\lib\net45\NuGet.Common.dll - - - ..\..\packages\nuget.core.2.8.5\lib\net40-Client\NuGet.Core.dll - True - - - ..\..\packages\NuGet.Frameworks.4.3.0\lib\net45\NuGet.Frameworks.dll - - - ..\..\packages\NuGet.Packaging.4.3.0\lib\net45\NuGet.Packaging.dll - - - ..\..\packages\NuGet.Packaging.Core.4.3.0\lib\net45\NuGet.Packaging.Core.dll - - - ..\..\packages\NuGet.Services.Configuration.2.2.2\lib\net452\NuGet.Services.Configuration.dll - - - ..\..\packages\NuGet.Services.KeyVault.2.2.2\lib\net45\NuGet.Services.KeyVault.dll - - - ..\..\packages\NuGet.Versioning.4.3.0\lib\net45\NuGet.Versioning.dll - - - ..\..\packages\NuGetGallery.Core.2.1.1\lib\net452\NuGetGallery.Core.dll - @@ -239,17 +53,7 @@ - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll - - - ..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll - @@ -260,6 +64,7 @@ + @@ -355,25 +160,47 @@ - - - - Designer - + + + 3.0.3 + + + 3.0.6262.31186 + + + 0.3.0 + runtime; build; native; contentfiles; analyzers + all + + + 1.0.0 + + + 4.8.0 + runtime; build; native; contentfiles; analyzers + all + + + 4.3.0 + + + 2.2.2 + + + 2.1.1 + + + 4.3.3 + + + 8.2.1 + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - ..\..\build $(BUILD_SOURCESDIRECTORY)\build @@ -381,5 +208,4 @@ - \ No newline at end of file diff --git a/src/NuGet.Indexing/NuGet.Indexing.nuspec b/src/NuGet.Indexing/NuGet.Indexing.nuspec deleted file mode 100644 index a9e10d9a8..000000000 --- a/src/NuGet.Indexing/NuGet.Indexing.nuspec +++ /dev/null @@ -1,17 +0,0 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - https://github.com/NuGet/NuGet.Services.Metadata/blob/master/LICENSE.txt - https://github.com/NuGet/NuGet.Services.Metadata - false - $description$ - - Copyright .NET Foundation - nuget services search index lucene - - \ No newline at end of file diff --git a/src/NuGet.Indexing/Properties/AssemblyInfo.cs b/src/NuGet.Indexing/Properties/AssemblyInfo.cs index 847c73b79..fc820d4a2 100644 --- a/src/NuGet.Indexing/Properties/AssemblyInfo.cs +++ b/src/NuGet.Indexing/Properties/AssemblyInfo.cs @@ -17,4 +17,4 @@ [assembly: InternalsVisibleTo("NuGet.IndexingTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] #else [assembly: InternalsVisibleTo("NuGet.IndexingTests")] -#endif \ No newline at end of file +#endif diff --git a/src/NuGet.Indexing/Readme.html b/src/NuGet.Indexing/Readme.html deleted file mode 100644 index e48d28a41..000000000 --- a/src/NuGet.Indexing/Readme.html +++ /dev/null @@ -1,2190 +0,0 @@ - - - - - - - - - - - - - - - - - - -
- -

AzureDirectory Library for Lucene.Net

- -

Project -description

- -

Lucene.Net is a robust open source search technology which -has an abstract interface called a Directory for defining how the index is -stored. AzureDirectory is an implementation of that -interface for Windows Azure Blob Storage.

- -

About -

- -

This project allows you to create Lucene Indexes and use them in Azure.
-
-This project implements a low level Lucene Directory -object called AzureDirectory around Windows Azure BlobStorage.

- -

Background -

- -

Lucene.NET -

- -

Lucene is a mature Java based open source full text indexing and -search engine and property store.
-Lucene.NET is a mature port of that library to C#.
-Lucene/Lucene.Net provides:

- -

*       -Super simple API for storing -documents with arbitrary properties

- -

*       -Complete control over what is -indexed and what is stored for retrieval

- -

*       -Robust control over where and how -things are indexed, how much memory is used, etc.

- -

*       -Superfast and super rich query -capabilities

- -

o    -Sorted results

- -

o    -Rich constraint semantics AND/OR/NOT -etc.

- -

o    -Rich text semantics (phrase match, -wildcard match, near, fuzzy match etc)

- -

o    -Text query syntax (example: -Title:(dog AND cat) OR Body:Lucen* )

- -

o    -Programmatic expressions

- -

o    -Ranked results with custom ranking -algorithms

- -

 

- -

AzureDirectory

- -

AzureDirectory smartly uses a local Directory to cache files as they are -created and automatically pushes them to Azure blob storage as appropriate. -Likewise, it smartly caches blob files on the client when they change. This -provides with a nice blend of just in time syncing of data local to indexers or -searchers across multiple machines.
-
-With the flexibility that Lucene provides over data -in memory versus storage and the just in time blob transfer that AzureDirectory provides you have great control over the composibility of where data is indexed and how it is -consumed.
-
-To be more concrete: you can have 1..N worker roles adding documents to an -index, and 1..N searcher webroles searching over the -catalog in near real time.

- -

Usage -

- -


-To use you need to create a blob storage account on http://azure.com .
-
-Create an App.Config or Web.Config -and configure your accountinfo:

- -
- -

         <?xml version="1.0" encoding="utf-8" ?>

- -

         <configuration>

- -

           -<appSettings>

- -

                 <!-- azure SETTINGS -->

- -

                 <add key="BlobStorageEndpoint" value="http://YOURACCOUNT.blob.core.windows.net"/>

- -

                 <add key="AccountName" value="YOURACCOUNTNAME"/>

- -

                 <add key="AccountSharedKey" value="YOURACCOUNTKEY"/>

- -

           -</appSettings>

- -

         </configuration>

- -

 

- -
- -


-To add documents to a catalog is as simple as
-
-

- -
- -

            AzureDirectory -azureDirectory = new AzureDirectory("TestCatalog");

- -

            IndexWriter -indexWriter = new IndexWriter(azureDirectory, new StandardAnalyzer(), -true);

- -

            Document doc = new Document();

- -

            doc.Add(new Field("id", DateTime.Now.ToFileTimeUtc().ToString(), -Field.Store.YES, Field.Index.TOKENIZED, -Field.TermVector.NO));

- -

            doc.Add(new Field("Title", “this is my title”, Field.Store.YES, Field.Index.TOKENIZED, -Field.TermVector.NO));

- -

            doc.Add(new Field("Body", “This is my body”, Field.Store.YES, Field.Index.TOKENIZED, -Field.TermVector.NO));

- -

            indexWriter.AddDocument(doc);

- -

            indexWriter.Close();

- -

}

- -

 

- -
- -


-And searching is as easy as:
-
-

- -
- -

            IndexSearcher -searcher = new IndexSearcher(azureDirectory);               

- -

            Lucene.Net.QueryParsers.QueryParser -parser = QueryParser("Title", new StandardAnalyzer());

- -

            Lucene.Net.Search.Query -query = parser.Parse("Title:(Dog AND -Cat)");

- -

 

- -

            Hits hits -= searcher.Search(query);

- -

            for (int i = 0; i < hits.Length(); -i++)

- -

            {

- -

                Document doc = hits.Doc(i);

- -

                Console.WriteLine(doc.GetField("Title").StringValue());

- -

            }

- -

 

- -
- -

 

- -

Caching -and Compression

- -


-AzureDirectory compresses blobs before sent to the -blob storage. Blobs are automatically cached local to reduce roundtrips for -blobs which haven't changed.
-
-By default AzureDirectory stores this local cache in -a temporary folder. You can easily control where the local cache is stored by -passing in a Directory object for whatever type and location of storage you -want.
-
-This example stores the cache in a ram directory:

- -
- -

      AzureDirectory azureDirectory = new AzureDirectory("MyIndex", new RAMDirectory());

- -

 

- -
- -


-And this example stores in the file system in C:\myindex

- -
- -

      AzureDirectory azureDirectory = new AzureDirectory("MyIndex", new FSDirectory(@"c:\myindex"));

- -

 

- -
- -


-
-

- -

Notes -on settings

- -


-Just like a normal Lucene index, calling optimize too -often causes a lot of churn and not calling it enough causes too many segment -files to be created, so call it "just enough" times. That will -totally depend on your application and the nature of your pattern of adding and -updating items to determine (which is why Lucene -provides so many knobs to configure its behavior).
-
-The default compound file support that Lucene uses reduces -the number of files that are generated...this means it deletes and merges files -regularly which causes churn on the blob storage. Calling indexWriter.SetCompoundFiles(false) -will give better performance.
-
-The version of Lucene.NET checked in as a binary is Version 2.3.1, but you can -use any version of Lucene.NET you want by simply enlisting from the above open -source site.

- -

FAQ

- -

Related -

- -

There is a LINQ to Lucene provider http://linqtoLucene.codeplex.com/Wiki/View.aspx?title=Project%20Documentation  -on codeplex which allows you to define your schema as -a strongly typed object and execute LINQ expressions against the index.

- -

 

- -
- - - - diff --git a/src/NuGet.Indexing/app.config b/src/NuGet.Indexing/app.config deleted file mode 100644 index a6b36a861..000000000 --- a/src/NuGet.Indexing/app.config +++ /dev/null @@ -1,66 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/NuGet.Indexing/packages.config b/src/NuGet.Indexing/packages.config deleted file mode 100644 index d870a5200..000000000 --- a/src/NuGet.Indexing/packages.config +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet.Services.BasicSearch/NuGet.Services.BasicSearch.csproj b/src/NuGet.Services.BasicSearch/NuGet.Services.BasicSearch.csproj index 7059bd5e9..84483e1cc 100644 --- a/src/NuGet.Services.BasicSearch/NuGet.Services.BasicSearch.csproj +++ b/src/NuGet.Services.BasicSearch/NuGet.Services.BasicSearch.csproj @@ -1,7 +1,5 @@  - - - + Debug @@ -15,7 +13,7 @@ Properties NuGet.Services.BasicSearch NuGet.Services.BasicSearch - v4.5.2 + v4.6.2 true @@ -46,259 +44,21 @@ 4 - - ..\..\packages\Hyak.Common.1.0.2\lib\net45\Hyak.Common.dll - True - - - ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - True - - - ..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - True - - - ..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.2.0.6\lib\net45\Microsoft.AI.Agent.Intercept.dll - - - ..\..\packages\Microsoft.ApplicationInsights.DependencyCollector.2.2.0\lib\net45\Microsoft.AI.DependencyCollector.dll - - - ..\..\packages\Microsoft.ApplicationInsights.PerfCounterCollector.2.2.0\lib\net45\Microsoft.AI.PerfCounterCollector.dll - - - ..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll - - - ..\..\packages\Microsoft.ApplicationInsights.Web.2.2.0\lib\net45\Microsoft.AI.Web.dll - - - ..\..\packages\Microsoft.ApplicationInsights.WindowsServer.2.2.0\lib\net45\Microsoft.AI.WindowsServer.dll - - - ..\..\packages\Microsoft.ApplicationInsights.2.2.0\lib\net45\Microsoft.ApplicationInsights.dll - - - ..\..\packages\Microsoft.ApplicationInsights.PerformanceCollector.0.12.0-build17386\lib\net40\Microsoft.ApplicationInsights.Extensibility.PerfCollector.dll - True - - - ..\..\packages\Microsoft.ApplicationInsights.RuntimeTelemetry.0.12.0-build17386\lib\net45\Microsoft.ApplicationInsights.Extensibility.RuntimeTelemetry.dll - True - - - ..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.dll - True - - - ..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.NetFramework.dll - True - - - ..\..\packages\Microsoft.Azure.KeyVault.1.0.0\lib\net45\Microsoft.Azure.KeyVault.dll - True - - - ..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True - - - ..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll - - - ..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll - - - ..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll - - - ..\..\packages\Microsoft.Diagnostics.Instrumentation.Extensions.Intercept.0.12.0-build02810\lib\net40\Microsoft.Diagnostics.Instrumentation.Extensions.Intercept.dll - True - - - ..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.11-beta\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Configuration.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Configuration.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.FileExtensions.1.0.0\lib\net451\Microsoft.Extensions.Configuration.FileExtensions.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.Json.1.0.0\lib\net451\Microsoft.Extensions.Configuration.Json.dll - True - - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.FileProviders.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.FileProviders.Physical.1.0.0\lib\net451\Microsoft.Extensions.FileProviders.Physical.dll - True - - - ..\..\packages\Microsoft.Extensions.FileSystemGlobbing.1.0.0\lib\net451\Microsoft.Extensions.FileSystemGlobbing.dll - True - - - ..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll - True - - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.Primitives.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll - True - - - ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.13.5\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll - True - - - ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.13.5\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll + True - - ..\..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll - True - - - ..\..\packages\Microsoft.Owin.Cors.3.0.1\lib\net45\Microsoft.Owin.Cors.dll - True - - - ..\..\packages\Microsoft.Owin.Diagnostics.3.0.1\lib\net45\Microsoft.Owin.Diagnostics.dll - True - - - ..\..\packages\Microsoft.Owin.FileSystems.3.0.1\lib\net45\Microsoft.Owin.FileSystems.dll - True - - - ..\..\packages\Microsoft.Owin.Host.SystemWeb.3.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - True - - - ..\..\packages\Microsoft.Owin.StaticFiles.3.0.1\lib\net45\Microsoft.Owin.StaticFiles.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - True - - - ..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - True - - - True - - + False - - ..\..\packages\WindowsAzure.Storage.8.2.1\lib\net45\Microsoft.WindowsAzure.Storage.dll - - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - - - ..\..\packages\NuGet.Services.Configuration.2.2.2\lib\net452\NuGet.Services.Configuration.dll - - - ..\..\packages\NuGet.Services.KeyVault.2.2.2\lib\net45\NuGet.Services.KeyVault.dll - - - ..\..\packages\NuGet.Services.Logging.2.2.3\lib\net452\NuGet.Services.Logging.dll - - - ..\..\packages\NuGet.Services.Owin.2.2.3\lib\net452\NuGet.Services.Owin.dll - - - ..\..\packages\NuGet.Versioning.4.3.0\lib\net45\NuGet.Versioning.dll - - - ..\..\packages\Owin.1.0\lib\net40\Owin.dll - True - - - ..\..\packages\Serilog.2.0.0\lib\net45\Serilog.dll - True - - - ..\..\packages\Serilog.Enrichers.Environment.2.1.0\lib\net45\Serilog.Enrichers.Environment.dll - True - - - ..\..\packages\Serilog.Enrichers.Process.2.0.0\lib\net45\Serilog.Enrichers.Process.dll - True - - - ..\..\packages\Serilog.Extensions.Logging.1.2.0\lib\net45\Serilog.Extensions.Logging.dll - True - - - ..\..\packages\Serilog.Sinks.ApplicationInsights.2.2.1\lib\net45\Serilog.Sinks.ApplicationInsights.dll - - - ..\..\packages\Serilog.Sinks.ColoredConsole.2.0.0\lib\net45\Serilog.Sinks.ColoredConsole.dll - True - - - ..\..\packages\SerilogTraceListener.2.0.10027\lib\net45\SerilogTraceListener.dll - True - - - ..\..\packages\SerilogWeb.Classic.2.0.9\lib\net45\SerilogWeb.Classic.dll - True - - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll - - - - ..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll - - - ..\..\packages\Microsoft.AspNet.Cors.5.0.0\lib\net45\System.Web.Cors.dll - True - @@ -306,9 +66,6 @@ - - Designer - ResXFileCodeGenerator LogMessages.Designer.cs @@ -374,6 +131,55 @@ + + + 0.3.0 + runtime; build; native; contentfiles; analyzers + all + + + 2.2.0 + + + 1.0.17-build01715 + + + 0.12.0-build17386 + + + 0.12.0-build17386 + + + 2.2.0 + + + 0.12.0-build02810 + + + 1.1.11-beta + + + 3.0.1 + + + 3.0.1 + + + 3.0.1 + + + 3.0.1 + + + 2.2.3 + + + 2.2.3 + + + 2.0.9 + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -399,16 +205,6 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - ..\..\build $(BUILD_SOURCESDIRECTORY)\build @@ -416,5 +212,4 @@ - \ No newline at end of file diff --git a/src/NuGet.Services.BasicSearch/NuGet.Services.BasicSearch.nuspec b/src/NuGet.Services.BasicSearch/NuGet.Services.BasicSearch.nuspec deleted file mode 100644 index 1fd872532..000000000 --- a/src/NuGet.Services.BasicSearch/NuGet.Services.BasicSearch.nuspec +++ /dev/null @@ -1,21 +0,0 @@ - - - - NuGet.Services.BasicSearch - $version$ - NuGet.Services.BasicSearch - .Net Foundation - .Net Foundation - https://github.com/NuGet/NuGet.Services.Metadata/blob/master/LICENSE - https://github.com/NuGet/NuGet.Services.Metadata - false - Basic Search service for v3 - - Copyright 2014 .NET Foundation - nuget V3 search services - - - - - - \ No newline at end of file diff --git a/src/NuGet.Services.BasicSearch/Web.config b/src/NuGet.Services.BasicSearch/Web.config index a03bfd7e0..84abef6fe 100644 --- a/src/NuGet.Services.BasicSearch/Web.config +++ b/src/NuGet.Services.BasicSearch/Web.config @@ -1,134 +1,148 @@ - + - - + + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - + + + + + + - + - + - - + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/NuGet.Services.BasicSearch/packages.config b/src/NuGet.Services.BasicSearch/packages.config deleted file mode 100644 index 4e748ceed..000000000 --- a/src/NuGet.Services.BasicSearch/packages.config +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet.Services.Metadata.Catalog.Monitoring/NuGet.Services.Metadata.Catalog.Monitoring.csproj b/src/NuGet.Services.Metadata.Catalog.Monitoring/NuGet.Services.Metadata.Catalog.Monitoring.csproj index 309601d72..590cb2f29 100644 --- a/src/NuGet.Services.Metadata.Catalog.Monitoring/NuGet.Services.Metadata.Catalog.Monitoring.csproj +++ b/src/NuGet.Services.Metadata.Catalog.Monitoring/NuGet.Services.Metadata.Catalog.Monitoring.csproj @@ -9,8 +9,18 @@ Properties NuGet.Services.Metadata.Catalog.Monitoring NuGet.Services.Metadata.Catalog.Monitoring - v4.5.2 + v4.6.2 512 + true + win + + + + .NET Foundation + https://github.com/NuGet/NuGet.Services.Metadata/blob/master/LICENSE + https://github.com/NuGet/NuGet.Services.Metadata + Monitor the package metadata catalog. + Copyright .NET Foundation true @@ -30,84 +40,6 @@ 4 - - ..\..\packages\Microsoft.ApplicationInsights.2.1.0\lib\net45\Microsoft.ApplicationInsights.dll - - - ..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - - - ..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll - - - ..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll - - - ..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll - - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - ..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll - - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll - - - ..\..\packages\WindowsAzure.Storage.8.2.1\lib\net45\Microsoft.WindowsAzure.Storage.dll - - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\NuGet.Common.4.3.0\lib\net45\NuGet.Common.dll - - - ..\..\packages\NuGet.Configuration.4.3.0\lib\net45\NuGet.Configuration.dll - - - ..\..\packages\NuGet.Frameworks.4.3.0\lib\net45\NuGet.Frameworks.dll - - - ..\..\packages\NuGet.Packaging.4.3.0\lib\net45\NuGet.Packaging.dll - - - ..\..\packages\NuGet.Packaging.Core.4.3.0\lib\net45\NuGet.Packaging.Core.dll - - - ..\..\packages\NuGet.Protocol.4.3.0\lib\net45\NuGet.Protocol.dll - - - ..\..\packages\NuGet.Services.Logging.2.2.2\lib\net452\NuGet.Services.Logging.dll - - - ..\..\packages\NuGet.Services.Storage.2.25.0-sb-queuesize-32353\lib\net452\NuGet.Services.Storage.dll - - - ..\..\packages\NuGet.Versioning.4.3.0\lib\net45\NuGet.Versioning.dll - - - ..\..\packages\Serilog.2.0.0\lib\net45\Serilog.dll - - - ..\..\packages\Serilog.Enrichers.Environment.2.1.0\lib\net45\Serilog.Enrichers.Environment.dll - - - ..\..\packages\Serilog.Enrichers.Process.2.0.0\lib\net45\Serilog.Enrichers.Process.dll - - - ..\..\packages\Serilog.Extensions.Logging.1.2.0\lib\net45\Serilog.Extensions.Logging.dll - - - ..\..\packages\Serilog.Sinks.ApplicationInsights.2.2.1\lib\net45\Serilog.Sinks.ApplicationInsights.dll - - - ..\..\packages\Serilog.Sinks.ColoredConsole.2.0.0\lib\net45\Serilog.Sinks.ColoredConsole.dll - - - ..\..\packages\SerilogTraceListener.2.0.10027\lib\net45\SerilogTraceListener.dll - @@ -115,14 +47,10 @@ - - ..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll - - @@ -201,12 +129,21 @@ - - - Designer - + + 4.8.0 + runtime; build; native; contentfiles; analyzers + all + + + 4.3.0 + + + 2.25.0-sb-queuesize-32353 + + + 8.2.1 + - ..\..\build diff --git a/src/NuGet.Services.Metadata.Catalog.Monitoring/app.config b/src/NuGet.Services.Metadata.Catalog.Monitoring/app.config deleted file mode 100644 index 506d0ddbe..000000000 --- a/src/NuGet.Services.Metadata.Catalog.Monitoring/app.config +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet.Services.Metadata.Catalog.Monitoring/packages.config b/src/NuGet.Services.Metadata.Catalog.Monitoring/packages.config deleted file mode 100644 index a2282424b..000000000 --- a/src/NuGet.Services.Metadata.Catalog.Monitoring/packages.config +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tools/MennoCopy/App.config b/src/Tools/MennoCopy/App.config deleted file mode 100644 index 99156f13a..000000000 --- a/src/Tools/MennoCopy/App.config +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tools/MennoCopy/MennoCopy.csproj b/src/Tools/MennoCopy/MennoCopy.csproj deleted file mode 100644 index 5bc9cd4c8..000000000 --- a/src/Tools/MennoCopy/MennoCopy.csproj +++ /dev/null @@ -1,88 +0,0 @@ - - - - - Debug - AnyCPU - {7AE1E48A-9F7C-463D-ACAD-3312CB0B97CB} - Exe - Properties - MennoCopy - MennoCopy - v4.5 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True - - - ..\..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll - - - ..\..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll - - - ..\..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll - - - False - ..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - - - ..\..\..\packages\WindowsAzure.Storage.8.2.1\lib\net45\Microsoft.WindowsAzure.Storage.dll - - - ..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - - - - - ..\..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll - - - - - - - - - - - - - - - - - - - - - ..\..\build - $(BUILD_SOURCESDIRECTORY)\build - $(NuGetBuildPath) - - - \ No newline at end of file diff --git a/src/Tools/MennoCopy/Program.cs b/src/Tools/MennoCopy/Program.cs deleted file mode 100644 index 80d63c54a..000000000 --- a/src/Tools/MennoCopy/Program.cs +++ /dev/null @@ -1,182 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.WindowsAzure.Storage; -using Microsoft.WindowsAzure.Storage.Blob; -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MennoCopy -{ - /// - /// MennoCopy copies a blob container and rewrites URLs contained in the blobs to match the new path. - /// - class Program - { - private static bool _run = true; - - // if overwrite is false existing blobs will be skipped - private static bool _overwrite = false; - - static void Main(string[] args) - { - if (args.Length != 2) - { - Console.WriteLine(".exe "); - Environment.Exit(1); - } - - Console.WriteLine("Overwrite: " + (_overwrite ? "true" : "false")); - - Console.CancelKeyPress += Console_CancelKeyPress; - - int threads = 8; - Int32.TryParse(args[1], out threads); - - FileInfo file = new FileInfo(args[0]); - - if (!file.Exists) - { - throw new FileNotFoundException(file.FullName); - } - - JObject config = null; - - using (var stream = file.OpenText()) - { - config = JObject.Parse(stream.ReadToEnd()); - } - - Stopwatch runtime = new Stopwatch(); - runtime.Start(); - - // set up - CloudStorageAccount inputAccount = CloudStorageAccount.Parse(config["InputConnectionString"].ToString()); - CloudStorageAccount outputAccount = CloudStorageAccount.Parse(config["OutputConnectionString"].ToString()); - - var inputClient = inputAccount.CreateCloudBlobClient(); - var outputClient = outputAccount.CreateCloudBlobClient(); - - var inputContainer = inputClient.GetContainerReference(config["InputContainer"].ToString()); - var outputContainer = outputClient.GetContainerReference(config["OutputContainer"].ToString()); - - List> baseAddresses = new List>(); - - foreach (var pair in config["BaseAddresses"]) - { - baseAddresses.Add(new KeyValuePair(pair["Input"].ToString(), pair["Output"].ToString())); - } - - // the longest uri has to be first so we get the best match - baseAddresses = baseAddresses.OrderByDescending(p => p.Key.Length).ToList(); - - // list blobs - ParallelOptions options = new ParallelOptions(); - options.MaxDegreeOfParallelism = threads; - - string inputUri = inputContainer.Uri.AbsoluteUri + "/"; - string[] inputPaths = inputContainer.ListBlobs(null, true).Select(b => Uri.UnescapeDataString(b.Uri.AbsoluteUri.Replace(inputUri, string.Empty))).OrderBy(s => s).ToArray(); - - // create container if needed - if (!outputContainer.Exists()) - { - outputContainer.Create(); - - if (inputContainer.GetPermissions().PublicAccess == BlobContainerPublicAccessType.Container) - { - outputContainer.SetPermissions(new BlobContainerPermissions { PublicAccess = BlobContainerPublicAccessType.Container }); - } - } - - Console.WriteLine("Copying: " + inputPaths.Length + " blobs"); - - // copy blobs - Parallel.ForEach(inputPaths, options, path => - { - if (_run) - { - var inputBlob = inputContainer.GetBlockBlobReference(path); - var outputBlob = outputContainer.GetBlockBlobReference(path); - - if (_overwrite || !outputBlob.Exists()) - { - int count = 0; - - var fetchPropsTask = inputBlob.FetchAttributesAsync(); - - using (MemoryStream stream = new MemoryStream()) - { - inputBlob.DownloadToStream(stream); - - stream.Seek(0, SeekOrigin.Begin); - - // replace strings found in - if (path.EndsWith(".json", StringComparison.OrdinalIgnoreCase)) - { - using (StreamReader reader = new StreamReader(stream)) - { - JObject json = JObject.Parse(reader.ReadToEnd()); - - foreach (var token in json.Descendants().Select(t => t as JValue).Where(t => t != null && t.Type == JTokenType.String)) - { - string val = token.Value.ToString(); - - foreach (var pair in baseAddresses) - { - // replace the url if we find it - if (val.IndexOf(pair.Key) == 0) - { - count++; - token.Value = pair.Value + val.Substring(pair.Key.Length); - break; - } - } - } - - outputBlob.UploadText(json.ToString(), Encoding.UTF8); - } - } - else - { - outputBlob.UploadFromStream(stream); - } - } - - fetchPropsTask.Wait(); - - // update properties - outputBlob.Properties.ContentType = inputBlob.Properties.ContentType; - outputBlob.Properties.CacheControl = inputBlob.Properties.CacheControl; - outputBlob.Properties.ContentEncoding = inputBlob.Properties.ContentEncoding; - outputBlob.Properties.ContentDisposition = inputBlob.Properties.ContentDisposition; - outputBlob.Properties.ContentLanguage = inputBlob.Properties.ContentLanguage; - - outputBlob.SetProperties(); - - Console.WriteLine("{0} Changes: {1}", path, count); - } - else - { - Console.WriteLine("Already exists: " + path); - } - } - }); - - runtime.Stop(); - - Console.WriteLine("Runtime: " + runtime.Elapsed); - } - - private static void Console_CancelKeyPress(object sender, ConsoleCancelEventArgs e) - { - e.Cancel = true; - _run = false; - Console.WriteLine("Ctrl+C caught. Skipping remaining files."); - } - } -} diff --git a/src/Tools/MennoCopy/packages.config b/src/Tools/MennoCopy/packages.config deleted file mode 100644 index 0f5e319d5..000000000 --- a/src/Tools/MennoCopy/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tools/MennoCopy/template.json b/src/Tools/MennoCopy/template.json deleted file mode 100644 index 351fd0b03..000000000 --- a/src/Tools/MennoCopy/template.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "InputConnectionString": "DefaultEndpointsProtocol=https;AccountName=inputacct;AccountKey=;", - "OutputConnectionString": "DefaultEndpointsProtocol=https;AccountName=outputacct;AccountKey=;", - "InputContainer": "catalog-0", - "OutputContainer": "catalog-0", - "BaseAddresses": [ - { - "Input": "https://inputacct.blob.core.windows.net/", - "Output": "https://outputacct.blob.core.windows.net/" - }, - { - "Input": "https://inputacct.blob.core.windows.net/catalog-0/", - "Output": "https://outputacct.blob.core.windows.net/catalog-1/" - } - ] -} \ No newline at end of file diff --git a/src/V3PerPackage/App.config b/src/V3PerPackage/App.config index bae5d6d81..c76c89bb8 100644 --- a/src/V3PerPackage/App.config +++ b/src/V3PerPackage/App.config @@ -1,6 +1,6 @@ - - - + + + diff --git a/src/V3PerPackage/V3PerPackage.csproj b/src/V3PerPackage/V3PerPackage.csproj index a908a0550..2c7941d21 100644 --- a/src/V3PerPackage/V3PerPackage.csproj +++ b/src/V3PerPackage/V3PerPackage.csproj @@ -8,7 +8,7 @@ Exe NuGet.Services.V3PerPackage NuGet.Services.V3PerPackage - v4.6.1 + v4.6.2 512 true @@ -64,10 +64,10 @@ - PreserveNewest + @@ -117,9 +117,6 @@ 2.23.0 - - 2.2.2 - 2.25.0-sb-queuesize-32353 diff --git a/test.ps1 b/test.ps1 index fa5a24f2d..1fddcc3d3 100644 --- a/test.ps1 +++ b/test.ps1 @@ -28,7 +28,8 @@ Function Run-Tests { "tests\NgTests\bin\$Configuration\NgTests.dll", ` "tests\NuGet.IndexingTests\bin\$Configuration\NuGet.IndexingTests.dll", ` "tests\NuGet.Services.BasicSearchTests\bin\$Configuration\NuGet.Services.BasicSearchTests.dll", ` - "tests\CatalogTests\bin\$Configuration\CatalogTests.dll" + "tests\CatalogTests\bin\$Configuration\CatalogTests.dll", ` + "tests\CatalogMetadataTests\bin\$Configuration\CatalogMetadataTests.dll" $TestCount = 0 diff --git a/tests/BasicSearchTests.FunctionalTests.Core/BasicSearchTests.FunctionalTests.Core.csproj b/tests/BasicSearchTests.FunctionalTests.Core/BasicSearchTests.FunctionalTests.Core.csproj index 331f637a0..9579d3feb 100644 --- a/tests/BasicSearchTests.FunctionalTests.Core/BasicSearchTests.FunctionalTests.Core.csproj +++ b/tests/BasicSearchTests.FunctionalTests.Core/BasicSearchTests.FunctionalTests.Core.csproj @@ -1,7 +1,5 @@  - - - + Debug @@ -11,7 +9,7 @@ Properties BasicSearchTests.FunctionalTests.Core BasicSearchTests.FunctionalTests.Core - v4.5.2 + v4.6.2 512 @@ -34,59 +32,22 @@ prompt 4 + + true + true + - - ..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll - True - - - ..\packages\Microsoft.Owin.Host.HttpListener.3.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll - True - - - ..\packages\Microsoft.Owin.Hosting.3.0.1\lib\net45\Microsoft.Owin.Hosting.dll - True - - - ..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - True - - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - ..\packages\Owin.1.0\lib\net40\Owin.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True - - - - ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll - True - - - ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll - True - @@ -118,20 +79,32 @@ - - + - + + 5.2.3 + + + 3.0.1 + + + 3.0.1 + + + 9.0.1 + + + 4.3.3 + + + 2.0.0 + + + 2.1.0 + - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/tests/NuGet.IndexingTests/app.config b/tests/NuGet.IndexingTests/app.config deleted file mode 100644 index b6875c4d9..000000000 --- a/tests/NuGet.IndexingTests/app.config +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/NuGet.IndexingTests/packages.config b/tests/NuGet.IndexingTests/packages.config deleted file mode 100644 index 202447855..000000000 --- a/tests/NuGet.IndexingTests/packages.config +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/NuGet.Services.BasicSearchTests/NuGet.Services.BasicSearchTests.csproj b/tests/NuGet.Services.BasicSearchTests/NuGet.Services.BasicSearchTests.csproj index 2656a1126..27b297e83 100644 --- a/tests/NuGet.Services.BasicSearchTests/NuGet.Services.BasicSearchTests.csproj +++ b/tests/NuGet.Services.BasicSearchTests/NuGet.Services.BasicSearchTests.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties NuGet.Services.BasicSearchTests NuGet.Services.BasicSearchTests - v4.5.2 + v4.6.2 512 @@ -32,174 +32,17 @@ prompt 4 + + true + true + - - ..\..\packages\Hyak.Common.1.0.2\lib\net45\Hyak.Common.dll - True - - - ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - True - - - ..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - True - - - ..\..\packages\Microsoft.ApplicationInsights.2.2.0\lib\net45\Microsoft.ApplicationInsights.dll - - - ..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.dll - True - - - ..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.NetFramework.dll - True - - - ..\..\packages\Microsoft.Azure.KeyVault.1.0.0\lib\net45\Microsoft.Azure.KeyVault.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Configuration.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Configuration.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.FileExtensions.1.0.0\lib\net451\Microsoft.Extensions.Configuration.FileExtensions.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.Json.1.0.0\lib\net451\Microsoft.Extensions.Configuration.Json.dll - True - - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.FileProviders.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.FileProviders.Physical.1.0.0\lib\net451\Microsoft.Extensions.FileProviders.Physical.dll - True - - - ..\..\packages\Microsoft.Extensions.FileSystemGlobbing.1.0.0\lib\net451\Microsoft.Extensions.FileSystemGlobbing.dll - True - - - ..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll - True - - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.Primitives.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll - True - - - ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.13.5\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll - True - - - ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.13.5\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll - True - - - ..\..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll - True - - - ..\..\packages\Microsoft.Owin.Host.HttpListener.3.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll - True - - - ..\..\packages\Microsoft.Owin.Hosting.3.0.1\lib\net45\Microsoft.Owin.Hosting.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - True - - - ..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - True - - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - - - ..\..\packages\NuGet.Services.Configuration.2.2.2\lib\net452\NuGet.Services.Configuration.dll - - - ..\..\packages\NuGet.Services.KeyVault.2.2.2\lib\net45\NuGet.Services.KeyVault.dll - - - ..\..\packages\NuGet.Services.Logging.2.2.3\lib\net452\NuGet.Services.Logging.dll - - - ..\..\packages\Owin.1.0\lib\net40\Owin.dll - True - - - ..\..\packages\Serilog.2.0.0\lib\net45\Serilog.dll - True - - - ..\..\packages\Serilog.Enrichers.Environment.2.1.0\lib\net45\Serilog.Enrichers.Environment.dll - True - - - ..\..\packages\Serilog.Enrichers.Process.2.0.0\lib\net45\Serilog.Enrichers.Process.dll - True - - - ..\..\packages\Serilog.Extensions.Logging.1.2.0\lib\net45\Serilog.Extensions.Logging.dll - True - - - ..\..\packages\Serilog.Sinks.ApplicationInsights.2.2.1\lib\net45\Serilog.Sinks.ApplicationInsights.dll - - - ..\..\packages\Serilog.Sinks.ColoredConsole.2.0.0\lib\net45\Serilog.Sinks.ColoredConsole.dll - True - - - ..\..\packages\SerilogTraceListener.2.0.10027\lib\net45\SerilogTraceListener.dll - True - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll - - - ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll - @@ -207,22 +50,8 @@ - - - ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - @@ -254,14 +83,12 @@ - PreserveNewest PreserveNewest - @@ -281,14 +108,33 @@ Always + + + 3.0.3 + + + 2.2.0 + + + 5.2.3 + + + 3.0.1 + + + 3.0.1 + + + 2.2.2 + + + 2.2.3 + + + 2.1.0 + + - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/tests/NuGetFeedTests/Properties/AssemblyInfo.cs b/tests/NuGetFeedTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 18a59519d..000000000 --- a/tests/NuGetFeedTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("NuGetFeedTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NuGetFeedTests")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("37396caf-900b-4afa-a6a0-3039bfd71bb0")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tests/NuGetFeedTests/Util.cs b/tests/NuGetFeedTests/Util.cs deleted file mode 100644 index 2a055a05a..000000000 --- a/tests/NuGetFeedTests/Util.cs +++ /dev/null @@ -1,81 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Moq; -using NuGet; -using System; -using System.Globalization; -using System.IO; - -namespace NuGetFeedTests -{ - public class Util - { - - /// - /// Creates a test package. - Take from NuGet.Core.Tests - /// - /// The id of the created package. - /// The version of the created package. - /// The directory where the package is created. - /// The full path of the created package file. - public static string CreateTestPackage(string packageId, string version, string path, Uri licenseUrl = null) - { - var packageBuilder = new PackageBuilder - { - Id = packageId, - Version = new SemanticVersion(version) - }; - packageBuilder.Description = string.Format( - CultureInfo.InvariantCulture, - "desc of {0} {1}", - packageId, version); - - if (licenseUrl != null) - { - packageBuilder.LicenseUrl = licenseUrl; - } - - packageBuilder.Files.Add(CreatePackageFile(@"content\test1.txt")); - packageBuilder.Authors.Add("test author"); - - var packageFileName = string.Format("{0}.{1}.nupkg", packageId, version); - var packageFileFullPath = Path.Combine(path, packageFileName); - using (var fileStream = File.Create(packageFileFullPath)) - { - packageBuilder.Save(fileStream); - } - - return packageFileFullPath; - } - - /// - /// Creates a file with the specified content. - /// - /// The directory of the created file. - /// The name of the created file. - /// The content of the created file. - public static void CreateFile(string directory, string fileName, string fileContent) - { - var fileFullName = Path.Combine(directory, fileName); - using (var writer = new StreamWriter(fileFullName)) - { - writer.Write(fileContent); - } - } - - private static IPackageFile CreatePackageFile(string name) - { - var file = new Mock(); - file.SetupGet(f => f.Path).Returns(name); - file.Setup(f => f.GetStream()).Returns(new MemoryStream()); - - string effectivePath; - var fx = VersionUtility.ParseFrameworkNameFromFilePath(name, out effectivePath); - file.SetupGet(f => f.EffectivePath).Returns(effectivePath); - file.SetupGet(f => f.TargetFramework).Returns(fx); - - return file.Object; - } - - } -} diff --git a/tests/NuGetFeedTests/packages.config b/tests/NuGetFeedTests/packages.config deleted file mode 100644 index a07e404d7..000000000 --- a/tests/NuGetFeedTests/packages.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file