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: cee02337e9c0
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a35b647f1fb0
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 19, 2019

  1. Copy the full SHA
    b1533c8 View commit details

Commits on Aug 20, 2019

  1. I meant 16.2.3.

    pleroy committed Aug 20, 2019
    Copy the full SHA
    6470597 View commit details
  2. Merge pull request #2294 from pleroy/VS16_2_2

    Migrate to Visual Studio 16.2.3
    pleroy authored Aug 20, 2019
    Copy the full SHA
    a35b647 View commit details
Showing with 13 additions and 5 deletions.
  1. +2 −1 base/not_null_test.cpp
  2. +11 −4 find_msbuild.ps1
3 changes: 2 additions & 1 deletion base/not_null_test.cpp
Original file line number Diff line number Diff line change
@@ -61,7 +61,8 @@ TEST_F(NotNullTest, Move) {
_MSC_FULL_VER == 191'627'027 || \
_MSC_FULL_VER == 192'027'508 || \
_MSC_FULL_VER == 192'227'706 || \
_MSC_FULL_VER == 192'227'724)
_MSC_FULL_VER == 192'227'724 || \
_MSC_FULL_VER == 192'227'905)
EXPECT_THAT(*(std::unique_ptr<int> const&)int_ptr1, Eq(3));
#endif
not_null<std::unique_ptr<int>> int_ptr2 = std::move(int_ptr1);
15 changes: 11 additions & 4 deletions find_msbuild.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
$version = "16.2.0"
$preview = "2"
$version = "16.2.3"
$preview = ""
if ($preview.length -gt 0) {
$description = "version $version preview $preview"
$path = "VisualStudioPreview/$version-pre.$preview."
} else {
$description = "version $version"
$path = "VisualStudio/$version+"
}

$vswhere = "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
$names = &$vswhere `
@@ -16,12 +23,12 @@ $msbuildpaths = &$vswhere `

$i = 0;
foreach ($name in $names) {
if ($name.startswith("VisualStudioPreview/$version-pre.$preview.")) {
if ($name.startswith("$path")) {
return ($msbuildpaths | select-object -index $i)
}
++$i
}

write-error(
"Could not find Visual Studio version $version preview $preview;" +
"Could not find Visual Studio $description;" +
" found the following versions:`n$([string]::join("`n", $names))")