diff --git a/.gitignore b/.gitignore index 8abab9934c87..c61457eb9fbd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore .nuspec/**/*.dll +.nuspec/**/*.dylib +.nuspec/**/*.so .XamarinFormsVersionFile.txt # User-specific files diff --git a/.nuspec/package.ps1 b/.nuspec/package.ps1 index a27c76f041f4..f343ceecc2fb 100644 --- a/.nuspec/package.ps1 +++ b/.nuspec/package.ps1 @@ -3,4 +3,4 @@ param ($configuration) dotnet pack $PSScriptRoot\..\Microsoft.Maui-net6.sln ` -c:$configuration ` -p:SymbolPackageFormat=snupkg ` - -bl:$PSScriptRoot\..\artifacts\maui.binlog + -bl:$PSScriptRoot/../artifacts/maui.binlog diff --git a/Microsoft.Maui-net6.sln b/Microsoft.Maui-net6.sln index da210c9c619c..aa3b6f32cdc7 100644 --- a/Microsoft.Maui-net6.sln +++ b/Microsoft.Maui-net6.sln @@ -26,6 +26,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.Droid- EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.iOS-net6", "src\Controls\samples\Controls.Sample.iOS\Maui.Controls.Sample.iOS-net6.csproj", "{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.MacCatalyst-net6", "src\Controls\samples\Controls.Sample.MacCatalyst\Maui.Controls.Sample.MacCatalyst-net6.csproj", "{D7FE9FD0-144A-4199-93FC-3AD62325F1D6}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.SingleProject", "src\Controls\samples\Controls.Sample.SingleProject\Maui.Controls.Sample.SingleProject.csproj", "{CB495F62-CFE6-4975-AED8-F26B6C5D0113}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compatibility", "Compatibility", "{123AA89E-1638-4E0E-B828-B8F9F9F906A2}" @@ -83,6 +85,10 @@ Global {1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Release|Any CPU.ActiveCfg = Release|Any CPU {1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Release|Any CPU.Build.0 = Release|Any CPU + {D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Release|Any CPU.Build.0 = Release|Any CPU {CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -124,6 +130,7 @@ Global {B8DC1324-977C-46F1-B697-9064ADE6099A} = {E1082E26-D700-4127-9329-66D673FD2D55} {BE50FAEF-4096-48B5-B9CE-EE0C38F15A18} = {E1082E26-D700-4127-9329-66D673FD2D55} {1C3439E6-73D7-4F8E-A64A-5448F5CB18DE} = {E1082E26-D700-4127-9329-66D673FD2D55} + {D7FE9FD0-144A-4199-93FC-3AD62325F1D6} = {E1082E26-D700-4127-9329-66D673FD2D55} {CB495F62-CFE6-4975-AED8-F26B6C5D0113} = {E1082E26-D700-4127-9329-66D673FD2D55} {75C380E0-CE53-4C01-B89F-CF685331DE18} = {459BF674-83CB-46F6-881F-A2D2117DBF4D} {39B47A3C-21CA-4B28-9250-14FD957EB0FC} = {94F3C036-A5F4-4ACC-A028-8506802ADB88} diff --git a/src/Compatibility/Core/src/Android.FormsViewGroup/Compatibility.Android.FormsViewGroup-net6.csproj b/src/Compatibility/Core/src/Android.FormsViewGroup/Compatibility.Android.FormsViewGroup-net6.csproj index cec46e5c8614..e5b74ad03c01 100644 --- a/src/Compatibility/Core/src/Android.FormsViewGroup/Compatibility.Android.FormsViewGroup-net6.csproj +++ b/src/Compatibility/Core/src/Android.FormsViewGroup/Compatibility.Android.FormsViewGroup-net6.csproj @@ -1,22 +1,14 @@ net6.0-android - Microsoft.Maui.Controls.Android - Microsoft.Maui.Controls.Android.FormsViewGroup + Microsoft.Maui.Controls.Compatibility.Android + Microsoft.Maui.Controls.Compatibility.Android.FormsViewGroup Library disable - - - - - - - - - - + + diff --git a/src/Compatibility/Core/src/Android.FormsViewGroup/Compatibility.Android.FormsViewGroup.csproj b/src/Compatibility/Core/src/Android.FormsViewGroup/Compatibility.Android.FormsViewGroup.csproj index 46caed10d673..80acaadb5499 100644 --- a/src/Compatibility/Core/src/Android.FormsViewGroup/Compatibility.Android.FormsViewGroup.csproj +++ b/src/Compatibility/Core/src/Android.FormsViewGroup/Compatibility.Android.FormsViewGroup.csproj @@ -1,63 +1,16 @@ - - + + $(AndroidTargetFrameworks) + Microsoft.Maui.Controls.Compatibility.Android + Microsoft.Maui.Controls.Compatibility.Android.FormsViewGroup XAJavaInterop1 - Microsoft.Maui.Controls.Android - - + class-parse Debug AnyCPU - 8.0.30703 - 2.0 - {3B72465B-ACAE-43AE-9327-10F372FE5F80} - {10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - FormsViewGroup - FormsViewGroup - 512 - v10.0 - - - true - portable - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - CS0109 + true - - portable - true - bin\Release\ - TRACE - prompt - 4 - CS0109 - - - - - - - - - - - - - - + + - - \ No newline at end of file diff --git a/src/Compatibility/Core/src/Android.FormsViewGroup/Properties/AssemblyInfo.cs b/src/Compatibility/Core/src/Android.FormsViewGroup/Properties/AssemblyInfo.cs deleted file mode 100644 index effe12d6482e..000000000000 --- a/src/Compatibility/Core/src/Android.FormsViewGroup/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle ("FormsViewGroup")] -[assembly: AssemblyDescription ("")] -[assembly: ComVisible (false)] \ No newline at end of file diff --git a/src/Compatibility/Core/src/Android.FormsViewGroup/Transforms/Metadata.xml b/src/Compatibility/Core/src/Android.FormsViewGroup/Transforms/Metadata.xml index 8987b31dea96..bbc6c370aca5 100644 --- a/src/Compatibility/Core/src/Android.FormsViewGroup/Transforms/Metadata.xml +++ b/src/Compatibility/Core/src/Android.FormsViewGroup/Transforms/Metadata.xml @@ -8,6 +8,6 @@ --> - Microsoft.Maui.Controls.Android - Microsoft.Maui.Controls.Android + Microsoft.Maui.Controls.Compatibility + Microsoft.Maui.Controls.Compatibility \ No newline at end of file diff --git a/src/Compatibility/Core/src/Android/VisualElementRenderer.cs b/src/Compatibility/Core/src/Android/VisualElementRenderer.cs index 7c989c1e7e98..7dfe2cf75b6a 100644 --- a/src/Compatibility/Core/src/Android/VisualElementRenderer.cs +++ b/src/Compatibility/Core/src/Android/VisualElementRenderer.cs @@ -9,7 +9,6 @@ using AndroidX.Core.View; using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers; using AView = Android.Views.View; -using Microsoft.Maui.Controls.Android; using Microsoft.Maui.Controls.Internals; namespace Microsoft.Maui.Controls.Compatibility.Platform.Android diff --git a/src/Compatibility/Core/src/Android/VisualElementTracker.cs b/src/Compatibility/Core/src/Android/VisualElementTracker.cs index 800550550c00..a8011ad6247f 100644 --- a/src/Compatibility/Core/src/Android/VisualElementTracker.cs +++ b/src/Compatibility/Core/src/Android/VisualElementTracker.cs @@ -94,7 +94,7 @@ public void UpdateLayout() var width = Math.Max(0, (int)_context.ToPixels(view.Width)); var height = Math.Max(0, (int)_context.ToPixels(view.Height)); - var formsViewGroup = aview as Controls.Android.FormsViewGroup; + var formsViewGroup = aview as FormsViewGroup; if (formsViewGroup == null) { Performance.Start(reference, "Measure"); @@ -348,7 +348,7 @@ void UpdateNativeView(object sender, EventArgs e) VisualElement view = _renderer.Element; AView aview = _renderer.View; - if (aview is Controls.Android.FormsViewGroup formsViewGroup) + if (aview is FormsViewGroup formsViewGroup) { formsViewGroup.SendBatchUpdate((float)(view.AnchorX * _context.ToPixels(view.Width)), (float)(view.AnchorY * _context.ToPixels(view.Height)), @@ -365,7 +365,7 @@ void UpdateNativeView(object sender, EventArgs e) } else { - Controls.Android.FormsViewGroup.SendViewBatchUpdate(aview, + FormsViewGroup.SendViewBatchUpdate(aview, (float)(view.AnchorX * _context.ToPixels(view.Width)), (float)(view.AnchorY * _context.ToPixels(view.Height)), (int)(view.IsVisible ? ViewStates.Visible : ViewStates.Invisible), diff --git a/src/Controls/samples/Controls.Sample.Droid/Controls.Sample.Droid.csproj b/src/Controls/samples/Controls.Sample.Droid/Controls.Sample.Droid.csproj index 262fee785da5..7eb54d19bb3c 100644 --- a/src/Controls/samples/Controls.Sample.Droid/Controls.Sample.Droid.csproj +++ b/src/Controls/samples/Controls.Sample.Droid/Controls.Sample.Droid.csproj @@ -68,7 +68,6 @@ - @@ -76,26 +75,8 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/Controls/samples/Controls.Sample.Droid/Maui.Controls.Sample.Droid-net6.csproj b/src/Controls/samples/Controls.Sample.Droid/Maui.Controls.Sample.Droid-net6.csproj index 8abf27a4729c..6d184ccf12f0 100644 --- a/src/Controls/samples/Controls.Sample.Droid/Maui.Controls.Sample.Droid-net6.csproj +++ b/src/Controls/samples/Controls.Sample.Droid/Maui.Controls.Sample.Droid-net6.csproj @@ -1,4 +1,5 @@ + net6.0-android Exe @@ -6,15 +7,14 @@ Maui.Controls.Sample.Droid false - - - + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SingleProject/Resizetizer/src/Resizetizer.csproj b/src/SingleProject/Resizetizer/src/Resizetizer.csproj index 01f00be3c0b6..5448e5810c0f 100644 --- a/src/SingleProject/Resizetizer/src/Resizetizer.csproj +++ b/src/SingleProject/Resizetizer/src/Resizetizer.csproj @@ -69,6 +69,7 @@ <_CopyItems Include="$(TargetDir)**\*.dll" /> + <_CopyItems Include="$(TargetDir)**\*.dylib" />