Merge pull request #19 from cefsharp/cefsharp/41

Upgrade to 41.0.0 Release
This commit is contained in:
Alex Maitland 2015-06-24 16:04:43 +10:00
commit b20c371f5a
13 changed files with 37 additions and 37 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.Common.39.0.2\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.39.0.2\build\CefSharp.Common.props')" />
<Import Project="..\packages\CefSharp.OffScreen.39.0.2\build\CefSharp.OffScreen.props" Condition="Exists('..\packages\CefSharp.OffScreen.39.0.2\build\CefSharp.OffScreen.props')" />
<Import Project="..\packages\CefSharp.Common.41.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.41.0.0\build\CefSharp.Common.props')" />
<Import Project="..\packages\CefSharp.OffScreen.41.0.0\build\CefSharp.OffScreen.props" Condition="Exists('..\packages\CefSharp.OffScreen.41.0.0\build\CefSharp.OffScreen.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -15,7 +15,7 @@
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<NuGetPackageImportStamp>c8489494</NuGetPackageImportStamp>
<NuGetPackageImportStamp>86066425</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
@ -82,7 +82,7 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.39.0.2\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.39.0.2\build\CefSharp.Common.targets')" />
<Import Project="..\packages\cef.redist.x86.3.2272.32\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2272.32\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2272.32\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2272.32\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.41.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.41.0.0\build\CefSharp.Common.targets')" />
</Project>

View File

@ -1,4 +1,4 @@
// Copyright © 2010-2014 The CefSharp Authors. All rights reserved.
// Copyright © 2010-2015 The CefSharp Authors. All rights reserved.
//
// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

View File

@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CefSharp.MinimalExample.OffScreen")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.redist.x64" version="3.2171.2069" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2171.2069" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="39.0.2" targetFramework="net40-Client" />
<package id="CefSharp.OffScreen" version="39.0.2" targetFramework="net40-Client" />
<package id="cef.redist.x64" version="3.2272.32" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2272.32" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="41.0.0" targetFramework="net40-Client" />
<package id="CefSharp.OffScreen" version="41.0.0" targetFramework="net40-Client" />
</packages>

View File

@ -1,4 +1,4 @@
// Copyright © 2010-2014 The CefSharp Authors. All rights reserved.
// Copyright © 2010-2015 The CefSharp Authors. All rights reserved.
//
// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.Common.39.0.2\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.39.0.2\build\CefSharp.Common.props')" />
<Import Project="..\packages\CefSharp.WinForms.39.0.2\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.39.0.2\build\CefSharp.WinForms.props')" />
<Import Project="..\packages\CefSharp.Common.41.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.41.0.0\build\CefSharp.Common.props')" />
<Import Project="..\packages\CefSharp.WinForms.41.0.0\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.41.0.0\build\CefSharp.WinForms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -23,7 +23,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<NuGetPackageImportStamp>182c5946</NuGetPackageImportStamp>
<NuGetPackageImportStamp>201e235d</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<PlatformTarget>x64</PlatformTarget>
@ -98,7 +98,7 @@
<None Include="Resources\chromium-256.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.39.0.2\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.39.0.2\build\CefSharp.Common.targets')" />
<Import Project="..\packages\cef.redist.x86.3.2272.32\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2272.32\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2272.32\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2272.32\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.41.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.41.0.0\build\CefSharp.Common.targets')" />
</Project>

View File

@ -1,4 +1,4 @@
// Copyright © 2010-2014 The CefSharp Authors. All rights reserved.
// Copyright © 2010-2015 The CefSharp Authors. All rights reserved.
//
// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

View File

@ -1,4 +1,4 @@
// Copyright © 2010-2014 The CefSharp Authors. All rights reserved.
// Copyright © 2010-2015 The CefSharp Authors. All rights reserved.
//
// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

View File

@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CefSharp.MinimalExample.WinForms")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.redist.x64" version="3.2171.2069" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2171.2069" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="39.0.2" targetFramework="net40-Client" />
<package id="CefSharp.WinForms" version="39.0.2" targetFramework="net40-Client" />
<package id="cef.redist.x64" version="3.2272.32" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2272.32" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="41.0.0" targetFramework="net40-Client" />
<package id="CefSharp.WinForms" version="41.0.0" targetFramework="net40-Client" />
</packages>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.Common.39.0.2\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.39.0.2\build\CefSharp.Common.props')" />
<Import Project="..\packages\CefSharp.Wpf.39.0.2\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.39.0.2\build\CefSharp.Wpf.props')" />
<Import Project="..\packages\CefSharp.Common.41.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.41.0.0\build\CefSharp.Common.props')" />
<Import Project="..\packages\CefSharp.Wpf.41.0.0\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.41.0.0\build\CefSharp.Wpf.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -17,7 +17,7 @@
<WarningLevel>4</WarningLevel>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<NuGetPackageImportStamp>5db844a5</NuGetPackageImportStamp>
<NuGetPackageImportStamp>0627409c</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
@ -132,9 +132,9 @@
<Resource Include="chromium-256.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.39.0.2\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.39.0.2\build\CefSharp.Common.targets')" />
<Import Project="..\packages\cef.redist.x86.3.2272.32\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2272.32\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2272.32\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2272.32\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.41.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.41.0.0\build\CefSharp.Common.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.
<Target Name="BeforeBuild">

View File

@ -10,7 +10,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CefSharp.MinimalExample.Wpf")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.redist.x64" version="3.2171.2069" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2171.2069" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="39.0.2" targetFramework="net40-Client" />
<package id="CefSharp.Wpf" version="39.0.2" targetFramework="net40-Client" />
<package id="cef.redist.x64" version="3.2272.32" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2272.32" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="41.0.0" targetFramework="net40-Client" />
<package id="CefSharp.Wpf" version="41.0.0" targetFramework="net40-Client" />
</packages>