Skip to content

Commit d22c0dc

Browse files
author
Jason Zhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into merge/release/9.0.2xx-to-main
2 parents c1b0a9a + 131a081 commit d22c0dc

File tree

19 files changed

+528
-688
lines changed

19 files changed

+528
-688
lines changed

‎eng/Version.Details.xml‎

Lines changed: 224 additions & 224 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 88 additions & 88 deletions
Large diffs are not rendered by default.

‎eng/common/native/install-dependencies.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ case "$os" in
4444
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
4545
# Skip brew update for now, see https://github.com/actions/setup-python/issues/577
4646
# brew update --preinstall
47+
48+
# Temporarily uninstall [email protected] to work around https://github.com/actions/runner-images/issues/10984
49+
brew uninstall --ignore-dependencies --force [email protected]
50+
4751
brew bundle --no-upgrade --no-lock --file=- <<EOF
4852
brew "cmake"
4953
brew "icu4c"

‎github-merge-flow.jsonc‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
// IMPORTANT: This file is read by the merge flow from main branch only.
22
{
33
"merge-flow-configurations": {
4-
// Automate opening PRs to merge cli release/6.0.1xx to .4xx
5-
"release/6.0.1xx":{
6-
"MergeToBranch": "release/6.0.4xx",
7-
"ExtraSwitches": "-QuietComments"
8-
},
9-
// Automate opening PRs to merge cli release/6.0.4xx to 8.0.1xx
10-
"release/6.0.4xx":{
11-
"MergeToBranch": "release/8.0.1xx",
12-
"ExtraSwitches": "-QuietComments"
13-
},
144
// Automate opening PRs to merge cli release/8.0.1xx to 8.0.3xx
155
"release/8.0.1xx":{
166
"MergeToBranch": "release/8.0.3xx",

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24564.1",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.4",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24570.4",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompat.Shared/SuppressionFileHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static void GenerateSuppressionFile(ISuppressionEngine suppressionEngine,
3939
return;
4040
}
4141

42-
if (suppressionEngine.WriteSuppressionsToFile(suppressionOutputFile, preserveUnnecessarySuppressions).Count > 0)
42+
if (suppressionEngine.WriteSuppressionsToFile(suppressionOutputFile, preserveUnnecessarySuppressions).SuppressionFileUpdated)
4343
{
4444
log.LogMessage(MessageImportance.High,
4545
string.Format(CommonResources.WroteSuppressions, suppressionOutputFile));

‎src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompatibility/Logging/ISuppressionEngine.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public interface ISuppressionEngine
5454
/// </summary>
5555
/// <param name="suppressionOutputFile">The path to the file to be written.</param>
5656
/// <param name="preserveUnnecessarySuppressions">If <see langword="true"/>, preserves unnecessary suppressions.</param>
57-
/// <returns>Returns the set of suppressions written.</returns>
58-
IReadOnlyCollection<Suppression> WriteSuppressionsToFile(string suppressionOutputFile, bool preserveUnnecessarySuppressions = false);
57+
/// <returns>Returns a boolean indicating whether the suppression file got updated and the set of suppressions written.</returns>
58+
(bool SuppressionFileUpdated, IReadOnlyCollection<Suppression> UpdatedSuppressions) WriteSuppressionsToFile(string suppressionOutputFile, bool preserveUnnecessarySuppressions = false);
5959
}
6060
}

‎src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompatibility/Logging/SuppressionEngine.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ public bool IsErrorSuppressed(Suppression error)
104104
public void AddSuppression(Suppression suppression) => _suppressions.Add(suppression);
105105

106106
/// <inheritdoc/>
107-
public IReadOnlyCollection<Suppression> WriteSuppressionsToFile(string suppressionOutputFile, bool preserveUnnecessarySuppressions = false)
107+
public (bool SuppressionFileUpdated, IReadOnlyCollection<Suppression> UpdatedSuppressions)
108+
WriteSuppressionsToFile(string suppressionOutputFile, bool preserveUnnecessarySuppressions = false)
108109
{
109110
// If unnecessary suppressions should be preserved in the suppression file, union the
110111
// baseline suppressions with the set of actual suppressions. Duplicates are ignored.
@@ -114,9 +115,11 @@ public IReadOnlyCollection<Suppression> WriteSuppressionsToFile(string suppressi
114115
suppressionsToSerialize.UnionWith(_baselineSuppressions);
115116
}
116117

117-
if (suppressionsToSerialize.Count == 0)
118+
// If there aren't any suppressions and baseline suppressions, skip writing the
119+
// suppression file.
120+
if (suppressionsToSerialize.Count == 0 && _baselineSuppressions.Count == 0)
118121
{
119-
return Array.Empty<Suppression>();
122+
return (false, []);
120123
}
121124

122125
Suppression[] orderedSuppressions = suppressionsToSerialize
@@ -138,7 +141,7 @@ public IReadOnlyCollection<Suppression> WriteSuppressionsToFile(string suppressi
138141
CreateXmlSerializer().Serialize(xmlWriter, orderedSuppressions);
139142
AfterWritingSuppressionsCallback(stream);
140143

141-
return orderedSuppressions;
144+
return (true, orderedSuppressions);
142145
}
143146

144147
/// <inheritdoc/>

‎src/SourceBuild/content/eng/allowed-vmr-binaries.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ src/nuget-client/test/NuGet.Core.Tests/NuGet.Protocol.Tests/compiler/resources/*
6767
src/nuget-client/test/NuGet.Core.FuncTests/NuGet.Packaging.FuncTest/compiler/resources/*.nupkg
6868
src/nuget-client/test/NuGet.Core.FuncTests/NuGet.Packaging.FuncTest/compiler/resources/*.zip
6969
src/nuget-client/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/*.nupkg
70-
src/nuget-client/test/TestUtilities/Test.Utility/compiler/resources/*.crt
71-
src/nuget-client/test/TestUtilities/Test.Utility/compiler/resources/.signature.p7s
72-
src/nuget-client/test/TestUtilities/Test.Utility/compiler/resources/*.nupkg
73-
src/nuget-client/test/TestUtilities/Test.Utility/compiler/resources/*.zip
70+
src/nuget-client/test/TestUtilities/**/compiler/resources/*.crt
71+
src/nuget-client/test/TestUtilities/**/compiler/resources/.signature.p7s
72+
src/nuget-client/test/TestUtilities/**/compiler/resources/*.nupkg
73+
src/nuget-client/test/TestUtilities/**/compiler/resources/*.zip
7474

7575
# razor
7676
src/razor/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/TestFiles/BlazorProject.zip

‎src/SourceBuild/content/repo-projects/Directory.Build.targets‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
<RepoArtifactsShippingPackagesDir Condition="'$(ReferenceOnlyRepoArtifacts)' == 'true'">$(ReferencePackagesDir)</RepoArtifactsShippingPackagesDir>
1717
<RepoArtifactsNonShippingPackagesDir Condition="'$(ReferenceOnlyRepoArtifacts)' != 'true'">$([MSBuild]::NormalizeDirectory('$(ArtifactsNonShippingPackagesDir)', '$(RepositoryName)'))</RepoArtifactsNonShippingPackagesDir>
1818
<RepoArtifactsNonShippingPackagesDir Condition="'$(ReferenceOnlyRepoArtifacts)' == 'true'">$(ReferencePackagesDir)</RepoArtifactsNonShippingPackagesDir>
19+
20+
<RepoArtifactsDir>$([MSBuild]::NormalizeDirectory('$(ProjectDirectory)', 'artifacts'))</RepoArtifactsDir>
21+
<RepoArtifactsPackageCache>$([MSBuild]::NormalizeDirectory('$(RepoArtifactsDir)', 'sb', 'package-cache'))</RepoArtifactsPackageCache>
22+
1923
<!-- Pass location for packages -->
2024
<BuildArgs>$(BuildArgs) /p:SourceBuiltShippingPackagesDir=$(RepoArtifactsShippingPackagesDir)</BuildArgs>
2125
<!-- Trim the trailing slash as it breaks argument parsing on Windows if this is the last argument. -->
@@ -557,7 +561,7 @@
557561
<Target Name="CopyInnerBuildRestoredPackages"
558562
Condition="'$(IsUtilityProject)' != 'true' and '$(DotNetBuildSourceOnly)' == 'true'">
559563
<ItemGroup>
560-
<_InnerPackageCacheFiles Include="$(ProjectDirectory)artifacts/sb/package-cache/**/*" />
564+
<_InnerPackageCacheFiles Include="$(RepoArtifactsPackageCache)**/*" />
561565
</ItemGroup>
562566

563567
<!-- Retries can be necessary due to file locking when parallel builds are enabled and multiple repos
@@ -572,11 +576,11 @@
572576

573577
<Target Name="MoveDotNetBuildLogs"
574578
Condition="'$(IsUtilityProject)' != 'true' and
575-
Exists('$(ProjectDirectory)artifacts')">
579+
Exists('$(RepoArtifactsDir)')">
576580
<ItemGroup>
577-
<LogFilesToMove Include="$(ProjectDirectory)artifacts/**/*.log" />
578-
<LogFilesToMove Include="$(ProjectDirectory)artifacts/**/*.binlog" />
579-
<PrebuiltReportsToMove Include="$(ProjectDirectory)artifacts/sb/prebuilt-report/*" />
581+
<LogFilesToMove Include="$(RepoArtifactsDir)**/*.log" />
582+
<LogFilesToMove Include="$(RepoArtifactsDir)**/*.binlog" />
583+
<PrebuiltReportsToMove Include="$(RepoArtifactsDir)sb/prebuilt-report/*" />
580584
</ItemGroup>
581585

582586
<!-- Move the build logs -->
@@ -595,7 +599,7 @@
595599
Outputs="$(BaseIntermediateOutputPath)CleanupRepo.complete"
596600
Condition="'$(IsUtilityProject)' != 'true' and
597601
'$(CleanWhileBuilding)' == 'true' and
598-
Exists('$(ProjectDirectory)artifacts')">
602+
Exists('$(RepoArtifactsDir)')">
599603
<!--
600604
Some repositories (WinForms) use source generators that open files manually and keep file handles open on the compiler server (CsWin32).
601605
These source generators are written incorrectly (a source generator should never do IO itself),
@@ -604,6 +608,7 @@
604608
Don't fail the build when shutdown returns a failure.
605609
-->
606610
<Exec Command="$(DotnetTool) build-server shutdown --vbcscompiler"
611+
EnvironmentVariables="NUGET_PACKAGES=$(RepoArtifactsPackageCache)"
607612
IgnoreStandardErrorWarningFormat="true"
608613
IgnoreExitCode="true" />
609614

@@ -612,7 +617,7 @@
612617
</PropertyGroup>
613618

614619
<ItemGroup>
615-
<ObjFilesToCopy Include="$(ProjectDirectory)artifacts/**/project.assets.json" />
620+
<ObjFilesToCopy Include="$(RepoArtifactsDir)**/project.assets.json" />
616621
</ItemGroup>
617622

618623
<!-- Make a copy of project.assets.json files -->
@@ -621,7 +626,7 @@
621626
Condition="'@(ObjFilesToCopy)' != ''" />
622627

623628
<ItemGroup>
624-
<DirsToDelete Include="$([System.IO.Directory]::GetDirectories('$(ProjectDirectory)artifacts'))" />
629+
<DirsToDelete Include="$([System.IO.Directory]::GetDirectories('$(RepoArtifactsDir)'))" />
625630

626631
<DirsToDeleteWithTrailingSeparator Include="$([MSBuild]::EnsureTrailingSlash('%(DirsToDelete.Identity)'))" />
627632
<DirsToDeleteWithTrailingSeparator Remove="$(BuildObjDir)" />

0 commit comments

Comments
 (0)