Skip to content

Commit

Permalink
Merge pull request #10091 (Merge NuGet.Jobs int NuGetGallery)
Browse files Browse the repository at this point in the history
  • Loading branch information
joelverhagen authored Jul 30, 2024
2 parents 666ab64 + 6bb2527 commit d55ed52
Show file tree
Hide file tree
Showing 2,104 changed files with 204,247 additions and 33 deletions.
95 changes: 95 additions & 0 deletions .pipelines/NuGet.Jobs-CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
name: NuGet.Jobs CI $(BuildId)

trigger:
branches:
include:
- '*'
batch: True

variables:
- name: Assemblies
value: ''
- name: BuildConfiguration
value: Release
- name: Codeql.Enabled
value: true
- name: NUGET_SNK_PATH_DISABLED
value: $(NuGetJobsPath)\build\private\Signing\keys\35MSSharedLib1024.snk
- name: nugetMultiFeedWarnLevel
value: none
- name: NugetSecurityAnalysisWarningLevel
value: none
- name: GalleryPackageVersion
value: $(GalleryAssemblyVersion)-$(NuGetJobsBranch)-$(Build.BuildId)
- name: GalleryAssemblyVersion
value: 4.4.5
- name: JobsPackageVersion
value: $(JobsAssemblyVersion)-$(NuGetJobsBranch)-$(Build.BuildId)
- name: JobsAssemblyVersion
value: 4.3.0
- name: UsePrivateRepo
value: false
- name: PrivateRepoBranch
value: main
- name: NuGetJobsDirectory
value: nj
- name: NuGetJobsPath
value: $(Agent.BuildDirectory)\$(NuGetJobsDirectory)
- name: ArtifactsFolder
value: $(NuGetJobsPath)\artifacts
- name: NuGetJobsBranch
value: $(Build.SourceBranchName)

resources:
repositories:
- repository: self
type: git
ref: refs/heads/main
- repository: 1ESPipelineTemplates
type: git
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release

extends:
template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
parameters:
pool:
name: NuGet-1ES-Hosted-Pool
image: NuGet-1ESPT-Win2022
os: windows
customBuildTags:
- ES365AIMigrationTooling
stages:
- stage: stage
jobs:
- job: Phase_1
displayName: Phase 1
cancelTimeoutInMinutes: 1
steps:
- checkout: self
fetchDepth: 1
clean: true
fetchTags: false
path: $(NuGetJobsDirectory)
- task: PowerShell@1
name: PowerShell_1
displayName: Build
inputs:
scriptName: $(NuGetJobsPath)\build.ps1
arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipGallery -GalleryAssemblyVersion $(GalleryAssemblyVersion) -GalleryPackageVersion $(GalleryPackageVersion) -JobsAssemblyVersion $(JobsAssemblyVersion) -JobsPackageVersion $(JobsPackageVersion) -Branch $(NuGetJobsBranch) -CommitSHA $(Build.SourceVersion)
workingFolder: $(NuGetJobsPath)
- task: PowerShell@1
name: PowerShell_2
displayName: Run unit tests
inputs:
scriptName: $(NuGetJobsPath)\test.ps1
arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipGallery
workingFolder: $(NuGetJobsPath)
- task: PublishTestResults@2
name: PublishTestResults_3
displayName: Publish Test Results Results.*.xml
condition: succeededOrFailed()
inputs:
testRunner: VSTest
testResultsFiles: $(NuGetJobsPath)\Results.*.xml
failTaskOnFailedTests: true
8 changes: 6 additions & 2 deletions .pipelines/NuGetGallery-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ variables:
value: $(GalleryAssemblyVersion)-$(NuGetGalleryBranch)-$(Build.BuildId)
- name: GalleryAssemblyVersion
value: 4.4.5
- name: JobsPackageVersion
value: $(JobsAssemblyVersion)-$(GalleryPackageVersion)-$(Build.BuildId)
- name: JobsAssemblyVersion
value: 4.3.0
- name: nugetMultiFeedWarnLevel
value: none
- name: NuGetGalleryDirectory
Expand Down Expand Up @@ -66,14 +70,14 @@ extends:
displayName: Build
inputs:
scriptName: $(NuGetGalleryPath)\build.ps1
arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -GalleryAssemblyVersion $(GalleryAssemblyVersion) -GalleryPackageVersion $(GalleryPackageVersion) -Branch $(NuGetGalleryBranch) -CommitSHA $(Build.SourceVersion)
arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipJobs -GalleryAssemblyVersion $(GalleryAssemblyVersion) -GalleryPackageVersion $(GalleryPackageVersion) -JobsAssemblyVersion $(JobsAssemblyVersion) -JobsPackageVersion $(JobsPackageVersion) -Branch $(NuGetGalleryBranch) -CommitSHA $(Build.SourceVersion)
workingFolder: $(NuGetGalleryPath)
- task: PowerShell@1
name: PowerShell_2
displayName: Run unit tests
inputs:
scriptName: $(NuGetGalleryPath)\test.ps1
arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId)
arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SkipJobs
workingFolder: $(NuGetGalleryPath)
- task: PublishTestResults@2
name: PublishTestResults_3
Expand Down
2 changes: 2 additions & 0 deletions .pipelines/Release-trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ parameters:
paramName: NuGetGallerySubmoduleBranch
- id: 21280
paramName: NuGetGalleryBranch
- id: 21128
paramName: Branch

