Merge pull request #911 from NuGet/dev

Merge branch dev into master
NuGet · Aug 11, 2020 · dd26676 · dd26676
2 parents 02defbb + 46ebdab
commit dd26676
Show file tree

Hide file tree

Showing 990 changed files with 105,495 additions and 74 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,8 @@ tools/
 .nuget/credprovider
 .nuget/.marker.v*
 nuget.exe
+functionaltests.*.xml
+AssemblyInfo.g.cs
 
 # Roslyn cache directories
 *.ide/
@@ -206,3 +208,8 @@ AssemblyInfo.*.cs
 /tests/Validation.Common.Tests/Validation.Common.Tests.nuget.props
 /tests/Validation.Common.Tests/Validation.Common.Tests.nuget.targets
 /tests/Validation.Helper.Tests/Validation.Helper.Tests.nuget.targets
+/tests/packages
+/tests/CatalogMetadataTests/CatalogMetadataTests.nuget.props
+*.lock.json
+/src/V3PerPackage/Settings.json
+artifacts/*
diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MicroBuild.Core" version="0.3.0" />
+  <package id="Microsoft.ApplicationInsights.JavaScript" version="1.0.17-build01715" />
+  <package id="Microsoft.CodeAnalysis.BinSkim" version="1.3.6" />
   <package id="xunit.runner.console" version="2.1.0" />
   <package id="xunit.runner.visualstudio" version="2.1.0" />
 </packages>
diff --git a/NuGet.Jobs.sln b/NuGet.Jobs.sln
diff --git a/README.md b/README.md
@@ -1,5 +1,8 @@
 NuGet.Jobs
-==============
+==========
+
+This repo contains nuget.org's implementation of the [NuGet V3 API](https://docs.microsoft.com/en-us/nuget/api/overview)
+as well as many other back-end jobs for the operation of nuget.org.
 
 1. Each job would be an exe with 2 main classes Program and Job
 2. Program.Main should simply do the following and nothing more
@@ -20,6 +23,14 @@ NuGet.Jobs
 
 7. Also, add settings.job file to mark the job as singleton, if the job will be run as a webjob, and it be a continuously running singleton
 
+## Feedback
+
+If you're having trouble with the NuGet.org Website, file a bug on the [NuGet Gallery Issue Tracker](https://github.com/nuget/NuGetGallery/issues). 
+
+If you're having trouble with the NuGet client tools (the Visual Studio extension, NuGet.exe command line tool, etc.), file a bug on [NuGet Home](https://github.com/nuget/home/issues).
+
+Check out the [contributing](http://docs.nuget.org/contribute) page to see the best places to log issues and start discussions. The [NuGet Home](https://github.com/NuGet/Home) repo provides an overview of the different NuGet projects available.
+
 Open Source Code of Conduct
 ===================
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
diff --git a/build.ps1 b/build.ps1
@@ -87,25 +87,36 @@ Invoke-BuildStep 'Clearing artifacts' { Clear-Artifacts } `
 
 Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' { `
         $versionMetadata =
-            "$PSScriptRoot\src\CopyAzureContainer\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\NuGetCDNRedirect\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\NuGet.Services.Validation.Orchestrator\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\NuGet.Services.Revalidate\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\Stats.CollectAzureChinaCDNLogs\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\Validation.PackageSigning.ProcessSignature\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\Validation.PackageSigning.ValidateCertificate\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\Validation.PackageSigning.RevalidateCertificate\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\Validation.Common.Job\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\Validation.ScanAndSign.Core\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\PackageLagMonitor\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\StatusAggregator\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\Validation.Symbols.Core\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\Stats.CDNLogsSanitizer\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\NuGet.Jobs.GitHubIndexer\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\SplitLargeFiles\Properties\AssemblyInfo.g.cs"
+            "src\CopyAzureContainer\Properties\AssemblyInfo.g.cs",
+            "src\NuGetCDNRedirect\Properties\AssemblyInfo.g.cs",
+            "src\NuGet.Services.Validation.Orchestrator\Properties\AssemblyInfo.g.cs",
+            "src\NuGet.Services.Revalidate\Properties\AssemblyInfo.g.cs",
+            "src\Stats.CollectAzureChinaCDNLogs\Properties\AssemblyInfo.g.cs",
+            "src\Validation.PackageSigning.ProcessSignature\Properties\AssemblyInfo.g.cs",
+            "src\Validation.PackageSigning.ValidateCertificate\Properties\AssemblyInfo.g.cs",
+            "src\Validation.PackageSigning.RevalidateCertificate\Properties\AssemblyInfo.g.cs",
+            "src\Validation.Common.Job\Properties\AssemblyInfo.g.cs",
+            "src\Validation.ScanAndSign.Core\Properties\AssemblyInfo.g.cs",
+            "src\PackageLagMonitor\Properties\AssemblyInfo.g.cs",
+            "src\StatusAggregator\Properties\AssemblyInfo.g.cs",
+            "src\Validation.Symbols.Core\Properties\AssemblyInfo.g.cs",
+            "src\Stats.CDNLogsSanitizer\Properties\AssemblyInfo.g.cs",
+            "src\NuGet.Jobs.GitHubIndexer\Properties\AssemblyInfo.g.cs",
+            "src\SplitLargeFiles\Properties\AssemblyInfo.g.cs",
+            "src\Catalog\Properties\AssemblyInfo.g.cs",
+            "src\NuGet.ApplicationInsights.Owin\Properties\AssemblyInfo.g.cs",
+            "src\Ng\Properties\AssemblyInfo.g.cs",
+            "src\NuGet.Services.Metadata.Catalog.Monitoring\Properties\AssemblyInfo.g.cs",
+            "src\NuGet.Protocol.Catalog\Properties\AssemblyInfo.g.cs",
+            "src\NuGet.Services.AzureSearch\Properties\AssemblyInfo.g.cs",
+            "src\NuGet.Jobs.Db2AzureSearch\Properties\AssemblyInfo.g.cs",
+            "src\NuGet.Jobs.Catalog2AzureSearch\Properties\AssemblyInfo.g.cs",
+            "src\NuGet.Services.SearchService\Properties\AssemblyInfo.g.cs",
+            "src\NuGet.Jobs.Auxiliary2AzureSearch\Properties\AssemblyInfo.g.cs",
+            "src\NuGet.Jobs.Catalog2Registration\Properties\AssemblyInfo.g.cs"
 
         $versionMetadata | ForEach-Object {
-            Set-VersionInfo -Path $_ -Version $SimpleVersion -Branch $Branch -Commit $CommitSHA
+            Set-VersionInfo -Path (Join-Path $PSScriptRoot $_) -Version $SimpleVersion -Branch $Branch -Commit $CommitSHA
         }
     } `
     -ev +BuildErrors
@@ -122,6 +133,12 @@ Invoke-BuildStep 'Building solution' {
     -args $Configuration, $BuildNumber, (Join-Path $PSScriptRoot "NuGet.Jobs.sln"), $SkipRestore `
     -ev +BuildErrors 
 
+Invoke-BuildStep 'Building functional test solution' { 
+        $SolutionPath = Join-Path $PSScriptRoot "tests\NuGetServicesMetadata.FunctionalTests.sln"
+        Build-Solution $Configuration $BuildNumber -MSBuildVersion "$msBuildVersion" $SolutionPath -SkipRestore:$SkipRestore `
+    } `
+    -ev +BuildErrors
+
 Invoke-BuildStep 'Signing the binaries' {
         Sign-Binaries -Configuration $Configuration -BuildNumber $BuildNumber -MSBuildVersion "15" `
     } `
@@ -135,40 +152,57 @@ Invoke-BuildStep 'Creating artifacts' {
         # We need symbols published for those, too. All other packages are deployment ones and
         # don't need to be shared, hence no need for symbols for them
         $CsprojProjects =
-            "src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj",
-            "src/Validation.Common.Job/Validation.Common.Job.csproj",
-            "src/Validation.ScanAndSign.Core/Validation.ScanAndSign.Core.csproj",
-            "src/Validation.Symbols.Core/Validation.Symbols.Core.csproj"
+            "src\NuGet.Jobs.Common\NuGet.Jobs.Common.csproj",
+            "src\Validation.Common.Job\Validation.Common.Job.csproj",
+            "src\Validation.ScanAndSign.Core\Validation.ScanAndSign.Core.csproj",
+            "src\Validation.Symbols.Core\Validation.Symbols.Core.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",
+            "src\NuGet.Protocol.Catalog\NuGet.Protocol.Catalog.csproj",
+            "src\NuGet.Services.AzureSearch\NuGet.Services.AzureSearch.csproj"
 
         $CsprojProjects | ForEach-Object {
             New-ProjectPackage (Join-Path $PSScriptRoot $_) -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -Symbols
         }
 
         $NuspecProjects = `
-            "src/Stats.CollectAzureCdnLogs/Stats.CollectAzureCdnLogs.csproj", `
-            "src/Stats.AggregateCdnDownloadsInGallery/Stats.AggregateCdnDownloadsInGallery.csproj", `
-            "src/Stats.ImportAzureCdnStatistics/Stats.ImportAzureCdnStatistics.csproj", `
-            "src/Stats.CreateAzureCdnWarehouseReports/Stats.CreateAzureCdnWarehouseReports.csproj", `
-            "src/Gallery.CredentialExpiration/Gallery.CredentialExpiration.csproj", `
-            "src/Gallery.Maintenance/Gallery.Maintenance.nuspec", `
-            "src/ArchivePackages/ArchivePackages.csproj", `
-            "src/Stats.RollUpDownloadFacts/Stats.RollUpDownloadFacts.csproj", `
-            "src/NuGet.SupportRequests.Notifications/NuGet.SupportRequests.Notifications.csproj", `
-            "src/CopyAzureContainer/CopyAzureContainer.csproj", `
-            "src/NuGet.Services.Validation.Orchestrator/Validation.Orchestrator.nuspec", `
-            "src/NuGet.Services.Validation.Orchestrator/Validation.SymbolsOrchestrator.nuspec", `
-            "src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj", `
-            "src/Stats.CollectAzureChinaCDNLogs/Stats.CollectAzureChinaCDNLogs.csproj", `
-            "src/Validation.PackageSigning.ProcessSignature/Validation.PackageSigning.ProcessSignature.csproj", `
-            "src/Validation.PackageSigning.ValidateCertificate/Validation.PackageSigning.ValidateCertificate.csproj", `
-            "src/Validation.PackageSigning.RevalidateCertificate/Validation.PackageSigning.RevalidateCertificate.csproj", `
-            "src/PackageLagMonitor/Monitoring.PackageLag.csproj", `
-            "src/StatusAggregator/StatusAggregator.csproj", `
-            "src/Validation.Symbols.Core/Validation.Symbols.Core.csproj", `
-            "src/Validation.Symbols/Validation.Symbols.Job.csproj", `
-            "src/Stats.CDNLogsSanitizer/Stats.CDNLogsSanitizer.csproj", `
-            "src/NuGet.Jobs.GitHubIndexer/NuGet.Jobs.GitHubIndexer.nuspec", `
-            "src/SplitLargeFiles/SplitLargeFiles.nuspec"
+            "src\Stats.CollectAzureCdnLogs\Stats.CollectAzureCdnLogs.csproj", `
+            "src\Stats.AggregateCdnDownloadsInGallery\Stats.AggregateCdnDownloadsInGallery.csproj", `
+            "src\Stats.ImportAzureCdnStatistics\Stats.ImportAzureCdnStatistics.csproj", `
+            "src\Stats.CreateAzureCdnWarehouseReports\Stats.CreateAzureCdnWarehouseReports.csproj", `
+            "src\Gallery.CredentialExpiration\Gallery.CredentialExpiration.csproj", `
+            "src\Gallery.Maintenance\Gallery.Maintenance.nuspec", `
+            "src\ArchivePackages\ArchivePackages.csproj", `
+            "src\Stats.RollUpDownloadFacts\Stats.RollUpDownloadFacts.csproj", `
+            "src\NuGet.SupportRequests.Notifications\NuGet.SupportRequests.Notifications.csproj", `
+            "src\CopyAzureContainer\CopyAzureContainer.csproj", `
+            "src\NuGet.Services.Validation.Orchestrator\Validation.Orchestrator.nuspec", `
+            "src\NuGet.Services.Validation.Orchestrator\Validation.SymbolsOrchestrator.nuspec", `
+            "src\NuGet.Services.Revalidate\NuGet.Services.Revalidate.csproj", `
+            "src\Stats.CollectAzureChinaCDNLogs\Stats.CollectAzureChinaCDNLogs.csproj", `
+            "src\Validation.PackageSigning.ProcessSignature\Validation.PackageSigning.ProcessSignature.csproj", `
+            "src\Validation.PackageSigning.ValidateCertificate\Validation.PackageSigning.ValidateCertificate.csproj", `
+            "src\Validation.PackageSigning.RevalidateCertificate\Validation.PackageSigning.RevalidateCertificate.csproj", `
+            "src\PackageLagMonitor\Monitoring.PackageLag.csproj", `
+            "src\StatusAggregator\StatusAggregator.csproj", `
+            "src\Validation.Symbols.Core\Validation.Symbols.Core.csproj", `
+            "src\Validation.Symbols\Validation.Symbols.Job.csproj", `
+            "src\Stats.CDNLogsSanitizer\Stats.CDNLogsSanitizer.csproj", `
+            "src\NuGet.Jobs.GitHubIndexer\NuGet.Jobs.GitHubIndexer.nuspec", `
+            "src\SplitLargeFiles\SplitLargeFiles.nuspec", `
+            "src\Ng\Catalog2Dnx.nuspec", `
+            "src\Ng\Catalog2icon.nuspec", `
+            "src\Ng\Catalog2Monitoring.nuspec", `
+            "src\Ng\Db2Catalog.nuspec", `
+            "src\Ng\Db2Monitoring.nuspec", `
+            "src\Ng\Monitoring2Monitoring.nuspec", `
+            "src\Ng\MonitoringProcessor.nuspec", `
+            "src\Ng\Ng.Operations.nuspec", `
+            "src\NuGet.Jobs.Db2AzureSearch\NuGet.Jobs.Db2AzureSearch.nuspec", `
+            "src\NuGet.Jobs.Catalog2AzureSearch\NuGet.Jobs.Catalog2AzureSearch.nuspec", `
+            "src\NuGet.Jobs.Auxiliary2AzureSearch\NuGet.Jobs.Auxiliary2AzureSearch.nuspec", `
+            "src\NuGet.Jobs.Catalog2Registration\NuGet.Jobs.Catalog2Registration.nuspec"
 
         Foreach ($Project in $NuspecProjects) {
             New-Package (Join-Path $PSScriptRoot "$Project") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "$msBuildVersion"