Skip to content

Commit

Permalink
EnableDefaultItems on Compatibility project (#1615)
Browse files Browse the repository at this point in the history 
* EnableDefaultItems on Compatibility project

* - fix non net6 project

* - remove extra files

* - fix default items include

* - fix resource files

* - fix namespace

* - fix default items

* - fix WPF include and resource path

* - explicitly add styles

* - fix net6 project

* - properly exclude

* - exclude page/mauixaml

* - fix up removes on non net6 project

* EnableDefaultItems on Compatibility project

* - fix non net6 project

* - remove extra files

* - fix resource files

* - fix namespace

* - fix WPF include and resource path

* - explicitly add styles

* - fix net6 project

* - properly exclude

* - exclude page/mauixaml

* - fix up removes on non net6 project
  • Loading branch information
@PureWeen
PureWeen committed Jul 15, 2021
1 parent 584ffac commit db18955
Show file tree
Hide file tree
Showing 200 changed files with 106 additions and 182 deletions.
71 changes: 0 additions & 71 deletions src/Compatibility/Core/src/Android/AppCompat/Resource.cs
View file

This file was deleted.

4 changes: 2 additions & 2 deletions src/Compatibility/Core/src/AppHostBuilderExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ static IAppHostBuilder SetupDefaults(this IAppHostBuilder builder)
handlers.TryAddCompatibilityRenderer(typeof(ActivityIndicator), typeof(ActivityIndicatorRenderer));
handlers.TryAddCompatibilityRenderer(typeof(Frame), typeof(FrameRenderer));
handlers.TryAddCompatibilityRenderer(typeof(CheckBox), typeof(CheckBoxRenderer));
#if !WINDOWS
handlers.TryAddCompatibilityRenderer(typeof(TabbedPage), typeof(TabbedPageRenderer));
#if !WINDOWS
handlers.TryAddCompatibilityRenderer(typeof(Shell), typeof(ShellRenderer));
handlers.TryAddCompatibilityRenderer(typeof(OpenGLView), typeof(OpenGLViewRenderer));
#else
Expand Down Expand Up @@ -262,7 +262,7 @@ public void Configure(HostBuilderContext context, IServiceProvider services)
AddLibraryResources("MicrosoftMauiControlsIncluded", "ms-appx:///Microsoft.Maui.Controls/Platform/Windows/Styles/Resources.xbf");

// Microsoft.Maui.Controls.Compatibility
AddLibraryResources("MicrosoftMauiControlsCompatibilityIncluded", "ms-appx:///Microsoft.Maui.Controls.Compatibility/WinUI/Resources.xbf");
AddLibraryResources("MicrosoftMauiControlsCompatibilityIncluded", "ms-appx:///Microsoft.Maui.Controls.Compatibility/Windows/Resources.xbf");
}
#endif
}
Expand Down
80 changes: 32 additions & 48 deletions src/Compatibility/Core/src/Compatibility-net6.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;$(MauiPlatforms)</TargetFrameworks>
<RootNamespace>Microsoft.Maui.Controls.Compatibility</RootNamespace>
<AssemblyName>Microsoft.Maui.Controls.Compatibility</AssemblyName>
<Nullable>disable</Nullable>
<EnableDefaultItems>false</EnableDefaultItems>
<AndroidRoot>Android\</AndroidRoot>
<iOSRoot>iOS\</iOSRoot>
<WindowsRoot>WinUI\</WindowsRoot>
<WindowsRoot>Windows\</WindowsRoot>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand All @@ -24,67 +23,52 @@
<PackageReference Include="Microsoft.Graphics.Win2D" />
</ItemGroup>

<!--<Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets" />-->
<Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets" />

<ItemGroup>
<Compile Remove="GTK\**" />
<Compile Remove="MacOS\**" />
<Compile Remove="Tizen\**" />
<Compile Remove="WPF\**" />
<EmbeddedResource Remove="GTK\**" />
<EmbeddedResource Remove="MacOS\**" />
<EmbeddedResource Remove="Tizen\**" />
<EmbeddedResource Remove="WPF\**" />
<None Remove="GTK\**" />
<None Remove="MacOS\**" />
<None Remove="Tizen\**" />
<None Remove="WPF\**" />
<Page Remove="**\WPF\**\*.xaml" />
<MauiXaml Remove="**\WPF\**\*.xaml" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
<Compile Include="$(WindowsRoot)**\*.cs"></Compile>
<Page Include="$(WindowsRoot)**\*.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Remove="$(WindowsRoot)TabbedPageStyle.xaml" />
<ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml-net6.csproj" />
<Compile Include="*.Windows.cs" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
<Compile Include="$(AndroidRoot)**\*.cs"></Compile>
<AndroidResource Include="$(AndroidRoot)Resources\Layout\bottomtablayout.axml" Link="Android\Resources\Layout\bottomtablayout.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\flyoutcontent.axml" Link="Android\Resources\Layout\flyoutcontent.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\rootlayout.axml" Link="Android\Resources\Layout\rootlayout.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\shellcontent.axml" Link="Android\Resources\Layout\shellcontent.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\tabbar.axml" Link="Android\Resources\Layout\tabbar.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\toolbar.axml" Link="Android\Resources\Layout\toolbar.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\bottomtablayout.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\flyoutcontent.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\rootlayout.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\shellcontent.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\tabbar.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\toolbar.axml" />


