Browse Source
* Add .NET 8 target to packable projects * Update test projects * Update sample projects to target .NET 8 * Update main Avalonia package to target .NET 8 as well * Remove MSBuildEnableWorkloadResolver hack and some minor change * Use net8.0 in nuke build as well * Pin 8.0.0 SDK * Adjust API validation * Pin a valid version * Remove net461 target from Avalonia package * Remove unused net6.0 target from Avalonia.Designer.HostApp * Adjust API diff * Update ControlCatalog.Android.csproj * Remove MSBuildEnableWorkloadResolver * Fix Browser issues on .NET 8 * Fix .NET 8 error * Fix merge conflicts * Replace explicit TFMs in .csproj files with a centralized registry * Fix merge conflict * Fix AvsLegacyWindowsTargetFrameworks and add hacks for the tests * Update XCode project CommandLineArgument --------- Co-authored-by: Nikita Tsukanov <keks9n@gmail.com>pull/16303/head
Max Katz
2 years ago
committed by
GitHub
GitHub
108 changed files with 282 additions and 192 deletions
@ -0,0 +1,94 @@ |
|||
<?xml version="1.0" encoding="utf-8"?> |
|||
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids --> |
|||
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.Animation</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.Animator</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.Attribute</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.Boolean</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.Color</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.Dimension</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.Drawable</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.Id</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.Integer</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.Interpolator</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.Layout</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.String</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.Style</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0001</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource.Styleable</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
<Suppression> |
|||
<DiagnosticId>CP0007</DiagnosticId> |
|||
<Target>T:Avalonia.Android.Internal.Resource</Target> |
|||
<Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left> |
|||
<Right>target/net8.0-android34.0/Avalonia.Android.dll</Right> |
|||
</Suppression> |
|||
</Suppressions> |
|||
@ -0,0 +1,15 @@ |
|||
<Project> |
|||
<PropertyGroup> |
|||
<AvsCurrentTargetFramework>net8.0</AvsCurrentTargetFramework> |
|||
<AvsCurrentWindowsTargetFramework>$(AvsCurrentTargetFramework)-windows</AvsCurrentWindowsTargetFramework> |
|||
<AvsCurrentAndroidTargetFramework>$(AvsCurrentTargetFramework)-android34</AvsCurrentAndroidTargetFramework> |
|||
<AvsCurrentIOSTargetFramework>$(AvsCurrentTargetFramework)-ios17.0</AvsCurrentIOSTargetFramework> |
|||
<AvsCurrentTvOSTargetFramework>$(AvsCurrentTargetFramework)-tvos17</AvsCurrentTvOSTargetFramework> |
|||
<AvsCurrentBrowserTargetFramework>$(AvsCurrentTargetFramework)-browser</AvsCurrentBrowserTargetFramework> |
|||
<AvsCurrentTizenTargetFramework>$(AvsCurrentTargetFramework)-tizen</AvsCurrentTizenTargetFramework> |
|||
</PropertyGroup> |
|||
<PropertyGroup Condition="'$(AvsSkipBuildingLegacyTargetFrameworks)' != 'True'"> |
|||
<AvsLegacyTargetFrameworks>net6.0</AvsLegacyTargetFrameworks> |
|||
<AvsLegacyWindowsTargetFrameworks>net6.0-windows</AvsLegacyWindowsTargetFrameworks> |
|||
</PropertyGroup> |
|||
</Project> |
|||
@ -1,9 +1,9 @@ |
|||
{ |
|||
"sdk": { |
|||
"version": "7.0.404", |
|||
"rollForward": "latestFeature" |
|||
}, |
|||
"msbuild-sdks": { |
|||
"Microsoft.Build.Traversal": "3.2.0" |
|||
} |
|||
"sdk": { |
|||
"version": "8.0.101", |
|||
"rollForward": "latestFeature" |
|||
}, |
|||
"msbuild-sdks": { |
|||
"Microsoft.Build.Traversal": "3.2.0" |
|||
} |
|||
} |
|||
|
|||
@ -1,13 +0,0 @@ |
|||
var LibraryExample = { |
|||
// Internal functions
|
|||
$EXAMPLE: { |
|||
internal_func: function () { |
|||
} |
|||
}, |
|||
InterceptGLObject: function () { |
|||
globalThis.AvaloniaGL = GL |
|||
} |
|||
} |
|||
|
|||
autoAddDeps(LibraryExample, '$EXAMPLE') |
|||
mergeInto(LibraryManager.library, LibraryExample) |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue