Skip to content

Commit

Permalink
[Recursive sync] installer / a0e2d0d → 6bbd460
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-maestro[bot] committed Feb 1, 2024
2 parents 160cb20 + 1d2487d commit 1337fab
Show file tree
Hide file tree
Showing 14 changed files with 90 additions and 76 deletions.
8 changes: 4 additions & 4 deletions Components.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ To enable full offline source-building of the VMR, we have no other choice than
- `src/emsdk`
*[dotnet/emsdk@e8ab136](https://github.com/dotnet/emsdk/tree/e8ab136db368ccb85c572d2c1541e3056883df3c)*
- `src/format`
*[dotnet/format@4f1acf0](https://github.com/dotnet/format/tree/4f1acf059b7e5e4ee76125a5a1dd94ce45d87a14)*
*[dotnet/format@36b6b86](https://github.com/dotnet/format/tree/36b6b8610f4d7530bc3bc290aaf85f48012e9d7a)*
- `src/fsharp`
*[dotnet/fsharp@80003bb](https://github.com/dotnet/fsharp/tree/80003bb3f0516455a0046887aa169febf2c4d3a8)*
- `src/installer`
*[dotnet/installer@a0e2d0d](https://github.com/dotnet/installer/tree/a0e2d0dec49d61502ddcb5230cb7018ab511ee54)*
*[dotnet/installer@6bbd460](https://github.com/dotnet/installer/tree/6bbd460f4db0a37cafeb04a1ed2d798ae56b0283)*
- `src/msbuild`
*[dotnet/msbuild@0868f37](https://github.com/dotnet/msbuild/tree/0868f37300c62178f9a56c068102ed26dda8c006)*
*[dotnet/msbuild@07fd5d5](https://github.com/dotnet/msbuild/tree/07fd5d51f25134ea3ab3620c66f6501a74df2921)*
- `src/nuget-client`
*[nuget/nuget.client@f207cbb](https://github.com/nuget/nuget.client/tree/f207cbb3530350f785d1b04014e15563cc9b5e03)*
- `src/nuget-client/submodules/NuGet.Build.Localization`
Expand All @@ -50,7 +50,7 @@ To enable full offline source-building of the VMR, we have no other choice than
- `src/scenario-tests`
*[dotnet/scenario-tests@bfde902](https://github.com/dotnet/scenario-tests/tree/bfde902a10d7b672f4fc7e844198ede405dbb9c6)*
- `src/sdk`
*[dotnet/sdk@7704430](https://github.com/dotnet/sdk/tree/7704430d51f6a3be1193591ba614d781745e1831)*
*[dotnet/sdk@fda3172](https://github.com/dotnet/sdk/tree/fda317207897906485106bb6844b29fd3af74ed2)*
- `src/source-build-externals`
*[dotnet/source-build-externals@414a85b](https://github.com/dotnet/source-build-externals/tree/414a85bf970355c0e91d6a2de1ee183fafbfcecd)*
- `src/source-build-externals/src/abstractions-xunit`
Expand Down
14 changes: 7 additions & 7 deletions prereqs/git-info/AllRepoVersions.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
<diagnosticsOutputPackageVersion>8.0.0-preview.24076.1</diagnosticsOutputPackageVersion>
<emsdkGitCommitHash>e8ab136db368ccb85c572d2c1541e3056883df3c</emsdkGitCommitHash>
<emsdkOutputPackageVersion>9.0.0-preview.1.24072.2</emsdkOutputPackageVersion>
<formatGitCommitHash>4f1acf059b7e5e4ee76125a5a1dd94ce45d87a14</formatGitCommitHash>
<formatOutputPackageVersion>9.0.507601</formatOutputPackageVersion>
<formatGitCommitHash>36b6b8610f4d7530bc3bc290aaf85f48012e9d7a</formatGitCommitHash>
<formatOutputPackageVersion>9.0.508102</formatOutputPackageVersion>
<fsharpGitCommitHash>80003bb3f0516455a0046887aa169febf2c4d3a8</fsharpGitCommitHash>
<fsharpOutputPackageVersion>8.0.300-beta.24080.5</fsharpOutputPackageVersion>
<installerGitCommitHash>a0e2d0dec49d61502ddcb5230cb7018ab511ee54</installerGitCommitHash>
<installerGitCommitHash>6bbd460f4db0a37cafeb04a1ed2d798ae56b0283</installerGitCommitHash>
<installerOutputPackageVersion>9.0.100</installerOutputPackageVersion>
<msbuildGitCommitHash>0868f37300c62178f9a56c068102ed26dda8c006</msbuildGitCommitHash>
<msbuildOutputPackageVersion>17.10.0-preview-24081-03</msbuildOutputPackageVersion>
<msbuildGitCommitHash>07fd5d51f25134ea3ab3620c66f6501a74df2921</msbuildGitCommitHash>
<msbuildOutputPackageVersion>17.10.0-preview-24101-01</msbuildOutputPackageVersion>
<nugetclientGitCommitHash>f207cbb3530350f785d1b04014e15563cc9b5e03</nugetclientGitCommitHash>
<nugetclientOutputPackageVersion>6.10.0-preview.1.18</nugetclientOutputPackageVersion>
<razorGitCommitHash>ae120b9fbe2d7af4dcaadd7f3cc5ea8c28ccca96</razorGitCommitHash>
Expand All @@ -37,8 +37,8 @@
<runtimeOutputPackageVersion>9.0.0-preview.1.24080.9</runtimeOutputPackageVersion>
<scenariotestsGitCommitHash>bfde902a10d7b672f4fc7e844198ede405dbb9c6</scenariotestsGitCommitHash>
<scenariotestsOutputPackageVersion>9.0.0-preview.24057.2</scenariotestsOutputPackageVersion>
<sdkGitCommitHash>7704430d51f6a3be1193591ba614d781745e1831</sdkGitCommitHash>
<sdkOutputPackageVersion>9.0.100-preview.1.24081.28</sdkOutputPackageVersion>
<sdkGitCommitHash>fda317207897906485106bb6844b29fd3af74ed2</sdkGitCommitHash>
<sdkOutputPackageVersion>9.0.100-preview.1.24101.1</sdkOutputPackageVersion>
<sourcebuildexternalsGitCommitHash>414a85bf970355c0e91d6a2de1ee183fafbfcecd</sourcebuildexternalsGitCommitHash>
<sourcebuildexternalsOutputPackageVersion>9.0.0-alpha.1.24076.1</sourcebuildexternalsOutputPackageVersion>
<sourcebuildreferencepackagesGitCommitHash>e659f328bf255d3e17e81296117c3aed1d461f2f</sourcebuildreferencepackagesGitCommitHash>
Expand Down
6 changes: 3 additions & 3 deletions prereqs/git-info/format.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<GitCommitHash>4f1acf059b7e5e4ee76125a5a1dd94ce45d87a14</GitCommitHash>
<OfficialBuildId>20240126.1</OfficialBuildId>
<OutputPackageVersion>9.0.507601</OutputPackageVersion>
<GitCommitHash>36b6b8610f4d7530bc3bc290aaf85f48012e9d7a</GitCommitHash>
<OfficialBuildId>20240201.1</OfficialBuildId>
<OutputPackageVersion>9.0.508102</OutputPackageVersion>
<PreReleaseVersionLabel></PreReleaseVersionLabel>
<IsStable>true</IsStable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion prereqs/git-info/installer.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<GitCommitHash>a0e2d0dec49d61502ddcb5230cb7018ab511ee54</GitCommitHash>
<GitCommitHash>6bbd460f4db0a37cafeb04a1ed2d798ae56b0283</GitCommitHash>
<OfficialBuildId>20240201.1</OfficialBuildId>
<OutputPackageVersion>9.0.100</OutputPackageVersion>
<PreReleaseVersionLabel></PreReleaseVersionLabel>
Expand Down
6 changes: 3 additions & 3 deletions prereqs/git-info/msbuild.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<GitCommitHash>0868f37300c62178f9a56c068102ed26dda8c006</GitCommitHash>
<OfficialBuildId>20240131.3</OfficialBuildId>
<OutputPackageVersion>17.10.0-preview-24081-03</OutputPackageVersion>
<GitCommitHash>07fd5d51f25134ea3ab3620c66f6501a74df2921</GitCommitHash>
<OfficialBuildId>20240201.1</OfficialBuildId>
<OutputPackageVersion>17.10.0-preview-24101-01</OutputPackageVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<IsStable>false</IsStable>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions prereqs/git-info/sdk.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<GitCommitHash>7704430d51f6a3be1193591ba614d781745e1831</GitCommitHash>
<OfficialBuildId>20240131.28</OfficialBuildId>
<OutputPackageVersion>9.0.100-preview.1.24081.28</OutputPackageVersion>
<GitCommitHash>fda317207897906485106bb6844b29fd3af74ed2</GitCommitHash>
<OfficialBuildId>20240201.1</OfficialBuildId>
<OutputPackageVersion>9.0.100-preview.1.24101.1</OutputPackageVersion>
<PreReleaseVersionLabel>preview.1</PreReleaseVersionLabel>
<IsStable>false</IsStable>
</PropertyGroup>
Expand Down
16 changes: 8 additions & 8 deletions src/format/eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<!-- Microsoft.CodeAnalysis.Workspaces.MSBuild transitively references M.Bcl.AsyncInterfaces.
Adding an explicit dependency to make sure the latest version is used instead of the SBRP
one under source build. -->
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0-preview.1.24074.8">
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0-preview.1.24080.9">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4aa81d9da52616ac18e6eb584e37a08cfb2ba87</Sha>
<Sha>1d1bf92fcf43aa6981804dc53c5174445069c9e4</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.3.2">
Expand Down Expand Up @@ -42,17 +42,17 @@
<Uri>https://github.com/dotnet/symreader</Uri>
<Sha>27e584661980ee6d82c419a2a471ae505b7d122e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.1.24074.8">
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.1.24080.9">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4aa81d9da52616ac18e6eb584e37a08cfb2ba87</Sha>
<Sha>1d1bf92fcf43aa6981804dc53c5174445069c9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-preview.1.24074.8">
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-preview.1.24080.9">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4aa81d9da52616ac18e6eb584e37a08cfb2ba87</Sha>
<Sha>1d1bf92fcf43aa6981804dc53c5174445069c9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.1.24074.8">
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.1.24080.9">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4aa81d9da52616ac18e6eb584e37a08cfb2ba87</Sha>
<Sha>1d1bf92fcf43aa6981804dc53c5174445069c9e4</Sha>
<SourceBuild RepoName="runtime" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.505902">
Expand Down
4 changes: 2 additions & 2 deletions src/format/eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<!-- roslyn-sdk -->
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
<!-- runtime -->
<MicrosoftExtensionsFileSystemGlobbingVersion>9.0.0-preview.1.24074.8</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.1.24074.8</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>9.0.0-preview.1.24080.9</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.1.24080.9</MicrosoftExtensionsLoggingVersion>
<!-- symreader -->
<MicrosoftDiaSymReaderVersion>2.0.0</MicrosoftDiaSymReaderVersion>
</PropertyGroup>
Expand Down
20 changes: 10 additions & 10 deletions src/installer/eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,22 +81,22 @@
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-preview.1.24081.28">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-preview.1.24101.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>7704430d51f6a3be1193591ba614d781745e1831</Sha>
<Sha>fda317207897906485106bb6844b29fd3af74ed2</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-preview.1.24081.28">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-preview.1.24101.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>7704430d51f6a3be1193591ba614d781745e1831</Sha>
<Sha>fda317207897906485106bb6844b29fd3af74ed2</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-preview.1.24081.28">
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-preview.1.24101.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>7704430d51f6a3be1193591ba614d781745e1831</Sha>
<Sha>fda317207897906485106bb6844b29fd3af74ed2</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-preview.1.24081.28">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-preview.1.24101.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>7704430d51f6a3be1193591ba614d781745e1831</Sha>
<Sha>fda317207897906485106bb6844b29fd3af74ed2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
Expand Down Expand Up @@ -155,9 +155,9 @@
<Sha>3cd939f76803da435c20b082a5cfcc844386fcfb</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.10.0-preview-24081-03" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.10.0-preview-24101-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>0868f37300c62178f9a56c068102ed26dda8c006</Sha>
<Sha>07fd5d51f25134ea3ab3620c66f6501a74df2921</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.10.0-preview.1.18" CoherentParentDependency="Microsoft.NET.Sdk">
Expand Down
6 changes: 3 additions & 3 deletions src/installer/eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.1.24081.28</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-preview.1.24081.28</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.1.24081.28</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.1.24101.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-preview.1.24101.1</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.1.24101.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Build.Collections;
Expand Down Expand Up @@ -568,7 +569,7 @@ internal async Task ExecuteTarget(ITaskBuilder taskBuilder, BuildRequestEntry re
}

// Produce the final results.
List<TaskItem> targetOutputItems = new List<TaskItem>();
TaskItem[] targetOutputItems = Array.Empty<TaskItem>();

try
{
Expand Down Expand Up @@ -622,37 +623,50 @@ internal async Task ExecuteTarget(ITaskBuilder taskBuilder, BuildRequestEntry re

if (keepDupes)
{
List<TaskItem> targetOutputItemsList = new();
foreach (ItemBucket bucket in batchingBuckets)
{
targetOutputItems.AddRange(bucket.Expander.ExpandIntoTaskItemsLeaveEscaped(targetReturns, ExpanderOptions.ExpandAll, targetReturnsLocation));
if (targetOutputItems is null)
{
// As an optimization, use the results for the first bucket and if there are no more buckets to process, only a single list is allocated.
targetOutputItemsList = bucket.Expander.ExpandIntoTaskItemsLeaveEscaped(targetReturns, ExpanderOptions.ExpandAll, targetReturnsLocation).ToList();
}
else
{
targetOutputItemsList.AddRange(bucket.Expander.ExpandIntoTaskItemsLeaveEscaped(targetReturns, ExpanderOptions.ExpandAll, targetReturnsLocation));
}
}

targetOutputItems = targetOutputItemsList.ToArray();
}
else
{
HashSet<TaskItem> addedItems = new HashSet<TaskItem>();
foreach (ItemBucket bucket in batchingBuckets)
// Optimize for only one bucket by initializing the HashSet<T> with the first one's items in case there are a lot of items, it won't need to be resized.
if (batchingBuckets.Count == 1)
{
IList<TaskItem> itemsToAdd = bucket.Expander.ExpandIntoTaskItemsLeaveEscaped(targetReturns, ExpanderOptions.ExpandAll, targetReturnsLocation);

foreach (TaskItem item in itemsToAdd)
targetOutputItems = new HashSet<TaskItem>(batchingBuckets[0].Expander.ExpandIntoTaskItemsLeaveEscaped(targetReturns, ExpanderOptions.ExpandAll, targetReturnsLocation)).ToArray();
}
else
{
HashSet<TaskItem> addedItems = new HashSet<TaskItem>();
foreach (ItemBucket bucket in batchingBuckets)
{
if (!addedItems.Contains(item))
{
targetOutputItems.Add(item);
addedItems.Add(item);
}
IList<TaskItem> itemsToAdd = bucket.Expander.ExpandIntoTaskItemsLeaveEscaped(targetReturns, ExpanderOptions.ExpandAll, targetReturnsLocation);
addedItems.UnionWith(itemsToAdd);
}

targetOutputItems = addedItems.ToArray();
}
}
}
}
finally
{
// log the last target finished since we now have the target outputs.
targetLoggingContext?.LogTargetBatchFinished(projectFullPath, targetSuccess, targetOutputItems?.Count > 0 ? targetOutputItems : null);
targetLoggingContext?.LogTargetBatchFinished(projectFullPath, targetSuccess, targetOutputItems.Length > 0 ? targetOutputItems : null);
}

_targetResult = new TargetResult(targetOutputItems.ToArray(), aggregateResult, targetLoggingContext?.BuildEventContext);
_targetResult = new TargetResult(targetOutputItems, aggregateResult, targetLoggingContext?.BuildEventContext);

if (aggregateResult.ResultCode == WorkUnitResultCode.Failed && aggregateResult.ActionCode == WorkUnitActionCode.Stop)
{
Expand Down

0 comments on commit 1337fab

Please sign in to comment.