Skip to content
This repository was archived by the owner on Sep 2, 2021. It is now read-only.

Added localization resuorces into the nuget package #146

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added localization resuorces into the nuget package #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0dead2
Added localization resurces into the nuget package
Nov 15, 2016
f3db17a
fix GetChildFrames
Eisenstein Apr 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions 1.0/FirstFloor.ModernUI/Build/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/Output/
4 changes: 3 additions & 1 deletion 1.0/FirstFloor.ModernUI/Build/ModernUI.WPF.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
6 changes: 6 additions & 0 deletions 1.0/FirstFloor.ModernUI/Build/ModernUI.msbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
6 changes: 3 additions & 3 deletions 1.0/FirstFloor.ModernUI/Shared/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
Expand Down Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion 1.0/FirstFloor.ModernUI/Shared/Windows/Controls/ModernFrame.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down