microsoft
/
BuildXL
зеркало из https://github.com/microsoft/BuildXL.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merged PR 612011: Upgrade ADO packages 

Doing this while ignoring the new dependency `DotNetFxRefAssemblies.Corext`, which they added to add the `netstandard.dll` references we add during runtime.
This commit is contained in:
Juan Carlos Guzman Islas 2021-05-06 16:13:11 +00:00
Родитель a8410ec4f4
Коммит 24bb7c1551
4 изменённых файлов: 43 добавлений и 30 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

21
Public/Src/Tools/SymbolDaemon/ReloadingSymbolClient.cs
Просмотреть файл

@ -87,11 +87,16 @@ namespace Tool.ServicePipDaemon
}
/// <inheritdoc />
public Task<IEnumerable<Request>> GetAllRequestsAsync(CancellationToken cancellationToken, SizeOptions sizeOptions = null, ExpirationDateOptions expirationDateOptions = null, IDomainId domainIdOption = null)
public Task<IEnumerable<Request>> GetAllRequestsAsync(CancellationToken cancellationToken,
SizeOptions sizeOptions = null,
ExpirationDateOptions expirationDateOptions = null,
IDomainId domainIdOption = null,
RetrievalOptions retrievalOptions = RetrievalOptions.ExcludeSoftDeleted,
RequestStatus? requestStatus = null)
{
return RetryAsync(
nameof(ISymbolServiceClient.GetAllRequestsAsync),
(client, ct) => client.GetAllRequestsAsync(ct, sizeOptions, expirationDateOptions, domainIdOption),
(client, ct) => client.GetAllRequestsAsync(ct, sizeOptions, expirationDateOptions, domainIdOption, retrievalOptions, requestStatus),
cancellationToken);
}
@ -155,11 +160,19 @@ namespace Tool.ServicePipDaemon
}
/// <inheritdoc />
public Task<IEnumerable<Request>> GetRequestPaginatedAsync(string continueFromRequestId, int pageSize, CancellationToken cancellationToken, SizeOptions sizeOptions = null, ExpirationDateOptions expirationDateOptions = null, IDomainId domainIdOption = null)
public Task<IEnumerable<Request>> GetRequestPaginatedAsync(
String continueFromRequestId,
int pageSize,
CancellationToken cancellationToken,
SizeOptions sizeOptions = null,
ExpirationDateOptions expirationDateOptions = null,
IDomainId domainIdOption = null,
RetrievalOptions retrievalOptions = RetrievalOptions.ExcludeSoftDeleted,
RequestStatus? requestStatus = null)
{
return RetryAsync(
nameof(ISymbolServiceClient.GetRequestPaginatedAsync),
(client, ct) => client.GetRequestPaginatedAsync(continueFromRequestId, pageSize, ct, sizeOptions, expirationDateOptions, domainIdOption),
(client, ct) => client.GetRequestPaginatedAsync(continueFromRequestId, pageSize, ct, sizeOptions, expirationDateOptions, domainIdOption, retrievalOptions, requestStatus),
cancellationToken);
}

4
Shared/Scripts/UpdateAdoPackages.ps1
Просмотреть файл

@ -3,7 +3,7 @@
$destination = 'https://pkgs.dev.azure.com/cloudbuild/_packaging/BuildXL.Selfhost/nuget/v3/index.json'
$source = 'https://pkgs.dev.azure.com/mseng/_packaging/VSOnline-Internal/nuget/v3/index.json'
$adoVersion = '16.186.0-internal202104121'
$adoVersion = '16.187.0-internal202105042'
$adoPackages = @(
'Microsoft.VisualStudio.Services.Client'
'Microsoft.VisualStudio.Services.InteractiveClient'
@ -18,7 +18,7 @@ $adoPackages = @(
'Microsoft.VisualStudio.Services.ServiceEndpoints.WebApi'
)
$artifactVersion = '18.186.31212-buildid14906928'
$artifactVersion = '18.187.31304-buildid15127069'
$artifactPackages = @(
'Microsoft.VisualStudio.Services.ArtifactServices.Shared'
'Microsoft.VisualStudio.Services.BlobStore.Client'

24
cg/nuget/cgmanifest.json
Просмотреть файл

@ -33,7 +33,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "ArtifactServices.App.Shared",
"Version": "18.186.31212-buildid14906928"
"Version": "18.187.31304-buildid15127069"
}
}
},
@ -42,7 +42,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "ArtifactServices.App.Shared.Cache",
"Version": "18.186.31212-buildid14906928"
"Version": "18.187.31304-buildid15127069"
}
}
},
@ -213,7 +213,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Drop.App.Core",
"Version": "18.186.31212-buildid14906928"
"Version": "18.187.31304-buildid15127069"
}
}
},
@ -222,7 +222,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Drop.Client",
"Version": "18.186.31212-buildid14906928"
"Version": "18.187.31304-buildid15127069"
}
}
},
@ -384,7 +384,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "ItemStore.Shared",
"Version": "18.186.31212-buildid14906928"
"Version": "18.187.31304-buildid15127069"
}
}
},
@ -1932,7 +1932,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.ArtifactServices.Shared",
"Version": "18.186.31212-buildid14906928"
"Version": "18.187.31304-buildid15127069"
}
}
},
@ -1941,7 +1941,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.BlobStore.Client",
"Version": "18.186.31212-buildid14906928"
"Version": "18.187.31304-buildid15127069"
}
}
},
@ -1950,7 +1950,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.BlobStore.Client.Cache",
"Version": "18.186.31212-buildid14906928"
"Version": "18.187.31304-buildid15127069"
}
}
},
@ -1959,7 +1959,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.Client",
"Version": "16.186.0-internal202104121"
"Version": "16.187.0-internal202105042"
}
}
},
@ -1968,7 +1968,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.InteractiveClient",
"Version": "16.186.0-internal202104121"
"Version": "16.187.0-internal202105042"
}
}
},
@ -2499,7 +2499,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Symbol.App.Core",
"Version": "18.186.31212-buildid14906928"
"Version": "18.187.31304-buildid15127069"
}
}
},
@ -2508,7 +2508,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Symbol.Client",
"Version": "18.186.31212-buildid14906928"
"Version": "18.187.31304-buildid15127069"
}
}
},

