bump to 1.2: mac os support

roubachof · Jul 12, 2021 · fca4a05 · fca4a05
1 parent 5e4b59c
commit fca4a05
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 58 deletions.
diff --git a/MaterialFrame/AssemblyInfo.targets b/MaterialFrame/AssemblyInfo.targets
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <Copyright>Copyright © Sharpnado 2021</Copyright>
-    <Version>1.1.4</Version>
+    <Version>1.2.0</Version>
     <Company>Sharpnado</Company>
     <Product>MaterialFrame</Product>
     <Description>Modern Frame supporting theming such as Blur styles, Acrylic style, Dark/Light modes for Xamarin.Forms (Android, iOS, UWP).</Description>

diff --git a/MaterialFrame/MaterialFrame.Android/AssemblyInfo.cs b/MaterialFrame/MaterialFrame.Android/AssemblyInfo.cs
@@ -1,20 +1,20 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyVersion("1.1.4")]
-[assembly: System.Reflection.AssemblyFileVersion("1.1.4")]
+[assembly: System.Reflection.AssemblyDescription("Modern Frame supporting theming such as Blur styles, Acrylic style, Dark/Light mo" +
+    "des for Xamarin.Forms (Android, iOS, UWP).")]
 [assembly: System.Reflection.AssemblyCompany("Sharpnado")]
 [assembly: System.Reflection.AssemblyProduct("MaterialFrame")]
 [assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2021")]
-[assembly: System.Reflection.AssemblyDescription("Modern Frame supporting theming such as Blur styles, Acrylic style, Dark/Light mo" +
-    "des for Xamarin.Forms (Android, iOS, macOS, UWP).")]
+[assembly: System.Reflection.AssemblyFileVersion("1.2.0")]
+[assembly: System.Reflection.AssemblyVersion("1.2.0")]
 [assembly: System.Reflection.AssemblyTitle("Sharpnado.MaterialFrame.Android")]
 
 
diff --git a/MaterialFrame/MaterialFrame.Android/MaterialFrame.Android.csproj b/MaterialFrame/MaterialFrame.Android/MaterialFrame.Android.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -70,7 +70,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -141,4 +141,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\AssemblyInfo.targets" />
-</Project>
+</Project>
+
+
+
diff --git a/MaterialFrame/MaterialFrame.UWP/AssemblyInfo.cs b/MaterialFrame/MaterialFrame.UWP/AssemblyInfo.cs
@@ -1,20 +1,20 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 [assembly: System.Reflection.AssemblyDescription("Modern Frame supporting theming such as Blur styles, Acrylic style, Dark/Light mo" +
-    "des for Xamarin.Forms (Android, iOS, macOS, UWP).")]
+    "des for Xamarin.Forms (Android, iOS, UWP).")]
 [assembly: System.Reflection.AssemblyCompany("Sharpnado")]
 [assembly: System.Reflection.AssemblyProduct("MaterialFrame")]
