Skip to content

Commit

Permalink
- remove compat
Browse files Browse the repository at this point in the history
  • Loading branch information
PureWeen committed Sep 21, 2023
1 parent 0000fc1 commit 7b11804
Show file tree
Hide file tree
Showing 15 changed files with 113 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
</ItemGroup>

<ItemGroup Condition=" '$(UseMaui)' != 'true' ">
<ProjectReference Include="..\..\..\Compatibility\Core\src\Compatibility.csproj" />
<ProjectReference Include="..\..\..\Core\src\Core.csproj" />
<ProjectReference Include="..\..\src\Xaml\Controls.Xaml.csproj" />
<ProjectReference Include="..\..\src\Core\Controls.Core.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core.csproj" />
<ProjectReference Include="..\..\..\BlazorWebView\src\Maui\Microsoft.AspNetCore.Components.WebView.Maui.csproj" />
<ProjectReference Include="..\..\..\Compatibility\Core\src\Compatibility.csproj" />
<ProjectReference Include="..\..\..\Controls\Maps\src\Controls.Maps.csproj" />
<ProjectReference Include="..\..\..\Controls\Foldable\src\Controls.Foldable.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
<ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml.csproj" />
<ProjectReference Include="..\..\..\Core\src\Core.csproj" />
<ProjectReference Include="..\..\..\Compatibility\Core\src\Compatibility.csproj" />
<ProjectReference Include="..\..\..\Controls\Foldable\src\Controls.Foldable.csproj" />
<ProjectReference Include="..\..\..\Controls\Maps\src\Controls.Maps.csproj" />
</ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/Controls/samples/Controls.Sample/MauiProgram.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
using Microsoft.Maui.Hosting;
using Microsoft.Maui.LifecycleEvents;
using Microsoft.Maui.Foldable;
using Microsoft.Maui.Controls.Compatibility;
using Microsoft.Maui.Controls.Compatibility.Hosting;


#if NET6_0_OR_GREATER
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Compatibility\Core\src\Compatibility.csproj" />
<ProjectReference Include="..\..\..\Controls\Maps\src\Controls.Maps.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml.csproj" />
Expand Down
21 changes: 21 additions & 0 deletions src/Controls/tests/Xaml.UnitTests.ExternalAssembly/App.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Maui.Graphics;

[assembly: Microsoft.Maui.Controls.XmlnsDefinition(
xmlNamespace: "http://example.com/maui-controls", clrNamespace: "Microsoft.Maui.Controls",
AssemblyName = "Microsoft.Maui.Controls")]

namespace Microsoft.Maui.Controls.ControlGallery
{
public class App : Application
{
public const string AppName = "CompatibilityGalleryControls";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<ResourceDictionary
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
<Color x:Key="notBlue">Red</Color>
<Color x:Key="AccentColor">#FF4B14</Color>
</ResourceDictionary>
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(_MauiDotNetTfm)</TargetFramework>
<AssemblyName>Microsoft.Maui.Controls.Xaml.UnitTests.ExternalAssembly</AssemblyName>
<IsPackable>false</IsPackable>
<NoWarn>0114;0672;0108;0067;0168;0169;0219;0612;0618;1998;4014</NoWarn>
<RootNamespace>Controls.Xaml.UnitTests.ExternalAssembly</RootNamespace>
</PropertyGroup>


<ItemGroup>
<ProjectReference Include="..\..\..\Controls\Maps\src\Controls.Maps.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml.csproj" />
<ProjectReference Include="..\..\..\Core\maps\src\Maps.csproj" />
<ProjectReference Include="..\..\..\Core\src\Core.csproj" />
<ProjectReference Include="..\..\..\Essentials\src\Essentials.csproj" />
<ProjectReference Include="..\..\..\TestUtils\src\TestUtils\TestUtils.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\..\..\Core\tests\UnitTests\TestClasses\DispatcherStub.cs" Link="TestClasses\DispatcherStub.cs" />
</ItemGroup>


<Import Project="$(MauiSrcDirectory)Maui.InTree.props" Condition=" '$(UseMaui)' != 'true' " />

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<Import Project="$(MauiSrcDirectory)Maui.InTree.targets" Condition=" '$(UseMaui)' != 'true' " />
<Import Project="$(MauiSrcDirectory)Microsoft.Maui.Controls.Debug.targets" />
<Import Project="$(MauiRootDirectory)Directory.Build.targets" />
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace Microsoft.Maui.Controls.ControlGallery
{
public class Issue3076Button : Button
{
public static readonly BindableProperty HorizontalContentAlignmentProperty =
BindableProperty.Create("HorizontalContentAlignemnt", typeof(TextAlignment), typeof(Issue3076Button), TextAlignment.Center);

public TextAlignment HorizontalContentAlignment
{
get { return (TextAlignment)GetValue(HorizontalContentAlignmentProperty); }
set { SetValue(HorizontalContentAlignmentProperty, value); }
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
using Microsoft.Maui.Controls;

[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/2021/maui/xaml/tests", "Microsoft.Maui.Controls.Xaml.UnitTests.Issues.Maui14158")]
[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/2021/maui/xaml/tests", "Microsoft.Maui.Controls.Xaml.UnitTests.Issues.Maui14158", AssemblyName = "Microsoft.Maui.Controls.Xaml.UnitTests.InternalsHiddenAssembly")]
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using System.ComponentModel;
using Microsoft.Maui.Controls;

namespace Microsoft.Maui.Controls.Xaml.UnitTests.Issues.Maui14158;

[Description("Microsoft.Maui.Controls.Xaml.UnitTests.ExternalAssembly")]
public class PublicInExternal : Button { }

[Description("Microsoft.Maui.Controls.Xaml.UnitTests.ExternalAssembly")]
internal class PublicInHidden : Button { }

[Description("Microsoft.Maui.Controls.Xaml.UnitTests.ExternalAssembly")]
internal class PublicInVisible : Button { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
using System.ComponentModel;
using Microsoft.Maui.Controls;

namespace Microsoft.Maui.Controls.Xaml.UnitTests.Issues.Maui14158;

[Description("Microsoft.Maui.Controls.Xaml.UnitTests.ExternalAssembly")]
public class PublicWithSuffix : Button { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace Microsoft.Maui.Controls.Xaml.UnitTests.ExternalAssembly
{
public static class Gh16923Library
{
public const string LibraryConstant = nameof(LibraryConstant);

public static class Nested
{
public const string NestedLibraryConstant = nameof(NestedLibraryConstant);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@

<ItemGroup>
<ProjectReference Include="..\..\..\Compatibility\ControlGallery\src\Core\Compatibility.ControlGallery.Core.csproj" />
<ProjectReference Include="..\..\..\Compatibility\Core\src\Compatibility.csproj" />
<ProjectReference Include="..\..\..\Controls\Maps\src\Controls.Maps.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Build.Tasks\Controls.Build.Tasks.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml.csproj" />
<ProjectReference Include="..\..\..\Core\src\Core.csproj" />
<ProjectReference Include="..\..\..\Essentials\src\Essentials.csproj" />
<ProjectReference Include="..\Xaml.UnitTests.ExternalAssembly\Controls.Xaml.UnitTests.ExternalAssembly.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 7b11804

Please sign in to comment.