From f0dead2e252c7d7e706e8011718f0daec8fd3d14 Mon Sep 17 00:00:00 2001
From: andrew-iv <andrew-iv@xrm.ru>
Date: Tue, 15 Nov 2016 12:52:56 +0500
Subject: [PATCH 1/2] Added localization resurces into the nuget package

---
 1.0/FirstFloor.ModernUI/Build/.gitignore                  | 1 +
 1.0/FirstFloor.ModernUI/Build/ModernUI.WPF.nuspec         | 4 +++-
 1.0/FirstFloor.ModernUI/Build/ModernUI.msbuild            | 6 ++++++
 1.0/FirstFloor.ModernUI/Shared/Properties/AssemblyInfo.cs | 6 +++---
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 1.0/FirstFloor.ModernUI/Build/.gitignore

diff --git a/1.0/FirstFloor.ModernUI/Build/.gitignore b/1.0/FirstFloor.ModernUI/Build/.gitignore
new file mode 100644
index 00000000..aa144c71
--- /dev/null
+++ b/1.0/FirstFloor.ModernUI/Build/.gitignore
@@ -0,0 +1 @@
+/Output/
diff --git a/1.0/FirstFloor.ModernUI/Build/ModernUI.WPF.nuspec b/1.0/FirstFloor.ModernUI/Build/ModernUI.WPF.nuspec
index 787cd0e7..fa418e0f 100644
--- a/1.0/FirstFloor.ModernUI/Build/ModernUI.WPF.nuspec
+++ b/1.0/FirstFloor.ModernUI/Build/ModernUI.WPF.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>ModernUI.WPF</id>
-    <version>1.0.9</version>
+    <version>1.0.10</version>
     <title>ModernUI for WPF</title>
     <authors>First Floor Software</authors>
     <owners>First Floor Software</owners>
@@ -18,8 +18,10 @@
   <files>
     <file src="Output\Temp\FirstFloor.ModernUI.dll" target="lib\net45\FirstFloor.ModernUI.dll" />
     <file src="Output\Temp\FirstFloor.ModernUI.XML" target="lib\net45\FirstFloor.ModernUI.XML" />
+    <file src="Output\Temp\**\FirstFloor.ModernUI.resources.dll" exclude="Output\Temp\net40\**" target="lib\net45\" />
     <file src="Output\Temp\net40\FirstFloor.ModernUI.dll" target="lib\net40\FirstFloor.ModernUI.dll" />
     <file src="Output\Temp\net40\FirstFloor.ModernUI.XML" target="lib\net40\FirstFloor.ModernUI.XML" />
     <file src="Output\Temp\net40\Microsoft.Windows.Shell.dll" target="lib\net40\Microsoft.Windows.Shell.dll" />
+    <file src="Output\Temp\net40\**\FirstFloor.ModernUI.resources.dll" target="lib\net40\" />
   </files>
 </package>
\ No newline at end of file
diff --git a/1.0/FirstFloor.ModernUI/Build/ModernUI.msbuild b/1.0/FirstFloor.ModernUI/Build/ModernUI.msbuild
index 96a9ea7e..33f3080c 100644
--- a/1.0/FirstFloor.ModernUI/Build/ModernUI.msbuild
+++ b/1.0/FirstFloor.ModernUI/Build/ModernUI.msbuild
@@ -95,13 +95,19 @@
   </Target>
   
   <Target Name="CopyOutput" DependsOnTargets="DisableSignAssembly">
+   <ItemGroup>
+        <Resources Include="$(BaseDir)\FirstFloor.ModernUI\Bin\Release\**\FirstFloor.ModernUI.resources.dll" />
+        <Resources4 Include="$(BaseDir)\FirstFloor.ModernUI.WPF4\Bin\Release\**\FirstFloor.ModernUI.resources.dll" />
+    </ItemGroup>
     <!-- copy output to temp dir -->
     <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI\Bin\Release\FirstFloor.ModernUI.dll" DestinationFolder="$(TempDir)" />
     <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI\Bin\Release\FirstFloor.ModernUI.xml" DestinationFolder="$(TempDir)" />
     <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI.App\Bin\Release\ModernUIDemo.exe" DestinationFolder="$(TempDir)" />
+	<Copy SourceFiles="@(Resources)" DestinationFolder="$(TempDir)\%(RecursiveDir)" />
     <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI.WPF4\Bin\Release\FirstFloor.ModernUI.dll" DestinationFolder="$(TempDir)\net40" />
     <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI.WPF4\Bin\Release\FirstFloor.ModernUI.xml" DestinationFolder="$(TempDir)\net40" />
     <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI.WPF4\Bin\Release\Microsoft.Windows.Shell.dll" DestinationFolder="$(TempDir)\net40" />
+	<Copy SourceFiles="@(Resources4)" DestinationFolder="$(TempDir)\net40\%(RecursiveDir)" />
     
     <!-- include license files -->
     <Copy SourceFiles="$(BaseDir)\License.Icons.txt" DestinationFolder="$(TempDir)\License" />
diff --git a/1.0/FirstFloor.ModernUI/Shared/Properties/AssemblyInfo.cs b/1.0/FirstFloor.ModernUI/Shared/Properties/AssemblyInfo.cs
index 17685de5..e889b0f5 100644
--- a/1.0/FirstFloor.ModernUI/Shared/Properties/AssemblyInfo.cs
+++ b/1.0/FirstFloor.ModernUI/Shared/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
@@ -41,8 +41,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.9.0")]
-[assembly: AssemblyFileVersion("1.0.9.0")]
+[assembly: AssemblyVersion("1.0.10")]
+[assembly: AssemblyFileVersion("1.0.10")]
 
 [assembly: XmlnsDefinition("http://firstfloorsoftware.com/ModernUI", "FirstFloor.ModernUI.Presentation")]
 [assembly: XmlnsDefinition("http://firstfloorsoftware.com/ModernUI", "FirstFloor.ModernUI.Windows")]

From f3db17a89873a3442c159c402e2f7cd1d5540d35 Mon Sep 17 00:00:00 2001
From: aisek <aisek@mail.ru>
Date: Wed, 19 Apr 2017 17:05:02 +0500
Subject: [PATCH 2/2] fix GetChildFrames

---
 1.0/FirstFloor.ModernUI/Shared/Windows/Controls/ModernFrame.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/1.0/FirstFloor.ModernUI/Shared/Windows/Controls/ModernFrame.cs b/1.0/FirstFloor.ModernUI/Shared/Windows/Controls/ModernFrame.cs
index fd1b9b16..062faa3a 100644
--- a/1.0/FirstFloor.ModernUI/Shared/Windows/Controls/ModernFrame.cs
+++ b/1.0/FirstFloor.ModernUI/Shared/Windows/Controls/ModernFrame.cs
@@ -306,7 +306,7 @@ private IEnumerable<ModernFrame> GetChildFrames()
                 if (r.TryGetTarget(out frame)) {
 #endif
                     // check if frame is still an actual child (not the case when child is removed, but not yet garbage collected)
-                    if (NavigationHelper.FindFrame(null, frame) == this) {
+                    if (NavigationHelper.FindFrame("_parent", frame) == this) {
                         valid = true;
                         yield return frame;
                     }