Skip to content

Commit

Permalink
v17 release changes: Upgrade to CefSharp/Chrome v65 (VC++2015). Updat…
Browse files Browse the repository at this point in the history
…e the FoldingBrowser FAH download links for the FAH website domain change
  • Loading branch information
Hou5e committed Jul 23, 2018
1 parent a79f984 commit 9d48dd5
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 78 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@
/Browser/bin/Release/FoldingBrowser.html
/Install/VCx86Redist/*.exe
/Browser/bin/Release/swiftshader
/Browser/bin/Release/FoldingBrowser.exe.config
/Browser/bin/Release/FoldingBrowser.exe
2 changes: 1 addition & 1 deletion Browser/FAHSetupDialog.vb
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
Me.lblErrorNote.Visible = True
End If

'Check for characters not allowed in a FAH Username. See: http://folding.stanford.edu/support/faq/stats-teams-usernames/#are-there-any-characters-i-should-avoid-in-a-username NOTE: Should only be letters, numbers, and underscore. Cannot be: # ^ ~ | Also, Email addresses are truncated / not handled well, so block '@'. See: http://folding.stanford.edu/support/faq/stats-teams-usernames/#how-do-i-choose-a-username
'Check for characters not allowed in a FAH Username. See: https://foldingathome.org/support/faq/stats-teams-usernames/#are-there-any-characters-i-should-avoid-in-a-username NOTE: Should only be letters, numbers, and underscore. Cannot be: # ^ ~ | Also, Email addresses are truncated / not handled well, so block '@'. See: https://foldingathome.org/support/faq/stats-teams-usernames/#how-do-i-choose-a-username
Select Case True
Case Me.txtUsername.Text.Length = 0
'Allow old Bitcoin address only format
Expand Down
24 changes: 12 additions & 12 deletions Browser/FoldingBrowser.vbproj
Original file line number Diff line number Diff line change
@@ -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.63.0.3\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.63.0.3\build\CefSharp.WinForms.props')" />
<Import Project="packages\CefSharp.Common.63.0.3\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.63.0.3\build\CefSharp.Common.props')" />
<Import Project="packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.props')" />
<Import Project="packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.props')" />
<Import Project="packages\CefSharp.WinForms.65.0.0\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.65.0.0\build\CefSharp.WinForms.props')" />
<Import Project="packages\CefSharp.Common.65.0.0\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.65.0.0\build\CefSharp.Common.props')" />
<Import Project="packages\cef.redist.x86.3.3325.1758\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.3.3325.1758\build\cef.redist.x86.props')" />
<Import Project="packages\cef.redist.x64.3.3325.1758\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.3.3325.1758\build\cef.redist.x64.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
Expand Down Expand Up @@ -247,15 +247,15 @@
<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.3239.1723\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.props'))" />
<Error Condition="!Exists('packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.63.0.3\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.63.0.3\build\CefSharp.Common.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.63.0.3\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.63.0.3\build\CefSharp.Common.targets'))" />
<Error Condition="!Exists('packages\CefSharp.WinForms.63.0.3\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.63.0.3\build\CefSharp.WinForms.props'))" />
<Error Condition="!Exists('packages\CefSharp.WinForms.63.0.3\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.63.0.3\build\CefSharp.WinForms.targets'))" />
<Error Condition="!Exists('packages\cef.redist.x64.3.3325.1758\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.3325.1758\build\cef.redist.x64.props'))" />
<Error Condition="!Exists('packages\cef.redist.x86.3.3325.1758\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.3325.1758\build\cef.redist.x86.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.65.0.0\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.65.0.0\build\CefSharp.Common.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.65.0.0\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.65.0.0\build\CefSharp.Common.targets'))" />
<Error Condition="!Exists('packages\CefSharp.WinForms.65.0.0\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.65.0.0\build\CefSharp.WinForms.props'))" />
<Error Condition="!Exists('packages\CefSharp.WinForms.65.0.0\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.65.0.0\build\CefSharp.WinForms.targets'))" />
</Target>
<Import Project="packages\CefSharp.Common.63.0.3\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.63.0.3\build\CefSharp.Common.targets')" />
<Import Project="packages\CefSharp.WinForms.63.0.3\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.63.0.3\build\CefSharp.WinForms.targets')" />
<Import Project="packages\CefSharp.Common.65.0.0\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.65.0.0\build\CefSharp.Common.targets')" />
<Import Project="packages\CefSharp.WinForms.65.0.0\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.65.0.0\build\CefSharp.WinForms.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">
Expand Down
6 changes: 3 additions & 3 deletions Browser/GlobalRefs.vb
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ Public Module GlobalRefs
Public Const URL_EOC As String = "http://folding.extremeoverclocking.com/user_summary.php?s=&u="
Public Const URL_CureCoin_EOC As String = "http://folding.extremeoverclocking.com/team_summary.php?s=&t=224497"

Public Const URL_FAH As String = "https://folding.stanford.edu/start-folding/"
Public Const URL_FAH_Client As String = "http://folding.stanford.edu/client/"
Public Const URL_NaCl_FAH As String = "http://folding.stanford.edu/nacl/"
Public Const URL_FAH As String = "https://foldingathome.org/start-folding/"
Public Const URL_FAH_Client As String = "http://client.foldingathome.org/"
Public Const URL_NaCl_FAH As String = "http://nacl.foldingathome.org/"

'This HTML is easier to view in source code file: FoldingBrowser.html
Public Const HTML_PortalPage As String = "<html><head><title>FoldingBrowser - Earn Digital Assets with FoldingCoin and CureCoin</title></head>
Expand Down
Binary file removed Browser/bin/Release/FoldingBrowser.exe
Binary file not shown.
11 changes: 0 additions & 11 deletions Browser/bin/Release/FoldingBrowser.exe.config

This file was deleted.

8 changes: 4 additions & 4 deletions Browser/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.redist.x64" version="3.3239.1723" targetFramework="net452" />
<package id="cef.redist.x86" version="3.3239.1723" targetFramework="net452" />
<package id="CefSharp.Common" version="63.0.3" targetFramework="net452" />
<package id="CefSharp.WinForms" version="63.0.3" targetFramework="net452" />
<package id="cef.redist.x64" version="3.3325.1758" targetFramework="net452" />
<package id="cef.redist.x86" version="3.3325.1758" targetFramework="net452" />
<package id="CefSharp.Common" version="65.0.0" targetFramework="net452" />
<package id="CefSharp.WinForms" version="65.0.0" targetFramework="net452" />
</packages>
Loading

0 comments on commit 9d48dd5

Please sign in to comment.