[main] Update dependencies from dotnet/arcade-services (#15030)
[main] Update dependencies from dotnet/arcade-services - Add N/A tokens - Remove IRemoteFactory
This commit is contained in:
parent
4140814b80
commit
5a06ace469
5 changed files with 7 additions and 50 deletions
|
@ -3,7 +3,7 @@
|
|||
"isRoot": true,
|
||||
"tools": {
|
||||
"microsoft.dotnet.darc": {
|
||||
"version": "1.1.0-beta.22561.2",
|
||||
"version": "1.1.0-beta.22573.3",
|
||||
"commands": [
|
||||
"darc"
|
||||
]
|
||||
|
|
|
@ -205,13 +205,13 @@
|
|||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.22561.2">
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.22573.3">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
<Sha>e1c11c90d26581339cca9684399250101cbbc3bb</Sha>
|
||||
<Sha>a0237ac5a1c16bca4ede7a6201f2abb165dcaabc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22561.2">
|
||||
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22573.3">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
<Sha>e1c11c90d26581339cca9684399250101cbbc3bb</Sha>
|
||||
<Sha>a0237ac5a1c16bca4ede7a6201f2abb165dcaabc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.22561.2</MicrosoftDotNetDarcLibVersion>
|
||||
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.22573.3</MicrosoftDotNetDarcLibVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.DotNet.DarcLib;
|
||||
using Microsoft.DotNet.DarcLib.Helpers;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace Microsoft.DotNet.VirtualMonoRepo.Tasks;
|
||||
|
||||
internal class RemoteFactory : IRemoteFactory
|
||||
{
|
||||
private readonly IProcessManager _processManager;
|
||||
private readonly IVersionDetailsParser _versionDetailsParser;
|
||||
private readonly string _tmpPath;
|
||||
|
||||
public RemoteFactory(IProcessManager processManager, IVersionDetailsParser versionDetailsParser, string tmpPath)
|
||||
{
|
||||
_processManager = processManager;
|
||||
_versionDetailsParser = versionDetailsParser;
|
||||
_tmpPath = tmpPath;
|
||||
}
|
||||
|
||||
public Task<IRemote> GetBarOnlyRemoteAsync(ILogger logger)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public Task<IRemote> GetRemoteAsync(string repoUrl, ILogger logger)
|
||||
{
|
||||
var githubClient = new DarcLib.GitHubClient(
|
||||
_processManager.GitExecutable,
|
||||
accessToken: null,
|
||||
logger,
|
||||
_tmpPath,
|
||||
cache: null);
|
||||
|
||||
IRemote remote = new Remote(githubClient, barClient: null, _versionDetailsParser, logger);
|
||||
return Task.FromResult(remote);
|
||||
}
|
||||
}
|
|
@ -61,7 +61,6 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask
|
|||
|
||||
private IServiceProvider CreateServiceProvider() => new ServiceCollection()
|
||||
.AddLogging(b => b.AddConsole().AddFilter(l => l >= LogLevel.Information))
|
||||
.AddSingleton<IRemoteFactory>(sp => ActivatorUtilities.CreateInstance<RemoteFactory>(sp, TmpPath))
|
||||
.AddVmrManagers("git", sp => new VmrInfo(VmrPath, TmpPath))
|
||||
.AddVmrManagers("git", VmrPath, TmpPath, null, null)
|
||||
.BuildServiceProvider();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue