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

Remove assemblies that aren't in both sdk's from version validation

Browse source
This commit is contained in:
Jackson Schuster 2024-03-19 14:34:34 -07:00
parent 47053c4b8e
commit a783e3b6a9
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/SdkContentTests.cs
View file

@ -89,19 +89,32 @@ public class SdkContentTests : SdkTests
{
IEnumerable<string> assemblyVersionDiffFilters = GetSdkAssemblyVersionDiffExclusionFilters()
.Select(filter => filter.TrimStart("./".ToCharArray()));
// Remove entries that are not in both. If they should be in both, the mismatch will be caught in another test
foreach(var kvp in sbSdkAssemblyVersions)
{
if (msftSdkAssemblyVersions.ContainsKey(kvp.Key))
{
sbSdkAssemblyVersions.Remove(kvp.Key);
}
}
// Remove any excluded files as long as SB SDK's file has the same or greater assembly version compared to the corresponding
foreach(var kvp in msftSdkAssemblyVersions)
{
if (sbSdkAssemblyVersions.ContainsKey(kvp.Key))
{
msftSdkAssemblyVersions.Remove(kvp.Key);
}
}
// Remove any excluded files as long as UB SDK's file has the same or greater assembly version compared to the corresponding
// file in the MSFT SDK. If the version is less, the file will show up in the results as this is not a scenario
// that is valid for shipping.
string[] sbSdkFileArray = sbSdkAssemblyVersions.Keys.ToArray();
for (int i = sbSdkFileArray.Length - 1; i >= 0; i--)
{
string assemblyPath = sbSdkFileArray[i];
Version? sbVersion = sbSdkAssemblyVersions[assemblyPath];
Version? msftVersion = msftSdkAssemblyVersions[assemblyPath];
if (sbVersion is not null &&
msftVersion is not null &&
if (sbSdkAssemblyVersions.TryGetValue(assemblyPath, out Version? sbVersion) &&
msftSdkAssemblyVersions.TryGetValue(assemblyPath, out Version? msftVersion) &&
sbVersion >= msftVersion &&
Utilities.IsFileExcluded(assemblyPath, assemblyVersionDiffFilters))
{