diff --git a/Program.cs b/Program.cs index 77d33dd2..963079ec 100644 --- a/Program.cs +++ b/Program.cs @@ -1,4 +1,5 @@ using CefSharp; +using CefSharp.WinForms; using System; using System.Diagnostics; using System.Globalization; diff --git a/README.md b/README.md index 83428ffb..91b46a99 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The program was built using Visual Studio 2017. Before opening the solution, ple After opening the solution, right-click the solution and select **Restore NuGet Packages**, or manually run this command in the **Package Manager Console**: ``` -PM> Install-Package CefSharp.WinForms -Version 67.0.0-CI2662 -Source https://www.myget.org/F/cefsharp/api/v3/index.json +PM> Install-Package CefSharp.WinForms -Version 67.0.0-pre01 ``` Note that some pre-release builds of CefSharp are not available on NuGet. To correctly restore packages in that case, open **Package Manager Settings**, and add `https://www.myget.org/F/cefsharp/api/v3/index.json` to the list of package sources. diff --git a/Resources/PostCefUpdate.ps1 b/Resources/PostCefUpdate.ps1 index bc43318c..5a5fcd20 100644 --- a/Resources/PostCefUpdate.ps1 +++ b/Resources/PostCefUpdate.ps1 @@ -10,10 +10,11 @@ try{ $sharpMatch = Select-String -Path $mainProj '<Import Project="packages\\CefSharp\.Common\.(.*?)\\' $sharpVersion = $sharpMatch.Matches[0].Groups[1].Value - $propsFiles = "..\packages\CefSharp.Common.${sharpVersion}\build\CefSharp.Common.props", - "..\packages\CefSharp.WinForms.${sharpVersion}\build\CefSharp.WinForms.props" + $replaceWhenTag = "..\packages\CefSharp.Common.${sharpVersion}\build\CefSharp.Common.props", + "..\packages\CefSharp.WinForms.${sharpVersion}\build\CefSharp.WinForms.props", + "..\packages\CefSharp.WinForms.${sharpVersion}\build\CefSharp.WinForms.targets" - $targetFiles = "..\packages\CefSharp.Common.${sharpVersion}\build\CefSharp.Common.targets" + $replaceItemGroupTag = "..\packages\CefSharp.Common.${sharpVersion}\build\CefSharp.Common.targets" # Greetings @@ -39,14 +40,14 @@ try{ Write-Host "Removing x64 and AnyCPU from package files..." - foreach($file in $propsFiles){ + foreach($file in $replaceWhenTag){ $contents = [IO.File]::ReadAllText($file) $contents = $contents -Replace '(?<=<When Condition=")(''\$\(Platform\)'' == ''(AnyCPU|x64)'')(?=">)', 'false' [IO.File]::WriteAllText($file, $contents) } - foreach($file in $targetFiles){ + foreach($file in $replaceItemGroupTag){ $contents = [IO.File]::ReadAllText($file) $contents = $contents -Replace '(?<=<ItemGroup Condition=")(''\$\(Platform\)'' == ''(AnyCPU|x64)'')(?=">)', 'false' diff --git a/TweetDuck.csproj b/TweetDuck.csproj index 37245a91..89f89939 100644 --- a/TweetDuck.csproj +++ b/TweetDuck.csproj @@ -1,9 +1,9 @@ <?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.WinForms.67.0.0-CI2662\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.67.0.0-CI2662\build\CefSharp.WinForms.props')" /> - <Import Project="packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.props')" /> - <Import Project="packages\cef.redist.x86.3.3396.1777\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.3.3396.1777\build\cef.redist.x86.props')" /> - <Import Project="packages\cef.redist.x64.3.3396.1777\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.3.3396.1777\build\cef.redist.x64.props')" /> + <Import Project="packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.props')" /> + <Import Project="packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.props')" /> + <Import Project="packages\cef.redist.x86.3.3396.1786\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.3.3396.1786\build\cef.redist.x86.props')" /> + <Import Project="packages\cef.redist.x64.3.3396.1786\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.3.3396.1786\build\cef.redist.x64.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -332,7 +332,6 @@ <None Include="Resources\Images\icon-tray-new.ico" /> <None Include="Resources\Images\icon-tray.ico" /> <None Include="Resources\Images\spinner.apng" /> - <None Include="Resources\PostBuild.ps1" /> <None Include="Resources\Plugins\.debug\.meta" /> <None Include="Resources\Plugins\.debug\browser.js" /> <None Include="Resources\Plugins\.debug\notification.js" /> @@ -354,7 +353,10 @@ <None Include="Resources\Plugins\templates\modal.html" /> <None Include="Resources\Plugins\timeline-polls\.meta" /> <None Include="Resources\Plugins\timeline-polls\browser.js" /> + <None Include="Resources\PostBuild.fsx" /> + <None Include="Resources\PostCefUpdate.ps1" /> <None Include="Resources\Scripts\code.js" /> + <None Include="Resources\Scripts\imports\markup\introduction.html" /> <None Include="Resources\Scripts\imports\scripts\plugins.base.js" /> <None Include="Resources\Scripts\imports\styles\introduction.css" /> <None Include="Resources\Scripts\imports\styles\twitter.base.css" /> @@ -418,11 +420,13 @@ IF EXIST "$(ProjectDir)bld\post_build.exe" ( <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\cef.redist.x64.3.3396.1777\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.3396.1777\build\cef.redist.x64.props'))" /> - <Error Condition="!Exists('packages\cef.redist.x86.3.3396.1777\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.3396.1777\build\cef.redist.x86.props'))" /> - <Error Condition="!Exists('packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.props'))" /> - <Error Condition="!Exists('packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.targets'))" /> - <Error Condition="!Exists('packages\CefSharp.WinForms.67.0.0-CI2662\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.67.0.0-CI2662\build\CefSharp.WinForms.props'))" /> + <Error Condition="!Exists('packages\cef.redist.x64.3.3396.1786\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.3396.1786\build\cef.redist.x64.props'))" /> + <Error Condition="!Exists('packages\cef.redist.x86.3.3396.1786\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.3396.1786\build\cef.redist.x86.props'))" /> + <Error Condition="!Exists('packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.props'))" /> + <Error Condition="!Exists('packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.targets'))" /> + <Error Condition="!Exists('packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.props'))" /> + <Error Condition="!Exists('packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.targets'))" /> </Target> - <Import Project="packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.targets')" /> + <Import Project="packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.targets')" /> + <Import Project="packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.targets')" /> </Project> \ No newline at end of file diff --git a/packages.config b/packages.config index 37c63379..853a4003 100644 --- a/packages.config +++ b/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="cef.redist.x64" version="3.3396.1777" targetFramework="net452" /> - <package id="cef.redist.x86" version="3.3396.1777" targetFramework="net452" /> - <package id="CefSharp.Common" version="67.0.0-CI2662" targetFramework="net452" /> - <package id="CefSharp.WinForms" version="67.0.0-CI2662" targetFramework="net452" /> + <package id="cef.redist.x64" version="3.3396.1786" targetFramework="net452" /> + <package id="cef.redist.x86" version="3.3396.1786" targetFramework="net452" /> + <package id="CefSharp.Common" version="67.0.0-pre01" targetFramework="net452" /> + <package id="CefSharp.WinForms" version="67.0.0-pre01" targetFramework="net452" /> </packages> \ No newline at end of file diff --git a/subprocess/TweetDuck.Browser.csproj b/subprocess/TweetDuck.Browser.csproj index e7ec522d..df498745 100644 --- a/subprocess/TweetDuck.Browser.csproj +++ b/subprocess/TweetDuck.Browser.csproj @@ -28,7 +28,7 @@ <ItemGroup> <Reference Include="CefSharp.BrowserSubprocess.Core, Version=67.0.0.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\packages\CefSharp.Common.67.0.0-CI2662\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath> + <HintPath>..\packages\CefSharp.Common.67.0.0-pre01\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath> </Reference> <Reference Include="System" /> </ItemGroup>