Revert "Dropping the NuGet version numbers as I moved ahead twice"

This reverts commit 9e75234b69.
This commit is contained in:
Matthew Leibowitz 2016-06-10 15:14:42 +02:00
Родитель a3c410e9f6
Коммит 2af21eddb6
17 изменённых файлов: 20 добавлений и 20 удалений

Просмотреть файл

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Mac</id>
<title>SkiaSharp for OSX</title>
<version>1.49.4.0-beta3</version>
<version>1.49.4.0-beta4</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>

Просмотреть файл

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Windows</id>
<title>SkiaSharp for Windows</title>
<version>1.49.4.0-beta3</version>
<version>1.49.4.0-beta4</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>

Просмотреть файл

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp</id>
<title>SkiaSharp</title>
<version>1.49.4.0-beta3</version>
<version>1.49.4.0-beta4</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>

Просмотреть файл

@ -52,7 +52,7 @@
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.49.4-beta2\lib\MonoAndroid\SkiaSharp.dll</HintPath>
<HintPath>..\packages\SkiaSharp.1.49.4-beta3\lib\MonoAndroid\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta2" targetFramework="monoandroid60" />
<package id="SkiaSharp" version="1.49.4-beta3" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" />

Просмотреть файл

@ -33,7 +33,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.49.4-beta2\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.dll</HintPath>
<HintPath>packages\SkiaSharp.1.49.4-beta3\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

Просмотреть файл

@ -4,7 +4,7 @@
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup>
<ImportGroup>
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta2\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta2\build\uap10.0\SkiaSharp.targets')" />
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta3\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta3\build\uap10.0\SkiaSharp.targets')" />
<Import Project="$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.38-pre2\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.38-pre2\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
</ImportGroup>
</Project>

Просмотреть файл

@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
"SkiaSharp": "1.49.4-beta2",
"SkiaSharp": "1.49.4-beta3",
"Xamarin.Forms": "2.3.0.38-pre2"
},
"frameworks": {

Просмотреть файл

@ -79,7 +79,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.49.4-beta2\lib\XamariniOS\SkiaSharp.dll</HintPath>
<HintPath>..\packages\SkiaSharp.1.49.4-beta3\lib\XamariniOS\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta2" targetFramework="xamarinios10" />
<package id="SkiaSharp" version="1.49.4-beta3" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="2.3.0.38-pre2" targetFramework="xamarinios10" />
</packages>

Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta2" targetFramework="portable45-net45+win8+wp8" />
<package id="SkiaSharp" version="1.49.4-beta3" targetFramework="portable45-net45+win8+wp8" />
<package id="Xamarin.Forms" version="2.3.0.38-pre2" targetFramework="portable45-net45+win8+wp8" />
</packages>

Просмотреть файл

@ -56,7 +56,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
<Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.49.4-beta2\lib\XamarinMac\SkiaSharp.dll</HintPath>
<HintPath>packages\SkiaSharp.1.49.4-beta3\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.4-beta2\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.4-beta2\build\XamarinMac\SkiaSharp.targets')" />
<Import Project="packages\SkiaSharp.1.49.4-beta3\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.4-beta3\build\XamarinMac\SkiaSharp.targets')" />
</Project>

Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta2" targetFramework="xamarinmac20" />
<package id="SkiaSharp" version="1.49.4-beta3" targetFramework="xamarinmac20" />
</packages>

Просмотреть файл

@ -4,6 +4,6 @@
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup>
<ImportGroup>
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta2\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta2\build\uap10.0\SkiaSharp.targets')" />
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta3\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta3\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": "1.49.4-beta2"
"SkiaSharp": "1.49.4-beta3"
},
"frameworks": {
"uap10.0": {}

Просмотреть файл

@ -87,7 +87,7 @@
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.49.4-beta2\lib\net45\SkiaSharp.dll</HintPath>
<HintPath>packages\SkiaSharp.1.49.4-beta3\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -133,11 +133,11 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="packages\SkiaSharp.1.49.4-beta2\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.4-beta2\build\net45\SkiaSharp.targets')" />
<Import Project="packages\SkiaSharp.1.49.4-beta3\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.4-beta3\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.4-beta2\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.49.4-beta2\build\net45\SkiaSharp.targets'))" />
<Error Condition="!Exists('packages\SkiaSharp.1.49.4-beta3\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.49.4-beta3\build\net45\SkiaSharp.targets'))" />
</Target>
</Project>

Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta2" targetFramework="net45" />
<package id="SkiaSharp" version="1.49.4-beta3" targetFramework="net45" />
</packages>