Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 396d1e6f8caf
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 45e2817c63d4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 6, 2018

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1f2061f View commit details
  2. Merge pull request #2015 from mockingbirdnest/revert-2011-Runtime

    Revert "New C++ redistributable runtime for 15.9"
    pleroy authored Dec 6, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    45e2817 View commit details
Showing with 3 additions and 4 deletions.
  1. +3 −4 ksp_plugin_adapter/loader.cs
7 changes: 3 additions & 4 deletions ksp_plugin_adapter/loader.cs
Original file line number Diff line number Diff line change
@@ -79,20 +79,19 @@ public static string LoadPrincipiaDllAndInitGoogleLogging() {

private static bool IsVCRedistInstalled() {
// NOTE(phl): This GUID is specific to:
// Microsoft Visual C++ 2017 Redistributable (x64) - 14.16.27012
// Microsoft Visual C++ 2017 Redistributable (x64) - 14.11.25325
// It will need to be updated when new versions of Visual C++
// Redistributable are released by Microsoft.
RegistryKey key = Registry.LocalMachine.OpenSubKey(
@"Software\Classes\Installer\Dependencies\" +
@"VC,redist.x64,amd64,14.16,bundle",
@"Software\Classes\Installer\Dependencies\,,amd64,14.0,bundle",
writable : false);
if (key == null) {
return false;
} else {
string version = (string)key.GetValue("Version");
// NOTE(phl): This string needs to be updated when new versions of Visual
// C++ Redistributable are released by Microsoft.
return version != null && version == "14.16.27012.6";
return version != null && version == "14.11.25325.0";
}
}