projects / platform / core / csapi / xsf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 782229f 327fa3c)
Merge branch '4.2.0' into 4.3.0
authorRui Marinho <me@ruimarinho.net>
Mon, 30 Sep 2019 01:29:36 +0000 (02:29 +0100)
committerRui Marinho <me@ruimarinho.net>
Mon, 30 Sep 2019 01:29:36 +0000 (02:29 +0100)
1  2 
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems patch | diff1 | diff2 | blob | history

diff --cc Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index a1421320db1bdbe61ca141dee27896069508f84e,10e942e0b0920607c1796b28fe82548b9925cf2f..e1a6a254995cf004c504f665b1bbe62d5523457f
--- 1/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
--- 2/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@@ -1066,13 -1025,8 +1066,14 @@@
      <Compile Include="$(MSBuildThisFileDirectory)Issue6894.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue6929.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Controls\ApiLabel.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue7035.xaml.cs">
 +      <DependentUpon>Issue7035.xaml</DependentUpon>
 +      <SubType>Code</SubType>
 +    </Compile>
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue7525.xaml.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue7395.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue7582.cs" />
+     <Compile Include="$(MSBuildThisFileDirectory)Issue7563.cs" />
    </ItemGroup>
    <ItemGroup>
      <EmbeddedResource Include="$(MSBuildThisFileDirectory)Bugzilla22229.xaml">
Domain: Dotnet / UI;