Merge pull request #22 from cefsharp/cefsharp/43.0.1

Upgrade to Official 43.0.1 Release
This commit is contained in:
Alex Maitland 2015-11-02 12:21:41 +10:00
commit 2efb9bbf27
7 changed files with 23 additions and 24 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.OffScreen.43.0.0\build\CefSharp.OffScreen.props" Condition="Exists('..\packages\CefSharp.OffScreen.43.0.0\build\CefSharp.OffScreen.props')" /> <Import Project="..\packages\CefSharp.OffScreen.43.0.1\build\CefSharp.OffScreen.props" Condition="Exists('..\packages\CefSharp.OffScreen.43.0.1\build\CefSharp.OffScreen.props')" />
<Import Project="..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Common.43.0.1\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.43.0.1\build\CefSharp.Common.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -15,7 +15,7 @@
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile> <TargetFrameworkProfile>Client</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<NuGetPackageImportStamp>59d47288</NuGetPackageImportStamp> <NuGetPackageImportStamp>eab8b36f</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -84,5 +84,5 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets')" /> <Import Project="..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets')" /> <Import Project="..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.43.0.1\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.43.0.1\build\CefSharp.Common.targets')" />
</Project> </Project>

View File

@ -2,6 +2,6 @@
<packages> <packages>
<package id="cef.redist.x64" version="3.2357.1287" targetFramework="net40-Client" /> <package id="cef.redist.x64" version="3.2357.1287" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2357.1287" targetFramework="net40-Client" /> <package id="cef.redist.x86" version="3.2357.1287" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="43.0.0" targetFramework="net40-Client" /> <package id="CefSharp.Common" version="43.0.1" targetFramework="net40-Client" />
<package id="CefSharp.OffScreen" version="43.0.0" targetFramework="net40-Client" /> <package id="CefSharp.OffScreen" version="43.0.1" targetFramework="net40-Client" />
</packages> </packages>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.WinForms.43.0.0\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.43.0.0\build\CefSharp.WinForms.props')" /> <Import Project="..\packages\CefSharp.WinForms.43.0.1\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.43.0.1\build\CefSharp.WinForms.props')" />
<Import Project="..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Common.43.0.1\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.43.0.1\build\CefSharp.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -23,7 +23,7 @@
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile> <TargetFrameworkProfile>Client</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<NuGetPackageImportStamp>37fa1b4c</NuGetPackageImportStamp> <NuGetPackageImportStamp>af2eb1fe</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
@ -100,5 +100,5 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets')" /> <Import Project="..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets')" /> <Import Project="..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.43.0.1\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.43.0.1\build\CefSharp.Common.targets')" />
</Project> </Project>

View File

@ -2,6 +2,6 @@
<packages> <packages>
<package id="cef.redist.x64" version="3.2357.1287" targetFramework="net40-Client" /> <package id="cef.redist.x64" version="3.2357.1287" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2357.1287" targetFramework="net40-Client" /> <package id="cef.redist.x86" version="3.2357.1287" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="43.0.0" targetFramework="net40-Client" /> <package id="CefSharp.Common" version="43.0.1" targetFramework="net40-Client" />
<package id="CefSharp.WinForms" version="43.0.0" targetFramework="net40-Client" /> <package id="CefSharp.WinForms" version="43.0.1" targetFramework="net40-Client" />
</packages> </packages>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.Wpf.43.0.0\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.43.0.0\build\CefSharp.Wpf.props')" /> <Import Project="..\packages\CefSharp.Wpf.43.0.1\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.43.0.1\build\CefSharp.Wpf.props')" />
<Import Project="..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Common.43.0.1\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.43.0.1\build\CefSharp.Common.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -17,7 +17,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<TargetFrameworkProfile>Client</TargetFrameworkProfile> <TargetFrameworkProfile>Client</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<NuGetPackageImportStamp>fe3ad8fe</NuGetPackageImportStamp> <NuGetPackageImportStamp>add73be0</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -134,7 +134,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets')" /> <Import Project="..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets')" /> <Import Project="..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.43.0.1\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.43.0.1\build\CefSharp.Common.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

View File

@ -2,6 +2,6 @@
<packages> <packages>
<package id="cef.redist.x64" version="3.2357.1287" targetFramework="net40-Client" /> <package id="cef.redist.x64" version="3.2357.1287" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2357.1287" targetFramework="net40-Client" /> <package id="cef.redist.x86" version="3.2357.1287" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="43.0.0" targetFramework="net40-Client" /> <package id="CefSharp.Common" version="43.0.1" targetFramework="net40-Client" />
<package id="CefSharp.Wpf" version="43.0.0" targetFramework="net40-Client" /> <package id="CefSharp.Wpf" version="43.0.1" targetFramework="net40-Client" />
</packages> </packages>

View File

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<packageSources>
<add key="NuGet official package source" value="https://nuget.org/api/v2/" />
<add key="cefsharp-myget" value="https://www.myget.org/F/cefsharp/" />
</packageSources>
<activePackageSource> <activePackageSource>
<add key="All" value="(Aggregate source)" /> <add key="All" value="(Aggregate source)" />
</activePackageSource> </activePackageSource>
<packageSources>
<add key="cefsharp-myget" value="https://www.myget.org/F/cefsharp/" />
</packageSources>
</configuration> </configuration>