Revert "Revert "upgrade to net462""

This reverts commit c78179e9ac.
5 years ago · e44c36bef3
20 changed files with 24 additions and 24 deletions
--- a/build/SampleApp.props
+++ b/build/SampleApp.props
@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(TargetFramework)'=='net461'" >
+  <PropertyGroup Condition="'$(TargetFramework)'=='net462'" >
    <OutputType>WinExe</OutputType>
  </PropertyGroup>
  <ItemGroup>
--- 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);
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-      <TargetFrameworks>netstandard2.0;net461;netcoreapp2.0</TargetFrameworks>
+      <TargetFrameworks>netstandard2.0;net462;netcoreapp2.0</TargetFrameworks>
      <PackageId>Avalonia</PackageId>
  </PropertyGroup>
@ -24,8 +24,8 @@
        <Visible>false</Visible>
        <BuildAction>None</BuildAction>
      </_PackageFiles>
-      <_PackageFiles Include="$(DesignerHostAppPath)/Avalonia.Designer.HostApp/bin/$(Configuration)/net461/Avalonia.Designer.HostApp.exe">
+      <_PackageFiles Include="$(DesignerHostAppPath)/Avalonia.Designer.HostApp/bin/$(Configuration)/net462/Avalonia.Designer.HostApp.exe">
-        <PackagePath>tools/net461/designer</PackagePath>
+        <PackagePath>tools/net462/designer</PackagePath>
        <Visible>false</Visible>
        <BuildAction>None</BuildAction>
      </_PackageFiles>
--- a/packages/Avalonia/Avalonia.props
+++ b/packages/Avalonia/Avalonia.props
@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <AvaloniaPreviewerNetCoreToolPath>$(MSBuildThisFileDirectory)\..\tools\netcoreapp2.0\designer\Avalonia.Designer.HostApp.dll</AvaloniaPreviewerNetCoreToolPath>
-    <AvaloniaPreviewerNetFullToolPath>$(MSBuildThisFileDirectory)\..\tools\net461\designer\Avalonia.Designer.HostApp.exe</AvaloniaPreviewerNetFullToolPath>
+    <AvaloniaPreviewerNetFullToolPath>$(MSBuildThisFileDirectory)\..\tools\net462\designer\Avalonia.Designer.HostApp.exe</AvaloniaPreviewerNetFullToolPath>
    <AvaloniaBuildTasksLocation>$(MSBuildThisFileDirectory)\..\tools\netstandard2.0\Avalonia.Build.Tasks.dll</AvaloniaBuildTasksLocation>
    <AvaloniaUseExternalMSBuild>false</AvaloniaUseExternalMSBuild>
  </PropertyGroup>
--- a/samples/BindingDemo/BindingDemo.csproj
+++ b/samples/BindingDemo/BindingDemo.csproj
@ -11,7 +11,7 @@
  <Import Project="..\..\build\SampleApp.props" />
  <Import Project="..\..\build\EmbedXaml.props" />
  <Import Project="..\..\build\Rx.props" />
-  <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
+  <Import Condition="'$(TargetFramework)'=='net462'" Project="..\..\build\NetFX.props" />
  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
  <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
--- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
+++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
@ -2,7 +2,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
    <PlatformTarget>x64</PlatformTarget>
  </PropertyGroup>
--- a/samples/RenderDemo/RenderDemo.csproj
+++ b/samples/RenderDemo/RenderDemo.csproj
@ -14,7 +14,7 @@
  <Import Project="..\..\build\SampleApp.props" />
  <Import Project="..\..\build\EmbedXaml.props" />
  <Import Project="..\..\build\Rx.props" />
-  <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
+  <Import Condition="'$(TargetFramework)'=='net462'" Project="..\..\build\NetFX.props" />
  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
  <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
--- a/samples/VirtualizationDemo/VirtualizationDemo.csproj
+++ b/samples/VirtualizationDemo/VirtualizationDemo.csproj
@ -11,7 +11,7 @@
  <Import Project="..\..\build\SampleApp.props" />
  <Import Project="..\..\build\EmbedXaml.props" />
  <Import Project="..\..\build\Rx.props" />
-  <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
+  <Import Condition="'$(TargetFramework)'=='net462'" Project="..\..\build\NetFX.props" />
  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
  <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
--- a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
+++ b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net461</TargetFramework>
+        <TargetFramework>net462</TargetFramework>
    </PropertyGroup>
    <ItemGroup>
        <PackageReference Include="SharpDX.Mathematics" Version="4.0.1" />
--- a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
+++ b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>WindowsInteropTest</RootNamespace>
    <AssemblyName>WindowsInteropTest</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  </PropertyGroup>
--- a/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj
+++ b/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp2.0</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup>
@ -11,7 +11,7 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="'$(TargetFramework)' == 'net461'" />
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="'$(TargetFramework)' == 'net462'" />
  </ItemGroup>
  <Import Project="..\..\build\NetCore.props" />
--- 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,
--- 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
--- 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)]
--- a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
+++ b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <UseWpf>true</UseWpf>
    <ExtrasEnableImplicitWinFormsReferences>true</ExtrasEnableImplicitWinFormsReferences>
--- 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)]
--- a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
+++ b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp2.0</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />
--- 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)
--- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
+++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
  </PropertyGroup>
  <Import Project="..\..\build\JetBrains.dotMemoryUnit.props" />
  <Import Project="..\..\build\Moq.props" />
--- 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;
	`@ -1 +1 @@`
		`Subproject commit 8e20d65eb5f1efbae08e49b18f39bfdce32df7b3`			`Subproject commit c88dd06556c41a926273709fc0aa7e76f2fbf4a7`