variables:
- name: NugetMultifeedWarnLevel
Expand Down
42 changes: 39 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<EnablePackageVersionOverride>true</EnablePackageVersionOverride>
<NuGetClientPackageVersion>6.9.1</NuGetClientPackageVersion>
<ServerCommonPackageVersion>2.120.0</ServerCommonPackageVersion>
<NuGetJobsPackageVersion>4.3.0-agr-gal-stsdk-9768098</NuGetJobsPackageVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="4.4.0" />
Expand All @@ -16,16 +15,22 @@
<PackageVersion Include="Autofac" Version="4.9.1" />
<PackageVersion Include="Azure.Core" Version="1.40.0" />
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
<PackageVersion Include="Azure.Search.Documents" Version="11.4.0-beta.6" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.20.0" />
<PackageVersion Include="CommonMark.NET" Version="0.15.1" />
<PackageVersion Include="CsvHelper" Version="7.1.1" />
<PackageVersion Include="d3" Version="5.4.0" />
<PackageVersion Include="Dapper.StrongName" Version="1.50.2" />
<PackageVersion Include="dotNetRDF" Version="1.0.8.3533" />
<PackageVersion Include="EntityFramework" Version="6.4.4" />
<PackageVersion Include="FluentAssertions" Version="5.5.0" />
<PackageVersion Include="FluentLinkChecker" Version="1.0.0.10" />
<PackageVersion Include="Knapcode.MiniZip" Version="0.20.0" />
<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="MicroBuild.Core" Version="0.3.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.TraceListener" Version="2.21.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.Web" Version="2.21.0" />
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
Expand All @@ -45,25 +50,35 @@
<PackageVersion Include="Microsoft.AspNet.WebPages" Version="3.2.3" />
<PackageVersion Include="Microsoft.AspNetCore.Cryptography.Internal" Version="1.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="1.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageVersion Include="Microsoft.Azure.Kusto.Data" Version="12.2.3" />
<PackageVersion Include="Microsoft.Azure.Storage.DataMovement" Version="0.9.0" />
<PackageVersion Include="Microsoft.Bcl.Compression" Version="3.9.85" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
<PackageVersion Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="3.6.0" />
<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.Binder" Version="2.2.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="2.2.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" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="2.2.0" />
<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.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" />
<PackageVersion Include="Microsoft.Owin.Host.SystemWeb" Version="4.2.2" />
<PackageVersion Include="Microsoft.Owin.Security.Cookies" Version="4.2.2" />
<PackageVersion Include="Microsoft.Owin.Security.MicrosoftAccount" Version="4.2.2" />
<PackageVersion Include="Microsoft.Owin.Security.OpenIdConnect" Version="4.2.2" />
<PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" />
<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.Web.Infrastructure" Version="1.0.0" />
<PackageVersion Include="Microsoft.Web.Xdt" Version="3.1.0" />
Expand All @@ -73,45 +88,66 @@
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="MvcTreeView" Version="1.4.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NuGet.CommandLine" Version="$(NuGetClientPackageVersion)" />
<PackageVersion Include="NuGet.Commands" Version="$(NuGetClientPackageVersion)" />
<PackageVersion Include="NuGet.Core" Version="2.8.6" />
<PackageVersion Include="NuGet.Frameworks" Version="$(NuGetClientPackageVersion)" />
<PackageVersion Include="NuGet.Jobs.Common" Version="$(NuGetJobsPackageVersion)" />
<PackageVersion Include="NuGet.PackageManagement" Version="$(NuGetClientPackageVersion)" />
<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.Validation.Common.Job" Version="$(NuGetJobsPackageVersion)" />
<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" />
<PackageVersion Include="NuGet.StrongName.elmah" Version="1.2.2" />
<PackageVersion Include="NuGet.StrongName.json-ld.net" Version="1.0.6" />
<PackageVersion Include="NuGet.StrongName.Octokit" Version="0.32.0" />
<PackageVersion Include="NuGet.StrongName.QueryInterceptor" Version="0.1.4237.2400" />
<PackageVersion Include="NuGet.StrongName.WebActivator" Version="1.4.4" />
<PackageVersion Include="NuGet.StrongName.WebBackgrounder.EntityFramework" Version="0.1.0" />
<PackageVersion Include="NuGet.StrongName.WebBackgrounder" Version="0.2.0" />
<PackageVersion Include="NuGet.Versioning" Version="$(NuGetClientPackageVersion)" />
<PackageVersion Include="Owin" Version="1.0.0" />
<PackageVersion Include="RouteMagic" Version="1.1.3" />
<PackageVersion Include="Serilog.Sinks.File" Version="4.0.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.Drawing.Common" Version="4.7.2" />
<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" />
<PackageVersion Include="System.Runtime" Version="4.3.1" />
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
<PackageVersion Include="Test.Utility" Version="6.4.2-rc.25" />
<PackageVersion Include="UAParser" Version="3.1.44" />
<PackageVersion Include="WebActivatorEx" Version="2.0.6" />
<PackageVersion Include="WebGrease" Version="1.6.0" />
<PackageVersion Include="WindowsAzure.Caching" Version="1.7.0" />
<PackageVersion Include="WindowsAzure.Storage" Version="9.3.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="xunit" Version="2.9.0" />
</ItemGroup>
Expand Down
31 changes: 31 additions & 0 deletions NuGet.Jobs.FunctionalTests.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.10.35027.167
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicSearchTests.FunctionalTests.Core", "tests\BasicSearchTests.FunctionalTests.Core\BasicSearchTests.FunctionalTests.Core.csproj", "{9C9B809A-A205-4288-8CCE-3EC8F42E5184}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Services.AzureSearch.FunctionalTests", "tests\NuGet.Services.AzureSearch.FunctionalTests\NuGet.Services.AzureSearch.FunctionalTests.csproj", "{32E258FC-ADE1-4C2D-B30A-B2359958D233}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9C9B809A-A205-4288-8CCE-3EC8F42E5184}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9C9B809A-A205-4288-8CCE-3EC8F42E5184}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9C9B809A-A205-4288-8CCE-3EC8F42E5184}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9C9B809A-A205-4288-8CCE-3EC8F42E5184}.Release|Any CPU.Build.0 = Release|Any CPU
{32E258FC-ADE1-4C2D-B30A-B2359958D233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{32E258FC-ADE1-4C2D-B30A-B2359958D233}.Debug|Any CPU.Build.0 = Debug|Any CPU
{32E258FC-ADE1-4C2D-B30A-B2359958D233}.Release|Any CPU.ActiveCfg = Release|Any CPU
{32E258FC-ADE1-4C2D-B30A-B2359958D233}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C32FA5BC-0AC5-4AE4-938B-66CC1B9AE8CA}
EndGlobalSection
EndGlobal
Loading

0 comments on commit d55ed52

Please sign in to comment.