Merge pull request #10109 (Merge ServerCommon into NuGetGallery)

Merge ServerCommon repository into NuGetGallery

Author: joelverhagen

.gitignore

@@ -405,10 +405,6 @@ nuget.exe
 Results.*.xml
 AssemblyInfo.*.cs
 
-# common build tools
-build/
-tools/
-
 # Functional test results
 tests/functionaltests.*.xml
 *.trx

.pipelines/NuGetGallery-CI.yml

@@ -15,6 +15,10 @@ variables:
     value: none
   - name: nugetMultiFeedWarnLevel
     value: none
+  - name: CommonPackageVersion
+    value: $(CommonAssemblyVersion)-$(NuGetGalleryBranch)-$(Build.BuildId)
+  - name: CommonAssemblyVersion
+    value: 3.0.0
   - name: GalleryPackageVersion
     value: $(GalleryAssemblyVersion)-$(NuGetGalleryBranch)-$(Build.BuildId)
   - name: GalleryAssemblyVersion
@@ -50,11 +54,48 @@ extends:
     customBuildTags:
       - ES365AIMigrationTooling
     stages:
+      - stage: common
+        displayName: NuGet.Server.Common.sln
+        dependsOn: []
+        jobs:
+          - job: build_and_test
+            displayName: common build and test
+            cancelTimeoutInMinutes: 1
+            steps:
+              - checkout: self
+                fetchDepth: 1
+                clean: true
+                fetchTags: false
+                path: $(NuGetGalleryDirectory)
+              - task: PowerShell@1
+                name: build
+                displayName: Build
+                inputs:
+                  scriptName: $(NuGetGalleryPath)\build.ps1
+                  arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipArtifacts -SkipGallery -SkipJobs -CommonAssemblyVersion $(CommonAssemblyVersion) -CommonPackageVersion $(CommonPackageVersion) -GalleryAssemblyVersion $(GalleryAssemblyVersion) -GalleryPackageVersion $(GalleryPackageVersion) -JobsAssemblyVersion $(JobsAssemblyVersion) -JobsPackageVersion $(JobsPackageVersion) -Branch $(NuGetGalleryBranch) -CommitSHA $(Build.SourceVersion)
+                  workingFolder: $(NuGetGalleryPath)
+              - task: PowerShell@1
+                name: test
+                displayName: Run tests
+                inputs:
+                  scriptName: $(NuGetGalleryPath)\test.ps1
+                  arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipGallery -SkipJobs
+                  workingFolder: $(NuGetGalleryPath)
+              - task: PublishTestResults@2
+                name: publish_test_results
+                displayName: Publish test results
+                condition: succeededOrFailed()
+                inputs:
+                  testRunner: VSTest
+                  testResultsFiles: $(NuGetGalleryPath)\Results.*.xml
+                  failTaskOnFailedTests: true
+
       - stage: gallery
+        displayName: NuGetGallery.sln
         dependsOn: []
         jobs:
           - job: build_and_test
-            displayName: NuGetGallery.sln - build and test
+            displayName: gallery build and test
             cancelTimeoutInMinutes: 1
             steps:
               - checkout: self
@@ -67,14 +108,14 @@ extends:
                 displayName: Build
                 inputs:
                   scriptName: $(NuGetGalleryPath)\build.ps1
-                  arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipJobs -GalleryAssemblyVersion $(GalleryAssemblyVersion) -GalleryPackageVersion $(GalleryPackageVersion) -JobsAssemblyVersion $(JobsAssemblyVersion) -JobsPackageVersion $(JobsPackageVersion) -Branch $(NuGetGalleryBranch) -CommitSHA $(Build.SourceVersion)
+                  arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipArtifacts -SkipCommon -SkipJobs -CommonAssemblyVersion $(CommonAssemblyVersion) -CommonPackageVersion $(CommonPackageVersion) -GalleryAssemblyVersion $(GalleryAssemblyVersion) -GalleryPackageVersion $(GalleryPackageVersion) -JobsAssemblyVersion $(JobsAssemblyVersion) -JobsPackageVersion $(JobsPackageVersion) -Branch $(NuGetGalleryBranch) -CommitSHA $(Build.SourceVersion)
                   workingFolder: $(NuGetGalleryPath)
               - task: PowerShell@1
                 name: test
                 displayName: Run tests
                 inputs:
                   scriptName: $(NuGetGalleryPath)\test.ps1
-                  arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipJobs
+                  arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipCommon -SkipJobs
                   workingFolder: $(NuGetGalleryPath)
               - task: PublishTestResults@2
                 name: publish_test_results
@@ -86,10 +127,11 @@ extends:
                   failTaskOnFailedTests: true
 
       - stage: jobs
+        displayName: NuGet.Jobs.sln
         dependsOn: []
         jobs:
           - job: build_and_test
-            displayName: NuGet.Jobs.sln - build and test
+            displayName: jobs build and test
             cancelTimeoutInMinutes: 1
             steps:
               - checkout: self
@@ -102,14 +144,14 @@ extends:
                 displayName: Build
                 inputs:
                   scriptName: $(NuGetGalleryPath)\build.ps1
-                  arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipGallery -GalleryAssemblyVersion $(GalleryAssemblyVersion) -GalleryPackageVersion $(GalleryPackageVersion) -JobsAssemblyVersion $(JobsAssemblyVersion) -JobsPackageVersion $(JobsPackageVersion) -Branch $(NuGetGalleryBranch) -CommitSHA $(Build.SourceVersion)
+                  arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipArtifacts -SkipCommon -SkipGallery -CommonAssemblyVersion $(CommonAssemblyVersion) -CommonPackageVersion $(CommonPackageVersion) -GalleryAssemblyVersion $(GalleryAssemblyVersion) -GalleryPackageVersion $(GalleryPackageVersion) -JobsAssemblyVersion $(JobsAssemblyVersion) -JobsPackageVersion $(JobsPackageVersion) -Branch $(NuGetGalleryBranch) -CommitSHA $(Build.SourceVersion)
                   workingFolder: $(NuGetGalleryPath)
               - task: PowerShell@1
                 name: test
                 displayName: Run tests
                 inputs:
                   scriptName: $(NuGetGalleryPath)\test.ps1
-                  arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipGallery
+                  arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipCommon -SkipGallery
                   workingFolder: $(NuGetGalleryPath)
               - task: PublishTestResults@2
                 name: publish_test_results
@@ -119,3 +161,24 @@ extends:
                   testRunner: VSTest
                   testResultsFiles: $(NuGetGalleryPath)\Results.*.xml
                   failTaskOnFailedTests: true
+
+      - stage: artifacts
+        displayName: Artifacts
+        dependsOn: []
+        jobs:
+          - job: build_artifacts
+            displayName: build
+            cancelTimeoutInMinutes: 1
+            steps:
+              - checkout: self
+                fetchDepth: 1
+                clean: true
+                fetchTags: false
+                path: $(NuGetGalleryDirectory)
+              - task: PowerShell@1
+                name: build_artifacts
+                displayName: Build
+                inputs:
+                  scriptName: $(NuGetGalleryPath)\build.ps1
+                  arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -CommonAssemblyVersion $(CommonAssemblyVersion) -CommonPackageVersion $(CommonPackageVersion) -GalleryAssemblyVersion $(GalleryAssemblyVersion) -GalleryPackageVersion $(GalleryPackageVersion) -JobsAssemblyVersion $(JobsAssemblyVersion) -JobsPackageVersion $(JobsPackageVersion) -Branch $(NuGetGalleryBranch) -CommitSHA $(Build.SourceVersion)
+                  workingFolder: $(NuGetGalleryPath)

.pipelines/Release-trigger.yml

@@ -12,11 +12,13 @@ parameters:
 - name: TargetPipelines
   type: object
   default:
-  - id: 21120
+  - id: 21120 # gallery web app
     paramName: NuGetGallerySubmoduleBranch
-  - id: 21280
-    paramName: NuGetGalleryBranch
-  - id: 21128
+  - id: 21280 # gallery packages
+    paramName: Branch
+  - id: 21128 # jobs
+    paramName: Branch
+  - id: 21269 # common
     paramName: Branch
 
 variables:

CredScanSuppressions.json

@@ -12,6 +12,10 @@
         {
             "file": "tests/NuGetGallery.Facts/Framework/Fakes.cs",
             "_justification": "Test file containing fake credentials"
+        },
+        {
+            "file": "tests/NuGet.Services.KeyVault.Tests/KeyVaultReaderFormatterFacts.cs",
+            "_justification": "Test file containing fake credentials"
         }
     ]
 }

Directory.Packages.props

@@ -4,7 +4,6 @@
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
     <EnablePackageVersionOverride>true</EnablePackageVersionOverride>
     <NuGetClientPackageVersion>6.9.1</NuGetClientPackageVersion>
-    <ServerCommonPackageVersion>2.123.0</ServerCommonPackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="4.4.0" />
@@ -14,9 +13,13 @@
     <PackageVersion Include="Autofac.WebApi2" Version="4.1.0" />
     <PackageVersion Include="Autofac" Version="4.9.1" />
     <PackageVersion Include="Azure.Core" Version="1.40.0" />
