projects / platform / core / csapi / xsf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a67764d 40b6e93)
Merge branch '4.1.0' into 4.2.0
authorStephane Delcroix <stephane@delcroix.org>
Mon, 26 Aug 2019 08:24:04 +0000 (10:24 +0200)
committerStephane Delcroix <stephane@delcroix.org>
Mon, 26 Aug 2019 08:24:04 +0000 (10:24 +0200)
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 f0800b8,678fc41..599c51b
--- 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
@@@ -1321,18 -1283,4 +1321,18 @@@
        <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
      </EmbeddedResource>
    </ItemGroup>
- </Project>
 +  <ItemGroup>
 +    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue5046.xaml">
 +      <SubType>Designer</SubType>
 +      <Generator>MSBuild:Compile</Generator>
 +    </EmbeddedResource>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue6644.xaml">
 +    </EmbeddedResource>
 +    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Github5623.xaml">
 +      <SubType>Designer</SubType>
 +      <Generator>MSBuild:Compile</Generator>
 +    </EmbeddedResource>
 +  </ItemGroup>
+ </Project>
Domain: Dotnet / UI;