diff options
author | Stephane Delcroix <stephane@delcroix.org> | 2017-02-02 15:19:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-02 15:19:03 +0100 |
commit | eacbc1acf4cc2b95b98099d069e7bfa31c89f4f8 (patch) | |
tree | 5b4b6eb618cba84ec9dbec4a86dd5cdb8ffd3f04 /Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj | |
parent | c25a360efbbbe1f161e6737e61aed4b96cd37ac3 (diff) | |
download | xamarin-forms-eacbc1acf4cc2b95b98099d069e7bfa31c89f4f8.tar.gz xamarin-forms-eacbc1acf4cc2b95b98099d069e7bfa31c89f4f8.tar.bz2 xamarin-forms-eacbc1acf4cc2b95b98099d069e7bfa31c89f4f8.zip |
[Xaml[C]] check for compatible types on op_implicit (#715)
* [Xaml[C]] check for compatible types on op_implicit
* fix merge issue
Diffstat (limited to 'Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj')
-rw-r--r-- | Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj | 6 |
1 files changed, 6 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 47b941b0..efbd9aab 100644 --- a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj +++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj @@ -436,6 +436,9 @@ <Compile Include="Issues\Bz43694.xaml.cs"> <DependentUpon>Bz43694.xaml</DependentUpon> </Compile> + <Compile Include="Issues\Bz45891.xaml.cs"> + <DependentUpon>Bz45891.xaml</DependentUpon> + </Compile> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="..\.nuspec\Xamarin.Forms.Debug.targets" /> @@ -793,6 +796,9 @@ <EmbeddedResource Include="Issues\Bz43694.xaml"> <Generator>MSBuild:UpdateDesignTimeXaml</Generator> </EmbeddedResource> + <EmbeddedResource Include="Issues\Bz45891.xaml"> + <Generator>MSBuild:UpdateDesignTimeXaml</Generator> + </EmbeddedResource> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> |