24
config.microsoftInternal.dsc
Просмотреть файл

@ -3,8 +3,8 @@
const isMicrosoftInternal = Environment.getFlag("[Sdk.BuildXL]microsoftInternal");
const artifactNugetVersion = "18.186.31212-buildid14906928";
const azureDevopsNugetVersion = "16.186.0-internal202104121";
const artifactNugetVersion = "18.187.31304-buildid15127069";
const azureDevopsNugetVersion = "16.187.0-internal202105042";
// These packages are Microsoft internal packages.
// These consist of internally repackaged products that we can't push to a public feed and have to rely on users installing locally.
@ -26,8 +26,8 @@ export const pkgs = isMicrosoftInternal ? [
{ id: "WindowsSdk.Corext", version: "10.0.16299.1", alias: "Windows.Sdk", osSkip: [ "macOS", "unix" ] },
// Artifact packages and dependencies
{ id: "Microsoft.VisualStudio.Services.ArtifactServices.Shared", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "Microsoft.Azure.Cosmos.Table", "Microsoft.Azure.Storage.Blob", "BuildXL.Utilities"] },
{ id: "Microsoft.VisualStudio.Services.BlobStore.Client", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces"] },
{ id: "Microsoft.VisualStudio.Services.ArtifactServices.Shared", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "Microsoft.Azure.Cosmos.Table", "Microsoft.Azure.Storage.Blob", "BuildXL.Utilities", "DotNetFxRefAssemblies.Corext" ] },
{ id: "Microsoft.VisualStudio.Services.BlobStore.Client", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "DotNetFxRefAssemblies.Corext"] },
{ id: "Microsoft.VisualStudio.Services.Client", version: azureDevopsNugetVersion, dependentPackageIdsToSkip: [ "Microsoft.Net.Http", "Microsoft.AspNet.WebApi.Client", "System.Security.Cryptography.OpenSsl", "System.Security.Principal.Windows" ] },
{ id: "Microsoft.VisualStudio.Services.InteractiveClient", version: azureDevopsNugetVersion, dependentPackageIdsToSkip: [ "Ben.Demystifier" ], dependentPackageIdsToIgnore: [ "Ben.Demystifier" ] },
{ id: "Microsoft.Azure.Storage.Common", version:"11.2.2" },
@ -37,15 +37,15 @@ export const pkgs = isMicrosoftInternal ? [
// DropDaemon Artifact dependencies.
// Here, even though the packages depend on Cache bits other than Hashing, we make sure that the codepaths that actually depend on them are never activated. This is to ensure that there is no cyclic dependency between BXL and AzureDevOps.
// This is further enforced by not including Cache bits in DropDaemon, other than BuildXL.Cache.Hashing.
{ id: "ArtifactServices.App.Shared", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing"] },
{ id: "ArtifactServices.App.Shared.Cache", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.Utilities"] },
{ id: "Drop.App.Core", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.Utilities"] },
{ id: "Drop.Client", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing"] },
{ id: "ItemStore.Shared", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing"] },
{ id: "Microsoft.VisualStudio.Services.BlobStore.Client.Cache", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.Utilities"] },
{ id: "ArtifactServices.App.Shared", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "DotNetFxRefAssemblies.Corext"] },
{ id: "ArtifactServices.App.Shared.Cache", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.Utilities", "DotNetFxRefAssemblies.Corext"] },
{ id: "Drop.App.Core", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.Utilities", "DotNetFxRefAssemblies.Corext"] },
{ id: "Drop.Client", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "DotNetFxRefAssemblies.Corext"] },
{ id: "ItemStore.Shared", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "DotNetFxRefAssemblies.Corext"] },
{ id: "Microsoft.VisualStudio.Services.BlobStore.Client.Cache", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.Utilities", "DotNetFxRefAssemblies.Corext"] },
{ id: "Microsoft.Windows.Debuggers.SymstoreInterop", version: "1.0.1" },
{ id: "Symbol.App.Core", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.Utilities"] },
{ id: "Symbol.Client", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing"] },
{ id: "Symbol.App.Core", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.Utilities", "DotNetFxRefAssemblies.Corext"] },
{ id: "Symbol.Client", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "DotNetFxRefAssemblies.Corext"] },
{ id: "TransientFaultHandling.Core", version: "5.1.1209.1" },
// CloudTest internal dependencies