Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to locate Microsoft Build Tools #2218

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Update to locate Microsoft Build Tools #2218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7406e20
Update to locate Microsoft Build Tools
Oct 23, 2024
db84ae9
Moved to protected so can be used as default
Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 1k/1kiss.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ function find_vs() {
if (!$required_vs_ver) { $required_vs_ver = '12.0+' }

$require_comps = @('Microsoft.Component.MSBuild', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64')
$vs_installs = ConvertFrom-Json "$(&$VSWHERE_EXE -version $required_vs_ver.TrimEnd('+') -format 'json' -requires $require_comps)"
$vs_installs = ConvertFrom-Json "$(&$VSWHERE_EXE -version $required_vs_ver.TrimEnd('+') -format 'json' -all -products Microsoft.VisualStudio.Product.BuildTools -requires $require_comps)"
$ErrorActionPreference = $eap

if ($vs_installs) {
Expand Down
8 changes: 5 additions & 3 deletions core/platform/apple/FileUtils-apple.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ class AX_DLL FileUtilsApple : public FileUtils
virtual std::string getPathForDirectory(std::string_view dir,
std::string_view searchPath) const override;

private:
virtual bool isFileExistInternal(std::string_view filePath) const override;
virtual bool removeDirectory(std::string_view dirPath) const override;
protected:
virtual bool isFileExistInternal(std::string_view filePath) const override;

private:
virtual bool removeDirectory(std::string_view dirPath) const override;

struct IMPL;
std::unique_ptr<IMPL> pimpl_;
Expand Down
Loading