From 62f7ead6cf4b7969dc64d5db9981d80ff4a507b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Thu, 5 Dec 2024 12:04:59 +0100 Subject: [PATCH 1/5] Ignore mapping disables during non-recursive synchronization (#4211) --- .../DarcLib/GitHubClient.cs | 18 +++++++++++------- .../DarcLib/VirtualMonoRepo/VmrUpdater.cs | 7 +------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/Microsoft.DotNet.Darc/DarcLib/GitHubClient.cs b/src/Microsoft.DotNet.Darc/DarcLib/GitHubClient.cs index 92f7fda59..752fee35c 100644 --- a/src/Microsoft.DotNet.Darc/DarcLib/GitHubClient.cs +++ b/src/Microsoft.DotNet.Darc/DarcLib/GitHubClient.cs @@ -239,7 +239,6 @@ public async Task DoesBranchExistAsync(string repoUri, string branch) /// Repository owner /// Repository name /// Branch to delete - /// private async Task DeleteBranchAsync(string owner, string repo, string branch) { await GetClient(owner, repo).Git.Reference.Delete(owner, repo, $"heads/{branch}"); @@ -360,7 +359,6 @@ public async Task GetPullRequestAsync(string pullRequestUrl) /// /// Repo to create the pull request for. /// Pull request data - /// public async Task CreatePullRequestAsync(string repoUri, PullRequest pullRequest) { (string owner, string repo) = ParseRepoUri(repoUri); @@ -369,9 +367,18 @@ public async Task CreatePullRequestAsync(string repoUri, PullRequest pul { Body = pullRequest.Description }; - Octokit.PullRequest createdPullRequest = await GetClient(repoUri).PullRequest.Create(owner, repo, pr); - return createdPullRequest.Url; + try + { + Octokit.PullRequest createdPullRequest = await GetClient(repoUri).PullRequest.Create(owner, repo, pr); + return createdPullRequest.Url; + } + catch (ApiValidationException) + { + throw new DarcException( + $"Failed to create PR in {repoUri} from branch {pullRequest.HeadBranch} to {pullRequest.BaseBranch}. " + + "PR for that branch already exists or a possible conflict prevents the PR from being created."); + } } /// @@ -379,7 +386,6 @@ public async Task CreatePullRequestAsync(string repoUri, PullRequest pul /// /// Uri of pull request to update /// Pull request info to update - /// public async Task UpdatePullRequestAsync(string pullRequestUri, PullRequest pullRequest) { (string owner, string repo, int id) = ParsePullRequestUri(pullRequestUri); @@ -422,7 +428,6 @@ public async Task> GetPullRequestCommitsAsync(string pullRequestUr /// Uri of pull request to merge /// Settings for merge /// Commit message used to merge the pull request - /// public async Task MergeDependencyPullRequestAsync(string pullRequestUrl, MergePullRequestParameters parameters, string mergeCommitMessage) { (string owner, string repo, int id) = ParsePullRequestUri(pullRequestUrl); @@ -770,7 +775,6 @@ private async Task GetGitItemImpl(string path, TreeItem treeItem, strin /// Logger /// Body if is POST or PATCH /// Use alternate API version, if specified. - /// private async Task ExecuteRemoteGitCommandAsync( HttpMethod method, string repoUri, diff --git a/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrUpdater.cs b/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrUpdater.cs index c1a26eef1..57a2479b5 100644 --- a/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrUpdater.cs +++ b/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrUpdater.cs @@ -198,12 +198,6 @@ private async Task> UpdateRepositoryInter bool discardPatches, CancellationToken cancellationToken) { - if (update.Mapping.DisableSynchronization) - { - _logger.LogInformation("Synchronization for {repo} is disabled, skipping...", update.Mapping.Name); - return []; - } - VmrDependencyVersion currentVersion = _dependencyTracker.GetDependencyVersion(update.Mapping) ?? throw new Exception($"Failed to find current version for {update.Mapping.Name}"); @@ -340,6 +334,7 @@ private async Task UpdateRepositoryRecursively( { if (update.Mapping.DisableSynchronization) { + _logger.LogInformation("Synchronization for {repo} is disabled, skipping...", update.Mapping.Name); continue; } From 8c453ce2b145f31db52b45b3f17989674f2827b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Thu, 5 Dec 2024 14:39:10 +0100 Subject: [PATCH 2/5] Stop generating the component list during forward flows (#4214) --- .../DarcLib/VirtualMonoRepo/VmrForwardFlower.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrForwardFlower.cs b/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrForwardFlower.cs index 303c5ee60..bf05d815e 100644 --- a/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrForwardFlower.cs +++ b/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrForwardFlower.cs @@ -247,7 +247,7 @@ protected override async Task SameDirectionFlowAsync( build.Id, updateDependencies: false, additionalRemotes: additionalRemotes, - componentTemplatePath: _vmrInfo.VmrPath / VmrInfo.ComponentTemplatePath, + componentTemplatePath: null, tpnTemplatePath: _vmrInfo.VmrPath / VmrInfo.ThirdPartyNoticesTemplatePath, generateCodeowners: false, generateCredScanSuppressions: true, @@ -303,7 +303,7 @@ await FlowCodeAsync( build.Id, updateDependencies: false, additionalRemotes, - componentTemplatePath: _vmrInfo.VmrPath / VmrInfo.ComponentTemplatePath, + componentTemplatePath: null, tpnTemplatePath: _vmrInfo.VmrPath / VmrInfo.ThirdPartyNoticesTemplatePath, generateCodeowners: false, generateCredScanSuppressions: false, @@ -379,7 +379,7 @@ .. submodules.Select(s => s.Path).Distinct().Select(VmrPatchHandler.GetExclusion build.Id, updateDependencies: false, additionalRemote, - componentTemplatePath: _vmrInfo.VmrPath / VmrInfo.ComponentTemplatePath, + componentTemplatePath: null, tpnTemplatePath: _vmrInfo.VmrPath / VmrInfo.ThirdPartyNoticesTemplatePath, generateCodeowners: false, generateCredScanSuppressions: true, From 5ae3990c0e21953cb681700166e9baaa7014b7ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Thu, 5 Dec 2024 16:07:21 +0100 Subject: [PATCH 3/5] Fix asset comparison during graph building (#4219) --- .../DarcLib/Models/Darc/DependencyGraph.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Darc/DarcLib/Models/Darc/DependencyGraph.cs b/src/Microsoft.DotNet.Darc/DarcLib/Models/Darc/DependencyGraph.cs index b636bb520..3344973b5 100644 --- a/src/Microsoft.DotNet.Darc/DarcLib/Models/Darc/DependencyGraph.cs +++ b/src/Microsoft.DotNet.Darc/DarcLib/Models/Darc/DependencyGraph.cs @@ -696,7 +696,7 @@ private static bool BuildContributesToNode(DependencyGraphNode node, Build poten { if (dependency.Commit == node.Commit && dependency.RepoUri == node.Repository && - potentialContributingBuild.Assets.Any(a => Equals(a, dependency))) + potentialContributingBuild.Assets.Any(a => AssetComparer.Equals(a, dependency))) { return true; } From b038405253ba9047601d8b885b76dc361c67084f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 16:45:06 +0100 Subject: [PATCH 4/5] [main] Update dependencies from dotnet/dnceng-shared (#4218) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Premek Vysoky --- Directory.Packages.props | 2 +- eng/Version.Details.xml | 88 +++++++++---------- eng/Versions.props | 44 +++++----- .../Maestro.Data/BuildAssetRegistryContext.cs | 32 +++---- src/Maestro/Maestro.Data/Maestro.Data.csproj | 2 - .../DependencyRegistrationTests.cs | 8 +- 6 files changed, 79 insertions(+), 97 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index b525ffdcd..5e2dc4038 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,7 +2,7 @@ 3.1.24 - 6.0.26 + 6.0.36 6.0.0 8.2.0 true diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fcd6d546c..a53b0dcba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,93 +1,93 @@ - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 - + https://github.com/dotnet/dnceng-shared - 77fb751f40c92262450af10314e965a1a708857b + 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 diff --git a/eng/Versions.props b/eng/Versions.props index 00991bf1e..f35c99134 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,28 +15,28 @@ 8.0.0-beta.24570.5 8.0.0-beta.24570.5 17.4.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 - 1.1.0-beta.24376.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 + 1.1.0-beta.24605.1 1.1.0-beta.24562.1 1.1.0-beta.24562.1 diff --git a/src/Maestro/Maestro.Data/BuildAssetRegistryContext.cs b/src/Maestro/Maestro.Data/BuildAssetRegistryContext.cs index 080ec061d..0921dc567 100644 --- a/src/Maestro/Maestro.Data/BuildAssetRegistryContext.cs +++ b/src/Maestro/Maestro.Data/BuildAssetRegistryContext.cs @@ -14,9 +14,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; using Microsoft.EntityFrameworkCore.Query.SqlExpressions; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Hosting.Internal; - namespace Maestro.Data; public class BuildAssetRegistryContextFactory : IDesignTimeDbContextFactory @@ -39,9 +36,7 @@ public BuildAssetRegistryContext CreateDbContext(string[] args) }) .Options; - return new BuildAssetRegistryContext( - new HostingEnvironment{EnvironmentName = Environments.Development}, - options); + return new BuildAssetRegistryContext(options); } public static string GetConnectionString(string databaseName) @@ -50,16 +45,9 @@ public static string GetConnectionString(string databaseName) } } -public class BuildAssetRegistryContext : IdentityDbContext, int> +public class BuildAssetRegistryContext(DbContextOptions options) + : IdentityDbContext, int>(options) { - public BuildAssetRegistryContext(IHostEnvironment hostingEnvironment, DbContextOptions options) : base( - options) - { - HostingEnvironment = hostingEnvironment; - } - - public IHostEnvironment HostingEnvironment { get; } - public DbSet Assets { get; set; } public DbSet AssetLocations { get; set; } public DbSet AssetFilters { get; set; } @@ -121,7 +109,7 @@ protected override void OnModelCreating(ModelBuilder builder) base.OnModelCreating(builder); builder.Entity() - .HasIndex(a => new {a.Name, a.Version}); + .HasIndex(a => new { a.Name, a.Version }); builder.Entity().HasIndex(c => c.Name).IsUnique(); @@ -144,7 +132,7 @@ protected override void OnModelCreating(ModelBuilder builder) .HasForeignKey(bc => bc.ChannelId); builder.Entity() - .HasKey(d => new {d.BuildId, d.DependentBuildId}); + .HasKey(d => new { d.BuildId, d.DependentBuildId }); builder.Entity() .HasOne(d => d.Build) @@ -176,7 +164,7 @@ protected override void OnModelCreating(ModelBuilder builder) dc.ChannelId }) .IsUnique(); - + builder.Entity().Property(typeof(DateTime), "SysStartTime").HasColumnType("datetime2"); builder.Entity().Property(typeof(DateTime), "SysEndTime").HasColumnType("datetime2"); @@ -203,7 +191,7 @@ protected override void OnModelCreating(ModelBuilder builder) builder.Entity().HasIndex("SysEndTime", "SysStartTime").IsClustered(); builder.Entity().HasIndex("SubscriptionId", "SysEndTime", "SysStartTime"); - builder.Entity().HasKey(r => new {r.RepositoryName}); + builder.Entity().HasKey(r => new { r.RepositoryName }); builder.Entity() .HasKey( @@ -216,7 +204,7 @@ protected override void OnModelCreating(ModelBuilder builder) builder.Entity() .HasOne(rb => rb.Repository) .WithMany(r => r.Branches) - .HasForeignKey(rb => new {rb.RepositoryName}); + .HasForeignKey(rb => new { rb.RepositoryName }); builder.Entity() .HasKey( @@ -335,8 +323,8 @@ AND traverse.Depth < 10 -- Don't load all the way back because of incorrect isPr }; IQueryable builds = from build in Builds - where buildIds.Contains(build.Id) - select build; + where buildIds.Contains(build.Id) + select build; Dictionary dict = await builds.ToDictionaryAsync(b => b.Id, b => diff --git a/src/Maestro/Maestro.Data/Maestro.Data.csproj b/src/Maestro/Maestro.Data/Maestro.Data.csproj index 53b14411a..5500e2588 100644 --- a/src/Maestro/Maestro.Data/Maestro.Data.csproj +++ b/src/Maestro/Maestro.Data/Maestro.Data.csproj @@ -6,8 +6,6 @@ - - diff --git a/test/Maestro.Data.Tests/DependencyRegistrationTests.cs b/test/Maestro.Data.Tests/DependencyRegistrationTests.cs index 8035c9771..82472ff50 100644 --- a/test/Maestro.Data.Tests/DependencyRegistrationTests.cs +++ b/test/Maestro.Data.Tests/DependencyRegistrationTests.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Hosting.Internal; +using Moq; using NUnit.Framework; namespace Maestro.Data.Tests; @@ -19,11 +19,7 @@ public void AreDependenciesRegistered() { DependencyInjectionValidation.IsDependencyResolutionCoherent(s => { - s.AddSingleton(new HostingEnvironment - { - EnvironmentName = - Environments.Development - }); + s.AddSingleton(Mock.Of(m => m.EnvironmentName == Environments.Development)); s.AddBuildAssetRegistry(options => { options.UseInMemoryDatabase("BuildAssetRegistry"); From 7e119788882ea6e648a2dee0777d5a7f8349da27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 21:21:27 +0100 Subject: [PATCH 5/5] [main] Update dependencies from dotnet/dnceng-shared (#4223) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++----------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a53b0dcba..d149100d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,93 +1,93 @@ - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a - + https://github.com/dotnet/dnceng-shared - 6f2b2d87ac1a49800e032603301d3076cd2fa4d0 + ba6673193e2447a3cb5f373a2168f0fe561dcd9a diff --git a/eng/Versions.props b/eng/Versions.props index f35c99134..bcf24f1e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,28 +15,28 @@ 8.0.0-beta.24570.5 8.0.0-beta.24570.5 17.4.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 - 1.1.0-beta.24605.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 + 1.1.0-beta.24606.1 1.1.0-beta.24562.1 1.1.0-beta.24562.1