Browse Source

Fixes nuget downgrade warning

pull/5202/head
Giuseppe Lippolis 5 years ago
parent
commit
9f583b939a
  1. 2
      build/AndroidWorkarounds.props
  2. 7
      samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
  3. 7
      src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj

2
build/AndroidWorkarounds.props

@ -2,7 +2,7 @@
<ItemGroup Condition="'$(AndroidApplication)' == 'true'">
<!-- WORKAROUND: The packages below are transitively referenced by System.Memory,
but Xamarin.Android applications need the newest versions directly referenced for the linker. -->
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
<PackageReference Include="System.Buffers" Version="4.5.0" />
</ItemGroup>
<Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">

7
samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj

@ -177,10 +177,13 @@
<Project>{d0a739b9-3c68-4ba6-a328-41606954b6bd}</Project>
<Name>ControlCatalog</Name>
</ProjectReference>
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.2-preview.33" />
<PackageReference Include="DumpExtensions">
<Version>2.0.0</Version>
</PackageReference>
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.1" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\..\build\LegacyProject.targets" />
<Import Project="..\..\build\SkiaSharp.props" />
<Import Project="..\..\build\HarfBuzzSharp.props" />
</Project>
</Project>

7
src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj

@ -144,10 +144,15 @@
<Name>Avalonia.Skia</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="DumpExtensions">
<Version>2.0.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\..\..\build\Base.props" />
<Import Project="..\..\..\build\Rx.props" />
<Import Project="..\..\..\build\System.Memory.props" />
<Import Project="..\..\..\build\AndroidWorkarounds.props" />
<Import Project="..\..\..\build\LegacyProject.targets" />
</Project>
</Project>
Loading…
Cancel
Save