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

Fix VMR initialization from installer (#16627)

Browse source
This commit is contained in:
Přemek Vysoký 2023-06-08 18:51:05 +02:00 • committed by GitHub
parent 441c290d7a
commit 6300bc3f99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/VirtualMonoRepo/InitializeVMR.proj
View file

@ -31,6 +31,7 @@
<Exec WorkingDirectory="$(VmrDir)" Command="git init -b $(VmrDefaultBranch)" /> <Exec WorkingDirectory="$(VmrDir)" Command="git init -b $(VmrDefaultBranch)" />
<Exec WorkingDirectory="$(VmrDir)" Command="git commit --allow-empty -m 'Initial commit of the VMR%0D%0A%0D%0A[[ commit created by automation ]]'" /> <Exec WorkingDirectory="$(VmrDir)" Command="git commit --allow-empty -m 'Initial commit of the VMR%0D%0A%0D%0A[[ commit created by automation ]]'" />
<Exec WorkingDirectory="$(VmrDir)" Command="git remote add origin https://github.com/dotnet/dotnet" /> <!-- source link needs this -->
</Target> </Target>
<Target Name="InitializeRepoAndDependentsRecursive"> <Target Name="InitializeRepoAndDependentsRecursive">
@ -56,6 +57,9 @@
Recursive="true" Recursive="true"
VmrPath="$(VmrDir)" VmrPath="$(VmrDir)"
TmpPath="$(TmpDir)" TmpPath="$(TmpDir)"
InstallerPath="$(RepoRoot)"
ReadmeTemplatePath="$(MSBuildThisFileDirectory)/README.template.md"
TpnTemplatePath="$(MSBuildThisFileDirectory)/THIRD-PARTY-NOTICES.template.txt"
SourceMappingsPath="$(MSBuildThisFileDirectory)/source-mappings.json" /> SourceMappingsPath="$(MSBuildThisFileDirectory)/source-mappings.json" />
<Message Text=" -> Done initializing individual repositories recursively" Importance="High" /> <Message Text=" -> Done initializing individual repositories recursively" Importance="High" />

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

@ -40,6 +40,12 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask
public string PackageVersion { get; set; } 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 bool Recursive { get; set; }
public VirtualMonoRepo_Initialize() public VirtualMonoRepo_Initialize()
@ -54,6 +60,10 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask
VmrPath = Path.GetFullPath(VmrPath); VmrPath = Path.GetFullPath(VmrPath);
TmpPath = Path.GetFullPath(TmpPath); TmpPath = Path.GetFullPath(TmpPath);
var additionalRemotes = InstallerPath == null
? Array.Empty<AdditionalRemote>()
: new[] { new AdditionalRemote("installer", InstallerPath) };
var vmrInitializer = _serviceProvider.Value.GetRequiredService<IVmrInitializer>(); var vmrInitializer = _serviceProvider.Value.GetRequiredService<IVmrInitializer>();
await vmrInitializer.InitializeRepository( await vmrInitializer.InitializeRepository(
Repository, Repository,
@ -61,7 +71,9 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask
PackageVersion, PackageVersion,
Recursive, Recursive,
new NativePath(SourceMappingsPath), new NativePath(SourceMappingsPath),
Array.Empty<AdditionalRemote>(), additionalRemotes,
ReadmeTemplatePath,
TpnTemplatePath,
_cancellationToken.Token); _cancellationToken.Token);
return true; return true;
} }