mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Handle source-build patches in VMR initialization (#14397)

Browse source 
- Bumps to a new version of DarcLib that handles SB patches
- Configures the VMR to point to tarball patches
- Adds a missing `llvm-project` mapping
This commit is contained in:
Přemek Vysoký 2022-08-25 20:57:31 +02:00 • committed by GitHub
parent 86925059c6
commit e6c9208965
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -213,9 +213,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22422.1">
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22425.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>a27d5e56acf479b4a0944a0cf4511acb22d4a75b</Sha>
<Sha>af1ca588ca991b9b570725581f7c7a4580629d3d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="7.0.0-preview.7.22375.6">
<Uri>https://github.com/dotnet/runtime</Uri>

2
eng/Versions.props
View file

@ -30,7 +30,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.22422.1</MicrosoftDotNetDarcLibVersion>
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.22425.1</MicrosoftDotNetDarcLibVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

10
src/SourceBuild/tarball/content/src/source-mappings.json
View file

@ -1,4 +1,5 @@
{
"patchesPath": "src/installer/src/SourceBuild/tarball/patches",
"defaults": {
"defaultRef": "main",
"exclude": [
@ -58,12 +59,19 @@
{
"name": "installer",
"defaultRemote": "https://github.com/dotnet/installer",
"defaultRef": "vmr"
"exclude": [
"src/SourceBuild/tarball/content/**/*"
]
},
{
"name": "linker",
"defaultRemote": "https://github.com/dotnet/linker"
},
{
"name": "llvm-project",
"defaultRemote": "https://github.com/dotnet/llvm-project",
"defaultRef": "dotnet/main"
},
{
"name": "msbuild",
"defaultRemote": "https://github.com/dotnet/msbuild"

9
src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs
View file

@ -39,9 +39,8 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask
private async Task<bool> ExecuteAsync()
{
var factory = _serviceProvider.Value.GetRequiredService<IVmrManagerFactory>();
var vmrManager = await factory.CreateVmrManager(_serviceProvider.Value, VmrPath, TmpPath);
await vmrManager.InitializeVmr(Repository, Revision, false, _cancellationToken.Token);
var vmrInitializer = _serviceProvider.Value.GetRequiredService<IVmrInitializer>();
await vmrInitializer.InitializeVmr(Repository, Revision, false, _cancellationToken.Token);
return true;
}
@ -49,9 +48,7 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask
private IServiceProvider CreateServiceProvider() => new ServiceCollection()
.AddLogging(b => b.AddConsole().AddFilter(l => l >= LogLevel.Information))
.AddTransient<IProcessManager>(sp => ActivatorUtilities.CreateInstance<ProcessManager>(sp, "git"))
.AddSingleton<ISourceMappingParser, SourceMappingParser>()
.AddSingleton<IVmrManagerFactory, VmrManagerFactory>()
.AddSingleton<IRemoteFactory>(sp => ActivatorUtilities.CreateInstance<RemoteFactory>(sp, TmpPath))
.AddVmrManagers("git", sp => new VmrManagerConfiguration(VmrPath, TmpPath))
.BuildServiceProvider();
}