<AndroidResource Include="$(AndroidRoot)Resources\anim\enterfromleft.xml" Link="Android\Resources\anim\enterfromleft.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\enterfromright.xml" Link="Android\Resources\anim\enterfromright.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\exittoleft.xml" Link="Android\Resources\anim\exittoleft.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\exittoright.xml" Link="Android\Resources\anim\exittoright.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\enterfromleft.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\enterfromright.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\exittoleft.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\exittoright.xml" />


<AndroidResource Include="$(AndroidRoot)Resources\values\styles.xml" Link="Android\Resources\values\styles.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\values\strings.xml" Link="Android\Resources\values\strings.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\values\attrs.xml" Link="Android\Resources\values\attrs.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\values\styles.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\values\strings.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\values\attrs.xml" />
<ProjectReference Include="..\..\Android.FormsViewGroup\src\Compatibility.Android.FormsViewGroup-net6.csproj" />

<Compile Remove="$(AndroidRoot)AppCompat\Resource.cs" />
<Compile Remove="$(AndroidRoot)bin\**\*.cs" />
<Compile Remove="$(AndroidRoot)obj\**\*.cs" />
<Compile Include="*.Android.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'ios' OR '$(TargetPlatformIdentifier)' == 'maccatalyst' ">
<Compile Include="$(iOSRoot)**\*.cs"></Compile>
<EmbeddedResource Include="$(iOSRoot)Resources\*.resx" />
<Compile Remove="$(iOSRoot)bin\**\*.cs" />
<Compile Remove="$(iOSRoot)obj\**\*.cs" />
<Compile Include="*.iOS.cs" />
</ItemGroup>

<ItemGroup>
<Compile Include="RendererToHandlerShim.cs" />
<Compile Include="AppHostBuilderExtensions.cs" />
<Compile Include="MauiHandlersCollectionExtensions.cs" />
<Compile Include="ExportRendererAttribute.cs" />
<Compile Include="Forms.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core-net6.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml-net6.csproj" />
Expand Down
75 changes: 39 additions & 36 deletions src/Compatibility/Core/src/Compatibility.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,68 +4,63 @@
<RootNamespace>Microsoft.Maui.Controls.Compatibility</RootNamespace>
<AssemblyName>Microsoft.Maui.Controls.Compatibility</AssemblyName>
<Nullable>disable</Nullable>
<EnableDefaultItems>false</EnableDefaultItems>
<AndroidRoot>Android\</AndroidRoot>
<iOSRoot>iOS\</iOSRoot>
<WindowsRoot>WinUI\</WindowsRoot>
<WindowsRoot>Windows\</WindowsRoot>
</PropertyGroup>
<PropertyGroup>
<PackageId>Microsoft.Maui.Controls.Compatibility</PackageId>
</PropertyGroup>

<!--<Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets" />-->
<Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets" />

<ItemGroup>
<Compile Remove="GTK\**" />
<Compile Remove="MacOS\**" />
<Compile Remove="Tizen\**" />
<Compile Remove="WPF\**" />
<EmbeddedResource Remove="GTK\**" />
<EmbeddedResource Remove="MacOS\**" />
<EmbeddedResource Remove="Tizen\**" />
<EmbeddedResource Remove="WPF\**" />
<None Remove="GTK\**" />
<None Remove="MacOS\**" />
<None Remove="Tizen\**" />
<None Remove="WPF\**" />
<Page Remove="**\WPF\**\*.xaml" />
<MauiXaml Remove="**\WPF\**\*.xaml" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) == true ">
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<Reference Include="System.Net.Http" />
<Compile Include="$(AndroidRoot)**\*.cs"></Compile>
<AndroidResource Include="$(AndroidRoot)Resources\Layout\bottomtablayout.axml" Link="Android\Resources\Layout\bottomtablayout.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\flyoutcontent.axml" Link="Android\Resources\Layout\flyoutcontent.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\rootlayout.axml" Link="Android\Resources\Layout\rootlayout.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\shellcontent.axml" Link="Android\Resources\Layout\shellcontent.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\tabbar.axml" Link="Android\Resources\Layout\tabbar.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\toolbar.axml" Link="Android\Resources\Layout\toolbar.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\bottomtablayout.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\flyoutcontent.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\rootlayout.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\shellcontent.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\tabbar.axml" />
<AndroidResource Include="$(AndroidRoot)Resources\Layout\toolbar.axml" />


<AndroidResource Include="$(AndroidRoot)Resources\anim\enterfromleft.xml" Link="Android\Resources\anim\enterfromleft.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\enterfromright.xml" Link="Android\Resources\anim\enterfromright.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\exittoleft.xml" Link="Android\Resources\anim\exittoleft.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\exittoright.xml" Link="Android\Resources\anim\exittoright.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\enterfromleft.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\enterfromright.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\exittoleft.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\anim\exittoright.xml" />


