Merge pull request #67 from evgenyvalavin/net6

.NET 6
FluentLayout · Oct 30, 2022 · ee85407 · ee85407
2 parents 8c3afc5 + 6f57850
commit ee85407
Show file tree

Hide file tree

Showing 11 changed files with 521 additions and 652 deletions.
diff --git a/Cirrious.FluentLayout/AdvancedFluentLayoutExtensions.cs b/Cirrious.FluentLayout/AdvancedFluentLayoutExtensions.cs
diff --git a/Cirrious.FluentLayout/Cirrious.FluentLayouts.Touch.csproj b/Cirrious.FluentLayout/Cirrious.FluentLayouts.Touch.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0-ios</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>true</ImplicitUsings>
+    <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,8 +15,6 @@
     <RootNamespace>Cirrious.FluentLayouts.Touch</RootNamespace>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>Cirrious.FluentLayouts.Touch</AssemblyName>
-    <TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,27 +37,4 @@
     <ConsolePause>false</ConsolePause>
     <MtouchLink>None</MtouchLink>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AdvancedFluentLayoutExtensions.cs" />
-    <Compile Include="FluentLayout.cs" />
-    <Compile Include="FluentLayoutExtensions.cs" />
-    <Compile Include="Margins.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RowSet-WorkInProgress\RowSet.cs" />
-    <Compile Include="UIViewAndLayoutAttribute.cs" />
-    <Compile Include="NfloatExtensions.cs" />
-    <Compile Include="Extensions\ArrayExtensions.cs" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Xamarin.iOS" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Extensions\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
diff --git a/Cirrious.FluentLayout/Extensions/ArrayExtensions.cs b/Cirrious.FluentLayout/Extensions/ArrayExtensions.cs