From 6300bc3f9942aa3787d54fe949c5c0b4ad52afaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Thu, 8 Jun 2023 18:51:05 +0200 Subject: [PATCH] Fix VMR initialization from installer (#16627) --- src/VirtualMonoRepo/InitializeVMR.proj | 4 ++++ .../Tasks/VirtualMonoRepo_Initialize.cs | 14 +++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index 781d32d0e..09ab72b1c 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -31,6 +31,7 @@ + @@ -56,6 +57,9 @@ Recursive="true" VmrPath="$(VmrDir)" TmpPath="$(TmpDir)" + InstallerPath="$(RepoRoot)" + ReadmeTemplatePath="$(MSBuildThisFileDirectory)/README.template.md" + TpnTemplatePath="$(MSBuildThisFileDirectory)/THIRD-PARTY-NOTICES.template.txt" SourceMappingsPath="$(MSBuildThisFileDirectory)/source-mappings.json" /> diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs index c8c614620..eae76d532 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs @@ -40,6 +40,12 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask public string PackageVersion { get; set; } + public string InstallerPath { get; set; } + + public string ReadmeTemplatePath { get; set; } + + public string TpnTemplatePath { get; set; } + public bool Recursive { get; set; } public VirtualMonoRepo_Initialize() @@ -54,6 +60,10 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask VmrPath = Path.GetFullPath(VmrPath); TmpPath = Path.GetFullPath(TmpPath); + var additionalRemotes = InstallerPath == null + ? Array.Empty() + : new[] { new AdditionalRemote("installer", InstallerPath) }; + var vmrInitializer = _serviceProvider.Value.GetRequiredService(); await vmrInitializer.InitializeRepository( Repository, @@ -61,7 +71,9 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask PackageVersion, Recursive, new NativePath(SourceMappingsPath), - Array.Empty(), + additionalRemotes, + ReadmeTemplatePath, + TpnTemplatePath, _cancellationToken.Token); return true; }