<AndroidResource Include="$(AndroidRoot)Resources\values\styles.xml" Link="Android\Resources\values\styles.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\values\strings.xml" Link="Android\Resources\values\strings.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\values\attrs.xml" Link="Android\Resources\values\attrs.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\values\styles.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\values\strings.xml" />
<AndroidResource Include="$(AndroidRoot)Resources\values\attrs.xml" />
<ProjectReference Include="..\..\Android.FormsViewGroup\src\Compatibility.Android.FormsViewGroup.csproj" />

<Compile Remove="$(AndroidRoot)AppCompat\Resource.cs" />
<Compile Remove="$(AndroidRoot)bin\**\*.cs" />
<Compile Remove="$(AndroidRoot)obj\**\*.cs" />
<Compile Include="*.Android.cs" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
<Compile Include="$(iOSRoot)**\*.cs"></Compile>
<EmbeddedResource Include="$(iOSRoot)Resources\*.resx" />
<Compile Remove="$(iOSRoot)bin\**\*.cs" />
<Compile Remove="$(iOSRoot)obj\**\*.cs" />
<Reference Include="System" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="System.Net.Http" />
<Compile Include="*.iOS.cs" />
</ItemGroup>

<ItemGroup>
<Compile Include="AppHostBuilderExtensions.cs" />
<Compile Include="MauiHandlersCollectionExtensions.cs" />
<Compile Include="ExportRendererAttribute.cs" />
<Compile Include="Forms.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RendererToHandlerShim.cs" />
</ItemGroup>

<ItemGroup>
Expand All @@ -78,4 +73,12 @@
<ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="iOS\Resources\StringResources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>StringResources.resx</DependentUpon>
</None>
</ItemGroup>
</Project>
0 ...ibility/Core/src/WinUI/AccessKeyHelper.cs → ...ility/Core/src/Windows/AccessKeyHelper.cs
View file
File renamed without changes.
0 ...Core/src/WinUI/AccessibilityExtensions.cs → ...re/src/Windows/AccessibilityExtensions.cs
View file
File renamed without changes.
0 ...re/src/WinUI/ActivityIndicatorRenderer.cs → .../src/Windows/ActivityIndicatorRenderer.cs
View file
File renamed without changes.
0 ...mpatibility/Core/src/WinUI/AlertDialog.cs → ...atibility/Core/src/Windows/AlertDialog.cs
View file
File renamed without changes.
0 ...ity/Core/src/WinUI/AlignmentExtensions.cs → ...y/Core/src/Windows/AlignmentExtensions.cs
View file
File renamed without changes.
0 ...ility/Core/src/WinUI/BackgroundTracker.cs → ...ity/Core/src/Windows/BackgroundTracker.cs
View file
File renamed without changes.
0 ...re/src/WinUI/BoolToVisibilityConverter.cs → .../src/Windows/BoolToVisibilityConverter.cs
View file
File renamed without changes.
0 ...ibility/Core/src/WinUI/BootstrapHelper.cs → ...ility/Core/src/Windows/BootstrapHelper.cs
View file
File renamed without changes.
0 ...y/Core/src/WinUI/BoxViewBorderRenderer.cs → ...Core/src/Windows/BoxViewBorderRenderer.cs
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/BrushConverter.cs → ...bility/Core/src/Windows/BrushConverter.cs
View file
File renamed without changes.
0 ...patibility/Core/src/WinUI/BrushHelpers.cs → ...tibility/Core/src/Windows/BrushHelpers.cs
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/ButtonRenderer.cs → ...bility/Core/src/Windows/ButtonRenderer.cs
View file
File renamed without changes.
0 ...ty/Core/src/WinUI/CarouselPageRenderer.cs → .../Core/src/Windows/CarouselPageRenderer.cs
View file
File renamed without changes.
0 ...atibility/Core/src/WinUI/CaseConverter.cs → ...ibility/Core/src/Windows/CaseConverter.cs
View file
File renamed without changes.
0 ...mpatibility/Core/src/WinUI/CellControl.cs → ...atibility/Core/src/Windows/CellControl.cs
View file
File renamed without changes.
0 ...bility/Core/src/WinUI/CheckBoxRenderer.cs → ...lity/Core/src/Windows/CheckBoxRenderer.cs
View file
File renamed without changes.
0 ...e/src/WinUI/CollapseWhenEmptyConverter.cs → ...src/Windows/CollapseWhenEmptyConverter.cs
View file
File renamed without changes.
0 ...UI/CollectionView/CarouselViewRenderer.cs → ...ws/CollectionView/CarouselViewRenderer.cs
View file
File renamed without changes.
0 .../CollectionView/CollectionViewRenderer.cs → .../CollectionView/CollectionViewRenderer.cs
View file
File renamed without changes.
0 ...src/WinUI/CollectionView/FormsGridView.cs → ...c/Windows/CollectionView/FormsGridView.cs
View file
File renamed without changes.
0 ...src/WinUI/CollectionView/FormsListView.cs → ...c/Windows/CollectionView/FormsListView.cs
View file
File renamed without changes.
0 ...ionView/GroupFooterItemTemplateContext.cs → ...ionView/GroupFooterItemTemplateContext.cs
View file
File renamed without changes.
0 ...ollectionView/GroupHeaderStyleSelector.cs → ...ollectionView/GroupHeaderStyleSelector.cs
View file
File renamed without changes.
0 ...UI/CollectionView/GroupTemplateContext.cs → ...ws/CollectionView/GroupTemplateContext.cs
View file
File renamed without changes.
0 ...lectionView/GroupableItemsViewRenderer.cs → ...lectionView/GroupableItemsViewRenderer.cs
View file
File renamed without changes.
0 ...tionView/GroupedItemTemplateCollection.cs → ...tionView/GroupedItemTemplateCollection.cs
View file
File renamed without changes.
0 ...re/src/WinUI/CollectionView/IEmptyView.cs → .../src/Windows/CollectionView/IEmptyView.cs
View file
File renamed without changes.
0 ...inUI/CollectionView/ItemContentControl.cs → ...dows/CollectionView/ItemContentControl.cs
View file
File renamed without changes.
0 ...nUI/CollectionView/ItemTemplateContext.cs → ...ows/CollectionView/ItemTemplateContext.cs
View file
File renamed without changes.
0 ...tionView/ItemTemplateContextEnumerable.cs → ...tionView/ItemTemplateContextEnumerable.cs
View file
File renamed without changes.
0 ...CollectionView/ItemTemplateContextList.cs → ...CollectionView/ItemTemplateContextList.cs
View file
File renamed without changes.
0 ...WinUI/CollectionView/ItemsViewRenderer.cs → ...ndows/CollectionView/ItemsViewRenderer.cs
View file
File renamed without changes.
0 ...WinUI/CollectionView/ItemsViewStyles.xaml → ...ndows/CollectionView/ItemsViewStyles.xaml
View file
File renamed without changes.
0 .../CollectionView/LoopableCollectionView.cs → .../CollectionView/LoopableCollectionView.cs
View file
File renamed without changes.
0 ...nView/ObservableItemTemplateCollection.cs → ...nView/ObservableItemTemplateCollection.cs
View file
File renamed without changes.
0 ...src/WinUI/CollectionView/ScrollHelpers.cs → ...c/Windows/CollectionView/ScrollHelpers.cs
View file
File renamed without changes.
0 ...ectionView/SelectableItemsViewRenderer.cs → ...ectionView/SelectableItemsViewRenderer.cs
View file
File renamed without changes.
0 ...ectionView/StructuredItemsViewRenderer.cs → ...ectionView/StructuredItemsViewRenderer.cs
View file
File renamed without changes.
0 ...lectionView/TemplatedItemSourceFactory.cs → ...lectionView/TemplatedItemSourceFactory.cs
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/ColorConverter.cs → ...bility/Core/src/Windows/ColorConverter.cs
View file
File renamed without changes.
0 ...y/Core/src/WinUI/Compatibility.UAP.csproj → ...Core/src/Windows/Compatibility.UAP.csproj
View file
File renamed without changes.
0 ...ility/Core/src/WinUI/CompositionHelper.cs → ...ity/Core/src/Windows/CompositionHelper.cs
View file
File renamed without changes.
0 ...lity/Core/src/WinUI/DatePickerRenderer.cs → ...ty/Core/src/Windows/DatePickerRenderer.cs
View file
File renamed without changes.
0 ...ibility/Core/src/WinUI/DefaultRenderer.cs → ...ility/Core/src/Windows/DefaultRenderer.cs
View file
File renamed without changes.
0 ...lity/Core/src/WinUI/Directory.Build.Props → ...ty/Core/src/Windows/Directory.Build.Props
View file
File renamed without changes.
0 ...ty/Core/src/WinUI/Directory.Build.targets → .../Core/src/Windows/Directory.Build.targets
View file
File renamed without changes.
0 ...ompatibility/Core/src/WinUI/Dispatcher.cs → ...patibility/Core/src/Windows/Dispatcher.cs
View file
File renamed without changes.
0 ...lity/Core/src/WinUI/DispatcherProvider.cs → ...ty/Core/src/Windows/DispatcherProvider.cs
View file
File renamed without changes.
0 ...rc/WinUI/DualScreen/IDualScreenService.cs → .../Windows/DualScreen/IDualScreenService.cs
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/EditorRenderer.cs → ...bility/Core/src/Windows/EditorRenderer.cs
View file
File renamed without changes.
0 ...ility/Core/src/WinUI/ElementExtensions.cs → ...ity/Core/src/Windows/ElementExtensions.cs
View file
File renamed without changes.
0 ...bility/Core/src/WinUI/EntryCellTextBox.cs → ...lity/Core/src/Windows/EntryCellTextBox.cs
View file
File renamed without changes.
0 ...atibility/Core/src/WinUI/EntryRenderer.cs → ...ibility/Core/src/Windows/EntryRenderer.cs
View file
File renamed without changes.
0 ...ompatibility/Core/src/WinUI/Extensions.cs → ...patibility/Core/src/Windows/Extensions.cs
View file
File renamed without changes.
0 ...re/src/WinUI/Extensions/ClipExtensions.cs → .../src/Windows/Extensions/ClipExtensions.cs
View file
File renamed without changes.
0 ...e/src/WinUI/Extensions/ImageExtensions.cs → ...src/Windows/Extensions/ImageExtensions.cs
View file
File renamed without changes.
0 .../Core/src/WinUI/FileImageSourceHandler.cs → ...ore/src/Windows/FileImageSourceHandler.cs
View file
File renamed without changes.
0 src/Compatibility/Core/src/WinUI/Flags.cs → src/Compatibility/Core/src/Windows/Flags.cs
View file
File renamed without changes.
0 ...Core/src/WinUI/FlowDirectionExtensions.cs → ...re/src/Windows/FlowDirectionExtensions.cs
View file
File renamed without changes.
0 ...ility/Core/src/WinUI/FlyoutPageControl.cs → ...ity/Core/src/Windows/FlyoutPageControl.cs
View file
File renamed without changes.
0 ...ore/src/WinUI/FlyoutPageControlStyle.xaml → ...e/src/Windows/FlyoutPageControlStyle.xaml
View file
File renamed without changes.
0 ...lity/Core/src/WinUI/FlyoutPageRenderer.cs → ...ty/Core/src/Windows/FlyoutPageRenderer.cs
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/FontExtensions.cs → ...bility/Core/src/Windows/FontExtensions.cs
View file
File renamed without changes.
0 .../Core/src/WinUI/FontImageSourceHandler.cs → ...ore/src/Windows/FontImageSourceHandler.cs
View file
File renamed without changes.
0 src/Compatibility/Core/src/WinUI/Forms.cs → src/Compatibility/Core/src/Windows/Forms.cs
View file
File renamed without changes.
0 ...e/src/WinUI/FormsAutoSuggestBoxStyle.xaml → ...src/Windows/FormsAutoSuggestBoxStyle.xaml
View file
File renamed without changes.
0 ...mpatibility/Core/src/WinUI/FormsButton.cs → ...atibility/Core/src/Windows/FormsButton.cs
View file
File renamed without changes.
0 ...ility/Core/src/WinUI/FormsCancelButton.cs → ...ity/Core/src/Windows/FormsCancelButton.cs
View file
File renamed without changes.
0 ...atibility/Core/src/WinUI/FormsCheckBox.cs → ...ibility/Core/src/Windows/FormsCheckBox.cs
View file
File renamed without changes.
0 ...ty/Core/src/WinUI/FormsCheckBoxStyle.xaml → .../Core/src/Windows/FormsCheckBoxStyle.xaml
View file
File renamed without changes.
0 ...atibility/Core/src/WinUI/FormsComboBox.cs → ...ibility/Core/src/Windows/FormsComboBox.cs
View file
File renamed without changes.
0 ...ibility/Core/src/WinUI/FormsCommandBar.cs → ...ility/Core/src/Windows/FormsCommandBar.cs
View file
File renamed without changes.
0 .../Core/src/WinUI/FormsCommandBarStyle.xaml → ...ore/src/Windows/FormsCommandBarStyle.xaml
View file
File renamed without changes.
0 ...e/src/WinUI/FormsEmbeddedPageWrapper.xaml → ...src/Windows/FormsEmbeddedPageWrapper.xaml
View file
File renamed without changes.
0 ...atibility/Core/src/WinUI/FormsFlyout.xaml → ...ibility/Core/src/Windows/FormsFlyout.xaml
View file
File renamed without changes.
0 ...bility/Core/src/WinUI/FormsFlyout.xaml.cs → ...lity/Core/src/Windows/FormsFlyout.xaml.cs
View file
File renamed without changes.
9 changes: 4 additions & 5 deletions ...ompatibility/Core/src/WinUI/FormsPivot.cs → ...patibility/Core/src/Windows/FormsPivot.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*

