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

Merged PR 528325: Update AzDevOps packages and fix breaking changes 

Update AzDevOps packages and fix breaking changes
This commit is contained in:
Juan Carlos Guzman Islas 2020-01-10 23:30:38 +00:00
Родитель bb6bec6f34
Коммит 2fda7beff3
18 изменённых файлов: 50 добавлений и 123 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

26
Private/InternalSdk/Drop/Drop.RemotableClient.Interfaces.dsc
Просмотреть файл

@ -1,26 +0,0 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
import {Transformer} from "Sdk.Transformers";
import * as Managed from "Sdk.Managed";
// This is an empty facade for a Microsoft internal package.
namespace Contents {
export declare const qualifier: {
};
@@public
export const all: StaticDirectory = Transformer.sealPartialDirectory(d`.`, []);
}
@@public
export const pkg: Managed.ManagedNugetPackage =
Managed.Factory.createNugetPackage(
"Drop.RemotableClient.Interfaces",
"0.0.0",
Contents.all,
[],
[],
[]
);

26
Private/InternalSdk/Drop/Drop.RemotableClient.dsc
Просмотреть файл

@ -1,26 +0,0 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
import {Transformer} from "Sdk.Transformers";
import * as Managed from "Sdk.Managed";
// This is an empty facade for a Microsoft internal package.
namespace Contents {
export declare const qualifier: {
};
@@public
export const all: StaticDirectory = Transformer.sealPartialDirectory(d`.`, []);
}
@@public
export const pkg: Managed.ManagedNugetPackage =
Managed.Factory.createNugetPackage(
"Drop.RemotableClient",
"0.0.0",
Contents.all,
[],
[],
[]
);

12
Private/InternalSdk/Drop/module.config.dsc
Просмотреть файл

@ -25,18 +25,6 @@ module({
projects: [f`Drop.Client.dsc`]
});
module({
name: "Drop.RemotableClient",
nameResolutionSemantics: NameResolutionSemantics.implicitProjectReferences,
projects: [f`Drop.RemotableClient.dsc`]
});
module({
name: "Drop.RemotableClient.Interfaces",
nameResolutionSemantics: NameResolutionSemantics.implicitProjectReferences,
projects: [f`Drop.RemotableClient.Interfaces.dsc`]
});
module({
name: "ItemStore.Shared",
nameResolutionSemantics: NameResolutionSemantics.implicitProjectReferences,

2
Public/Src/Cache/ContentStore/Vsts/BlobReadOnlyContentSession.cs
Просмотреть файл

@ -434,7 +434,7 @@ namespace BuildXL.Cache.ContentStore.Vsts
var offsetStream = await GetStreamInternalAsync(
context,
contentHash,
_parallelSegmentDownloadConfig.SegmentSizeInBytes).ConfigureAwait(false);
(int?)_parallelSegmentDownloadConfig.SegmentSizeInBytes).ConfigureAwait(false);
offsetStream.Position = offset;
return offsetStream;
},

4
Public/Src/Cache/ContentStore/Vsts/BuildXL.Cache.ContentStore.Vsts.dsc
Просмотреть файл

@ -18,9 +18,7 @@ namespace Vsts {
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("WindowsAzure.Storage").pkg,
...addIf(BuildXLSdk.isDotNetCoreBuild,
importFrom("Microsoft.IdentityModel.Clients.ActiveDirectory").pkg
),
importFrom("Microsoft.IdentityModel.Clients.ActiveDirectory").pkg,
importFrom("Microsoft.VisualStudio.Services.BlobStore.Client").pkg,
importFrom("Microsoft.VisualStudio.Services.Client").pkg,
importFrom("Microsoft.VisualStudio.Services.InteractiveClient").pkg,

1
Public/Src/Cache/ContentStore/Vsts/DedupContentSession.cs
Просмотреть файл

@ -49,7 +49,6 @@ namespace BuildXL.Cache.ContentStore.Vsts
{
_artifactFileSystem = VstsFileSystem.Instance;
_uploadSession = DedupStoreClient.CreateUploadSession(
DedupStoreClient,
new KeepUntilBlobReference(EndDateTime),
new AppTraceSourceContextAdapter(context, "CreateUploadSession", SourceLevels.All),
_artifactFileSystem);

4
Public/Src/Cache/ContentStore/Vsts/VssCredentialsFactory.cs
Просмотреть файл

@ -6,9 +6,7 @@ using System.Diagnostics.CodeAnalysis;
using System.Security;
using System.Threading.Tasks;
using JetBrains.Annotations;
#if NET_CORE
using Microsoft.IdentityModel.Clients.ActiveDirectory;
#endif
using Microsoft.VisualStudio.Services.Client;
using Microsoft.VisualStudio.Services.Common;
#if PLATFORM_WIN
@ -139,7 +137,7 @@ namespace BuildXL.Cache.ContentStore.Vsts
return CreateVssCredentialsForUserName(baseUri);
}
#endif // NET_CORE
return await _helper.GetCredentialsAsync(baseUri, useAad, _credentialBytes, null)
return await _helper.GetCredentialsAsync(baseUri, useAad, _credentialBytes, _pat, PromptBehavior.Never, null)
.ConfigureAwait(false);
}
#else

