Merge pull request #512 from telerik/development

Merge development into master
telerik · May 12, 2022 · e73f5e3 · e73f5e3
2 parents 13a9687 + 454cec6
commit e73f5e3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/BuildTools/BuildNuGet.bat b/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
diff --git a/BuildTools/BuildNuget.UWP.proj b/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>
 

diff --git a/BuildTools/Nuspecs.UWP/Package.UniversalWindowsPlatform.nuspec b/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>

diff --git a/Controls/Grid/Grid.UWP/View/ContainerGenerators/XamlGridEditCellGenerator.cs b/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
                         {