New: Build with Msbuild 15 (#399)

* New: Build with Msbuild 15

* fixup! Msbuild 15

* fixup! appveyor build when changes
pull/391/merge
Qstick 6 years ago committed by GitHub
parent f9f3cfb1f5
commit e669e2262f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -54,4 +54,6 @@ only_commits:
- setup/ - setup/
- frontend/ - frontend/
- appveyor.yml - appveyor.yml
- build-appveyor.cake - build.sh
- test.sh
- appveyor-package.sh

@ -1,5 +1,5 @@
#! /bin/bash #! /bin/bash
msBuild='/c/Program Files (x86)/MSBuild/14.0/Bin' msBuildVersion='15.0'
outputFolder='./_output' outputFolder='./_output'
outputFolderLinux='./_output_linux' outputFolderLinux='./_output_linux'
outputFolderMacOS='./_output_macos' outputFolderMacOS='./_output_macos'
@ -19,6 +19,8 @@ artifactsFolderMacOS=$artifactsFolder/macos
artifactsFolderMacOSApp=$artifactsFolder/macos-app artifactsFolderMacOSApp=$artifactsFolder/macos-app
nuget='tools/nuget/nuget.exe'; nuget='tools/nuget/nuget.exe';
vswhere='tools/vswhere/vswhere.exe';
CheckExitCode() CheckExitCode()
{ {
"$@" "$@"
@ -74,8 +76,14 @@ AddJsonNet()
BuildWithMSBuild() BuildWithMSBuild()
{ {
installationPath=`$vswhere -latest -products \* -requires Microsoft.Component.MSBuild -property installationPath`
installationPath=${installationPath/C:\\/\/c\/}
installationPath=${installationPath//\\/\/}
msBuild="$installationPath/MSBuild/$msBuildVersion/Bin"
echo $msBuild
export PATH=$msBuild:$PATH export PATH=$msBuild:$PATH
CheckExitCode MSBuild.exe $slnFile //t:Clean //m CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Clean //m
$nuget restore $slnFile $nuget restore $slnFile
CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Build //m //p:AllowedReferenceRelatedFileExtensions=.pdb CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Build //m //p:AllowedReferenceRelatedFileExtensions=.pdb
} }
@ -83,9 +91,9 @@ BuildWithMSBuild()
BuildWithXbuild() BuildWithXbuild()
{ {
export MONO_IOMAP=case export MONO_IOMAP=case
CheckExitCode xbuild /t:Clean $slnFile CheckExitCode msbuild /t:Clean $slnFile
mono $nuget restore $slnFile mono $nuget restore $slnFile
CheckExitCode xbuild /p:Configuration=Release /p:Platform=x86 /t:Build /p:AllowedReferenceRelatedFileExtensions=.pdb $slnFile CheckExitCode msbuild /p:Configuration=Release /p:Platform=x86 /t:Build /p:AllowedReferenceRelatedFileExtensions=.pdb $slnFile
} }
LintUI() LintUI()

Binary file not shown.

Binary file not shown.
Loading…
Cancel
Save