forked from unoplatform/uno
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request unoplatform#4986 from unoplatform/dev/djo/resource…
…dictionary-fix-2 Fix ResourceDictionary.Source resolution when globbed includes are defined in an included file
- Loading branch information
Showing
11 changed files
with
198 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <Project ToolsVersion="Current"> | ||
| <ItemGroup> | ||
| <Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" /> | ||
| <Compile Update="**\*.xaml.cs"> | ||
| <DependentUpon>%(Filename)</DependentUpon> | ||
| </Compile> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> | ||
| <Style x:Key="GlobPropsMarginButtonStyle" TargetType="Button"> | ||
| <Setter Property="Margin" | ||
| Value="99,33,7,7" /> | ||
| </Style> | ||
| </ResourceDictionary> |
68 changes: 68 additions & 0 deletions
68
src/Uno.UI.Tests.ViewLibraryProps/Uno.UI.Tests.ViewLibraryProps.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0"> | ||
| <PropertyGroup> | ||
| <TargetFrameworks>net461</TargetFrameworks> | ||
| <NoWarn>1998;4014;67</NoWarn> | ||
| <OutputPath>bin\$(Platform)\$(Configuration)</OutputPath> | ||
| <TreatWarningsAsErrors>true</TreatWarningsAsErrors> | ||
| <ImportFrameworkWinFXTargets>false</ImportFrameworkWinFXTargets> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <DefineConstants>TRACE;DEBUG;HAS_UMBRELLA_BINDING;IS_UNIT_TESTS;HAS_GEOCOORDINATE_WATCHER;HAS_GEOCOORDINATE;HAS_COMPILED_REGEX;HAS_ISTORAGEFILE;HAS_SEMAPHORE;HAS_FILE_IO;IS_UNO;HAS_CRIPPLEDREFLECTION;NET46</DefineConstants> | ||
| <TreatWarningsAsErrors>false</TreatWarningsAsErrors> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <DefineConstants>TRACE;HAS_UMBRELLA_BINDING;IS_UNIT_TESTS;HAS_GEOCOORDINATE_WATCHER;HAS_GEOCOORDINATE;HAS_COMPILED_REGEX;HAS_ISTORAGEFILE;HAS_SEMAPHORE;HAS_FILE_IO;IS_UNO;HAS_CRIPPLEDREFLECTION</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> | ||
| <PackageReference Include="System.Collections.Immutable"> | ||
| <Version>1.7.0</Version> | ||
| </PackageReference> | ||
| <PackageReference Include="Uno.SourceGenerationTasks" /> | ||
| <PackageReference Include="Uno.Core" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Reference Include="PresentationCore" /> | ||
| <Reference Include="PresentationFramework" /> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Drawing" /> | ||
| <Reference Include="System.Net.Http" /> | ||
| <Reference Include="System.Numerics" /> | ||
| <Reference Include="System.Numerics.Vectors" /> | ||
| <Reference Include="System.Windows.Forms" /> | ||
| <Reference Include="System.Xaml" /> | ||
| <Reference Include="System.Xml" /> | ||
| <Reference Include="System.Xml.Linq" /> | ||
| <Reference Include="WindowsBase" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <UnoUIMSBuildTasksPath>$(MSBuildThisFileDirectory)..\SourceGenerators\Uno.UI.Tasks\bin\$(Configuration)_Shadow</UnoUIMSBuildTasksPath> | ||
| <UnoForceProcessPRIResource>true</UnoForceProcessPRIResource> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="..\SourceGenerators\Uno.UI.SourceGenerators\Content\Uno.UI.SourceGenerators.props" /> | ||
| <Import Project="..\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" Condition="'$(SkipUnoResourceGeneration)' == '' " /> | ||
|
|
||
| <Target Name="BeforeBuildCleanup" BeforeTargets="XamlMarkupCompilePass1;_UnoSourceGenerator" /> | ||
|
|
||
| <Import Project="..\Common.targets" /> | ||
|
|
||
| <Import Project="..\Common_ViewLibraryProps\Globbing.props" /> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\SourceGenerators\System.Xaml\Uno.Xaml.csproj" /> | ||
| <ProjectReference Include="..\Uno.UI\Uno.UI.csproj" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
src/Uno.UI.Tests/Windows_UI_Xaml/Controls/When_Source_And_Globbing_From_Included_File.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <UserControl | ||
| x:Class="Uno.UI.Tests.Windows_UI_Xaml.Controls.When_Source_And_Globbing_From_Included_File" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:local="using:Uno.UI.Tests.Windows_UI_Xaml.Controls" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| mc:Ignorable="d" | ||
| d:DesignHeight="300" | ||
| d:DesignWidth="400"> | ||
| <UserControl.Resources> | ||
| <ResourceDictionary Source="ms-appx:///Uno.UI.Tests.ViewLibraryProps/Themes/Button.xaml"/> | ||
| </UserControl.Resources> | ||
|
|
||
| <Grid> | ||
|
|
||
| </Grid> | ||
| </UserControl> |
27 changes: 27 additions & 0 deletions
27
...Uno.UI.Tests/Windows_UI_Xaml/Controls/When_Source_And_Globbing_From_Included_File.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Runtime.InteropServices.WindowsRuntime; | ||
| using Windows.Foundation; | ||
| using Windows.Foundation.Collections; | ||
| using Windows.UI.Xaml; | ||
| using Windows.UI.Xaml.Controls; | ||
| using Windows.UI.Xaml.Controls.Primitives; | ||
| using Windows.UI.Xaml.Data; | ||
| using Windows.UI.Xaml.Input; | ||
| using Windows.UI.Xaml.Media; | ||
| using Windows.UI.Xaml.Navigation; | ||
|
|
||
| // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 | ||
|
|
||
| namespace Uno.UI.Tests.Windows_UI_Xaml.Controls | ||
| { | ||
| public sealed partial class When_Source_And_Globbing_From_Included_File : UserControl | ||
| { | ||
| public When_Source_And_Globbing_From_Included_File() | ||
| { | ||
| this.InitializeComponent(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters