From 86925059c6e021963ac8ac03f3d9169a166a34ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 11:01:42 -0700 Subject: [PATCH 1/2] [main] Update dependencies from dotnet/arcade (#14385) * Update dependencies from https://github.com/dotnet/arcade build 20220823.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22423.2 Dependency coherency updates runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.0.0-alpha.1.22364.1 -> To Version 1.0.0-alpha.1.22364.1 (parent: Microsoft.NETCore.App.Runtime.win-x64 * Resolve llvm source-build patch conflict * Update dependencies from https://github.com/dotnet/arcade build 20220824.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22424.3 Dependency coherency updates runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.0.0-alpha.1.22364.1 -> To Version 1.0.0-alpha.1.22364.1 (parent: Microsoft.NETCore.App.Runtime.win-x64 * Update global.json patch for llvm. Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons Co-authored-by: Chris Rummel --- eng/Version.Details.xml | 22 +++++++++---------- eng/Versions.props | 2 +- eng/common/generate-locproject.ps1 | 4 ++-- global.json | 4 ++-- ....Build.Traversal-version-we-have-a-r.patch | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da74b22b8..dcafdd280 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,7 +19,7 @@ https://github.com/dotnet/llvm-project - 75e182c26dbf5d9f8ccca0ac68ee63b0bebb17b8 + 754d13817d834b716d339183e21aac7d2489c496 @@ -200,18 +200,18 @@ - + https://github.com/dotnet/arcade - 34dff939b4a91e4693f78a856e0e055c1a3f3fba + 258a37cd6a7884f771d0f991d9f24d29e292abd0 - + https://github.com/dotnet/arcade - 34dff939b4a91e4693f78a856e0e055c1a3f3fba + 258a37cd6a7884f771d0f991d9f24d29e292abd0 - + https://github.com/dotnet/arcade - 34dff939b4a91e4693f78a856e0e055c1a3f3fba + 258a37cd6a7884f771d0f991d9f24d29e292abd0 https://github.com/dotnet/arcade-services @@ -226,14 +226,14 @@ c1bc837421e41a673cb30bf670c0cdd83ac09b75 - + https://github.com/dotnet/sourcelink - a74d21bcfa0f928b0cb1dab9fa6ff8a17248c584 + 0bba6b2d342056cb3fb3906f25929a92e063c5f8 - + https://github.com/dotnet/xliff-tasks - a125e2b00ca0add2a2a23e0ba67f8ae6a4b1a1ee + d106fdda2b3eda55f12e72977de336ab3afa1d91 diff --git a/eng/Versions.props b/eng/Versions.props index 6e569e714..32c365eb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.22419.1 + 7.0.0-beta.22424.3 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 846e7950c..bab18543d 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -62,7 +62,7 @@ $locJson = @{ $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($outputPath.Contains($exclusion)) + if ($_.FullName.Contains($exclusion)) { $continue = $false } @@ -98,7 +98,7 @@ $locJson = @{ $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($outputPath.Contains($exclusion)) + if ($_.FullName.Contains($exclusion)) { $continue = $false } diff --git a/global.json b/global.json index f0ab65167..62bb6aab6 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22419.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22419.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22424.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22424.3" } } diff --git a/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch b/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch index 57846fba6..098694eff 100644 --- a/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch +++ b/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch @@ -16,8 +16,8 @@ index df77e9a199d6..19b99be1f71b 100644 +++ b/global.json @@ -5,6 +5,6 @@ "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22367.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22367.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22358.3", - "Microsoft.Build.Traversal": "2.0.2" + "Microsoft.Build.Traversal": "2.0.34" } From e6c92089651222722100b99ae05c05c76add83bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Thu, 25 Aug 2022 20:57:31 +0200 Subject: [PATCH 2/2] Handle source-build patches in VMR initialization (#14397) - 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 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- .../tarball/content/src/source-mappings.json | 10 +++++++++- .../Tasks/VirtualMonoRepo_Initialize.cs | 9 +++------ 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dcafdd280..cc17bac0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -213,9 +213,9 @@ https://github.com/dotnet/arcade 258a37cd6a7884f771d0f991d9f24d29e292abd0 - + https://github.com/dotnet/arcade-services - a27d5e56acf479b4a0944a0cf4511acb22d4a75b + af1ca588ca991b9b570725581f7c7a4580629d3d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 32c365eb1..ac3348ac8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22422.1 + 1.1.0-beta.22425.1 diff --git a/src/SourceBuild/tarball/content/src/source-mappings.json b/src/SourceBuild/tarball/content/src/source-mappings.json index 3144d9e23..7a21f4f5b 100644 --- a/src/SourceBuild/tarball/content/src/source-mappings.json +++ b/src/SourceBuild/tarball/content/src/source-mappings.json @@ -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" diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs index 721bef092..dd977ff87 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs @@ -39,9 +39,8 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask private async Task ExecuteAsync() { - var factory = _serviceProvider.Value.GetRequiredService(); - var vmrManager = await factory.CreateVmrManager(_serviceProvider.Value, VmrPath, TmpPath); - await vmrManager.InitializeVmr(Repository, Revision, false, _cancellationToken.Token); + var vmrInitializer = _serviceProvider.Value.GetRequiredService(); + 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(sp => ActivatorUtilities.CreateInstance(sp, "git")) - .AddSingleton() - .AddSingleton() .AddSingleton(sp => ActivatorUtilities.CreateInstance(sp, TmpPath)) + .AddVmrManagers("git", sp => new VmrManagerConfiguration(VmrPath, TmpPath)) .BuildServiceProvider(); }