From 8aa64528e8663dc33bf4db0984d71559753b44a5 Mon Sep 17 00:00:00 2001
From: Stebner <b.stebner@outlook.de>
Date: Thu, 6 Oct 2022 00:49:48 -0700
Subject: [PATCH] Merge

---
 Avalonia.sln                             | 2 --
 nukebuild/_build.csproj                  | 8 ++++++--
 src/iOS/Avalonia.iOS/Avalonia.iOS.csproj | 6 ++++++
 src/iOS/Avalonia.iOS/CombinedSpan3.cs    | 8 ++++----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Avalonia.sln b/Avalonia.sln
index c1760cd6b4..81a9b43890 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -411,9 +411,7 @@ Global
 		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|Any CPU.Build.0 = Release|Any CPU
 		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{41B02319-965D-4945-8005-C1A3D1224165}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj
index 5db9579876..8c0d824298 100644
--- a/nukebuild/_build.csproj
+++ b/nukebuild/_build.csproj
@@ -4,9 +4,9 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace></RootNamespace>
     <IsPackable>False</IsPackable>
-    <NoWarn>CS0649;CS0169</NoWarn>
+    <NoWarn>CS0649;CS0169;SYSLIB0011</NoWarn>
     <NukeTelemetryVersion>1</NukeTelemetryVersion>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
  
  <Import Project="..\build\JetBrains.dotMemoryUnit.props" />
@@ -40,5 +40,9 @@
   <ItemGroup>
     <Compile Remove="il-repack\ILRepack\Application.cs" />
   </ItemGroup>
+    
+  <ItemGroup>
+    <Folder Include="Numerge\Numerge.Console\" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
index e05566c454..99d4fd2a27 100644
--- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
+++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
@@ -4,6 +4,12 @@
     <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn></NoWarn>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
diff --git a/src/iOS/Avalonia.iOS/CombinedSpan3.cs b/src/iOS/Avalonia.iOS/CombinedSpan3.cs
index c73fb8de96..e9f44b7d58 100644
--- a/src/iOS/Avalonia.iOS/CombinedSpan3.cs
+++ b/src/iOS/Avalonia.iOS/CombinedSpan3.cs
@@ -16,7 +16,7 @@ internal ref struct CombinedSpan3<T>
 
     public int Length => Span1.Length + Span2.Length + Span3.Length;
 
-    void CopyFromSpan(ReadOnlySpan<T> from, ref int offset, ref Span<T> to)
+    void CopyFromSpan(ReadOnlySpan<T> from, int offset, ref Span<T> to)
     {
         if(to.Length == 0)
             return;
@@ -33,8 +33,8 @@ internal ref struct CombinedSpan3<T>
     
     public void CopyTo(Span<T> to, int offset)
     {
-        //CopyFromSpan(Span1, ref offset, ref to);
-        //CopyFromSpan(Span2, ref offset, ref to);
-        //CopyFromSpan(Span3, ref offset, ref to);
+        CopyFromSpan(Span1, offset, ref to);
+        CopyFromSpan(Span2, offset, ref to);
+        CopyFromSpan(Span3, offset, ref to);
     }
 }