using System.Threading.Tasks;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
Expand All @@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
{
public class FormsPivot : Pivot, IToolbarProvider
{
public static readonly DependencyProperty TitleVisibilityProperty = DependencyProperty.Register(nameof(TitleVisibility), typeof(Visibility), typeof(FormsPivot), new PropertyMetadata(Visibility.Collapsed));
public static readonly DependencyProperty TitleVisibilityProperty = DependencyProperty.Register(nameof(TitleVisibility), typeof(UI.Xaml.Visibility), typeof(FormsPivot), new PropertyMetadata(UI.Xaml.Visibility.Collapsed));

public static readonly DependencyProperty ToolbarForegroundProperty = DependencyProperty.Register(nameof(ToolbarForeground), typeof(WBrush), typeof(FormsPivot), new PropertyMetadata(default(WBrush)));

Expand Down Expand Up @@ -41,9 +41,9 @@ public WBrush ToolbarForeground
set { SetValue(ToolbarForegroundProperty, value); }
}

public Visibility TitleVisibility
public UI.Xaml.Visibility TitleVisibility
{
get { return (Visibility)GetValue(TitleVisibilityProperty); }
get { return (UI.Xaml.Visibility)GetValue(TitleVisibilityProperty); }
set { SetValue(TitleVisibilityProperty, value); }
}

Expand Down Expand Up @@ -129,4 +129,3 @@ void UpdateToolbarDynamicOverflowEnabled()
}
}
}
*/
0 ...tibility/Core/src/WinUI/FormsPresenter.cs → ...bility/Core/src/Windows/FormsPresenter.cs
View file
File renamed without changes.
0 ...bility/Core/src/WinUI/FormsProgressBar.cs → ...lity/Core/src/Windows/FormsProgressBar.cs
View file
File renamed without changes.
0 ...Core/src/WinUI/FormsProgressBarStyle.xaml → ...re/src/Windows/FormsProgressBarStyle.xaml
View file
File renamed without changes.
0 ...bility/Core/src/WinUI/FormsRadioButton.cs → ...lity/Core/src/Windows/FormsRadioButton.cs
View file
File renamed without changes.
0 ...mpatibility/Core/src/WinUI/FormsSlider.cs → ...atibility/Core/src/Windows/FormsSlider.cs
View file
File renamed without changes.
0 ...patibility/Core/src/WinUI/FormsTextBox.cs → ...tibility/Core/src/Windows/FormsTextBox.cs
View file
File renamed without changes.
0 ...ity/Core/src/WinUI/FormsTextBoxStyle.xaml → ...y/Core/src/Windows/FormsTextBoxStyle.xaml
View file
File renamed without changes.
0 src/Compatibility/Core/src/WinUI/FormsUWP.cs → ...ompatibility/Core/src/Windows/FormsUWP.cs
View file
File renamed without changes.
0 ...atibility/Core/src/WinUI/FrameRenderer.cs → ...ibility/Core/src/Windows/FrameRenderer.cs
View file
File renamed without changes.
0 ...e/src/WinUI/FrameworkElementExtensions.cs → ...src/Windows/FrameworkElementExtensions.cs
View file
File renamed without changes.
0 ...y/Core/src/WinUI/HandlerToRendererShim.cs → ...Core/src/Windows/HandlerToRendererShim.cs
View file
File renamed without changes.
0 ...ibility/Core/src/WinUI/HeightConverter.cs → ...ility/Core/src/Windows/HeightConverter.cs
View file
File renamed without changes.
0 ...WinUI/HorizontalTextAlignmentConverter.cs → ...ndows/HorizontalTextAlignmentConverter.cs
View file
File renamed without changes.
0 ...atibility/Core/src/WinUI/ICellRenderer.cs → ...ibility/Core/src/Windows/ICellRenderer.cs
View file
File renamed without changes.
0 .../src/WinUI/IImageVisualElementRenderer.cs → ...rc/Windows/IImageVisualElementRenderer.cs
View file
File renamed without changes.
0 ...lity/Core/src/WinUI/ITitleIconProvider.cs → ...ty/Core/src/Windows/ITitleIconProvider.cs
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/ITitleProvider.cs → ...bility/Core/src/Windows/ITitleProvider.cs
View file
File renamed without changes.
0 ...lity/Core/src/WinUI/ITitleViewProvider.cs → ...ty/Core/src/Windows/ITitleViewProvider.cs
View file
File renamed without changes.
0 ...src/WinUI/ITitleViewRendererController.cs → ...c/Windows/ITitleViewRendererController.cs
View file
File renamed without changes.
0 ...ore/src/WinUI/IToolBarForegroundBinder.cs → ...e/src/Windows/IToolBarForegroundBinder.cs
View file
File renamed without changes.
0 ...bility/Core/src/WinUI/IToolbarProvider.cs → ...lity/Core/src/Windows/IToolbarProvider.cs
View file
File renamed without changes.
0 .../Core/src/WinUI/IVisualElementRenderer.cs → ...ore/src/Windows/IVisualElementRenderer.cs
View file
File renamed without changes.
0 ...src/WinUI/IVisualNativeElementRenderer.cs → ...c/Windows/IVisualNativeElementRenderer.cs
View file
File renamed without changes.
0 ...ity/Core/src/WinUI/ImageButtonRenderer.cs → ...y/Core/src/Windows/ImageButtonRenderer.cs
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/ImageConverter.cs → ...bility/Core/src/Windows/ImageConverter.cs
View file
File renamed without changes.
0 ...ity/Core/src/WinUI/ImageElementManager.cs → ...y/Core/src/Windows/ImageElementManager.cs
View file
File renamed without changes.
0 ...atibility/Core/src/WinUI/ImageRenderer.cs → ...ibility/Core/src/Windows/ImageRenderer.cs
View file
File renamed without changes.
0 .../WinUI/ImageSourceIconElementConverter.cs → ...indows/ImageSourceIconElementConverter.cs
View file
File renamed without changes.
0 ...y/Core/src/WinUI/IndicatorViewRenderer.cs → ...Core/src/Windows/IndicatorViewRenderer.cs
View file
File renamed without changes.
0 .../src/WinUI/InterceptVisualStateManager.cs → ...rc/Windows/InterceptVisualStateManager.cs
View file
File renamed without changes.
0 ...ility/Core/src/WinUI/KeyboardConverter.cs → ...ity/Core/src/Windows/KeyboardConverter.cs
View file
File renamed without changes.
0 ...lity/Core/src/WinUI/KeyboardExtensions.cs → ...ty/Core/src/Windows/KeyboardExtensions.cs
View file
File renamed without changes.
0 ...ibility/Core/src/WinUI/LabelHtmlHelper.cs → ...ility/Core/src/Windows/LabelHtmlHelper.cs
View file
File renamed without changes.
0 ...atibility/Core/src/WinUI/LabelRenderer.cs → ...ibility/Core/src/Windows/LabelRenderer.cs
View file
File renamed without changes.
0 ...bility/Core/src/WinUI/LayoutExtensions.cs → ...lity/Core/src/Windows/LayoutExtensions.cs
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/LayoutRenderer.cs → ...bility/Core/src/Windows/LayoutRenderer.cs
View file
File renamed without changes.
0 ...ore/src/WinUI/ListGroupHeaderPresenter.cs → ...e/src/Windows/ListGroupHeaderPresenter.cs
View file
File renamed without changes.
0 ...e/src/WinUI/ListViewGroupStyleSelector.cs → ...src/Windows/ListViewGroupStyleSelector.cs
View file
File renamed without changes.
0 ...bility/Core/src/WinUI/ListViewRenderer.cs → ...lity/Core/src/Windows/ListViewRenderer.cs
View file
File renamed without changes.
0 ...re/src/WinUI/MasterBackgroundConverter.cs → .../src/Windows/MasterBackgroundConverter.cs
View file
File renamed without changes.
0 ...e/src/WinUI/MasterDetailControlStyle.xaml → ...src/Windows/MasterDetailControlStyle.xaml
View file
File renamed without changes.
0 ...ibility/Core/src/WinUI/MenuItemCommand.cs → ...ility/Core/src/Windows/MenuItemCommand.cs
View file
File renamed without changes.
0 ...Core/src/WinUI/NativeBindingExtensions.cs → ...re/src/Windows/NativeBindingExtensions.cs
View file
File renamed without changes.
0 ...ty/Core/src/WinUI/NativeBindingService.cs → .../Core/src/Windows/NativeBindingService.cs
View file
File renamed without changes.
0 ...lity/Core/src/WinUI/NativeEventWrapper.cs → ...ty/Core/src/Windows/NativeEventWrapper.cs
View file
File renamed without changes.
0 .../Core/src/WinUI/NativePropertyListener.cs → ...ore/src/Windows/NativePropertyListener.cs
View file
File renamed without changes.
0 .../src/WinUI/NativeValueConverterService.cs → ...rc/Windows/NativeValueConverterService.cs
View file
File renamed without changes.
0 ...ility/Core/src/WinUI/NativeViewWrapper.cs → ...ity/Core/src/Windows/NativeViewWrapper.cs
View file
File renamed without changes.
0 ...re/src/WinUI/NativeViewWrapperRenderer.cs → .../src/Windows/NativeViewWrapperRenderer.cs
View file
File renamed without changes.
0 .../Core/src/WinUI/NavigationPageRenderer.cs → ...ore/src/Windows/NavigationPageRenderer.cs
View file
File renamed without changes.
0 ...mpatibility/Core/src/WinUI/PageControl.cs → ...atibility/Core/src/Windows/PageControl.cs
View file
File renamed without changes.
0 ...lity/Core/src/WinUI/PageControlStyle.xaml → ...ty/Core/src/Windows/PageControlStyle.xaml
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/PageExtensions.cs → ...bility/Core/src/Windows/PageExtensions.cs
View file
File renamed without changes.
0 ...patibility/Core/src/WinUI/PageRenderer.cs → ...tibility/Core/src/Windows/PageRenderer.cs
View file
File renamed without changes.
0 ...c/WinUI/PageToRenderedElementConverter.cs → ...Windows/PageToRenderedElementConverter.cs
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/PickerRenderer.cs → ...bility/Core/src/Windows/PickerRenderer.cs
View file
File renamed without changes.
0 ...atibility/Core/src/WinUI/PickerStyle.xaml → ...ibility/Core/src/Windows/PickerStyle.xaml
View file
File renamed without changes.
0 src/Compatibility/Core/src/WinUI/Platform.cs → ...ompatibility/Core/src/Windows/Platform.cs
View file
File renamed without changes.
0 .../WinUI/PlatformConfigurationExtensions.cs → ...indows/PlatformConfigurationExtensions.cs
View file
File renamed without changes.
8 changes: 8 additions & 0 deletions src/Compatibility/Core/src/Windows/PlatformEffect.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using Microsoft.UI.Xaml;

namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
{
public abstract class PlatformEffect : PlatformEffect<FrameworkElement, FrameworkElement>
{
}
}
0 ...re/src/WinUI/PointCollectionExtensions.cs → .../src/Windows/PointCollectionExtensions.cs
View file
File renamed without changes.
0 ...ity/Core/src/WinUI/ProgressBarRenderer.cs → ...y/Core/src/Windows/ProgressBarRenderer.cs
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/PromptDialog.xaml → ...bility/Core/src/Windows/PromptDialog.xaml
View file
File renamed without changes.
0 ...ility/Core/src/WinUI/PromptDialog.xaml.cs → ...ity/Core/src/Windows/PromptDialog.xaml.cs
View file
File renamed without changes.
0 ...Core/src/WinUI/Properties/AssemblyInfo.cs → ...re/src/Windows/Properties/AssemblyInfo.cs
View file
File renamed without changes.
0 ...perties/Xamarin.Forms.Platform.UAP.rd.xml → ...perties/Xamarin.Forms.Platform.UAP.rd.xml
View file
File renamed without changes.
0 ...nUI/PropertyChangedEventArgsExtensions.cs → ...ows/PropertyChangedEventArgsExtensions.cs
View file
File renamed without changes.
0 ...ity/Core/src/WinUI/RadioButtonRenderer.cs → ...y/Core/src/Windows/RadioButtonRenderer.cs
View file
File renamed without changes.
0 ...ity/Core/src/WinUI/RefreshViewRenderer.cs → ...y/Core/src/Windows/RefreshViewRenderer.cs
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...mpatibility/Core/src/WinUI/Resources.xaml → ...atibility/Core/src/Windows/Resources.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ResourceDictionary Source="FormsAutoSuggestBoxStyle.xaml" />
<ResourceDictionary Source="MasterDetailControlStyle.xaml" />
<ResourceDictionary Source="FlyoutPageControlStyle.xaml" />
<!--<ResourceDictionary Source="TabbedPageStyle.xaml" />-->
<ResourceDictionary Source="TabbedPageStyle.xaml" />
<ResourceDictionary Source="SliderStyle.xaml" />
<ResourceDictionary Source="CollectionView/ItemsViewStyles.xaml" />
<ResourceDictionary Source="PickerStyle.xaml" />
Expand Down
0 ...lity/Core/src/WinUI/ScrollViewRenderer.cs → ...ty/Core/src/Windows/ScrollViewRenderer.cs
View file
File renamed without changes.
0 ...ility/Core/src/WinUI/SearchBarRenderer.cs → ...ity/Core/src/Windows/SearchBarRenderer.cs
View file
File renamed without changes.
0 .../Core/src/WinUI/Shapes/EllipseRenderer.cs → ...ore/src/Windows/Shapes/EllipseRenderer.cs
View file
File renamed without changes.
0 ...ity/Core/src/WinUI/Shapes/LineRenderer.cs → ...y/Core/src/Windows/Shapes/LineRenderer.cs
View file
File renamed without changes.
0 ...ity/Core/src/WinUI/Shapes/PathRenderer.cs → ...y/Core/src/Windows/Shapes/PathRenderer.cs
View file
File renamed without changes.
0 .../Core/src/WinUI/Shapes/PolygonRenderer.cs → ...ore/src/Windows/Shapes/PolygonRenderer.cs
View file
File renamed without changes.
0 ...Core/src/WinUI/Shapes/PolylineRenderer.cs → ...re/src/Windows/Shapes/PolylineRenderer.cs
View file
File renamed without changes.
0 ...ore/src/WinUI/Shapes/RectangleRenderer.cs → ...e/src/Windows/Shapes/RectangleRenderer.cs
View file
File renamed without changes.
0 ...ty/Core/src/WinUI/Shapes/ShapeRenderer.cs → .../Core/src/Windows/Shapes/ShapeRenderer.cs
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/SliderRenderer.cs → ...bility/Core/src/Windows/SliderRenderer.cs
View file
File renamed without changes.
0 ...atibility/Core/src/WinUI/SliderStyle.xaml → ...ibility/Core/src/Windows/SliderStyle.xaml
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/StepperControl.cs → ...bility/Core/src/Windows/StepperControl.cs
View file
File renamed without changes.
0 ...ibility/Core/src/WinUI/StepperRenderer.cs → ...ility/Core/src/Windows/StepperRenderer.cs
View file
File renamed without changes.
0 ...ore/src/WinUI/StreamImagesourceHandler.cs → ...e/src/Windows/StreamImagesourceHandler.cs
View file
File renamed without changes.
0 ...ility/Core/src/WinUI/SwipeViewRenderer.cs → ...ity/Core/src/Windows/SwipeViewRenderer.cs
View file
File renamed without changes.
0 ...tibility/Core/src/WinUI/SwitchRenderer.cs → ...bility/Core/src/Windows/SwitchRenderer.cs
View file
File renamed without changes.
Loading

0 comments on commit db18955

Please sign in to comment.