2
Public/Src/Tools/DropDaemon/DropConfig.cs
Просмотреть файл

@ -43,7 +43,7 @@ namespace Tool.DropDaemon
public TimeSpan Retention { get; }
/// <summary>
/// Timeout for http requests (<see cref="Microsoft.VisualStudio.Services.Content.Common.ArtifactHttpClientFactory.ArtifactHttpClientFactory"/>).
/// Timeout for http requests (<see cref="Microsoft.VisualStudio.Services.Content.Common.ArtifactHttpClientFactory.ArtifactHttpClientFactory(Microsoft.VisualStudio.Services.Common.VssCredentials, TimeSpan?, Microsoft.VisualStudio.Services.Content.Common.Tracing.IAppTraceSource, System.Threading.CancellationToken)"/>).
/// </summary>
public TimeSpan HttpSendTimeout { get; }

1
Public/Src/Tools/DropDaemon/Tool.DropDaemon.dsc
Просмотреть файл

@ -35,7 +35,6 @@ export namespace DropDaemon {
importFrom("ArtifactServices.App.Shared.Cache").pkg,
importFrom("Drop.App.Core").pkg,
importFrom("Drop.Client").pkg,
importFrom("Drop.RemotableClient.Interfaces").pkg,
importFrom("ItemStore.Shared").pkg,
importFrom("Microsoft.ApplicationInsights").pkg,
importFrom("Microsoft.AspNet.WebApi.Client").pkg,

3
Public/Src/Tools/DropDaemon/VsoClient.cs
Просмотреть файл

@ -13,6 +13,7 @@ using System.Threading.Tasks.Dataflow;
using BuildXL.Ipc.Common;
using BuildXL.Ipc.Interfaces;
using BuildXL.Utilities.Tasks;
using Microsoft.IdentityModel.Clients.ActiveDirectory;
using Microsoft.VisualStudio.Services.ArtifactServices.App.Shared.Cache;
using Microsoft.VisualStudio.Services.BlobStore.Common;
using Microsoft.VisualStudio.Services.Common;
@ -104,7 +105,7 @@ namespace Tool.DropDaemon
private VssCredentials GetCredentials() =>
new VsoCredentialHelper(m => m_logger.Verbose(m))
.GetCredentials(m_config.Service, true, null);
.GetCredentials(m_config.Service, true, null, null, PromptBehavior.Never);
private ArtifactHttpClientFactory GetFactory() =>
new ArtifactHttpClientFactory(

9
Public/Src/Tools/ServicePipDaemon/ReloadingDropServiceClient.cs
Просмотреть файл

@ -299,6 +299,15 @@ namespace Tool.ServicePipDaemon
cancellationToken);
}
/// <inheritdoc />
public Task<DownloadResult> DownloadManifestToFilePathAsync(string dropName, string filePath, CancellationToken cancellationToken)
{
return RetryAsync(
nameof(IDropServiceClient.DownloadManifestToFilePathAsync),
(client, ct) => client.DownloadManifestToFilePathAsync(dropName, filePath, ct),
cancellationToken);
}
/// <inheritdoc />
public string GetVersionString()
{

2
Public/Src/Tools/ServicePipDaemon/Tool.ServicePipDaemon.dsc
Просмотреть файл

@ -16,6 +16,8 @@ namespace ServicePipDaemon {
rootNamespace: "Tool.ServicePipDaemon",
sources: globR(d`.`, "*.cs"),
references:[
importFrom("BuildXL.Cache.ContentStore").Hashing.dll,
importFrom("BuildXL.Cache.ContentStore").UtilitiesCore.dll,
importFrom("BuildXL.Utilities.Instrumentation").Common.dll,
importFrom("BuildXL.Utilities.Instrumentation").Tracing.dll,
importFrom("BuildXL.Utilities").dll,

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

@ -27,7 +27,7 @@ namespace Tool.SymbolDaemon
public TimeSpan Retention { get; }
/// <summary>
/// Timeout for http requests (<see cref="Microsoft.VisualStudio.Services.Content.Common.ArtifactHttpClientFactory.ArtifactHttpClientFactory"/>).
/// Timeout for http requests (<see cref="Microsoft.VisualStudio.Services.Content.Common.ArtifactHttpClientFactory.ArtifactHttpClientFactory(Microsoft.VisualStudio.Services.Common.VssCredentials, TimeSpan?, Microsoft.VisualStudio.Services.Content.Common.Tracing.IAppTraceSource, System.Threading.CancellationToken)"/>).
/// </summary>
public TimeSpan HttpSendTimeout { get; }

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

@ -11,6 +11,7 @@ using BuildXL.Ipc.Common;
using BuildXL.Ipc.ExternalApi;
using BuildXL.Ipc.Interfaces;
using BuildXL.Utilities;
using Microsoft.IdentityModel.Clients.ActiveDirectory;
using Microsoft.VisualStudio.Services.Common;
using Microsoft.VisualStudio.Services.Content.Common;
using Microsoft.VisualStudio.Services.Content.Common.Authentication;
@ -46,7 +47,7 @@ namespace Tool.SymbolDaemon
private VssCredentials GetCredentials() =>
new VsoCredentialHelper(m => m_logger.Verbose(m))
.GetCredentials(m_config.Service, true, null);
.GetCredentials(m_config.Service, true, null, null, PromptBehavior.Never);
private ArtifactHttpClientFactory GetFactory() =>
new ArtifactHttpClientFactory(

7
Public/Src/Tools/UnitTests/DropDaemon/ReloadingDropServiceClientTest.cs
Просмотреть файл

@ -185,7 +185,12 @@ namespace Test.Tool.DropDaemon
throw new NotImplementedException();
}
Task IDropServiceClient.DownloadAsync(string dropName, DropServiceClientDownloadContext downloadContext, CancellationToken cancellationToken, bool releaseLocalCache)
Task IDropDownloader.DownloadAsync(string dropName, DropServiceClientDownloadContext downloadContext, CancellationToken cancellationToken, bool releaseLocalCache)
{
throw new NotImplementedException();
}
Task<DownloadResult> IDropDownloader.DownloadManifestToFilePathAsync(string dropName, string filePath, CancellationToken cancellationToken)
{
throw new NotImplementedException();
}

1
Public/Src/Tools/UnitTests/DropDaemon/Test.Tool.DropDaemon.dsc
Просмотреть файл

@ -23,7 +23,6 @@ namespace Test.Tool.DropDaemon {
importFrom("ItemStore.Shared").pkg,
importFrom("Drop.App.Core").pkg,
importFrom("Drop.Client").pkg,
importFrom("Drop.RemotableClient.Interfaces").pkg,
importFrom("Microsoft.AspNet.WebApi.Client").pkg,
BuildXLSdk.visualStudioServicesArtifactServicesWorkaround,
importFrom("Microsoft.VisualStudio.Services.BlobStore.Client").pkg,

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

@ -33,7 +33,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "ArtifactServices.App.Shared",
"Version": "17.150.28901-buildid9382555"
"Version": "18.163.29708-buildid11260482"
}
}
},
@ -42,7 +42,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "ArtifactServices.App.Shared.Cache",
"Version": "17.150.28901-buildid9382555"
"Version": "18.163.29708-buildid11260482"
}
}
},
@ -186,7 +186,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Drop.App.Core",
"Version": "17.150.28901-buildid9382555"
"Version": "18.163.29708-buildid11260482"
}
}
},
@ -195,25 +195,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Drop.Client",
"Version": "17.150.28901-buildid9382555"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Drop.RemotableClient",
"Version": "17.150.28901-buildid9382555"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Drop.RemotableClient.Interfaces",
"Version": "17.150.28901-buildid9382555"
"Version": "18.163.29708-buildid11260482"
}
}
},
@ -348,7 +330,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "ItemStore.Shared",
"Version": "17.150.28901-buildid9382555"
"Version": "18.163.29708-buildid11260482"
}
}
},
@ -2049,7 +2031,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.ArtifactServices.Shared",
"Version": "17.150.28901-buildid9382555"
"Version": "18.163.29708-buildid11260482"
}
}
},
@ -2058,7 +2040,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.BlobStore.Client",
"Version": "17.150.28901-buildid9382555"
"Version": "18.163.29708-buildid11260482"
}
}
},
@ -2067,7 +2049,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.BlobStore.Client.Cache",
"Version": "17.150.28901-buildid9382555"
"Version": "18.163.29708-buildid11260482"
}
}
},
@ -2076,7 +2058,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.Client",
"Version": "17.150.20190501.2-release"
"Version": "16.163.0-internal202001081"
}
}
},
@ -2085,7 +2067,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.InteractiveClient",
"Version": "17.150.20190501.2-release"
"Version": "16.163.0-internal202001081"
}
}
},
@ -2571,7 +2553,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Symbol.App.Core",
"Version": "17.150.28901-buildid9382555"
"Version": "18.163.29708-buildid11260482"
}
}
},
@ -2580,7 +2562,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Symbol.Client",
"Version": "17.150.28901-buildid9382555"
"Version": "18.163.29708-buildid11260482"
}
}
},

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