-[assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2020")]
-[assembly: System.Reflection.AssemblyFileVersion("1.1.3")]
-[assembly: System.Reflection.AssemblyVersion("1.1.3")]
+[assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2021")]
+[assembly: System.Reflection.AssemblyFileVersion("1.2.0")]
+[assembly: System.Reflection.AssemblyVersion("1.2.0")]
 [assembly: System.Reflection.AssemblyTitle("Sharpnado.MaterialFrame.UWP")]
 
 
diff --git a/MaterialFrame/MaterialFrame.UWP/MaterialFrame.UWP.csproj b/MaterialFrame/MaterialFrame.UWP/MaterialFrame.UWP.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -58,7 +58,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -89,4 +89,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
+
+
+
diff --git a/MaterialFrame/MaterialFrame.iOS/AssemblyInfo.cs b/MaterialFrame/MaterialFrame.iOS/AssemblyInfo.cs
@@ -1,20 +1,20 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyVersion("1.1.4")]
-[assembly: System.Reflection.AssemblyFileVersion("1.1.4")]
+[assembly: System.Reflection.AssemblyDescription("Modern Frame supporting theming such as Blur styles, Acrylic style, Dark/Light mo" +
+    "des for Xamarin.Forms (Android, iOS, UWP).")]
 [assembly: System.Reflection.AssemblyCompany("Sharpnado")]
 [assembly: System.Reflection.AssemblyProduct("MaterialFrame")]
 [assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2021")]
-[assembly: System.Reflection.AssemblyDescription("Modern Frame supporting theming such as Blur styles, Acrylic style, Dark/Light mo" +
-    "des for Xamarin.Forms (Android, iOS, macOS, UWP).")]
+[assembly: System.Reflection.AssemblyFileVersion("1.2.0")]
+[assembly: System.Reflection.AssemblyVersion("1.2.0")]
 [assembly: System.Reflection.AssemblyTitle("Sharpnado.MaterialFrame.iOS")]
 
 
diff --git a/MaterialFrame/MaterialFrame.iOS/MaterialFrame.iOS.csproj b/MaterialFrame/MaterialFrame.iOS/MaterialFrame.iOS.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -60,7 +60,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -76,4 +76,7 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-</Project>
+</Project>
+
+
+
diff --git a/MaterialFrame/MaterialFrame.macOS/AssemblyInfo.cs b/MaterialFrame/MaterialFrame.macOS/AssemblyInfo.cs
@@ -1,20 +1,20 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyVersion("1.1.4")]
-[assembly: System.Reflection.AssemblyFileVersion("1.1.4")]
+[assembly: System.Reflection.AssemblyDescription("Modern Frame supporting theming such as Blur styles, Acrylic style, Dark/Light mo" +
+    "des for Xamarin.Forms (Android, iOS, UWP).")]
 [assembly: System.Reflection.AssemblyCompany("Sharpnado")]
 [assembly: System.Reflection.AssemblyProduct("MaterialFrame")]
 [assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2021")]
-[assembly: System.Reflection.AssemblyDescription("Modern Frame supporting theming such as Blur styles, Acrylic style, Dark/Light mo" +
-    "des for Xamarin.Forms (Android, iOS, macOS, UWP).")]
+[assembly: System.Reflection.AssemblyFileVersion("1.2.0")]
+[assembly: System.Reflection.AssemblyVersion("1.2.0")]
 [assembly: System.Reflection.AssemblyTitle("Sharpnado.MaterialFrame.macOS")]
 
 
diff --git a/MaterialFrame/MaterialFrame.macOS/MaterialFrame.macOS.csproj b/MaterialFrame/MaterialFrame.macOS/MaterialFrame.macOS.csproj
@@ -6,7 +6,7 @@
     <ProjectGuid>{447A39AE-70B4-4656-A46C-55C6D60A8E5A}</ProjectGuid>
     <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
-<RootNamespace>Sharpnado.MaterialFrame.macOS</RootNamespace>
+    <RootNamespace>Sharpnado.MaterialFrame.macOS</RootNamespace>
     <AssemblyName>Sharpnado.MaterialFrame.macOS</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
@@ -25,22 +25,25 @@
     <EnablePackageSigning>false</EnablePackageSigning>
     <IncludeMonoRuntime>false</IncludeMonoRuntime>
     <UseSGen>false</UseSGen>
-    <HttpClientHandler></HttpClientHandler>
+    <HttpClientHandler>
+    </HttpClientHandler>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>full</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
-    <DefineConstants></DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <EnableCodeSigning>false</EnableCodeSigning>
     <CreatePackage>false</CreatePackage>
     <EnablePackageSigning>false</EnablePackageSigning>
     <IncludeMonoRuntime>false</IncludeMonoRuntime>
     <UseSGen>false</UseSGen>
-    <HttpClientHandler></HttpClientHandler>
+    <HttpClientHandler>
+    </HttpClientHandler>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="netstandard" />
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -61,7 +64,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -80,4 +83,5 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-</Project>
+  <Import Project="..\AssemblyInfo.targets" />
+</Project>
diff --git a/MaterialFrame/MaterialFrame/AssemblyInfo.cs b/MaterialFrame/MaterialFrame/AssemblyInfo.cs
@@ -1,20 +1,20 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyVersion("1.1.4")]
-[assembly: System.Reflection.AssemblyFileVersion("1.1.4")]
+[assembly: System.Reflection.AssemblyDescription("Modern Frame supporting theming such as Blur styles, Acrylic style, Dark/Light mo" +
+    "des for Xamarin.Forms (Android, iOS, UWP).")]
 [assembly: System.Reflection.AssemblyCompany("Sharpnado")]
 [assembly: System.Reflection.AssemblyProduct("MaterialFrame")]
 [assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2021")]
-[assembly: System.Reflection.AssemblyDescription("Modern Frame supporting theming such as Blur styles, Acrylic style, Dark/Light mo" +
-    "des for Xamarin.Forms (Android, iOS, macOS, UWP).")]
+[assembly: System.Reflection.AssemblyFileVersion("1.2.0")]
+[assembly: System.Reflection.AssemblyVersion("1.2.0")]
 [assembly: System.Reflection.AssemblyTitle("Sharpnado.MaterialFrame")]
 
 
diff --git a/MaterialFrame/MaterialFrame/MaterialFrame.csproj b/MaterialFrame/MaterialFrame/MaterialFrame.csproj
diff --git a/Sharpnado.MaterialFrame.nuspec b/Sharpnado.MaterialFrame.nuspec
@@ -15,7 +15,7 @@
       <repository url="https://github.com/roubachof/Sharpnado.MaterialFrame" />
       <summary>A modern Xamarin.Forms Frame component supporting blur, acrylic, dark mode. Implemented with RealtimeBlurView on Android (custom blurview), UIVisualEffectView on iOS and AcrylicBrush on UWP.</summary>
       <tags>xamarin.forms android ios uwp netstandard blurview blur UIVisualEffectView acrylic dark mode frame blurred background AcrylicBrush</tags>
-      <releaseNotes>Fix issue with XF 5.0 and android background colors.</releaseNotes>
+      <releaseNotes>Add support for MacOS thanks to @nor0x.</releaseNotes>
       <description>
 The Xamarin.Forms MaterialFrame aims at delivering out of the box modern popular theming such as:
   * Light
@@ -33,7 +33,12 @@ On Android, the blur is implemented thanks to the RealtimeBlurView from Tu Yimin
 Mandatory initialization on iOS:
 
     Xamarin.Forms.Forms.Init();
-    MaterialFrame.iOS.iOSMaterialFrameRenderer.Init();
+    Sharpnado.MaterialFrame.iOS.iOSMaterialFrameRenderer.Init();
+
+Mandatory initialization on macOS:
+
+    Xamarin.Forms.Forms.Init();
+    Sharpnado.MaterialFrame.macOS.macOSMaterialFrameRenderer.Init();
 
 Mandatory initialization on UWP: