Merge branch '4.4.0'
authorStephane Delcroix <stephane@delcroix.org>
Mon, 2 Dec 2019 10:25:47 +0000 (11:25 +0100)
committerStephane Delcroix <stephane@delcroix.org>
Mon, 2 Dec 2019 10:25:47 +0000 (11:25 +0100)
1  2 
Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
Xamarin.Forms.Core/Items/CarouselView.cs
Xamarin.Forms.Platform.UAP/CollectionView/CarouselViewRenderer.cs
Xamarin.Forms.Platform.UAP/ListViewRenderer.cs
Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewRenderer.cs

      </EmbeddedResource>
    </ItemGroup>
    <ItemGroup>
 -</Project>
 +    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue6693.xaml">
 +      <SubType>Designer</SubType>
 +      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
 +    </EmbeddedResource>
 +  </ItemGroup>
++  <ItemGroup>
+     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue8508.xaml">
+       <SubType>Designer</SubType>
+       <Generator>MSBuild:Compile</Generator>
+     </EmbeddedResource>
+   </ItemGroup>
 +</Project>