Merge pull request #82 from mono/samples-update
Update Samples with new NuGet
This commit is contained in:
Коммит
0178d552e6
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -55,9 +55,6 @@
|
|||
<Reference Include="Xamarin.Android.Support.v7.CardView">
|
||||
<HintPath>..\packages\Xamarin.Android.Support.v7.CardView.23.0.1.3\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
|
||||
<HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.0.1.3\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Forms.Platform.Android">
|
||||
<HintPath>..\packages\Xamarin.Forms.2.1.0.6529\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
|
||||
</Reference>
|
||||
|
@ -73,8 +70,11 @@
|
|||
<Reference Include="Xamarin.Forms.Platform">
|
||||
<HintPath>..\packages\Xamarin.Forms.2.1.0.6529\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
|
||||
<HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.0.1.3\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SkiaSharp">
|
||||
<HintPath>..\packages\SkiaSharp.1.49.2.1-beta\lib\MonoAndroid\SkiaSharp.dll</HintPath>
|
||||
<HintPath>..\packages\SkiaSharp.1.49.3.0-beta\lib\MonoAndroid\SkiaSharp.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="SkiaSharp" version="1.49.2.1-beta" targetFramework="MonoAndroid60" />
|
||||
<package id="SkiaSharp" version="1.49.3.0-beta" targetFramework="MonoAndroid60" />
|
||||
<package id="Xamarin.Android.Support.Design" version="23.0.1.3" targetFramework="MonoAndroid60" />
|
||||
<package id="Xamarin.Android.Support.v4" version="23.0.1.3" targetFramework="MonoAndroid60" />
|
||||
<package id="Xamarin.Android.Support.v7.AppCompat" version="23.0.1.3" targetFramework="MonoAndroid60" />
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
<HintPath>packages\Xamarin.Forms.2.1.0.6529\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SkiaSharp">
|
||||
<HintPath>packages\SkiaSharp.1.49.2.1-beta\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.dll</HintPath>
|
||||
<HintPath>packages\SkiaSharp.1.49.3.0-beta\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
|
|
@ -93,7 +93,7 @@
|
|||
<HintPath>..\packages\Xamarin.Forms.2.1.0.6529\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SkiaSharp">
|
||||
<HintPath>..\packages\SkiaSharp.1.49.2.1-beta\lib\XamariniOS\SkiaSharp.dll</HintPath>
|
||||
<HintPath>..\packages\SkiaSharp.1.49.3.0-beta\lib\XamariniOS\SkiaSharp.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="SkiaSharp" version="1.49.2.1-beta" targetFramework="xamarinios10" />
|
||||
<package id="SkiaSharp" version="1.49.3.0-beta" targetFramework="xamarinios10" />
|
||||
<package id="Xamarin.Forms" version="2.1.0.6529" targetFramework="xamarinios10" />
|
||||
</packages>
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="SkiaSharp" version="1.49.2.1-beta" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarintvos10+xamarinwatchos10+xamarinios10" />
|
||||
<package id="SkiaSharp" version="1.49.3.0-beta" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarintvos10+xamarinwatchos10+xamarinios10" />
|
||||
<package id="Xamarin.Forms" version="2.1.0.6529" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarintvos10+xamarinwatchos10+xamarinios10" />
|
||||
</packages>
|
|
@ -56,7 +56,7 @@
|
|||
<Reference Include="System.Core" />
|
||||
<Reference Include="Xamarin.Mac" />
|
||||
<Reference Include="SkiaSharp">
|
||||
<HintPath>packages\SkiaSharp.1.49.2.1-beta\lib\XamarinMac\SkiaSharp.dll</HintPath>
|
||||
<HintPath>packages\SkiaSharp.1.49.3.0-beta\lib\XamarinMac\SkiaSharp.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
@ -115,5 +115,5 @@
|
|||
</BundleResource>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
|
||||
<Import Project="packages\SkiaSharp.1.49.2.1-beta\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.2.1-beta\build\XamarinMac\SkiaSharp.targets')" />
|
||||
<Import Project="packages\SkiaSharp.1.49.3.0-beta\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.3.0-beta\build\XamarinMac\SkiaSharp.targets')" />
|
||||
</Project>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="SkiaSharp" version="1.49.2.1-beta" targetFramework="xamarinmac20" />
|
||||
<package id="SkiaSharp" version="1.49.3.0-beta" targetFramework="xamarinmac20" />
|
||||
</packages>
|
|
@ -4,6 +4,6 @@
|
|||
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
||||
</PropertyGroup>
|
||||
<ImportGroup>
|
||||
<Import Project="$(NuGetPackageRoot)\SkiaSharp.Windows\1.49.2.1-beta\build\uap10.0\SkiaSharp.Windows.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp.Windows\1.49.2.1-beta\build\uap10.0\SkiaSharp.Windows.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.3-beta\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.3-beta\build\uap10.0\SkiaSharp.targets')" />
|
||||
</ImportGroup>
|
||||
</Project>
|
|
@ -4,7 +4,7 @@
|
|||
"Microsoft.ApplicationInsights.PersistenceChannel": "1.0.0",
|
||||
"Microsoft.ApplicationInsights.WindowsApps": "1.0.0",
|
||||
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
|
||||
"SkiaSharp.Windows": "1.49.2.1-beta"
|
||||
"SkiaSharp": "1.49.3-beta"
|
||||
},
|
||||
"frameworks": {
|
||||
"uap10.0": {}
|
||||
|
|
|
@ -86,16 +86,16 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>packages\SkiaSharp.1.49.3.0-beta\lib\net45\SkiaSharp.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="SkiaSharp">
|
||||
<HintPath>packages\SkiaSharp.1.49.2.1-beta\lib\net45\SkiaSharp.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\SharedDemo\SkiaSharp.Demos.cs">
|
||||
|
@ -133,11 +133,11 @@
|
|||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="packages\SkiaSharp.1.49.2.1-beta\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.2.1-beta\build\net45\SkiaSharp.targets')" />
|
||||
<Import Project="packages\SkiaSharp.1.49.3.0-beta\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.3.0-beta\build\net45\SkiaSharp.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('packages\SkiaSharp.1.49.2.1-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.49.2.1-beta\build\net45\SkiaSharp.targets'))" />
|
||||
<Error Condition="!Exists('packages\SkiaSharp.1.49.3.0-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.49.3.0-beta\build\net45\SkiaSharp.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="SkiaSharp" version="1.49.2.1-beta" targetFramework="net45" />
|
||||
<package id="SkiaSharp" version="1.49.3.0-beta" targetFramework="net45" />
|
||||
</packages>
|
Загрузка…
Ссылка в новой задаче