@ -23,25 +23,23 @@ export const pkgs = isMicrosoftInternal ? [
{ id: "WindowsSdk.Corext", version: "10.0.16299.1", alias: "Windows.Sdk", osSkip: [ "macOS" ] },
// Artifact packages and dependencies
{ id: "Microsoft.VisualStudio.Services.ArtifactServices.Shared", version: "17.150.28901-buildid9382555", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing"] },
{ id: "Microsoft.VisualStudio.Services.BlobStore.Client", version: "17.150.28901-buildid9382555", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces"] },
{ id: "Microsoft.VisualStudio.Services.Client", version: "17.150.20190501.2-release", dependentPackageIdsToSkip: [ "Microsoft.Net.Http", "Microsoft.AspNet.WebApi.Client", "System.Security.Cryptography.OpenSsl", "System.Security.Principal.Windows" ] },
{ id: "Microsoft.VisualStudio.Services.InteractiveClient", version: "17.150.20190501.2-release", dependentPackageIdsToSkip: [ "Ben.Demystifier" ], dependentPackageIdsToIgnore: [ "Ben.Demystifier" ] },
{ id: "Microsoft.VisualStudio.Services.ArtifactServices.Shared", version: "18.163.29708-buildid11260482", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing"] },
{ id: "Microsoft.VisualStudio.Services.BlobStore.Client", version: "18.163.29708-buildid11260482", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces"] },
{ id: "Microsoft.VisualStudio.Services.Client", version: "16.163.0-internal202001081", dependentPackageIdsToSkip: [ "Microsoft.Net.Http", "Microsoft.AspNet.WebApi.Client", "System.Security.Cryptography.OpenSsl", "System.Security.Principal.Windows" ] },
{ id: "Microsoft.VisualStudio.Services.InteractiveClient", version: "16.163.0-internal202001081", dependentPackageIdsToSkip: [ "Ben.Demystifier" ], dependentPackageIdsToIgnore: [ "Ben.Demystifier" ] },
// 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: "17.150.28901-buildid9382555", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing"] },
{ id: "ArtifactServices.App.Shared.Cache", version: "17.150.28901-buildid9382555", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.library.forAzDev"] },
{ id: "Drop.App.Core", version: "17.150.28901-buildid9382555", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.library.forAzDev"] },
{ id: "Drop.Client", version: "17.150.28901-buildid9382555", dependentPackageIdsToSkip: ["*"] },
{ id: "Drop.RemotableClient", version: "17.150.28901-buildid9382555", dependentPackageIdsToSkip: ["*"] },
{ id: "Drop.RemotableClient.Interfaces", version: "17.150.28901-buildid9382555", dependentPackageIdsToSkip: ["*"] },
{ id: "ItemStore.Shared", version: "17.150.28901-buildid9382555", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing"] },
{ id: "Microsoft.VisualStudio.Services.BlobStore.Client.Cache", version: "17.150.28901-buildid9382555", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.library.forAzDev"] },
{ id: "ArtifactServices.App.Shared", version: "18.163.29708-buildid11260482", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing"] },
{ id: "ArtifactServices.App.Shared.Cache", version: "18.163.29708-buildid11260482", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.library.forAzDev"] },
{ id: "Drop.App.Core", version: "18.163.29708-buildid11260482", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.library.forAzDev"] },
{ id: "Drop.Client", version: "18.163.29708-buildid11260482", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing"] },
{ id: "ItemStore.Shared", version: "18.163.29708-buildid11260482", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing"] },
{ id: "Microsoft.VisualStudio.Services.BlobStore.Client.Cache", version: "18.163.29708-buildid11260482", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.library.forAzDev"] },
{ id: "Microsoft.Windows.Debuggers.SymstoreInterop", version: "1.0.1" },
{ id: "Symbol.App.Core", version: "17.150.28901-buildid9382555", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.library.forAzDev"] },
{ id: "Symbol.Client", version: "17.150.28901-buildid9382555", dependentPackageIdsToSkip: ["*"] },
{ id: "Symbol.App.Core", version: "18.163.29708-buildid11260482", dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "BuildXL.Cache.Libraries", "BuildXL.library.forAzDev"] },
{ id: "Symbol.Client", version: "18.163.29708-buildid11260482", dependentPackageIdsToSkip: ["*"] },
// Internal pacakged version to avoid downloading from the web but the trusted stable internal feed: