fix(reg): Avoid common namespace name conflict

unoplatform · Feb 9, 2021 · e9acc20 · e9acc20
1 parent 38dcd9a
commit e9acc20
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props b/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
@@ -87,7 +87,7 @@
   <ItemGroup>
 
 	<ExcludeXamlNamespaces Include="win" />
-	<ExcludeXamlNamespaces Include="uwp" Condition="'$(UNO_UWP_BUILD)'!='true'" />
+	<ExcludeXamlNamespaces Include="not_mux" Condition="'$(UNO_UWP_BUILD)'!='true'" />
 
 	<!-- iOS -->
 	<ExcludeXamlNamespaces Condition="'$(XamarinProjectType)'=='ios'" Include="android" />

diff --git a/src/Uno.UI/UI/Xaml/Style/Generic/Generic.xaml b/src/Uno.UI/UI/Xaml/Style/Generic/Generic.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-					xmlns:uwp="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:not_mux="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:not_android="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -6116,7 +6116,7 @@
 		</Setter>
 	</Style>
 
-	<uwp:Style TargetType="MediaPlayerElement">
+	<not_mux:Style TargetType="MediaPlayerElement">
 		<Setter Property="HorizontalAlignment"
 				Value="Stretch" />
 		<Setter Property="VerticalAlignment"
@@ -6149,7 +6149,7 @@
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
-	</uwp:Style>
+	</not_mux:Style>
 
 	<Style x:Key="MTC_ButtonStyle"
 		   TargetType="Button">
@@ -6614,7 +6614,7 @@
 		</Setter>
 	</Style>
 
-	<uwp:Style TargetType="MediaTransportControls">
+	<not_mux:Style TargetType="MediaTransportControls">
 		<Setter Property="IsTabStop"
 				Value="False" />
 		<Setter Property="Background"
@@ -7098,7 +7098,7 @@
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
-	</uwp:Style>
+	</not_mux:Style>
 
 	<Style x:Key="AccentButtonStyle" TargetType="Button">
 		<Setter Property="Foreground" Value="{ThemeResource AccentButtonForeground}" />