diff options
| author | Stephane Delcroix <stephane@delcroix.org> | 2017-04-06 23:13:49 +0200 |
|---|---|---|
| committer | Jason Smith <jason.smith@xamarin.com> | 2017-04-06 14:13:49 -0700 |
| commit | 0ee636003b6d1083ea4caeed85ef3efbc815ed06 (patch) | |
| tree | 861ba1a66b1b72be663719437ace87179cd3c03d /Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj | |
| parent | eb3db860e47da2974bddf6f0f959799f12e962c5 (diff) | |
| download | xamarin-forms-0ee636003b6d1083ea4caeed85ef3efbc815ed06.tar.gz xamarin-forms-0ee636003b6d1083ea4caeed85ef3efbc815ed06.tar.bz2 xamarin-forms-0ee636003b6d1083ea4caeed85ef3efbc815ed06.zip | |
Fix 54334 (#855)
* [C] unset the FromStyle flag on manual setting
* [C] Do not reset overriden values to default
* complete the fix
Diffstat (limited to 'Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj')
| -rw-r--r-- | Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj index e807c1b3..7041001c 100644 --- a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj +++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj @@ -461,6 +461,12 @@ <Compile Include="Issues\Bz53203.xaml.cs"> <DependentUpon>Bz53203.xaml</DependentUpon> </Compile> + <Compile Include="Issues\Bz54334.xaml.cs"> + <DependentUpon>Bz54334.xaml</DependentUpon> + </Compile> + <Compile Include="Issues\Bz41048.xaml.cs"> + <DependentUpon>Bz41048.xaml</DependentUpon> + </Compile> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="..\.nuspec\Xamarin.Forms.Debug.targets" /> @@ -842,6 +848,12 @@ <EmbeddedResource Include="Issues\Bz53203.xaml"> <Generator>MSBuild:UpdateDesignTimeXaml</Generator> </EmbeddedResource> + <EmbeddedResource Include="Issues\Bz54334.xaml"> + <Generator>MSBuild:UpdateDesignTimeXaml</Generator> + </EmbeddedResource> + <EmbeddedResource Include="Issues\Bz41048.xaml"> + <Generator>MSBuild:UpdateDesignTimeXaml</Generator> + </EmbeddedResource> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> |