diff options
author | Rui Marinho <me@ruimarinho.net> | 2017-03-08 11:30:34 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-08 11:30:34 +0000 |
commit | 04211b2ba30f86c63da2e6b310ad3934928aa64e (patch) | |
tree | cdc33c7c33ad3cdd188ef2be4ae0601f5beb4c88 | |
parent | 1ad18e33eb6b6ac02551d14d39f267968d044068 (diff) | |
download | xamarin-forms-04211b2ba30f86c63da2e6b310ad3934928aa64e.tar.gz xamarin-forms-04211b2ba30f86c63da2e6b310ad3934928aa64e.tar.bz2 xamarin-forms-04211b2ba30f86c63da2e6b310ad3934928aa64e.zip |
VSTS support (#803)
* Fix certs
* Try fix build reference
* Update to nuget 3.5
* Remove BingMapsSDK
* Revert git ignore change
15 files changed, 20 insertions, 16 deletions
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe Binary files differindex cb3ed036..305300ad 100644 --- a/.nuget/NuGet.exe +++ b/.nuget/NuGet.exe diff --git a/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj b/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj index 0b3fa329..7ce0a97b 100644 --- a/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj +++ b/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj @@ -17,7 +17,7 @@ <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk> - <TargetFrameworkVersion>v7.0</TargetFrameworkVersion> + <TargetFrameworkVersion>v7.1</TargetFrameworkVersion> <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis> <AndroidStoreUncompressedFileExtensions /> <MandroidI18n /> diff --git a/PagesGallery/PagesGallery.UWP/Package.appxmanifest b/PagesGallery/PagesGallery.UWP/Package.appxmanifest index d6dd4e17..41645b62 100644 --- a/PagesGallery/PagesGallery.UWP/Package.appxmanifest +++ b/PagesGallery/PagesGallery.UWP/Package.appxmanifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> - <Identity Name="f736c883-f105-4d30-a719-4bf328872f5e" Publisher="CN=xamarinforms" Version="1.0.0.0" /> + <Identity Name="f736c883-f105-4d30-a719-4bf328872f5e" Publisher="CN=XamarinForms" Version="1.0.0.0" /> <mp:PhoneIdentity PhoneProductId="f736c883-f105-4d30-a719-4bf328872f5e" PhonePublisherId="00000000-0000-0000-0000-000000000000" /> <Properties> <DisplayName>FPCL.WIndows</DisplayName> diff --git a/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj b/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj index 9a1cf96e..1d3750fa 100644 --- a/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj +++ b/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj @@ -17,8 +17,8 @@ <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile> <FileAlignment>512</FileAlignment> <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <PackageCertificateKeyFile>PagesGallery.UWP_TemporaryKey.pfx</PackageCertificateKeyFile> - <PackageCertificateThumbprint>85D3565C16113BAA3DC11E6149341D2449C333FD</PackageCertificateThumbprint> + <PackageCertificateKeyFile>Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx</PackageCertificateKeyFile> + <PackageCertificateThumbprint>D160433BDC22781DEAE0558325140B91C02A6A20</PackageCertificateThumbprint> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'"> <DebugSymbols>true</DebugSymbols> @@ -93,6 +93,7 @@ <!-- A reference to the entire .Net Framework and Windows SDK are automatically included --> <None Include="PagesGallery.UWP_TemporaryKey.pfx" /> <None Include="project.json" /> + <None Include="Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx" /> </ItemGroup> <ItemGroup> <Compile Include="App.xaml.cs"> diff --git a/PagesGallery/PagesGallery.UWP/Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx b/PagesGallery/PagesGallery.UWP/Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx Binary files differnew file mode 100644 index 00000000..6d80e21f --- /dev/null +++ b/PagesGallery/PagesGallery.UWP/Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx diff --git a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj index 11d12e1a..e11700f9 100644 --- a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj +++ b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj @@ -18,7 +18,7 @@ <DevInstrumentationEnabled>True</DevInstrumentationEnabled> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <RestorePackages>true</RestorePackages> - <TargetFrameworkVersion>v7.0</TargetFrameworkVersion> + <TargetFrameworkVersion>v7.1</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj index bf48f587..c8b9f6eb 100644 --- a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj +++ b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj @@ -15,7 +15,7 @@ <AndroidApplication>true</AndroidApplication> <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> - <TargetFrameworkVersion>v7.0</TargetFrameworkVersion> + <TargetFrameworkVersion>v7.1</TargetFrameworkVersion> <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> <AndroidSupportedAbis>armeabi-v7a,x86</AndroidSupportedAbis> <AndroidStoreUncompressedFileExtensions /> diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Package.appxmanifest b/Xamarin.Forms.ControlGallery.WindowsUniversal/Package.appxmanifest index ab3b6366..6430b2f6 100644 --- a/Xamarin.Forms.ControlGallery.WindowsUniversal/Package.appxmanifest +++ b/Xamarin.Forms.ControlGallery.WindowsUniversal/Package.appxmanifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> - <Identity Name="0d4424f6-1e29-4476-ac00-ba22c3789cb6" Publisher="CN=xamarinforms" Version="1.0.0.0" /> + <Identity Name="0d4424f6-1e29-4476-ac00-ba22c3789cb6" Publisher="CN=XamarinForms" Version="1.0.0.0" /> <mp:PhoneIdentity PhoneProductId="0d4424f6-1e29-4476-ac00-ba22c3789cb6" PhonePublisherId="00000000-0000-0000-0000-000000000000" /> <Properties> <DisplayName>Xamarin.Forms.ControlGallery.WindowsUniversal</DisplayName> diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj b/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj index 9907d361..bfb232e8 100644 --- a/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj +++ b/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj @@ -19,7 +19,7 @@ <FileAlignment>512</FileAlignment> <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <PackageCertificateKeyFile>Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx</PackageCertificateKeyFile> - <PackageCertificateThumbprint>5006389F0C8209A9821D107B01A93539FC799EBA</PackageCertificateThumbprint> + <PackageCertificateThumbprint>D160433BDC22781DEAE0558325140B91C02A6A20</PackageCertificateThumbprint> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'"> <DebugSymbols>true</DebugSymbols> diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx b/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx Binary files differindex c7527366..6d80e21f 100644 --- a/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx +++ b/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx diff --git a/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj b/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj index e70ae03b..58e443d0 100644 --- a/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj +++ b/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -208,10 +208,7 @@ <ItemGroup> <None Include="packages.config" /> </ItemGroup> - <ItemGroup> - <Folder Include="Tests\" /> - <Folder Include="Utilities\" /> - </ItemGroup> + <ItemGroup /> <ItemGroup> <ProjectReference Include="..\Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj"> <Project>{4DCD0420-1168-4B77-86DB-6196EE4BD491}</Project> @@ -226,6 +223,9 @@ <Name>Xamarin.Forms.Maps</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> <Import Project="..\Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems" Label="Shared" Condition="Exists('..\Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems')" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="..\packages\Xamarin.UITest.Desktop.0.0.7\build\Xamarin.UITest.Desktop.targets" Condition="Exists('..\packages\Xamarin.UITest.Desktop.0.0.7\build\Xamarin.UITest.Desktop.targets')" /> diff --git a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj index 9ca7b284..aa1a9e9e 100644 --- a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj +++ b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj @@ -15,7 +15,7 @@ <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk> - <TargetFrameworkVersion>v7.0</TargetFrameworkVersion> + <TargetFrameworkVersion>v7.1</TargetFrameworkVersion> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <RestorePackages>true</RestorePackages> <NuGetPackageImportStamp> diff --git a/Xamarin.Forms.Maps.WinRT.Tablet/Xamarin.Forms.Maps.WinRT.Tablet.csproj b/Xamarin.Forms.Maps.WinRT.Tablet/Xamarin.Forms.Maps.WinRT.Tablet.csproj index d8c0c993..b2115521 100644 --- a/Xamarin.Forms.Maps.WinRT.Tablet/Xamarin.Forms.Maps.WinRT.Tablet.csproj +++ b/Xamarin.Forms.Maps.WinRT.Tablet/Xamarin.Forms.Maps.WinRT.Tablet.csproj @@ -150,6 +150,9 @@ <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '12.0' "> <VisualStudioVersion>12.0</VisualStudioVersion> </PropertyGroup> + <PropertyGroup> + <SDKReferenceDirectoryRoot>$(SolutionDir)\.\tools\BingMapsSdk;$(LocalAppData)\Microsoft SDKs;$(MSBuildProgramFiles32)\Microsoft SDKs</SDKReferenceDirectoryRoot> + </PropertyGroup> <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj b/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj index f5770ee9..d05031c4 100644 --- a/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj +++ b/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj @@ -13,7 +13,7 @@ <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile> <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk> <AssemblyName>Xamarin.Forms.Platform.Android.AppLinks</AssemblyName> - <TargetFrameworkVersion>v7.0</TargetFrameworkVersion> + <TargetFrameworkVersion>v7.1</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj index 89cf67e0..29562618 100644 --- a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj +++ b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj @@ -14,7 +14,7 @@ <FileAlignment>512</FileAlignment> <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> - <TargetFrameworkVersion>v7.0</TargetFrameworkVersion> + <TargetFrameworkVersion>v7.1</TargetFrameworkVersion> <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <RestorePackages>true</RestorePackages> |