From 9f86500af4becbc09385b1a05bc4fce21297a2b5 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Sat, 15 Jun 2019 20:14:32 -0700 Subject: [PATCH 1/3] [AppVeyor] Use proper MSBuild version --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index ead907ab8..f3a6cd180 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -53,7 +53,7 @@ environment: # scripts that run after cloning repository install: - - cmd: set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH% + - cmd: set PATH=C:\Program Files (x86)\MSBuild\15.0\Bin;%PATH% - cmd: xb.bat setup From 17924bc9452806e568a88515e932f294c881bb29 Mon Sep 17 00:00:00 2001 From: Silent Date: Sat, 29 Jun 2019 13:08:54 +0200 Subject: [PATCH 2/3] [xenia-build] Make vswhere.exe output in UTF-8 so Python doesn't fail to parse regional characters in output --- xenia-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xenia-build b/xenia-build index 439210dcf..c4f969b3a 100755 --- a/xenia-build +++ b/xenia-build @@ -96,7 +96,7 @@ def import_vs_environment(): install_path = None env_tool_args = None - vswhere = subprocess.check_output('third_party/vswhere/vswhere.exe -version "[15,)" -latest -format json', shell=False, universal_newlines=True) + vswhere = subprocess.check_output('third_party/vswhere/vswhere.exe -version "[15,)" -latest -format json -utf8', shell=False, universal_newlines=True) if vswhere: vswhere = json.loads(vswhere) if vswhere and len(vswhere) > 0: From d9ace8a923c0c698794ad4de29a4102034459f69 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Mon, 24 Jun 2019 20:32:12 -0700 Subject: [PATCH 3/3] [xenia-build] Update old link and fix VS Preview not being found -prerelease allows preview/prerelease versions of VS to work in xb. https://github.com/microsoft/vswhere/issues/185#issuecomment-499962802 --- xenia-build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xenia-build b/xenia-build index c4f969b3a..0b44ba890 100755 --- a/xenia-build +++ b/xenia-build @@ -48,7 +48,7 @@ def main(): if vs_version is None: print('ERROR: Visual Studio not found!') print('Please refer to the building guide:') - print('https://github.com/benvanik/xenia/blob/master/docs/building.md') + print('https://github.com/xenia-project/xenia/blob/master/docs/building.md') sys.exit(1) # Setup main argument parser and common arguments. @@ -96,7 +96,7 @@ def import_vs_environment(): install_path = None env_tool_args = None - vswhere = subprocess.check_output('third_party/vswhere/vswhere.exe -version "[15,)" -latest -format json -utf8', shell=False, universal_newlines=True) + vswhere = subprocess.check_output('third_party/vswhere/vswhere.exe -version "[15,)" -latest -prerelease -format json -utf8', shell=False, universal_newlines=True) if vswhere: vswhere = json.loads(vswhere) if vswhere and len(vswhere) > 0: