From e44c36bef3af887105013e7e67c189ef97dffd83 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 30 Nov 2021 22:41:37 +0000 Subject: [PATCH] Revert "Revert "upgrade to net462"" This reverts commit c78179e9ac5110ca1e0fb2e10eacbe5b8f1c8418. --- build/SampleApp.props | 2 +- nukebuild/Build.cs | 2 +- packages/Avalonia/Avalonia.csproj | 6 +++--- packages/Avalonia/Avalonia.props | 2 +- samples/BindingDemo/BindingDemo.csproj | 2 +- .../ControlCatalog.Desktop/ControlCatalog.Desktop.csproj | 2 +- samples/RenderDemo/RenderDemo.csproj | 2 +- samples/VirtualizationDemo/VirtualizationDemo.csproj | 2 +- .../Direct3DInteropSample/Direct3DInteropSample.csproj | 2 +- .../interop/WindowsInteropTest/WindowsInteropTest.csproj | 2 +- src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj | 4 ++-- src/Avalonia.DesktopRuntime/RuntimeInfo.cs | 2 +- src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github | 2 +- src/Shared/PlatformSupport/StandardRuntimePlatform.cs | 2 +- .../Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj | 2 +- src/iOS/Avalonia.iOS/Boilerplate/Shared.cs | 2 +- .../Avalonia.Designer.HostApp.csproj | 2 +- src/tools/Avalonia.Designer.HostApp/Program.cs | 2 +- tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj | 2 +- tests/Avalonia.UnitTests/InvariantCultureFixture.cs | 4 ++-- 20 files changed, 24 insertions(+), 24 deletions(-) diff --git a/build/SampleApp.props b/build/SampleApp.props index 285f880129..6a7548e717 100644 --- a/build/SampleApp.props +++ b/build/SampleApp.props @@ -1,5 +1,5 @@ - + WinExe diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs index 6f4afd9191..067eeef842 100644 --- a/nukebuild/Build.cs +++ b/nukebuild/Build.cs @@ -253,7 +253,7 @@ partial class Build : NukeBuild .DependsOn(Compile) .Executes(() => { - var testAssembly = "tests\\Avalonia.LeakTests\\bin\\Release\\net461\\Avalonia.LeakTests.dll"; + var testAssembly = "tests\\Avalonia.LeakTests\\bin\\Release\\net462\\Avalonia.LeakTests.dll"; DotMemoryUnit( $"{XunitPath.DoubleQuoteIfNeeded()} --propagate-exit-code -- {testAssembly}", timeout: 120_000); diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj index 44e2290a0d..c43986e5f1 100644 --- a/packages/Avalonia/Avalonia.csproj +++ b/packages/Avalonia/Avalonia.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net461;netcoreapp2.0 + netstandard2.0;net462;netcoreapp2.0 Avalonia @@ -24,8 +24,8 @@ false None - <_PackageFiles Include="$(DesignerHostAppPath)/Avalonia.Designer.HostApp/bin/$(Configuration)/net461/Avalonia.Designer.HostApp.exe"> - tools/net461/designer + <_PackageFiles Include="$(DesignerHostAppPath)/Avalonia.Designer.HostApp/bin/$(Configuration)/net462/Avalonia.Designer.HostApp.exe"> + tools/net462/designer false None diff --git a/packages/Avalonia/Avalonia.props b/packages/Avalonia/Avalonia.props index 6f21971d3d..24dc8ede67 100644 --- a/packages/Avalonia/Avalonia.props +++ b/packages/Avalonia/Avalonia.props @@ -1,7 +1,7 @@ $(MSBuildThisFileDirectory)\..\tools\netcoreapp2.0\designer\Avalonia.Designer.HostApp.dll - $(MSBuildThisFileDirectory)\..\tools\net461\designer\Avalonia.Designer.HostApp.exe + $(MSBuildThisFileDirectory)\..\tools\net462\designer\Avalonia.Designer.HostApp.exe $(MSBuildThisFileDirectory)\..\tools\netstandard2.0\Avalonia.Build.Tasks.dll false diff --git a/samples/BindingDemo/BindingDemo.csproj b/samples/BindingDemo/BindingDemo.csproj index 2c6ff74e5e..ca11f1da32 100644 --- a/samples/BindingDemo/BindingDemo.csproj +++ b/samples/BindingDemo/BindingDemo.csproj @@ -11,7 +11,7 @@ - + diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj index c6405dabb6..40c96a44d1 100644 --- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj +++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj @@ -2,7 +2,7 @@ Exe - net461 + net462 x64 diff --git a/samples/RenderDemo/RenderDemo.csproj b/samples/RenderDemo/RenderDemo.csproj index eed6fa9e89..aef42cc191 100644 --- a/samples/RenderDemo/RenderDemo.csproj +++ b/samples/RenderDemo/RenderDemo.csproj @@ -14,7 +14,7 @@ - + diff --git a/samples/VirtualizationDemo/VirtualizationDemo.csproj b/samples/VirtualizationDemo/VirtualizationDemo.csproj index 2c6ff74e5e..ca11f1da32 100644 --- a/samples/VirtualizationDemo/VirtualizationDemo.csproj +++ b/samples/VirtualizationDemo/VirtualizationDemo.csproj @@ -11,7 +11,7 @@ - + diff --git a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj index cd9963a2e5..abe5c5f73b 100644 --- a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj +++ b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj @@ -1,7 +1,7 @@  Exe - net461 + net462 diff --git a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj index 8394d7cb13..c12f05fc3a 100644 --- a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj +++ b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj @@ -9,7 +9,7 @@ Properties WindowsInteropTest WindowsInteropTest - v4.6.1 + v4.6.2 512 true diff --git a/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj b/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj index 805aae2d1a..a29f8dbf6c 100644 --- a/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj +++ b/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj @@ -1,7 +1,7 @@ - net461;netcoreapp2.0 + net462;netcoreapp2.0 @@ -11,7 +11,7 @@ - + diff --git a/src/Avalonia.DesktopRuntime/RuntimeInfo.cs b/src/Avalonia.DesktopRuntime/RuntimeInfo.cs index 82eaadb895..91a604f06e 100644 --- a/src/Avalonia.DesktopRuntime/RuntimeInfo.cs +++ b/src/Avalonia.DesktopRuntime/RuntimeInfo.cs @@ -23,7 +23,7 @@ namespace Avalonia.Shared.PlatformSupport { #if NETCOREAPP2_0 IsCoreClr = true, -#elif NET461 +#elif NET462 IsDotNetFramework = false, #endif IsDesktop = true, diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github index 8e20d65eb5..c88dd06556 160000 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github @@ -1 +1 @@ -Subproject commit 8e20d65eb5f1efbae08e49b18f39bfdce32df7b3 +Subproject commit c88dd06556c41a926273709fc0aa7e76f2fbf4a7 diff --git a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs index 8521a50087..832f634c85 100644 --- a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs +++ b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs @@ -124,7 +124,7 @@ namespace Avalonia.Shared.PlatformSupport -#if NET461 || NETCOREAPP2_0 +#if NET462 || NETCOREAPP2_0 [DllImport("libc", SetLastError = true)] private static extern IntPtr mmap(IntPtr addr, IntPtr length, int prot, int flags, int fd, IntPtr offset); [DllImport("libc", SetLastError = true)] diff --git a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj index 0e11ee3b92..6025b6b28d 100644 --- a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj +++ b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj @@ -1,6 +1,6 @@ - net461 + net462 true true true diff --git a/src/iOS/Avalonia.iOS/Boilerplate/Shared.cs b/src/iOS/Avalonia.iOS/Boilerplate/Shared.cs index c6e6e01e64..cab0052750 100644 --- a/src/iOS/Avalonia.iOS/Boilerplate/Shared.cs +++ b/src/iOS/Avalonia.iOS/Boilerplate/Shared.cs @@ -142,7 +142,7 @@ namespace Avalonia.Shared.PlatformSupport -#if NET461 || NETCOREAPP2_0 +#if NET462 || NETCOREAPP2_0 [DllImport("libc", SetLastError = true)] private static extern IntPtr mmap(IntPtr addr, IntPtr length, int prot, int flags, int fd, IntPtr offset); [DllImport("libc", SetLastError = true)] diff --git a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj index a2d27fd579..795cebd473 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;netcoreapp2.0 + net462;netcoreapp2.0 diff --git a/src/tools/Avalonia.Designer.HostApp/Program.cs b/src/tools/Avalonia.Designer.HostApp/Program.cs index 4472dac4e3..5dc60eeca0 100644 --- a/src/tools/Avalonia.Designer.HostApp/Program.cs +++ b/src/tools/Avalonia.Designer.HostApp/Program.cs @@ -8,7 +8,7 @@ namespace Avalonia.Designer.HostApp { class Program { -#if NET461 +#if NET462 private static string s_appDir; private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj index d49a859b89..2fac4ed2ab 100644 --- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj +++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj @@ -1,6 +1,6 @@  - net461 + net462 diff --git a/tests/Avalonia.UnitTests/InvariantCultureFixture.cs b/tests/Avalonia.UnitTests/InvariantCultureFixture.cs index 6dfc6d4202..b7adc74b1c 100644 --- a/tests/Avalonia.UnitTests/InvariantCultureFixture.cs +++ b/tests/Avalonia.UnitTests/InvariantCultureFixture.cs @@ -17,7 +17,7 @@ namespace Avalonia.UnitTests public InvariantCultureFixture() { -#if NET461 +#if NET462 _restore = Thread.CurrentThread.CurrentCulture; Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; #else @@ -28,7 +28,7 @@ namespace Avalonia.UnitTests public void Dispose() { -#if NET461 +#if NET462 Thread.CurrentThread.CurrentCulture = _restore; #else CultureInfo.CurrentCulture = _restore;