-
-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
18 changed files
with
261 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1"> | ||
| <runtime xdt:Transform="InsertIfMissing"/> | ||
|
|
||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing"/> | ||
| </runtime> | ||
|
|
||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.Core')"/> | ||
| <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.Core')"> | ||
| <assemblyIdentity name="CefSharp.Core" processorArchitecture="x64" publicKeyToken="40c4b6fc221f4138" culture="neutral"/> | ||
| <codeBase version="83.4.2.0" href="x64/CefSharp.Core.dll"/> | ||
| </dependentAssembly> | ||
|
|
||
| <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp')"/> | ||
| <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp')"> | ||
| <assemblyIdentity name="CefSharp" processorArchitecture="x64" publicKeyToken="40c4b6fc221f4138" culture="neutral"/> | ||
| <codeBase version="83.4.2.0" href="x64/CefSharp.dll"/> | ||
| </dependentAssembly> | ||
|
|
||
| <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.BrowserSubprocess.Core')"/> | ||
| <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.BrowserSubprocess.Core')"> | ||
| <assemblyIdentity name="CefSharp.BrowserSubprocess.Core" processorArchitecture="x64" publicKeyToken="40c4b6fc221f4138" culture="neutral"/> | ||
| <codeBase version="83.4.2.0" href="x64/CefSharp.BrowserSubprocess.Core.dll"/> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| </runtime> | ||
| </configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1"> | ||
| <runtime xdt:Transform="InsertIfMissing"/> | ||
|
|
||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing"/> | ||
| </runtime> | ||
|
|
||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.Core')"/> | ||
| <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.Core')"> | ||
| <assemblyIdentity name="CefSharp.Core" processorArchitecture="x86" publicKeyToken="40c4b6fc221f4138" culture="neutral"/> | ||
| <codeBase version="83.4.2.0" href="x86/CefSharp.Core.dll"/> | ||
| </dependentAssembly> | ||
|
|
||
| <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp')"/> | ||
| <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp')"> | ||
| <assemblyIdentity name="CefSharp" processorArchitecture="x86" publicKeyToken="40c4b6fc221f4138" culture="neutral"/> | ||
| <codeBase version="83.4.2.0" href="x86/CefSharp.dll"/> | ||
| </dependentAssembly> | ||
|
|
||
| <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.BrowserSubprocess.Core')"/> | ||
| <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.BrowserSubprocess.Core')"> | ||
| <assemblyIdentity name="CefSharp.BrowserSubprocess.Core" processorArchitecture="x86" publicKeyToken="40c4b6fc221f4138" culture="neutral"/> | ||
| <codeBase version="83.4.2.0" href="x86/CefSharp.BrowserSubprocess.Core.dll"/> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| </runtime> | ||
| </configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,49 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Target Name="PlatformCheck" BeforeTargets="ResolveAssemblyReferences" Condition="(('$(Platform)' != 'x86') AND ('$(Platform)' != 'x64') AND ('$(Platform)' != 'Win32') AND '$(CefSharpAnyCpuSupport)' != 'true')"> | ||
| <Error Text="$(MSBuildThisFileName) is unable to proceeed as your current Platform is '$(Platform)'. To target AnyCPU please read https://github.com/cefsharp/CefSharp/issues/1714. Alternatively change your Platform to x86 or x64 and the relevant files will be copied automatically. For details on changing your projects Platform see https://docs.microsoft.com/en-gb/visualstudio/ide/how-to-configure-projects-to-target-platforms?view=vs-2017" HelpKeyword="CefSharpSolutionPlatformCheck" /> | ||
| </Target> | ||
|
|
||
| <Target Name="FrameworkVersionCheck" BeforeTargets="ResolveAssemblyReferences" Condition="(('$(TargetFrameworkVersion)' == 'v4.5.1') OR ('$(TargetFrameworkVersion)' == 'v4.5') OR ('$(TargetFrameworkVersion)' == 'v4.0'))"> | ||
| <Error Text="CefSharp requires .Net 4.5.2 or higher" /> | ||
| </Target> | ||
|
|
||
| <PropertyGroup> | ||
| <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' ">.</CefSharpTargetDir> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- | ||
| These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the | ||
| correct ordering .props imports, which we require as this depends on the cef.redist packages | ||
| exporting an ItemGroup | ||
| --> | ||
|
|
||
| <ItemGroup Condition="('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')"> | ||
| <ItemGroup Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')"> | ||
| <None Include="@(CefRedist32)"> | ||
| <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <Link>x86\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| <None Include="@(CefSharpCommonBinaries32)"> | ||
| <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <Link>x86\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(Platform)' == 'x64'"> | ||
| <ItemGroup Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x64')"> | ||
| <None Include="@(CefRedist64)"> | ||
| <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <Link>x64\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| <None Include="@(CefSharpCommonBinaries64)"> | ||
| <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <Link>x64\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(Platform)' == 'AnyCPU'"> | ||
| <None Include="@(CefRedist32)"> | ||
| <Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| <None Include="@(CefRedist64)"> | ||
| <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| <None Include="@(CefSharpCommonBinaries32)"> | ||
| <Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| <None Include="@(CefSharpCommonBinaries64)"> | ||
| <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| </ItemGroup> | ||
| <UsingTask TaskName="TransformXml" AssemblyFile="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Web\Microsoft.Web.Publishing.Tasks.dll" /> | ||
| <Target Name="CefSharpCommon_TransformX86Config" Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')" AfterTargets="_CopyAppConfigFile"> | ||
| <TransformXml Source="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')" Transform="$(MSBuildThisFileDirectory)app.config.x86.transform" Destination="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')"/> | ||
| </Target> | ||
| <Target Name="CefSharpCommon_TransformX64Config" Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x64')" AfterTargets="_CopyAppConfigFile"> | ||
| <TransformXml Source="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')" Transform="$(MSBuildThisFileDirectory)app.config.x64.transform" Destination="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')"/> | ||
| </Target> | ||
| </Project> |
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,35 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' ">.</CefSharpTargetDir> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- | ||
| These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the | ||
| correct ordering .props imports, which we require as this depends on the cef.redist packages | ||
| exporting an ItemGroup | ||
| --> | ||
|
|
||
| <!-- Copying all files here included those at are added As References so you can specify CefSharpTargetDir --> | ||
| <Choose> | ||
| <When Condition="'$(Platform)' == 'AnyCPU'"> | ||
| <ItemGroup> | ||
| <None Include="@(CefSharpOffScreenBinaries32)"> | ||
| <Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| <None Include="@(CefSharpOffScreenBinaries64)"> | ||
| <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| </ItemGroup> | ||
| </When> | ||
| <When Condition="'$(Platform)' == 'x64'"> | ||
| <ItemGroup> | ||
| <None Include="@(CefSharpOffScreenBinaries64)"> | ||
| <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| </ItemGroup> | ||
| </When> | ||
| <!-- x86, and Win32 --> | ||
| <Otherwise> | ||
| <ItemGroup> | ||
| <None Include="@(CefSharpOffScreenBinaries32)"> | ||
| <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| </ItemGroup> | ||
| </Otherwise> | ||
| </Choose> | ||
| <ItemGroup Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')"> | ||
| <None Include="@(CefSharpOffScreenBinaries32)"> | ||
| <Link>x86\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x64')"> | ||
| <None Include="@(CefSharpOffScreenBinaries64)"> | ||
| <Link>x64\%(RecursiveDir)%(FileName)%(Extension)</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <PublishState>Include</PublishState> | ||
| <Visible>false</Visible> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| <UsingTask TaskName="TransformXml" AssemblyFile="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Web\Microsoft.Web.Publishing.Tasks.dll" /> | ||
| <Target Name="CefSharpOffScreen_TransformX86Config" Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')" AfterTargets="_CopyAppConfigFile"> | ||
| <TransformXml Source="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')" Transform="$(MSBuildThisFileDirectory)app.config.x86.transform" Destination="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')"/> | ||
| </Target> | ||
| <Target Name="CefSharpOffScreen_TransformX64Config" Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x64')" AfterTargets="_CopyAppConfigFile"> | ||
| <TransformXml Source="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')" Transform="$(MSBuildThisFileDirectory)app.config.x64.transform" Destination="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')"/> | ||
| </Target> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1"> | ||
| <runtime xdt:Transform="InsertIfMissing"/> | ||
|
|
||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing"/> | ||
| </runtime> | ||
|
|
||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.WinForms')"/> | ||
| <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.WinForms')"> | ||
| <assemblyIdentity name="CefSharp.WinForms" processorArchitecture="x64" publicKeyToken="40c4b6fc221f4138" culture="neutral"/> | ||
| <codeBase version="83.4.2.0" href="x64/CefSharp.WinForms.dll"/> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| </runtime> | ||
| </configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1"> | ||
| <runtime xdt:Transform="InsertIfMissing"/> | ||
|
|
||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing"/> | ||
| </runtime> | ||
|
|
||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.WinForms')"/> | ||
| <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.WinForms')"> | ||
| <assemblyIdentity name="CefSharp.WinForms" processorArchitecture="x86" publicKeyToken="40c4b6fc221f4138" culture="neutral"/> | ||
| <codeBase version="83.4.2.0" href="x86/CefSharp.WinForms.dll"/> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| </runtime> | ||
| </configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.