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

Merge branch 'main' of https://github.com/dotnet/installer into TestProjectValidation

Browse source
This commit is contained in:
Jackson Schuster 2024-04-01 11:29:19 -07:00
commit df7cd4ff54
23 changed files with 351 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/SourceBuild/content/eng/Version.Details.xml
View file

@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24177.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
<Sha>689fb2d1b620a9df28c3384d9b208e3654a0f928</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

6
src/SourceBuild/content/eng/Versions.props
View file

@ -23,10 +23,10 @@
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
are not necessary, and this property is removed from the file.
-->
<PrivateSourceBuiltSdkVersion>9.0.100-preview.2.24104.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.2.24104.1</PrivateSourceBuiltArtifactsVersion>
<PrivateSourceBuiltSdkVersion>9.0.100-preview.4.24179.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.4.24179.1</PrivateSourceBuiltArtifactsVersion>
<!-- msbuild -->
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
<MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
<!-- runtime -->
<MicrosoftExtensionsFileSystemGlobbingVersion>9.0.0-preview.2.24128.5</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.2.24128.5</MicrosoftExtensionsLoggingConsoleVersion>

6
src/SourceBuild/content/eng/tools/init-build.proj
View file

@ -94,12 +94,12 @@
</Touch>
</Target>
<!-- Build msbuild tasks for the poisoning feature. -->
<!-- Build msbuild tasks for the poisoning feature even when EnablePoison!=true to validate that the task project
builds as EnablePoison=true isn't exercised in PR validation. -->
<Target Name="BuildLeakDetection"
DependsOnTargets="ExtractToolPackage;BuildMSBuildSdkResolver"
Inputs="$(MSBuildProjectFullPath)"
Outputs="$(BaseIntermediateOutputPath)BuildLeakDetection.complete"
Condition="'$(EnablePoison)' == 'true'">
Outputs="$(BaseIntermediateOutputPath)BuildLeakDetection.complete">
<MSBuild Projects="tasks\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj"
Targets="Restore"
Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())" />

1
src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj
View file

@ -6,7 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
</ItemGroup>

99
src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs
View file

