From fb5beeb26b9672d89ffe894387f80a811e8bbad8 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Tue, 9 Aug 2022 17:11:17 +0200 Subject: [PATCH 01/31] Add source-mappings.json with a defaults section --- .../tarball/content/src/source-mappings.json | 151 ++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 src/SourceBuild/tarball/content/src/source-mappings.json diff --git a/src/SourceBuild/tarball/content/src/source-mappings.json b/src/SourceBuild/tarball/content/src/source-mappings.json new file mode 100644 index 000000000000..a016155beafc --- /dev/null +++ b/src/SourceBuild/tarball/content/src/source-mappings.json @@ -0,0 +1,151 @@ +{ + "defaults": { + "defaultRef": "main", + "exclude": [ + "**/*.dll", + "**/*.Dll", + "**/*.exe", + "**/*.pdb", + "**/*.mdb", + "**/*.zip", + "**/*.nupkg" + ] + }, + "mappings": [ + { + "name": "arcade", + "defaultRemote": "https://github.com/dotnet/arcade", + "include": [ + "*.*", + ".*", + "eng/**/*", + "src/**/*", + "scripts/**/*" + ], + "exclude": [ + "**/tests/**/*", + "**/*.Tests/**/*" + ] + }, + { + "name": "aspnetcore", + "defaultRemote": "https://github.com/dotnet/aspnetcore", + "exclude": [ + "**/samples/**/jquery-validation-unobtrusive/.bower.json", + "**/samples/**/jquery-validation-unobtrusive/*.js" + ] + }, + { + "name": "clicommandlineparser", + "defaultRemote": "https://github.com/dotnet/clicommandlineparser" + }, + { + "name": "command-line-api", + "defaultRemote": "https://github.com/dotnet/command-line-api" + }, + { + "name": "deployment-tools", + "defaultRemote": "https://github.com/dotnet/deployment-tools" + }, + { + "name": "diagnostics", + "defaultRemote": "https://github.com/dotnet/diagnostics" + }, + { + "name": "format", + "defaultRemote": "https://github.com/dotnet/format" + }, + { + "name": "fsharp", + "defaultRemote": "https://github.com/dotnet/fsharp" + }, + { + "name": "installer", + "defaultRemote": "https://github.com/dotnet/installer" + }, + { + "name": "linker", + "defaultRemote": "https://github.com/dotnet/linker" + }, + { + "name": "msbuild", + "defaultRemote": "https://github.com/dotnet/msbuild" + }, + { + "name": "nuget-client", + "defaultRemote": "https://github.com/NuGet/NuGet.Client", + "defaultRef": "dev", + "exclude": [ + "**/EndToEnd/**/jquery-validation-unobtrusive/*.js", + "**/EndToEnd/**/jquery-validation-unobtrusive/.bower.json" + ] + }, + { + "name": "razor-compiler", + "defaultRemote": "https://github.com/dotnet/razor-compiler" + }, + { + "name": "roslyn", + "defaultRemote": "https://github.com/dotnet/roslyn" + }, + { + "name": "roslyn-analyzers", + "defaultRemote": "https://github.com/dotnet/roslyn-analyzers" + }, + { + "name": "runtime", + "defaultRemote": "https://github.com/dotnet/runtime" + }, + { + "name": "sdk", + "defaultRemote": "https://github.com/dotnet/sdk" + }, + { + "name": "source-build", + "defaultRemote": "https://github.com/dotnet/source-build" + }, + { + "name": "source-build-externals", + "defaultRemote": "https://github.com/dotnet/source-build-externals", + "exclude": [ + "**/humanizer/samples/**/*.js" + ] + }, + { + "name": "source-build-reference-packages", + "defaultRemote": "https://github.com/dotnet/source-build-reference-packages", + "exclude": [ + "src/targetPacks/ILsrc/microsoft.netframework.referenceassemblies.net20/**/*", + "src/targetPacks/ILsrc/microsoft.netframework.referenceassemblies.net4*/**/*" + ] + }, + { + "name": "sourcelink", + "defaultRemote": "https://github.com/dotnet/sourcelink" + }, + { + "name": "symreader", + "defaultRemote": "https://github.com/dotnet/symreader" + }, + { + "name": "templating", + "defaultRemote": "https://github.com/dotnet/templating" + }, + { + "name": "test-templates", + "defaultRemote": "https://github.com/dotnet/test-templates" + }, + { + "name": "vstest", + "defaultRemote": "https://github.com/microsoft/vstest" + }, + { + "name": "xdt", + "defaultRemote": "https://github.com/dotnet/xdt" + }, + { + "name": "xliff-tasks", + "defaultRemote": "https://github.com/dotnet/xliff-tasks" + } + ] +} From 3e040ce37f302f843a7fbc6ab821360f219fe1dd Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Fri, 12 Aug 2022 12:03:53 +0200 Subject: [PATCH 02/31] Add empty InitializeVMR targets, VMR tasks --- eng/Build.props | 37 ++++++++++++++----- src/VirtualMonoRepo/InitializeVMR.proj | 28 ++++++++++++++ .../VirtualMonoRepo.Tasks.csproj | 18 +++++++++ .../VirtualMonoRepo_Initialize.cs | 25 +++++++++++++ 4 files changed, 98 insertions(+), 10 deletions(-) create mode 100644 src/VirtualMonoRepo/InitializeVMR.proj create mode 100644 src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj create mode 100644 src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs diff --git a/eng/Build.props b/eng/Build.props index 4df683babb65..753e14b54850 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -1,12 +1,29 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj new file mode 100644 index 000000000000..67af55d40934 --- /dev/null +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -0,0 +1,28 @@ + + + + + + $(RepoRoot)/artifacts/bin/VirtualMonoRepo.Tasks/$(Configuration)/net6.0/VirtualMonoRepo.Tasks.dll + + + + + + + + $(RepoRoot)artifacts/ + $(ArtifactsDir)vmr/ + $([MSBuild]::EnsureTrailingSlash('$(VmrDir)')) + $(RepoRoot)tmp/ + + + + + + + + + + + diff --git a/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj b/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj new file mode 100644 index 000000000000..a4a47064c50d --- /dev/null +++ b/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj @@ -0,0 +1,18 @@ + + + net6.0 + false + false + disable + preview + + + + + + + + + + + diff --git a/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs new file mode 100644 index 000000000000..5023463f78fe --- /dev/null +++ b/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs @@ -0,0 +1,25 @@ +// 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.Collections.Generic; +using System.Linq; +using System.Text; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using Microsoft.DotNet.DarcLib.VirtualMonoRepo; + +namespace Microsoft.DotNet.VirtualMonoRepo.Tasks; + +public class VirtualMonoRepo_Initialize : Task +{ + [Required] + public string Repository { get; set; } + + public string Revision { get; set; } + + public override bool Execute() + { + throw new NotImplementedException(); + } +} From f1bd6fb5868cce2a851c89c5026cb24ff6a7e12b Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Fri, 12 Aug 2022 12:43:05 +0200 Subject: [PATCH 03/31] Copy initial VMR content and commit it --- .../tools/SourceBuildArcadeTarball.targets | 4 +- src/VirtualMonoRepo/InitializeVMR.proj | 38 +++++++++++++------ 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index a516a86cf3f7..0c284237da18 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -14,7 +14,7 @@ $(RepoRoot)artifacts/ - $(ArtifactsDir)tarball/ + $(ArtifactsDir)tarball/ $([MSBuild]::EnsureTrailingSlash('$(TarballDir)')) $(TarballRootDir)src/ $(TarballRootDir)git-info/ @@ -298,7 +298,7 @@ - diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index 67af55d40934..1f63675b4422 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -1,28 +1,42 @@ - - $(RepoRoot)/artifacts/bin/VirtualMonoRepo.Tasks/$(Configuration)/net6.0/VirtualMonoRepo.Tasks.dll - - - - - - $(RepoRoot)artifacts/ $(ArtifactsDir)vmr/ $([MSBuild]::EnsureTrailingSlash('$(VmrDir)')) $(RepoRoot)tmp/ + + + $(VmrDir) - - - - + + + + + + + + + + + + + + + + + + + + + From bda9a9dc4547d40ea5e74ebbad44a5ac37a0d8e1 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Fri, 12 Aug 2022 13:24:45 +0200 Subject: [PATCH 04/31] Add steps to generate installer.props --- src/VirtualMonoRepo/InitializeVMR.proj | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index 1f63675b4422..a4dc9daf60a4 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -14,13 +14,20 @@ + + $(TarballGitInfoDir) + + - + InitialVmrCommit; + SetupSelfGithubInfo"> @@ -29,9 +36,10 @@ + - + From 6da9799294a7b89b23eaeb754bfd30c3df035eed Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Fri, 12 Aug 2022 13:43:51 +0200 Subject: [PATCH 05/31] Add a target for recursive repo initialization --- src/VirtualMonoRepo/InitializeVMR.proj | 80 +++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 7 deletions(-) diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index a4dc9daf60a4..a04bafc979b2 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -8,7 +8,7 @@ $([MSBuild]::EnsureTrailingSlash('$(VmrDir)')) $(RepoRoot)tmp/ - + $(VmrDir) @@ -26,8 +26,9 @@ GenerateVersionFile; InitializeCleanVmr; CopyTarballContent; - InitialVmrCommit; - SetupSelfGithubInfo"> + CommitInitialContent; + SetupSelfGithubInfo; + InitializeRepoAndDependentsRecursive"> @@ -39,12 +40,77 @@ - + - - - + + + + + + + + + + $(SourceBuildRepoName)/ + $(TarballSourceDir)$(SourceDir) + $(TarballSourceDir)$(SourceDir)eng/ + $(TarballRepoSourceEngDir)Version.Details.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 61bae2d9ec7d67558b6f7ea7fa83b143a9b1f002 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Fri, 12 Aug 2022 14:19:23 +0200 Subject: [PATCH 06/31] Build SourceBuild tasks too --- eng/Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Build.props b/eng/Build.props index 753e14b54850..96e8ff50c19b 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -11,6 +11,7 @@ + From 6be1810e8bebf362af1822b6cb633efbb640f98a Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Fri, 12 Aug 2022 14:36:16 +0200 Subject: [PATCH 07/31] Implement the "initialize VMR" task --- .../tarball/content/src/source-mappings.json | 3 +- src/VirtualMonoRepo/InitializeVMR.proj | 4 +- src/VirtualMonoRepo/RemoteFactory.cs | 38 ++++++++++++++++++ .../VirtualMonoRepo.Tasks.csproj | 12 ++++-- .../VirtualMonoRepo_Initialize.cs | 40 ++++++++++++++++--- 5 files changed, 85 insertions(+), 12 deletions(-) create mode 100644 src/VirtualMonoRepo/RemoteFactory.cs diff --git a/src/SourceBuild/tarball/content/src/source-mappings.json b/src/SourceBuild/tarball/content/src/source-mappings.json index a016155beafc..28969af8a2fe 100644 --- a/src/SourceBuild/tarball/content/src/source-mappings.json +++ b/src/SourceBuild/tarball/content/src/source-mappings.json @@ -61,7 +61,8 @@ }, { "name": "installer", - "defaultRemote": "https://github.com/dotnet/installer" + "defaultRemote": "https://github.com/dotnet/installer", + "defaultRef": "vmr" }, { "name": "linker", diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index a04bafc979b2..9b5e359e03da 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -1,9 +1,9 @@ - $(RepoRoot)/artifacts/bin/VirtualMonoRepo.Tasks/$(Configuration)/net6.0/VirtualMonoRepo.Tasks.dll - $(RepoRoot)artifacts/ + $(ArtifactsDir)bin/VirtualMonoRepo.Tasks/$(Configuration)/net6.0/VirtualMonoRepo.Tasks.dll + $(ArtifactsDir)vmr/ $([MSBuild]::EnsureTrailingSlash('$(VmrDir)')) $(RepoRoot)tmp/ diff --git a/src/VirtualMonoRepo/RemoteFactory.cs b/src/VirtualMonoRepo/RemoteFactory.cs new file mode 100644 index 000000000000..cde8faadd5ea --- /dev/null +++ b/src/VirtualMonoRepo/RemoteFactory.cs @@ -0,0 +1,38 @@ +// 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; + +namespace Microsoft.DotNet.VirtualMonoRepo.Tasks; + +internal class RemoteFactory : IRemoteFactory +{ + private readonly IProcessManager _processManager; + private readonly string _tmpPath; + + public RemoteFactory(IProcessManager processManager, string tmpPath) + { + _processManager = processManager; + _tmpPath = tmpPath; + } + + public Task GetBarOnlyRemoteAsync(Extensions.Logging.ILogger logger) + { + throw new NotImplementedException(); + } + + public Task GetRemoteAsync(string repoUrl, Extensions.Logging.ILogger logger) + { + var githubClient = new DarcLib.GitHubClient( + _processManager.GitExecutable, + accessToken: null, + logger, + _tmpPath, + cache: null); + + return System.Threading.Tasks.Task.FromResult(new Remote(githubClient, barClient: null, logger)); + } +} diff --git a/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj b/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj index a4a47064c50d..3505b0f57666 100644 --- a/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj +++ b/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj @@ -1,18 +1,22 @@ - + net6.0 false false disable preview + False + false + false + true - - - + + + diff --git a/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs index 5023463f78fe..12133bb9a3a0 100644 --- a/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs +++ b/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs @@ -2,24 +2,54 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; +using Microsoft.DotNet.DarcLib; +using Microsoft.DotNet.DarcLib.Helpers; using Microsoft.DotNet.DarcLib.VirtualMonoRepo; +using Microsoft.Extensions.DependencyInjection; namespace Microsoft.DotNet.VirtualMonoRepo.Tasks; -public class VirtualMonoRepo_Initialize : Task +public class VirtualMonoRepo_Initialize : Build.Utilities.Task { [Required] public string Repository { get; set; } + [Required] + public string VmrPath { get; set; } + + [Required] + public string TmpPath { get; set; } + public string Revision { get; set; } public override bool Execute() { - throw new NotImplementedException(); + var vmrManager = CreateVmrManager(); + + var mapping = vmrManager.Mappings.FirstOrDefault(m => m.Name == Repository) + ?? throw new Exception($"No repository mapping named `{Repository}` found!"); + + vmrManager.InitializeVmr(mapping, Revision, false, default).GetAwaiter().GetResult(); + + return true; + } + + private IVmrManager CreateVmrManager() + { + var services = new ServiceCollection() + .AddLogging() + .AddTransient(s => ActivatorUtilities.CreateInstance(s, "git")) + .AddSingleton() + .AddSingleton() + .AddSingleton(s => ActivatorUtilities.CreateInstance(s, TmpPath)) + .AddSingleton(s => + { + var factory = s.GetRequiredService(); + return factory.CreateVmrManager(s, VmrPath, TmpPath).GetAwaiter().GetResult(); + }); + + return services.BuildServiceProvider().GetRequiredService(); } } From 356c02278e4b58f074f51d733d84502dc2740bac Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Fri, 12 Aug 2022 16:40:38 +0200 Subject: [PATCH 08/31] Add console logging --- src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj | 4 +++- src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj b/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj index 3505b0f57666..8b3618bede9e 100644 --- a/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj +++ b/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj @@ -16,7 +16,9 @@ - + + + diff --git a/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs index 12133bb9a3a0..928c1b50df35 100644 --- a/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs +++ b/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs @@ -8,6 +8,7 @@ using Microsoft.DotNet.DarcLib.Helpers; using Microsoft.DotNet.DarcLib.VirtualMonoRepo; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; namespace Microsoft.DotNet.VirtualMonoRepo.Tasks; @@ -39,7 +40,7 @@ public override bool Execute() private IVmrManager CreateVmrManager() { var services = new ServiceCollection() - .AddLogging() + .AddLogging(b => b.AddConsole().AddFilter(l => l >= LogLevel.Information)) .AddTransient(s => ActivatorUtilities.CreateInstance(s, "git")) .AddSingleton() .AddSingleton() From f4e99fd72cbf07b709e68a7012b245ee67fd5304 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Mon, 15 Aug 2022 13:40:44 +0200 Subject: [PATCH 09/31] Use newest DarcLib --- .../VirtualMonoRepo.Tasks.csproj | 2 +- .../VirtualMonoRepo_Initialize.cs | 42 +++++++++---------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj b/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj index 8b3618bede9e..7f4d51a770df 100644 --- a/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj +++ b/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs index 928c1b50df35..ada44cc7b16b 100644 --- a/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs +++ b/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs @@ -3,6 +3,8 @@ using System; using System.Linq; +using System.Threading; +using System.Threading.Tasks; using Microsoft.Build.Framework; using Microsoft.DotNet.DarcLib; using Microsoft.DotNet.DarcLib.Helpers; @@ -14,6 +16,8 @@ namespace Microsoft.DotNet.VirtualMonoRepo.Tasks; public class VirtualMonoRepo_Initialize : Build.Utilities.Task { + private readonly Lazy _serviceProvider; + [Required] public string Repository { get; set; } @@ -25,32 +29,26 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task public string Revision { get; set; } - public override bool Execute() + public VirtualMonoRepo_Initialize() { - var vmrManager = CreateVmrManager(); - - var mapping = vmrManager.Mappings.FirstOrDefault(m => m.Name == Repository) - ?? throw new Exception($"No repository mapping named `{Repository}` found!"); + _serviceProvider = new(CreateServiceProvider); + } - vmrManager.InitializeVmr(mapping, Revision, false, default).GetAwaiter().GetResult(); + public override bool Execute() => ExecuteAsync().GetAwaiter().GetResult(); + private async Task ExecuteAsync() + { + var factory = _serviceProvider.Value.GetRequiredService(); + var vmrManager = await factory.CreateVmrManager(_serviceProvider.Value, VmrPath, TmpPath); + await vmrManager.InitializeVmr(Repository, Revision, false, default); return true; } - private IVmrManager CreateVmrManager() - { - var services = new ServiceCollection() - .AddLogging(b => b.AddConsole().AddFilter(l => l >= LogLevel.Information)) - .AddTransient(s => ActivatorUtilities.CreateInstance(s, "git")) - .AddSingleton() - .AddSingleton() - .AddSingleton(s => ActivatorUtilities.CreateInstance(s, TmpPath)) - .AddSingleton(s => - { - var factory = s.GetRequiredService(); - return factory.CreateVmrManager(s, VmrPath, TmpPath).GetAwaiter().GetResult(); - }); - - return services.BuildServiceProvider().GetRequiredService(); - } + private IServiceProvider CreateServiceProvider() => new ServiceCollection() + .AddLogging(b => b.AddConsole().AddFilter(l => l >= LogLevel.Information)) + .AddTransient(sp => ActivatorUtilities.CreateInstance(sp, "git")) + .AddSingleton() + .AddSingleton() + .AddSingleton(sp => ActivatorUtilities.CreateInstance(sp, TmpPath)) + .BuildServiceProvider(); } From 2ac3f6778d61dd867b6605b440193ae108fd16ba Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Mon, 15 Aug 2022 14:20:51 +0200 Subject: [PATCH 10/31] Make the task cancellable --- src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj | 2 +- src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj b/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj index 7f4d51a770df..f6665ac9e84d 100644 --- a/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj +++ b/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs index ada44cc7b16b..adc8b1b3722b 100644 --- a/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs +++ b/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs @@ -14,9 +14,10 @@ namespace Microsoft.DotNet.VirtualMonoRepo.Tasks; -public class VirtualMonoRepo_Initialize : Build.Utilities.Task +public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask { private readonly Lazy _serviceProvider; + private readonly CancellationTokenSource _cancellationToken = new(); [Required] public string Repository { get; set; } @@ -40,10 +41,15 @@ private async Task ExecuteAsync() { var factory = _serviceProvider.Value.GetRequiredService(); var vmrManager = await factory.CreateVmrManager(_serviceProvider.Value, VmrPath, TmpPath); - await vmrManager.InitializeVmr(Repository, Revision, false, default); + await vmrManager.InitializeVmr(Repository, Revision, false, _cancellationToken.Token); return true; } + public void Cancel() + { + _cancellationToken.Cancel(); + } + private IServiceProvider CreateServiceProvider() => new ServiceCollection() .AddLogging(b => b.AddConsole().AddFilter(l => l >= LogLevel.Information)) .AddTransient(sp => ActivatorUtilities.CreateInstance(sp, "git")) From fad42c741e42d228e194b174fc98cd5efa9929f3 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Wed, 17 Aug 2022 10:59:12 +0200 Subject: [PATCH 11/31] Set InitializeVMR to true always, improve dependency print, remove patches --- src/VirtualMonoRepo/InitializeVMR.proj | 21 ++----------------- .../VirtualMonoRepo_Initialize.cs | 5 +---- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index 9b5e359e03da..250e488e9608 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -10,6 +10,7 @@ $(VmrDir) + true @@ -67,24 +68,6 @@ - - - - - - - - - - + ExecuteAsync() return true; } - public void Cancel() - { - _cancellationToken.Cancel(); - } + public void Cancel() => _cancellationToken.Cancel(); private IServiceProvider CreateServiceProvider() => new ServiceCollection() .AddLogging(b => b.AddConsole().AddFilter(l => l >= LogLevel.Information)) From e72fa32459c5c46ae393a5ab18a807d087bea576 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Wed, 17 Aug 2022 17:09:04 +0200 Subject: [PATCH 12/31] Improve logging in SB task --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 0c284237da18..c1b082af0500 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -235,7 +235,7 @@ Dependencies="@(SourceBuildRepos)" /> - + Date: Wed, 17 Aug 2022 19:04:32 +0200 Subject: [PATCH 13/31] Do not log dependencies when there are none --- .../Arcade/tools/SourceBuildArcadeTarball.targets | 4 ++-- src/VirtualMonoRepo/InitializeVMR.proj | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index c1b082af0500..b597ceb3a84f 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -234,8 +234,8 @@ SourceBuildMetadataDir="$(TarballGitInfoDir)" Dependencies="@(SourceBuildRepos)" /> - - + + + - - + + Date: Thu, 18 Aug 2022 12:14:18 +0200 Subject: [PATCH 14/31] Add rest of the missing tarball steps --- .../tools/SourceBuildArcadeTarball.targets | 4 +-- src/VirtualMonoRepo/InitializeVMR.proj | 28 +++++++++++++++++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 77d3326df357..fc0af84c82d1 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -30,7 +30,6 @@ SetupSelfGithubInfo; CloneRepoAndDependentsRecursive; CleanClonedSource; - RestoreTextOnlyPackages; CopyTextOnlyPackages; CopyTarballContent; "> @@ -285,7 +284,7 @@ - @@ -428,4 +427,3 @@ - diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index 427fbe9c58cf..c506cb0f10af 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -7,6 +7,7 @@ $(ArtifactsDir)vmr/ $([MSBuild]::EnsureTrailingSlash('$(VmrDir)')) $(RepoRoot)tmp/ + main $(VmrDir) @@ -23,14 +24,21 @@ - + + InitializeRepoAndDependentsRecursive; + CommitGitInfoFiles; + CopyTextOnlyPackages; + CommitTextOnlyPackages"> @@ -42,7 +50,7 @@ - + @@ -97,4 +105,18 @@ + + + + + + + + + + + + From 61da10a8160ced3e21839df6a42e0dde0fd9d5c3 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 18 Aug 2022 12:20:52 +0200 Subject: [PATCH 15/31] Add a TODO issue link --- src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj b/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj index f6665ac9e84d..78cadb080d03 100644 --- a/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj +++ b/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj @@ -5,7 +5,7 @@ false disable preview - False + false false false true @@ -16,7 +16,7 @@ - + From f2109adf0637ec2ece56958b075e703505653fdc Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 18 Aug 2022 15:34:40 +0200 Subject: [PATCH 16/31] Use WorkingDirectory instead of -C --- src/VirtualMonoRepo/InitializeVMR.proj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index c506cb0f10af..ff141727dcec 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -50,12 +50,12 @@ - + - - + + - + - - + + - - + + From f37f3efacfa66fe808440bec3fc53044752c555c Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 18 Aug 2022 17:39:58 +0200 Subject: [PATCH 17/31] Make VmrDir a required parameter --- src/VirtualMonoRepo/InitializeVMR.proj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index ff141727dcec..d545f765c6cd 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -4,8 +4,7 @@ $(RepoRoot)artifacts/ $(ArtifactsDir)bin/VirtualMonoRepo.Tasks/$(Configuration)/net6.0/VirtualMonoRepo.Tasks.dll - $(ArtifactsDir)vmr/ - $([MSBuild]::EnsureTrailingSlash('$(VmrDir)')) + $([MSBuild]::EnsureTrailingSlash('$(VmrDir)')) $(RepoRoot)tmp/ main From 51e53d0b05b9fcfd60c43a4fdc5d8d23f114c56f Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 18 Aug 2022 17:40:11 +0200 Subject: [PATCH 18/31] Do not use Tarball properties --- src/VirtualMonoRepo/InitializeVMR.proj | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index d545f765c6cd..5bede0a06ba4 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -15,8 +15,10 @@ + $(TarballGitInfoDir) + $(TarballSourceDir) @@ -42,8 +44,6 @@ - - @@ -63,9 +63,9 @@ $(SourceBuildRepoName)/ - $(TarballSourceDir)$(SourceDir) - $(TarballSourceDir)$(SourceDir)eng/ - $(TarballRepoSourceEngDir)Version.Details.xml + $(VmrSourceDir)$(SourceDir) + $(VmrSourceDir)$(SourceDir)eng/ + $(IndividualRepoSourceEngDir)Version.Details.xml @@ -88,14 +88,14 @@ The commit sha for the cloned repo in the tarball being the one that was first encountered. --> - + - + + SourceFiles="$(VmrGitInfoDir)runtime.props" + DestinationFiles="$(VmrGitInfoDir)runtime-portable.props" /> From 71a22832438b1b7adf407b2dd6490351f26d24c5 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 18 Aug 2022 17:42:19 +0200 Subject: [PATCH 19/31] Move tasks under Tasks/ --- eng/Build.props | 2 +- src/VirtualMonoRepo/{ => Tasks}/VirtualMonoRepo.Tasks.csproj | 0 src/VirtualMonoRepo/{ => Tasks}/VirtualMonoRepo_Initialize.cs | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename src/VirtualMonoRepo/{ => Tasks}/VirtualMonoRepo.Tasks.csproj (100%) rename src/VirtualMonoRepo/{ => Tasks}/VirtualMonoRepo_Initialize.cs (100%) diff --git a/eng/Build.props b/eng/Build.props index 96e8ff50c19b..2e1312f95ccd 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -12,7 +12,7 @@ - + diff --git a/src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj similarity index 100% rename from src/VirtualMonoRepo/VirtualMonoRepo.Tasks.csproj rename to src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj diff --git a/src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs similarity index 100% rename from src/VirtualMonoRepo/VirtualMonoRepo_Initialize.cs rename to src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs From 6ff48eaa2862e5a8fa51ab65d36bcb46813d0db6 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 18 Aug 2022 17:44:47 +0200 Subject: [PATCH 20/31] Use .NET 7.0 TFM --- src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj index 78cadb080d03..18c8da72c0fe 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj @@ -1,6 +1,6 @@  - net6.0 + net7.0 false false disable From 0d78123a1edeaae5741c3bd318d29f7aec8d6796 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 18 Aug 2022 17:44:59 +0200 Subject: [PATCH 21/31] Remove obsolete exclusions --- .../tarball/content/src/source-mappings.json | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/SourceBuild/tarball/content/src/source-mappings.json b/src/SourceBuild/tarball/content/src/source-mappings.json index 28969af8a2fe..3144d9e23f6f 100644 --- a/src/SourceBuild/tarball/content/src/source-mappings.json +++ b/src/SourceBuild/tarball/content/src/source-mappings.json @@ -29,11 +29,7 @@ }, { "name": "aspnetcore", - "defaultRemote": "https://github.com/dotnet/aspnetcore", - "exclude": [ - "**/samples/**/jquery-validation-unobtrusive/.bower.json", - "**/samples/**/jquery-validation-unobtrusive/*.js" - ] + "defaultRemote": "https://github.com/dotnet/aspnetcore" }, { "name": "clicommandlineparser", @@ -75,11 +71,7 @@ { "name": "nuget-client", "defaultRemote": "https://github.com/NuGet/NuGet.Client", - "defaultRef": "dev", - "exclude": [ - "**/EndToEnd/**/jquery-validation-unobtrusive/*.js", - "**/EndToEnd/**/jquery-validation-unobtrusive/.bower.json" - ] + "defaultRef": "dev" }, { "name": "razor-compiler", @@ -114,11 +106,7 @@ }, { "name": "source-build-reference-packages", - "defaultRemote": "https://github.com/dotnet/source-build-reference-packages", - "exclude": [ - "src/targetPacks/ILsrc/microsoft.netframework.referenceassemblies.net20/**/*", - "src/targetPacks/ILsrc/microsoft.netframework.referenceassemblies.net4*/**/*" - ] + "defaultRemote": "https://github.com/dotnet/source-build-reference-packages" }, { "name": "sourcelink", From e73d666a2e4cadb6d4f7bd05089dbacd401e1c79 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 18 Aug 2022 17:50:53 +0200 Subject: [PATCH 22/31] Move RemoteFactory to Tasks/ --- src/VirtualMonoRepo/{ => Tasks}/RemoteFactory.cs | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/VirtualMonoRepo/{ => Tasks}/RemoteFactory.cs (100%) diff --git a/src/VirtualMonoRepo/RemoteFactory.cs b/src/VirtualMonoRepo/Tasks/RemoteFactory.cs similarity index 100% rename from src/VirtualMonoRepo/RemoteFactory.cs rename to src/VirtualMonoRepo/Tasks/RemoteFactory.cs From 35573712ab070d23754539a1ef84b039e7411fe4 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Fri, 19 Aug 2022 09:30:48 +0200 Subject: [PATCH 23/31] Extract Microsoft.DotNet.DarcLib version into Version.props --- eng/Versions.props | 5 +++++ src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3cc5d1fe3516..a709a5e2767c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,6 +195,11 @@ 0.1.0-7.0.100-bootstrap.11 0.1.0-7.0.100-5 + + + 1.1.0-beta.22418.1 + + 6.0.312 diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj index 18c8da72c0fe..c7d26798c1b0 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj @@ -16,9 +16,8 @@ - - - + + From 623eacf0283ad5452aad6579d7b1a1cabe485b80 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Fri, 19 Aug 2022 09:31:57 +0200 Subject: [PATCH 24/31] Bump SB tasks to net7.0 --- src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj index 735289e705a9..2842d265d457 100644 --- a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj +++ b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj @@ -1,6 +1,6 @@ - net5.0 + net7.0 false false disable From 4c3c2c12c8cf8b4f1fbb94888a79ae73050f90cc Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Fri, 19 Aug 2022 09:42:18 +0200 Subject: [PATCH 25/31] Fix XML tag --- eng/Versions.props | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a709a5e2767c..241ff6e1d707 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -199,7 +199,6 @@ 1.1.0-beta.22418.1 - 6.0.312 From 566403af4c3de4c0af8c5720646876b4fe5a6d34 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Fri, 19 Aug 2022 09:48:49 +0200 Subject: [PATCH 26/31] Update net7.0 task references --- eng/Versions.props | 1 + src/SourceBuild/Arcade/tools/BuildTasks.props | 2 +- src/VirtualMonoRepo/InitializeVMR.proj | 2 +- src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 241ff6e1d707..3acf86e6a4b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,6 +197,7 @@ + 7.0.0-preview.7.22375.6 1.1.0-beta.22418.1 diff --git a/src/SourceBuild/Arcade/tools/BuildTasks.props b/src/SourceBuild/Arcade/tools/BuildTasks.props index 4014b87ad046..50f49046bb24 100644 --- a/src/SourceBuild/Arcade/tools/BuildTasks.props +++ b/src/SourceBuild/Arcade/tools/BuildTasks.props @@ -2,6 +2,6 @@ - $(RepoRoot)\artifacts\bin\SourceBuild.Tasks\$(Configuration)\net5.0\SourceBuild.Tasks.dll + $(RepoRoot)\artifacts\bin\SourceBuild.Tasks\$(Configuration)\net7.0\SourceBuild.Tasks.dll \ No newline at end of file diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index 5bede0a06ba4..b1f480bf64f2 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -2,7 +2,7 @@ $(RepoRoot)artifacts/ - $(ArtifactsDir)bin/VirtualMonoRepo.Tasks/$(Configuration)/net6.0/VirtualMonoRepo.Tasks.dll + $(ArtifactsDir)bin/VirtualMonoRepo.Tasks/$(Configuration)/net7.0/VirtualMonoRepo.Tasks.dll $([MSBuild]::EnsureTrailingSlash('$(VmrDir)')) $(RepoRoot)tmp/ diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj index c7d26798c1b0..409475a3cddc 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj @@ -17,7 +17,7 @@ - + From c1006113ed41c346d5bf172e6be5fc0fcf40ac22 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Fri, 19 Aug 2022 10:07:56 +0200 Subject: [PATCH 27/31] Simplify .csproj --- src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj index 409475a3cddc..ee741c0ed809 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj @@ -1,10 +1,9 @@  net7.0 - false - false - disable preview + disable + false false false false @@ -12,8 +11,6 @@ - - From f555b3c3bbd075adb9a938c9d2e27f73f8e3c63b Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Mon, 22 Aug 2022 10:27:25 +0200 Subject: [PATCH 28/31] Address PR feedback --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 1 + src/VirtualMonoRepo/InitializeVMR.proj | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index fc0af84c82d1..5f61eb8ac83b 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -30,6 +30,7 @@ SetupSelfGithubInfo; CloneRepoAndDependentsRecursive; CleanClonedSource; + RestoreTextOnlyPackages; CopyTextOnlyPackages; CopyTarballContent; "> diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index b1f480bf64f2..176498bff770 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -5,7 +5,7 @@ $(ArtifactsDir)bin/VirtualMonoRepo.Tasks/$(Configuration)/net7.0/VirtualMonoRepo.Tasks.dll $([MSBuild]::EnsureTrailingSlash('$(VmrDir)')) - $(RepoRoot)tmp/ + $(ArtifactsDir)tmp/ main @@ -64,7 +64,7 @@ $(SourceBuildRepoName)/ $(VmrSourceDir)$(SourceDir) - $(VmrSourceDir)$(SourceDir)eng/ + $(IndividualRepoSourceDir)eng/ $(IndividualRepoSourceEngDir)Version.Details.xml From 585cdd423cd8c03978ea29898fc95fad5b5fd1ce Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Mon, 22 Aug 2022 10:38:32 +0200 Subject: [PATCH 29/31] Add the DarcLib dependency into Version.Details --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5c90b460581..7f291c903b3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -208,6 +208,10 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e + + https://github.com/dotnet/arcade-services + b3397259620ccc6c899843235d5c9fb0c2ebb071 + https://github.com/dotnet/source-build-reference-packages c1bc837421e41a673cb30bf670c0cdd83ac09b75 diff --git a/eng/Versions.props b/eng/Versions.props index 3acf86e6a4b7..828db9ac37ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,6 +28,10 @@ 7.0.0-beta.22411.2 + + + 1.1.0-beta.22418.1 + 7.0.0-rc.1.22377.2 @@ -171,6 +175,7 @@ 2.2.0-beta.19072.10 2.0.0 17.4.0-preview-20220813-01 + 7.0.0-preview.7.22375.6 @@ -195,11 +200,6 @@ 0.1.0-7.0.100-bootstrap.11 0.1.0-7.0.100-5 - - - 7.0.0-preview.7.22375.6 - 1.1.0-beta.22418.1 - 6.0.312 From ef1063aa04c9d0178c2e9122c3a7c5660dd66feb Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Mon, 22 Aug 2022 18:19:34 +0200 Subject: [PATCH 30/31] Run `darc update-dependencies` (brings fix to checking out off-branch SHAs) --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17a6a137be91..28341d1a5ade 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -208,9 +208,9 @@ https://github.com/dotnet/arcade 34dff939b4a91e4693f78a856e0e055c1a3f3fba - + https://github.com/dotnet/arcade-services - b3397259620ccc6c899843235d5c9fb0c2ebb071 + a27d5e56acf479b4a0944a0cf4511acb22d4a75b https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b00ec172857b..cff371a84449 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22418.1 + 1.1.0-beta.22422.1 From 7054873cf1f10952a039dcf1f9f1b0b2c17b4538 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Tue, 23 Aug 2022 10:47:03 +0200 Subject: [PATCH 31/31] Add subscription for `Microsoft.Extensions.Logging.Console` --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 2 +- src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28341d1a5ade..dc81ebc60a4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -212,6 +212,10 @@ https://github.com/dotnet/arcade-services a27d5e56acf479b4a0944a0cf4511acb22d4a75b + + https://github.com/dotnet/runtime + eecb02807867cad56cd05badddef65e432248b75 + https://github.com/dotnet/source-build-reference-packages c1bc837421e41a673cb30bf670c0cdd83ac09b75 diff --git a/eng/Versions.props b/eng/Versions.props index cff371a84449..6e569e714ea8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,7 +175,7 @@ 2.2.0-beta.19072.10 2.0.0 17.4.0-preview-20220813-01 - 7.0.0-preview.7.22375.6 + 7.0.0-preview.7.22375.6 diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj index ee741c0ed809..2d59069db3cb 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj @@ -14,7 +14,7 @@ - +