Merge pull request #512 from telerik/development

Merge development into master

Author: polqnaP

BuildTools/BuildNuGet.bat

@@ -1,2 +1,2 @@
 SET MSBUILD=%WINDIR%\microsoft.net\framework\v4.0.30319\MSBuild.exe
-%MSBUILD% BuildNuget.UWP.proj /property:Version=1.0.2.8
+%MSBUILD% BuildNuget.UWP.proj /property:Version=1.0.2.9

BuildTools/BuildNuget.UWP.proj

@@ -15,7 +15,7 @@
     <Target Name="PrepareNugetProperties">
 
         <PropertyGroup>
-            <Version Condition= " '$(Version)' == '' ">1.0.2.8</Version>
+            <Version Condition= " '$(Version)' == '' ">1.0.2.9</Version>
             <FullPathDeployDirectory>$([System.IO.Path]::GetFullPath('$(DeployDirectory)'))</FullPathDeployDirectory>
             <BinariesSubDir>$(BinariesTargetDirectory)</BinariesSubDir>
 

BuildTools/Nuspecs.UWP/Package.UniversalWindowsPlatform.nuspec

@@ -12,7 +12,7 @@
     <icon>images\uwp.png</icon>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>UI for Universal Windows Platform is a toolset for building Universal Windows Platform apps for the Windows Store and the enterprise. The library is designed to offer the same user experience, functionality and behavior on Windows devices of all form factors.</description>
-    <releaseNotes>For full release notes see https://github.com/telerik/UI-For-UWP/releases/tag/1.0.2.8</releaseNotes>
+    <releaseNotes>For full release notes see https://github.com/telerik/UI-For-UWP/releases/tag/1.0.2.9</releaseNotes>
     <tags>UWP Windows Telerik Controls XAML C#</tags>
     <language>en-US</language>
   </metadata>

Controls/Grid/Grid.UWP/View/ContainerGenerators/XamlGridEditCellGenerator.cs

@@ -79,7 +79,7 @@ public object GenerateContainerForItem(CellGenerationContext info, object contai
                     {
                         if (info.IsFrozen)
                         {
-                            this.owner.FrozenEditRowLayer.AddVisualChild(pair.Item2);
+                            this.owner.FrozenEditRowLayer.AddVisualChild(element);
                         }
                         else
                         {