@ -22,8 +22,9 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
* For previously source-built sources (PSB), add only the packages that do not exist in any of the current source-built sources.
* Also add PSB packages if that package version does not exist in current package sources.
* In offline build, remove all existing package source mappings for online sources.
* In online build, filter existing package source mappings to remove anything that exists in any source-build source.
* In online build, if NuGet.config didn't have any mappings, add default "*" pattern for all online sources.
* In online build, add online source mappings for all discovered packages from local sources.
* In online build, if NuGet.config didn't originally have any mappings, additionally,
* add default "*" pattern to all online source mappings.
*/
public class UpdateNuGetConfigPackageSourcesMappings : Task
{
@ -43,18 +44,26 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
[Required]
public string SbrpRepoSrcPath { get; set; }
private const string SbrpCacheSourceName = "source-build-reference-package-cache";
[Required]
public string SourceBuiltSourceNamePrefix { get; set; }
// allSourcesPackages contains 'package source', 'list of packages' mappings
public string SbrpCacheSourceName { get; set; }
public string ReferencePackagesSourceName { get; set; }
public string PreviouslySourceBuiltSourceName { get; set; }
public string[] CustomSources { get; set; }
// allSourcesPackages and oldSourceMappingPatterns contain 'package source', 'list of packages' mappings
private Dictionary<string, List<string>> allSourcesPackages = [];
private Dictionary<string, List<string>> oldSourceMappingPatterns = [];
// All other dictionaries are: 'package id', 'list of package versions'
private Dictionary<string, List<string>> currentPackages = [];
private Dictionary<string, List<string>> referencePackages = [];
private Dictionary<string, List<string>> previouslyBuiltPackages = [];
private Dictionary<string, List<string>> oldSourceMappingPatterns = [];
private string[] CustomSources = ["prebuilt", "net-sdk-supporting-feed"];
private Dictionary<string, List<string>> previouslySourceBuiltPackages = [];
private Dictionary<string, List<string>> prebuiltPackages = [];
public override bool Execute()
{
@ -79,7 +88,7 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
DiscoverPackagesFromAllSourceBuildSources(pkgSourcesElement);
// Discover all SBRP packages if source-build-reference-package-cache source is present in NuGet.config
XElement sbrpCacheSourceElement = pkgSourcesElement.Descendants().FirstOrDefault(e => e.Name == "add" && e.Attribute("key").Value == SbrpCacheSourceName);
XElement sbrpCacheSourceElement = GetElement(pkgSourcesElement, "add", SbrpCacheSourceName);
if (sbrpCacheSourceElement != null)
{
DiscoverPackagesFromSbrpCacheSource();
@ -101,7 +110,7 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
foreach (string packageSource in allSourcesPackages.Keys)
{
// Skip sources with zero package patterns
if (allSourcesPackages[packageSource] != null)
if (allSourcesPackages[packageSource]?.Count > 0)
{
pkgSrcMappingClearElement.AddAfterSelf(GetPackageMappingsElementForSource(packageSource));
}
@ -111,21 +120,17 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
// If there are none, add default mappings for all online sources.
if (BuildWithOnlineFeeds)
{
if (oldSourceMappingPatterns.Count > 0)
foreach (var entry in oldSourceMappingPatterns)
{
foreach (var entry in oldSourceMappingPatterns)
// Skip sources with zero package patterns
if (entry.Value?.Count > 0)
{
// Skip sources with zero package patterns
if (entry.Value?.Count > 0)
{
pkgSrcMappingElement.Add(GetPackageMappingsElementForSource(entry.Key, entry.Value));
}
pkgSrcMappingElement.Add(GetPackageMappingsElementForSource(entry.Key, entry.Value));
}
}
// Union all package sources to get the distinct list. These will get added to
// the two custom sourcess (prebuilt and net-sdk-supporting-feed) and all online
// sources based on following logic:
// Union all package sources to get the distinct list. These will get added to
// all custom sources and all online sources based on the following logic:
// If there were existing mappings for online feeds, add cummulative mappings
// from all feeds to these two.
// If there were no existing mappings, add default mappings for all online feeds.
@ -159,9 +164,14 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
private void AddMappingsForCustomSources(XElement pkgSrcMappingElement, XElement pkgSourcesElement, List<string> packagePatterns)
{
if (CustomSources == null)
{
return;
}
foreach (string sourceName in CustomSources)
{
if (null != pkgSourcesElement.Descendants().FirstOrDefault(e => e.Name == "add" && e.Attribute("key").Value == sourceName))
if (null != GetElement(pkgSourcesElement, "add", sourceName))
{
ReplaceSourceMappings(pkgSrcMappingElement, sourceName, packagePatterns);
}
@ -176,10 +186,10 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern)));
}
XElement pkgSrcMappingClearElement = pkgSrcMappingElement.Descendants().FirstOrDefault(e => e.Name == "packageSource" && e.Attribute("key").Value == sourceName);
if (pkgSrcMappingClearElement != null)
XElement existingPkgSrcElement = GetElement(pkgSrcMappingElement, "packageSource", sourceName);
if (existingPkgSrcElement != null)
{
pkgSrcMappingClearElement.ReplaceWith(pkgSrc);
existingPkgSrcElement.ReplaceWith(pkgSrc);
}
else
{
@ -216,9 +226,9 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
private XElement GetPackageMappingsElementForSource(string packageSource)
{
bool isCurrentSourceBuiltSource =
packageSource.StartsWith("source-built-") ||
packageSource.StartsWith(SourceBuiltSourceNamePrefix) ||
packageSource.Equals(SbrpCacheSourceName) ||
packageSource.Equals("reference-packages");
packageSource.Equals(ReferencePackagesSourceName);
XElement pkgSrc = new XElement("packageSource", new XAttribute("key", packageSource));
foreach (string packagePattern in allSourcesPackages[packageSource])
@ -230,9 +240,20 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
{
pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern)));
}
else
else if (packageSource.Equals(PreviouslySourceBuiltSourceName))
{
foreach (string version in previouslyBuiltPackages[packagePattern])
foreach (string version in previouslySourceBuiltPackages[packagePattern])
{
if (!currentPackages[packagePattern].Contains(version))
{
pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern)));
break;
}
}
}
else // prebuilt source
{
foreach (string version in prebuiltPackages[packagePattern])
{
if (!currentPackages[packagePattern].Contains(version))
{
@ -250,7 +271,7 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
{
foreach (string packageSource in SourceBuildSources)
{
XElement sourceElement = pkgSourcesElement.Descendants().FirstOrDefault(e => e.Name == "add" && e.Attribute("key").Value == packageSource);
XElement sourceElement = GetElement(pkgSourcesElement, "add", packageSource);
if (sourceElement == null)
{
continue;
@ -270,17 +291,21 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
string version = info.Version.ToLower();
// Add package with version to appropriate hashtable
if (packageSource.StartsWith("source-built-"))
if (packageSource.StartsWith(SourceBuiltSourceNamePrefix))
{
AddToDictionary(currentPackages, id, version);
}
else if (packageSource.Equals("reference-packages"))
else if (packageSource.Equals(ReferencePackagesSourceName))
{
AddToDictionary(referencePackages, id, version);
}
else // previously built packages
else if (packageSource.Equals(PreviouslySourceBuiltSourceName))
{
AddToDictionary(previouslyBuiltPackages, id, version);
AddToDictionary(previouslySourceBuiltPackages, id, version);
}
else // prebuilt source
{
AddToDictionary(prebuiltPackages, id, version);
}
AddToDictionary(allSourcesPackages, packageSource, id);
@ -318,6 +343,11 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
}
}
private XElement GetElement(XElement pkgSourcesElement, string name, string key)
{
return pkgSourcesElement.Descendants().FirstOrDefault(e => e.Name == name && e.Attribute("key").Value == key);
}
private void GetExistingFilteredSourceMappings(XElement pkgSrcMappingElement)
{
foreach (XElement packageSource in pkgSrcMappingElement.Descendants().Where(e => e.Name == "packageSource"))
@ -328,7 +358,8 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
string pattern = package.Attribute("pattern").Value.ToLower();
if (!currentPackages.ContainsKey(pattern) &&
!referencePackages.ContainsKey(pattern) &&
!previouslyBuiltPackages.ContainsKey(pattern))
!previouslySourceBuiltPackages.ContainsKey(pattern) &&
!prebuiltPackages.ContainsKey(pattern))
{
filteredPatterns.Add(pattern);
}