motimat/Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump minimal TFM for mobile projects from .NET 6 to .NET 7… (#13012)

Browse Source 
* Bump minimal TFM for mobile projects from .NET 6 to .NET 7 because of MAUI support policy

* Fix api diff
This commit is contained in:
Max Katz
2023-09-25 00:55:19 -07:00
committed by GitHub
parent 5113b70697
commit 3de2a0ea91
8 changed files with 18 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nukebuild/ApiDiffValidation.cs
+12 -1
View File
@@ -13,6 +13,12 @@ public static class ApiDiffValidation
{
private static readonly HttpClient s_httpClient = new();
private static readonly Dictionary<(string target, string asmName), (string target, string asmName)> s_assemblyRedirects = new()
{
[("net6.0-android31.0", "Avalonia.Android.dll")] = ("net7.0-android33.0", "Avalonia.Android.dll"),
[("net6.0-ios16.1", "Avalonia.iOS.dll")] = ("net7.0-ios16.1", "Avalonia.iOS.dll")
};
public static async Task ValidatePackage(
Tool apiCompatTool, string packagePath, string baselineVersion,
string suppressionFilesFolder, bool updateSuppressionFile)
@@ -58,8 +64,13 @@ public static class ApiDiffValidation
await baselineDll.entry.Open().CopyToAsync(baselineDllFile);
}
if (!s_assemblyRedirects.TryGetValue((baselineDll.target, baselineDll.entry.Name), out var lookupPair))
{
lookupPair = (baselineDll.target, baselineDll.entry.Name);
}
var targetDll = targetDlls.FirstOrDefault(e =>
e.target == baselineDll.target && e.entry.Name == baselineDll.entry.Name);
e.target == lookupPair.target && e.entry.Name == lookupPair.asmName);
if (targetDll.entry is null)
{
throw new InvalidOperationException($"Some assemblies are missing in the new package {packageId}: {baselineDll.entry.Name} for {baselineDll.target}");