+    <PackageVersion Include="Azure.Data.Tables" Version="12.8.3" />
     <PackageVersion Include="Azure.Identity" Version="1.12.0" />
+    <PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.16.1" />
     <PackageVersion Include="Azure.Search.Documents" Version="11.4.0-beta.6" />
+    <PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.4.0" />
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.20.0" />
+    <PackageVersion Include="Azure.Storage.Queues" Version="12.18.0" />
     <PackageVersion Include="CommonMark.NET" Version="0.15.1" />
     <PackageVersion Include="CsvHelper" Version="7.1.1" />
     <PackageVersion Include="d3" Version="5.4.0" />
@@ -29,6 +32,7 @@
     <PackageVersion Include="LibGit2Sharp" Version="0.26.0" />
     <PackageVersion Include="Lucene.Net.Contrib" Version="3.0.3" />
     <PackageVersion Include="Lucene.Net" Version="3.0.3" />
+    <PackageVersion Include="Markdig.Signed" Version="0.30.2" />
     <PackageVersion Include="MicroBuild.Core" Version="0.3.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights.TraceListener" Version="2.21.0" />
@@ -59,8 +63,12 @@
     <PackageVersion Include="Microsoft.Data.Services.Client" Version="5.8.4" />
     <PackageVersion Include="Microsoft.Data.Services" Version="5.8.4" />
     <PackageVersion Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="2.2.0" />
@@ -69,6 +77,7 @@
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.Identity.Client" Version="4.61.3" />
     <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.3.1" />
     <PackageVersion Include="Microsoft.Net.Http" Version="2.2.29" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
@@ -80,6 +89,7 @@
     <PackageVersion Include="Microsoft.Owin" Version="4.2.2" />
     <PackageVersion Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.8.24" />
     <PackageVersion Include="Microsoft.Web.Infrastructure" Version="1.0.0" />
     <PackageVersion Include="Microsoft.Web.Xdt" Version="3.1.0" />
     <PackageVersion Include="Microsoft.WindowsAzure.ConfigurationManager" Version="3.2.3" />
@@ -96,23 +106,6 @@
     <PackageVersion Include="NuGet.Packaging" Version="$(NuGetClientPackageVersion)" />
     <PackageVersion Include="NuGet.Protocol" Version="$(NuGetClientPackageVersion)" />
     <PackageVersion Include="NuGet.Resolver" Version="$(NuGetClientPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Configuration" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Cursor" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.FeatureFlags" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Incidents" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.KeyVault" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Licenses" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Logging" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Messaging.Email" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Owin" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.ServiceBus" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Sql" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Status.Table" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Status" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Storage" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Testing.Entities" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Validation.Issues" Version="$(ServerCommonPackageVersion)" />
-    <PackageVersion Include="NuGet.Services.Validation" Version="$(ServerCommonPackageVersion)" />
     <PackageVersion Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer" Version="1.2.0" />
     <PackageVersion Include="NuGet.StrongName.DynamicData.EFCodeFirstProvider" Version="0.3.0" />
     <PackageVersion Include="NuGet.StrongName.elmah.sqlserver" Version="1.2.2" />
@@ -126,15 +119,21 @@
     <PackageVersion Include="NuGet.Versioning" Version="$(NuGetClientPackageVersion)" />
     <PackageVersion Include="Owin" Version="1.0.0" />
     <PackageVersion Include="RouteMagic" Version="1.1.3" />
+    <PackageVersion Include="Serilog.Enrichers.Environment" Version="2.1.3" />
+    <PackageVersion Include="Serilog.Enrichers.Process" Version="2.0.1" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="3.0.1" />
+    <PackageVersion Include="Serilog.Sinks.ApplicationInsights" Version="3.0.4" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageVersion Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageVersion Include="SerilogTraceListener" Version="3.2.0" />
     <PackageVersion Include="SharpZipLib" Version="1.3.3" />
     <PackageVersion Include="Strathweb.CacheOutput.WebApi2.StrongName" Version="0.9.0" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageVersion Include="System.ComponentModel.EventBasedAsync" Version="4.0.11" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageVersion Include="System.Diagnostics.Debug" Version="4.3.0" />
-    <PackageVersion Include="System.Formats.Asn1" Version="6.0.1" />
     <PackageVersion Include="System.Drawing.Common" Version="4.7.2" />
+    <PackageVersion Include="System.Formats.Asn1" Version="6.0.1" />
     <PackageVersion Include="System.Linq.Expressions" Version="4.3.0" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Reflection.Metadata" Version="1.7.0-preview1-26717-04" />