diff --git a/Avalonia.sln b/Avalonia.sln index 119b7ab19..071fe7b38 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -120,6 +120,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1 build\TrimmingEnable.props = build\TrimmingEnable.props build\UnitTests.NetFX.props = build\UnitTests.NetFX.props build\XUnit.props = build\XUnit.props + build\TargetFrameworks.props = build\TargetFrameworks.props EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{4D6FAF79-58B4-482F-9122-0668C346364C}" diff --git a/Directory.Build.props b/Directory.Build.props index ec7a7ed18..2aebe18bd 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,11 +1,11 @@ + $(MSBuildThisFileDirectory)build-intermediate/nuget $(MSBuildThisFileDirectory)\src\tools\Avalonia.Designer.HostApp\bin\$(Configuration)\netstandard2.0\Avalonia.Designer.HostApp.dll false - false False 11 diff --git a/api/Avalonia.Android.nupkg.xml b/api/Avalonia.Android.nupkg.xml new file mode 100644 index 000000000..5e68aafc3 --- /dev/null +++ b/api/Avalonia.Android.nupkg.xml @@ -0,0 +1,94 @@ + + + + + CP0001 + T:Avalonia.Android.Internal.Resource.Animation + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0001 + T:Avalonia.Android.Internal.Resource.Animator + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0001 + T:Avalonia.Android.Internal.Resource.Attribute + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0001 + T:Avalonia.Android.Internal.Resource.Boolean + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0001 + T:Avalonia.Android.Internal.Resource.Color + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0001 + T:Avalonia.Android.Internal.Resource.Dimension + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0001 + T:Avalonia.Android.Internal.Resource.Drawable + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0001 + T:Avalonia.Android.Internal.Resource.Id + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0001 + T:Avalonia.Android.Internal.Resource.Integer + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0001 + T:Avalonia.Android.Internal.Resource.Interpolator + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0001 + T:Avalonia.Android.Internal.Resource.Layout + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0001 + T:Avalonia.Android.Internal.Resource.String + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0001 + T:Avalonia.Android.Internal.Resource.Style + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0001 + T:Avalonia.Android.Internal.Resource.Styleable + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + + CP0007 + T:Avalonia.Android.Internal.Resource + baseline/net6.0-android31.0/Avalonia.Android.dll + target/net8.0-android34.0/Avalonia.Android.dll + + \ No newline at end of file diff --git a/azure-pipelines-integrationtests.yml b/azure-pipelines-integrationtests.yml index 3613518dc..ce9b38c44 100644 --- a/azure-pipelines-integrationtests.yml +++ b/azure-pipelines-integrationtests.yml @@ -11,7 +11,7 @@ jobs: version: 6.0.x - task: UseDotNet@2 - displayName: 'Use .NET 7.0 SDK' + displayName: 'Use .NET 8.0 SDK' inputs: packageType: sdk useGlobalJson: true @@ -33,7 +33,7 @@ jobs: rm -rf $(osascript -e "POSIX path of (path to application id \"net.avaloniaui.avalonia.integrationtestapp\")") pkill IntegrationTestApp ./samples/IntegrationTestApp/bundle.sh - open -n ./samples/IntegrationTestApp/bin/Debug/net7.0/osx-$arch/publish/IntegrationTestApp.app + open -n ./samples/IntegrationTestApp/bin/Debug/net8.0/osx-$arch/publish/IntegrationTestApp.app pkill IntegrationTestApp displayName: 'Build IntegrationTestApp' @@ -65,7 +65,7 @@ jobs: version: 6.0.x - task: UseDotNet@2 - displayName: 'Use .NET 7.0 SDK' + displayName: 'Use .NET 8.0 SDK' inputs: packageType: sdk useGlobalJson: true diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3f918d8bc..ad691bcfb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,7 +36,7 @@ jobs: version: 6.0.x - task: UseDotNet@2 - displayName: 'Use .NET 7.0 SDK' + displayName: 'Use .NET 8.0 SDK' inputs: packageType: sdk useGlobalJson: true @@ -82,7 +82,7 @@ jobs: version: 6.0.x - task: UseDotNet@2 - displayName: 'Use .NET 7.0 SDK' + displayName: 'Use .NET 8.0 SDK' inputs: packageType: sdk useGlobalJson: true @@ -162,7 +162,7 @@ jobs: version: 6.0.x - task: UseDotNet@2 - displayName: 'Use .NET 7.0 SDK' + displayName: 'Use .NET 8.0 SDK' inputs: packageType: sdk useGlobalJson: true diff --git a/build/TargetFrameworks.props b/build/TargetFrameworks.props new file mode 100644 index 000000000..2da37e612 --- /dev/null +++ b/build/TargetFrameworks.props @@ -0,0 +1,15 @@ + + + net8.0 + $(AvsCurrentTargetFramework)-windows + $(AvsCurrentTargetFramework)-android34 + $(AvsCurrentTargetFramework)-ios17.0 + $(AvsCurrentTargetFramework)-tvos17 + $(AvsCurrentTargetFramework)-browser + $(AvsCurrentTargetFramework)-tizen + + + net6.0 + net6.0-windows + + diff --git a/global.json b/global.json index 13a6c6d6a..e5cbcdd04 100644 --- a/global.json +++ b/global.json @@ -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" + } } diff --git a/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme index 87a8312c3..c1e5b91e3 100644 --- a/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme +++ b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme @@ -56,7 +56,7 @@ diff --git a/nukebuild/ApiDiffHelper.cs b/nukebuild/ApiDiffHelper.cs index 2eabc3ef1..7579c6941 100644 --- a/nukebuild/ApiDiffHelper.cs +++ b/nukebuild/ApiDiffHelper.cs @@ -110,8 +110,8 @@ public static class ApiDiffHelper private static readonly (string oldTfm, string newTfm)[] s_tfmRedirects = new[] { // We use StartsWith below comparing these tfm, as we ignore platform versions (like, net6.0-ios16.1) - ("net6.0-android", "net7.0-android"), - ("net6.0-ios", "net7.0-ios"), + ("net6.0-android", "net8.0-android"), + ("net6.0-ios", "net8.0-ios"), // Designer was moved from netcoreapp to netstandard ("netcoreapp2.0", "netstandard2.0") }; @@ -171,8 +171,15 @@ public static class ApiDiffHelper if (targetDll?.entry is null) { + if (packageId == "Avalonia" + && baselineDll.target is "net461" or "netcoreapp2.0") + { + // In 11.1 we have removed net461 and netcoreapp2.0 targets from Avalonia package. + continue; + } + var actualTargets = string.Join(", ", - targetDlls.Select(d => $"{d.target} ({baselineDll.entry.Name})")); + targetDlls.Select(d => $"{d.target} ({d.entry.Name})")); throw new InvalidOperationException( $"Some assemblies are missing in the new package {packageId}: {baselineDll.entry.Name} for {baselineDll.target}." + $"\r\nActual targets: {actualTargets}."); diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs index 0fea818ea..685512f57 100644 --- a/nukebuild/Build.cs +++ b/nukebuild/Build.cs @@ -176,19 +176,29 @@ partial class Build : NukeBuild foreach (var fw in targetFrameworks) { - if (fw.StartsWith("net4") + var tfm = fw; + if (tfm == "$(AvsCurrentTargetFramework)") + { + tfm = "net8.0"; + } + if (tfm == "$(AvsLegacyTargetFrameworks)") + { + tfm = "net6.0"; + } + + if (tfm.StartsWith("net4") && (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) && Environment.GetEnvironmentVariable("FORCE_LINUX_TESTS") != "1") { - Information($"Skipping {projectName} ({fw}) tests on *nix - https://github.com/mono/mono/issues/13969"); + Information($"Skipping {projectName} ({tfm}) tests on *nix - https://github.com/mono/mono/issues/13969"); continue; } - Information($"Running for {projectName} ({fw}) ..."); + Information($"Running for {projectName} ({tfm}) ..."); DotNetTest(c => ApplySetting(c) .SetProjectFile(project) - .SetFramework(fw) + .SetFramework(tfm) .EnableNoBuild() .EnableNoRestore() .When(Parameters.PublishTestResults, _ => _ diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj index dd1103db7..7c89b896c 100644 --- a/nukebuild/_build.csproj +++ b/nukebuild/_build.csproj @@ -6,7 +6,9 @@ False $(NoWarn);CS0649;CS0169;SYSLIB0011 1 - net7.0 + $(AvsCurrentTargetFramework) + + true https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj index 6a3b06ee6..d25647b01 100644 --- a/packages/Avalonia/Avalonia.csproj +++ b/packages/Avalonia/Avalonia.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0;net461 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 Avalonia diff --git a/samples/AppWithoutLifetime/AppWithoutLifetime.csproj b/samples/AppWithoutLifetime/AppWithoutLifetime.csproj index fce12af29..2e959798d 100644 --- a/samples/AppWithoutLifetime/AppWithoutLifetime.csproj +++ b/samples/AppWithoutLifetime/AppWithoutLifetime.csproj @@ -1,7 +1,7 @@  WinExe - net6.0 + $(AvsCurrentTargetFramework) enable app.manifest diff --git a/samples/BindingDemo/BindingDemo.csproj b/samples/BindingDemo/BindingDemo.csproj index f094c0081..faeb643d8 100644 --- a/samples/BindingDemo/BindingDemo.csproj +++ b/samples/BindingDemo/BindingDemo.csproj @@ -1,7 +1,7 @@  Exe - net6.0 + $(AvsCurrentTargetFramework) diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj index 7921b608b..113f47363 100644 --- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj +++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj @@ -1,6 +1,6 @@  - net7.0-android + $(AvsCurrentAndroidTargetFramework) 21 Exe enable @@ -8,7 +8,6 @@ 1 1.0 apk - true diff --git a/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj b/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj index 363c6a8b2..2950028e6 100644 --- a/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj +++ b/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj @@ -1,6 +1,6 @@  - net7.0 + $(AvsCurrentBrowserTargetFramework) browser-wasm enable 16777216 diff --git a/samples/ControlCatalog.Browser/ControlCatalog.Browser.csproj b/samples/ControlCatalog.Browser/ControlCatalog.Browser.csproj index d1cec4e01..cc4087d2f 100644 --- a/samples/ControlCatalog.Browser/ControlCatalog.Browser.csproj +++ b/samples/ControlCatalog.Browser/ControlCatalog.Browser.csproj @@ -1,11 +1,10 @@  - net7.0 + $(AvsCurrentBrowserTargetFramework) browser-wasm AppBundle/main.js Exe true - true ./ diff --git a/samples/ControlCatalog.Browser/EmbedSample.Browser.cs b/samples/ControlCatalog.Browser/EmbedSample.Browser.cs index 1bd226d57..7bf3891a8 100644 --- a/samples/ControlCatalog.Browser/EmbedSample.Browser.cs +++ b/samples/ControlCatalog.Browser/EmbedSample.Browser.cs @@ -21,14 +21,17 @@ public class EmbedSampleWeb : INativeDemoControl } else { - var defaultHandle = (JSObjectControlHandle)createDefault(); + var parentContainer = (JSObjectControlHandle)createDefault(); - _ = JSHost.ImportAsync("embed.js", "./embed.js").ContinueWith(_ => + AddButton(parentContainer.Object); + + return parentContainer; + + static async void AddButton(JSObject parent) { - EmbedInterop.AddAppButton(defaultHandle.Object); - }, TaskScheduler.FromCurrentSynchronizationContext()); - - return defaultHandle; + await JSHost.ImportAsync("embed.js", "./embed.js"); + EmbedInterop.AddAppButton(parent); + } } } } diff --git a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj index 37719b77d..c87d9fdea 100644 --- a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj +++ b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj @@ -2,16 +2,9 @@ WinExe - net6.0 + $(AvsCurrentTargetFramework) true true - 6.0.8 - - - - true - https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json - 7.0.0-* @@ -36,13 +29,6 @@ - - - - - - - en diff --git a/samples/ControlCatalog.Tizen/ControlCatalog.Tizen.csproj b/samples/ControlCatalog.Tizen/ControlCatalog.Tizen.csproj index 378db1865..6b1408384 100644 --- a/samples/ControlCatalog.Tizen/ControlCatalog.Tizen.csproj +++ b/samples/ControlCatalog.Tizen/ControlCatalog.Tizen.csproj @@ -1,6 +1,6 @@  - net7.0-tizen + $(AvsCurrentTizenTargetFramework) Exe @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj index dc1309150..14b246c18 100644 --- a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj +++ b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj @@ -2,8 +2,8 @@ Exe manual - net7.0-ios - + $(AvsCurrentIOSTargetFramework) + 13.0 diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index 5125b4242..da2a00430 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net6.0 + netstandard2.0;$(AvsCurrentTargetFramework) true enable true diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props index 680d6d2b8..057d6b7b9 100644 --- a/samples/Directory.Build.props +++ b/samples/Directory.Build.props @@ -10,5 +10,6 @@ + diff --git a/samples/Generators.Sandbox/Generators.Sandbox.csproj b/samples/Generators.Sandbox/Generators.Sandbox.csproj index 37b496b92..6cbf210d3 100644 --- a/samples/Generators.Sandbox/Generators.Sandbox.csproj +++ b/samples/Generators.Sandbox/Generators.Sandbox.csproj @@ -1,7 +1,7 @@  Exe - net6.0 + $(AvsCurrentTargetFramework) true diff --git a/samples/GpuInterop/GpuInterop.csproj b/samples/GpuInterop/GpuInterop.csproj index 161821d92..5fbef07ab 100644 --- a/samples/GpuInterop/GpuInterop.csproj +++ b/samples/GpuInterop/GpuInterop.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + $(AvsCurrentTargetFramework) true enable false diff --git a/samples/IntegrationTestApp/IntegrationTestApp.csproj b/samples/IntegrationTestApp/IntegrationTestApp.csproj index 5cdbd77d5..77bfa828a 100644 --- a/samples/IntegrationTestApp/IntegrationTestApp.csproj +++ b/samples/IntegrationTestApp/IntegrationTestApp.csproj @@ -1,7 +1,7 @@  WinExe - net7.0 + $(AvsCurrentTargetFramework) enable $(NoWarn);AVP1012 diff --git a/samples/MobileSandbox.Android/MobileSandbox.Android.csproj b/samples/MobileSandbox.Android/MobileSandbox.Android.csproj index e1a75d478..75e1b90f6 100644 --- a/samples/MobileSandbox.Android/MobileSandbox.Android.csproj +++ b/samples/MobileSandbox.Android/MobileSandbox.Android.csproj @@ -1,6 +1,6 @@  - net7.0-android + $(AvsCurrentAndroidTargetFramework) 21 Exe enable @@ -8,7 +8,6 @@ 1 1.0 apk - true diff --git a/samples/MobileSandbox.Browser/MobileSandbox.Browser.csproj b/samples/MobileSandbox.Browser/MobileSandbox.Browser.csproj index 6174b4f13..f1410c675 100644 --- a/samples/MobileSandbox.Browser/MobileSandbox.Browser.csproj +++ b/samples/MobileSandbox.Browser/MobileSandbox.Browser.csproj @@ -1,11 +1,10 @@  - net7.0 + $(AvsCurrentBrowserTargetFramework) browser-wasm main.js Exe true - true true ./ diff --git a/samples/MobileSandbox.Desktop/MobileSandbox.Desktop.csproj b/samples/MobileSandbox.Desktop/MobileSandbox.Desktop.csproj index c1d157a2e..d523fd03b 100644 --- a/samples/MobileSandbox.Desktop/MobileSandbox.Desktop.csproj +++ b/samples/MobileSandbox.Desktop/MobileSandbox.Desktop.csproj @@ -2,7 +2,7 @@ WinExe - net6.0 + $(AvsCurrentTargetFramework) true diff --git a/samples/MobileSandbox.iOS/MobileSandbox.iOS.csproj b/samples/MobileSandbox.iOS/MobileSandbox.iOS.csproj index 0573eb781..719032c04 100644 --- a/samples/MobileSandbox.iOS/MobileSandbox.iOS.csproj +++ b/samples/MobileSandbox.iOS/MobileSandbox.iOS.csproj @@ -2,7 +2,7 @@ Exe manual - net7.0-ios + $(AvsCurrentIOSTargetFramework) 13.0 diff --git a/samples/MobileSandbox/MobileSandbox.csproj b/samples/MobileSandbox/MobileSandbox.csproj index 7fa364da9..9512f9990 100644 --- a/samples/MobileSandbox/MobileSandbox.csproj +++ b/samples/MobileSandbox/MobileSandbox.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net6.0 + netstandard2.0;$(AvsCurrentTargetFramework) true enable diff --git a/samples/PlatformSanityChecks/PlatformSanityChecks.csproj b/samples/PlatformSanityChecks/PlatformSanityChecks.csproj index 40efe818d..faafd6365 100644 --- a/samples/PlatformSanityChecks/PlatformSanityChecks.csproj +++ b/samples/PlatformSanityChecks/PlatformSanityChecks.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + $(AvsCurrentTargetFramework) diff --git a/samples/Previewer/Previewer.csproj b/samples/Previewer/Previewer.csproj index b572c3e4f..dcc727db8 100644 --- a/samples/Previewer/Previewer.csproj +++ b/samples/Previewer/Previewer.csproj @@ -1,7 +1,7 @@  Exe - net6.0 + $(AvsCurrentTargetFramework) diff --git a/samples/ReactiveUIDemo/ReactiveUIDemo.csproj b/samples/ReactiveUIDemo/ReactiveUIDemo.csproj index 33ec82088..00f470fd7 100644 --- a/samples/ReactiveUIDemo/ReactiveUIDemo.csproj +++ b/samples/ReactiveUIDemo/ReactiveUIDemo.csproj @@ -1,7 +1,7 @@  Exe - net6.0 + $(AvsCurrentTargetFramework) enable diff --git a/samples/RemoteDemo/RemoteDemo.csproj b/samples/RemoteDemo/RemoteDemo.csproj index 607222c2e..8c479b109 100644 --- a/samples/RemoteDemo/RemoteDemo.csproj +++ b/samples/RemoteDemo/RemoteDemo.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + $(AvsCurrentTargetFramework) diff --git a/samples/RenderDemo/RenderDemo.csproj b/samples/RenderDemo/RenderDemo.csproj index b37ecf01b..648f7d3e0 100644 --- a/samples/RenderDemo/RenderDemo.csproj +++ b/samples/RenderDemo/RenderDemo.csproj @@ -1,7 +1,7 @@  Exe - net6.0 + $(AvsCurrentTargetFramework) diff --git a/samples/SafeAreaDemo.Android/SafeAreaDemo.Android.csproj b/samples/SafeAreaDemo.Android/SafeAreaDemo.Android.csproj index cc182b2b5..62a3ebfed 100644 --- a/samples/SafeAreaDemo.Android/SafeAreaDemo.Android.csproj +++ b/samples/SafeAreaDemo.Android/SafeAreaDemo.Android.csproj @@ -1,14 +1,14 @@  Exe - net7.0-android + $(AvsCurrentAndroidTargetFramework) 21 enable com.avalonia.safeareademo 1 1.0 apk - False + false diff --git a/samples/SafeAreaDemo.Desktop/SafeAreaDemo.Desktop.csproj b/samples/SafeAreaDemo.Desktop/SafeAreaDemo.Desktop.csproj index a3b020d53..b3b48afcb 100644 --- a/samples/SafeAreaDemo.Desktop/SafeAreaDemo.Desktop.csproj +++ b/samples/SafeAreaDemo.Desktop/SafeAreaDemo.Desktop.csproj @@ -1,9 +1,7 @@  WinExe - - net7.0 + $(AvsCurrentTargetFramework) enable true diff --git a/samples/SafeAreaDemo.iOS/SafeAreaDemo.iOS.csproj b/samples/SafeAreaDemo.iOS/SafeAreaDemo.iOS.csproj index 3fc111301..589e5f48a 100644 --- a/samples/SafeAreaDemo.iOS/SafeAreaDemo.iOS.csproj +++ b/samples/SafeAreaDemo.iOS/SafeAreaDemo.iOS.csproj @@ -1,7 +1,7 @@  Exe - net7.0-ios + $(AvsCurrentIOSTargetFramework) 10.0 manual enable diff --git a/samples/SafeAreaDemo/SafeAreaDemo.csproj b/samples/SafeAreaDemo/SafeAreaDemo.csproj index f8eca5f5b..cec0419d6 100644 --- a/samples/SafeAreaDemo/SafeAreaDemo.csproj +++ b/samples/SafeAreaDemo/SafeAreaDemo.csproj @@ -1,6 +1,6 @@  - net7.0 + $(AvsCurrentTargetFramework) enable latest true diff --git a/samples/Sandbox/Sandbox.csproj b/samples/Sandbox/Sandbox.csproj index fac565b55..d1a654e1b 100644 --- a/samples/Sandbox/Sandbox.csproj +++ b/samples/Sandbox/Sandbox.csproj @@ -2,7 +2,7 @@ WinExe - net6.0 + $(AvsCurrentTargetFramework) true true diff --git a/samples/VirtualizationDemo/VirtualizationDemo.csproj b/samples/VirtualizationDemo/VirtualizationDemo.csproj index 3ac7aab58..32bc379f4 100644 --- a/samples/VirtualizationDemo/VirtualizationDemo.csproj +++ b/samples/VirtualizationDemo/VirtualizationDemo.csproj @@ -1,7 +1,7 @@  WinExe - net6.0 + $(AvsCurrentTargetFramework) true diff --git a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj index 0f11ad744..533aacf38 100644 --- a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj +++ b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj @@ -1,7 +1,7 @@  WinExe - net461;net6.0-windows + net461;$(AvsCurrentWindowsTargetFramework) true true true diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj index be93d9944..c0d216820 100644 --- a/src/Android/Avalonia.Android/Avalonia.Android.csproj +++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj @@ -1,9 +1,8 @@  - net7.0-android33 + $(AvsCurrentAndroidTargetFramework) 21 true - true portable Avalonia.Android.Internal diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index 19cf5cb86..1dbfe9fd8 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 Avalonia True true diff --git a/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj b/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj index a34b91b6e..ed080e306 100644 --- a/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj +++ b/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 true diff --git a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj index b003dcf7a..bc7885fa5 100644 --- a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj +++ b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 diff --git a/src/Avalonia.Controls.ItemsRepeater/Avalonia.Controls.ItemsRepeater.csproj b/src/Avalonia.Controls.ItemsRepeater/Avalonia.Controls.ItemsRepeater.csproj index 60bceabc1..d55fde555 100644 --- a/src/Avalonia.Controls.ItemsRepeater/Avalonia.Controls.ItemsRepeater.csproj +++ b/src/Avalonia.Controls.ItemsRepeater/Avalonia.Controls.ItemsRepeater.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 Avalonia diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj index f8f14cca6..aa48786e4 100644 --- a/src/Avalonia.Controls/Avalonia.Controls.csproj +++ b/src/Avalonia.Controls/Avalonia.Controls.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj index 0c1b3e8a4..47ccd7af3 100644 --- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj +++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 + + + @@ -16,20 +19,12 @@ - - - - - - + + - - - - - - + + diff --git a/src/Browser/Avalonia.Browser/build/interop.js b/src/Browser/Avalonia.Browser/build/interop.js deleted file mode 100644 index c7ae3a56c..000000000 --- a/src/Browser/Avalonia.Browser/build/interop.js +++ /dev/null @@ -1,13 +0,0 @@ -var LibraryExample = { - // Internal functions - $EXAMPLE: { - internal_func: function () { - } - }, - InterceptGLObject: function () { - globalThis.AvaloniaGL = GL - } -} - -autoAddDeps(LibraryExample, '$EXAMPLE') -mergeInto(LibraryManager.library, LibraryExample) diff --git a/src/Browser/Avalonia.Browser/webapp/modules/avalonia/canvas.ts b/src/Browser/Avalonia.Browser/webapp/modules/avalonia/canvas.ts index 4058cdd31..a653c5518 100644 --- a/src/Browser/Avalonia.Browser/webapp/modules/avalonia/canvas.ts +++ b/src/Browser/Avalonia.Browser/webapp/modules/avalonia/canvas.ts @@ -10,6 +10,12 @@ type CanvasElement = { Canvas: Canvas | undefined; } & HTMLCanvasElement; +function getGL(): any { + const self = globalThis as any; + const module = self.Module ?? self.getDotnetRuntime(0)?.Module; + return module?.GL ?? self.AvaloniaGL ?? self.SkiaSharpGL; +} + export class Canvas { static elements: Map; @@ -60,7 +66,7 @@ export class Canvas { return; } - const GL = (globalThis as any).AvaloniaGL; + const GL = getGL(); // make current GL.makeContextCurrent(ctx); @@ -179,7 +185,7 @@ export class Canvas { renderViaOffscreenBackBuffer: 1 }; - const GL = (globalThis as any).AvaloniaGL; + const GL = getGL(); let ctx: WebGLRenderingContext = GL.createContext(htmlCanvas, contextAttributes); diff --git a/src/Headless/Avalonia.Headless.NUnit/Avalonia.Headless.NUnit.csproj b/src/Headless/Avalonia.Headless.NUnit/Avalonia.Headless.NUnit.csproj index d176d74b5..e3900f5a2 100644 --- a/src/Headless/Avalonia.Headless.NUnit/Avalonia.Headless.NUnit.csproj +++ b/src/Headless/Avalonia.Headless.NUnit/Avalonia.Headless.NUnit.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net6.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 false diff --git a/src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj b/src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj index 2020dca48..7e6a76df4 100644 --- a/src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj +++ b/src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj @@ -1,7 +1,7 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 true diff --git a/src/Headless/Avalonia.Headless.XUnit/Avalonia.Headless.XUnit.csproj b/src/Headless/Avalonia.Headless.XUnit/Avalonia.Headless.XUnit.csproj index 85879faa4..d5a1f9508 100644 --- a/src/Headless/Avalonia.Headless.XUnit/Avalonia.Headless.XUnit.csproj +++ b/src/Headless/Avalonia.Headless.XUnit/Avalonia.Headless.XUnit.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net6.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 false diff --git a/src/Headless/Avalonia.Headless/Avalonia.Headless.csproj b/src/Headless/Avalonia.Headless/Avalonia.Headless.csproj index fe071b594..12750423a 100644 --- a/src/Headless/Avalonia.Headless/Avalonia.Headless.csproj +++ b/src/Headless/Avalonia.Headless/Avalonia.Headless.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj index 35c889512..f4a2948c4 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj +++ b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 true diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj index 8569b7ec9..cc4844ad1 100644 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj @@ -1,7 +1,7 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 true false $(DefineConstants);XAMLX_INTERNAL;XAML_RUNTIME_LOADER diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index ec4e79aa2..299aac61e 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 $(DefineConstants);PCL;NETSTANDARD;NETSTANDARD2_0;HAS_TYPE_CONVERTER;HAS_CUSTOM_ATTRIBUTE_PROVIDER;XAMLX_INTERNAL false $(DefineConstants);RUNTIME_XAML_CECIL diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj index 0fad13d0f..11c85f8ab 100644 --- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj +++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 Avalonia diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj index 9bdddd98c..96fb0e513 100644 --- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj +++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + $(AvsLegacyTargetFrameworks);netstandard2.0 true true true diff --git a/src/Tizen/Avalonia.Tizen/Avalonia.Tizen.csproj b/src/Tizen/Avalonia.Tizen/Avalonia.Tizen.csproj index 686db271f..67e03b441 100644 --- a/src/Tizen/Avalonia.Tizen/Avalonia.Tizen.csproj +++ b/src/Tizen/Avalonia.Tizen/Avalonia.Tizen.csproj @@ -1,16 +1,12 @@  - net7.0-tizen + $(AvsCurrentTizenTargetFramework) enable enable - true - - - diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj index c7d08eb1e..83e759ab0 100644 --- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj +++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 true true diff --git a/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj b/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj index 8796374e5..acc42d43f 100644 --- a/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj +++ b/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj @@ -1,6 +1,6 @@ - net461;net6.0-windows + net461;$(AvsLegacyWindowsTargetFrameworks);$(AvsCurrentWindowsTargetFramework) true true true diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj index 27cf5f69b..4c0da9fbc 100644 --- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj +++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0 true true diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs index 079a0d3c3..89ae3c5db 100644 --- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs +++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs @@ -2503,7 +2503,7 @@ namespace Avalonia.Win32.Interop [StructLayout(LayoutKind.Sequential)] internal struct APPBARDATA { - private static readonly int s_size = Marshal.SizeOf(typeof(APPBARDATA)); + private static readonly int s_size = Marshal.SizeOf(); public int cbSize; public nint hWnd; diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj index b9da0377f..9b95ff1db 100644 --- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj +++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj @@ -1,11 +1,10 @@  - net7.0-ios16.0;net7.0-tvos + $(AvsCurrentIOSTargetFramework);$(AvsCurrentTvOSTargetFramework) 13.0 13.0 13.1 - true true diff --git a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj index e5d2f14f7..e68eddc7f 100644 --- a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj +++ b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj @@ -1,7 +1,7 @@  Exe - net461;netstandard2.0;net6.0 + net461;netstandard2.0;$(AvsCurrentTargetFramework) $(DefineConstants);XAMLX_INTERNAL false diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj index 3cb85a564..0f71dac8f 100644 --- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj +++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj @@ -1,6 +1,6 @@  - net6.0 + $(AvsCurrentTargetFramework) Library true true diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj index 9ea0482ab..d4930bbe2 100644 --- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj +++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj @@ -1,6 +1,6 @@  - net6.0 + $(AvsCurrentTargetFramework) Exe false diff --git a/tests/Avalonia.Controls.DataGrid.UnitTests/Avalonia.Controls.DataGrid.UnitTests.csproj b/tests/Avalonia.Controls.DataGrid.UnitTests/Avalonia.Controls.DataGrid.UnitTests.csproj index 20c2f711a..885386238 100644 --- a/tests/Avalonia.Controls.DataGrid.UnitTests/Avalonia.Controls.DataGrid.UnitTests.csproj +++ b/tests/Avalonia.Controls.DataGrid.UnitTests/Avalonia.Controls.DataGrid.UnitTests.csproj @@ -1,6 +1,6 @@ - net6.0 + $(AvsCurrentTargetFramework) Library true diff --git a/tests/Avalonia.Controls.ItemsRepeater.UnitTests/Avalonia.Controls.ItemsRepeater.UnitTests.csproj b/tests/Avalonia.Controls.ItemsRepeater.UnitTests/Avalonia.Controls.ItemsRepeater.UnitTests.csproj index 6f9815757..4194b7622 100644 --- a/tests/Avalonia.Controls.ItemsRepeater.UnitTests/Avalonia.Controls.ItemsRepeater.UnitTests.csproj +++ b/tests/Avalonia.Controls.ItemsRepeater.UnitTests/Avalonia.Controls.ItemsRepeater.UnitTests.csproj @@ -1,6 +1,6 @@ - net6.0 + $(AvsCurrentTargetFramework) Library true diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj index 471f19f94..2d077f483 100644 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj +++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj @@ -1,6 +1,6 @@  - net6.0 + $(AvsCurrentTargetFramework) Library true diff --git a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj index a91cf3911..7067b5aa4 100644 --- a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj +++ b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj @@ -1,7 +1,7 @@  Exe - net6.0 + $(AvsCurrentTargetFramework) false diff --git a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj index 3af8d6e0d..9b09570af 100644 --- a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj +++ b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj @@ -1,6 +1,6 @@  - net6.0 + $(AvsCurrentTargetFramework) Library diff --git a/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs b/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs index 9003a0a8f..a2131121c 100644 --- a/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs +++ b/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs @@ -29,25 +29,25 @@ namespace Avalonia.DesignerSupport.Tests [SkippableTheory, InlineData( - @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/net6.0/", + @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/net8.0/", "Avalonia.DesignerSupport.TestApp", "Avalonia.DesignerSupport.TestApp.dll", @"..\..\..\..\..\tests\Avalonia.DesignerSupport.TestApp\MainWindow.xaml", "win32"), InlineData( - @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\net6.0\", + @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\net8.0\", "ControlCatalog.NetCore", "ControlCatalog.dll", @"..\..\..\..\..\samples\ControlCatalog\MainWindow.xaml", "win32"), InlineData( - @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/net6.0/", + @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/net8.0/", "Avalonia.DesignerSupport.TestApp", "Avalonia.DesignerSupport.TestApp.dll", @"..\..\..\..\..\tests\Avalonia.DesignerSupport.TestApp\MainWindow.xaml", "avalonia-remote"), InlineData( - @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\net6.0\", + @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\net8.0\", "ControlCatalog.NetCore", "ControlCatalog.dll", @"..\..\..\..\..\samples\ControlCatalog\MainWindow.xaml", @@ -74,6 +74,9 @@ namespace Avalonia.DesignerSupport.Tests #endif outputDir = outputDir.Replace("$BUILD", buildType); + var assemblyPath = Path.Combine(outputDir, assemblyName); + Assert.True(File.Exists(assemblyPath), "File.Exists(assemblyPath)"); + var sessionId = Guid.NewGuid(); long handle = 0; bool success = false; @@ -107,7 +110,7 @@ namespace Avalonia.DesignerSupport.Tests await conn.Send(new UpdateXamlMessage { - AssemblyPath = Path.Combine(outputDir, assemblyName), + AssemblyPath = assemblyPath, Xaml = xaml }); } diff --git a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj index 17e1ab0e5..febe87630 100644 --- a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj +++ b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj @@ -1,6 +1,6 @@  - net6.0 + $(AvsCurrentTargetFramework) true diff --git a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj index ad7e3ad50..b5335e7bf 100644 --- a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj +++ b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj @@ -1,6 +1,6 @@  - net6.0 + $(AvsCurrentTargetFramework) diff --git a/tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj b/tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj index 001d0a31e..eeb953d75 100644 --- a/tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj +++ b/tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + $(AvsCurrentTargetFramework) true diff --git a/tests/Avalonia.Headless.NUnit.UnitTests/Avalonia.Headless.NUnit.UnitTests.csproj b/tests/Avalonia.Headless.NUnit.UnitTests/Avalonia.Headless.NUnit.UnitTests.csproj index 1a69fb582..301b96e0e 100644 --- a/tests/Avalonia.Headless.NUnit.UnitTests/Avalonia.Headless.NUnit.UnitTests.csproj +++ b/tests/Avalonia.Headless.NUnit.UnitTests/Avalonia.Headless.NUnit.UnitTests.csproj @@ -1,6 +1,6 @@ - net6.0 + $(AvsCurrentTargetFramework) true $(DefineConstants);NUNIT diff --git a/tests/Avalonia.Headless.XUnit.UnitTests/Avalonia.Headless.XUnit.UnitTests.csproj b/tests/Avalonia.Headless.XUnit.UnitTests/Avalonia.Headless.XUnit.UnitTests.csproj index 25578c3ad..322ce6bb3 100644 --- a/tests/Avalonia.Headless.XUnit.UnitTests/Avalonia.Headless.XUnit.UnitTests.csproj +++ b/tests/Avalonia.Headless.XUnit.UnitTests/Avalonia.Headless.XUnit.UnitTests.csproj @@ -1,6 +1,6 @@ - net6.0 + $(AvsCurrentTargetFramework) true $(DefineConstants);XUNIT diff --git a/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj b/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj index 5de2b8556..a3c19c98b 100644 --- a/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj +++ b/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj @@ -1,7 +1,7 @@  - net6.0 + $(AvsCurrentTargetFramework) enable diff --git a/tests/Avalonia.IntegrationTests.Appium/DefaultAppFixture.cs b/tests/Avalonia.IntegrationTests.Appium/DefaultAppFixture.cs index bb08cc051..bdc5ca5f4 100644 --- a/tests/Avalonia.IntegrationTests.Appium/DefaultAppFixture.cs +++ b/tests/Avalonia.IntegrationTests.Appium/DefaultAppFixture.cs @@ -11,7 +11,7 @@ namespace Avalonia.IntegrationTests.Appium { public class DefaultAppFixture : IDisposable { - private const string TestAppPath = @"..\..\..\..\..\samples\IntegrationTestApp\bin\Debug\net7.0\IntegrationTestApp.exe"; + private const string TestAppPath = @"..\..\..\..\..\samples\IntegrationTestApp\bin\Debug\net8.0\IntegrationTestApp.exe"; private const string TestAppBundleId = "net.avaloniaui.avalonia.integrationtestapp"; public DefaultAppFixture() diff --git a/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh b/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh index 0d4a1fa57..f32a7984b 100755 --- a/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh +++ b/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh @@ -16,7 +16,7 @@ pkill IntegrationTestApp rm -rf $(osascript -e "POSIX path of (path to application id \"net.avaloniaui.avalonia.integrationtestapp\")") pkill IntegrationTestApp ./samples/IntegrationTestApp/bundle.sh -open -n ./samples/IntegrationTestApp/bin/Debug/net7.0/osx-$arch/publish/IntegrationTestApp.app +open -n ./samples/IntegrationTestApp/bin/Debug/net8.0/osx-$arch/publish/IntegrationTestApp.app pkill IntegrationTestApp open -b net.avaloniaui.avalonia.integrationtestapp dotnet test tests/Avalonia.IntegrationTests.Appium/ -l "console;verbosity=detailed" diff --git a/tests/Avalonia.IntegrationTests.Appium/readme.md b/tests/Avalonia.IntegrationTests.Appium/readme.md index f54720920..9877851c0 100644 --- a/tests/Avalonia.IntegrationTests.Appium/readme.md +++ b/tests/Avalonia.IntegrationTests.Appium/readme.md @@ -18,7 +18,7 @@ - Install Appium: https://appium.io/ - Give [Xcode helper the required permissions](https://apple.stackexchange.com/questions/334008) - `cd samples/IntegrationTestApp` then `./bundle.sh` to create an app bundle for `IntegrationTestApp` -- Register the app bundle by running `open -n ./bin/Debug/net7.0/osx-arm64/publish/IntegrationTestApp.app` +- Register the app bundle by running `open -n ./bin/Debug/net8.0/osx-arm64/publish/IntegrationTestApp.app` ### Running diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj index fc15ad823..7ff3642b9 100644 --- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj +++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj @@ -1,6 +1,6 @@  - net6.0 + $(AvsCurrentTargetFramework) Library true diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj index ade6010ba..a5366882a 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj @@ -1,6 +1,6 @@  - net6.0;net47 + $(AvsCurrentTargetFramework);net47 Library true diff --git a/tests/Avalonia.ReactiveUI.UnitTests/Avalonia.ReactiveUI.UnitTests.csproj b/tests/Avalonia.ReactiveUI.UnitTests/Avalonia.ReactiveUI.UnitTests.csproj index 9f3ec4013..3475b0788 100644 --- a/tests/Avalonia.ReactiveUI.UnitTests/Avalonia.ReactiveUI.UnitTests.csproj +++ b/tests/Avalonia.ReactiveUI.UnitTests/Avalonia.ReactiveUI.UnitTests.csproj @@ -1,6 +1,6 @@ - net6.0 + $(AvsCurrentTargetFramework) false diff --git a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj index d149138fe..34ec24a28 100644 --- a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj +++ b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj @@ -1,6 +1,6 @@  - net6.0 + $(AvsCurrentTargetFramework) AVALONIA_SKIA;AVALONIA_SKIA_SKIP_FAIL true diff --git a/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj b/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj index 0c575cd96..a80948005 100644 --- a/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj +++ b/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj @@ -1,6 +1,6 @@  - net6.0 + $(AvsCurrentTargetFramework) diff --git a/tests/TestFiles/BuildTasks/PInvoke/PInvoke.csproj b/tests/TestFiles/BuildTasks/PInvoke/PInvoke.csproj index 7df69b429..86ad76129 100644 --- a/tests/TestFiles/BuildTasks/PInvoke/PInvoke.csproj +++ b/tests/TestFiles/BuildTasks/PInvoke/PInvoke.csproj @@ -2,7 +2,7 @@ WinExe - net6.0;netstandard2.0 + $(AvsCurrentTargetFramework);netstandard2.0 true true