Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 1 addition & 25 deletions make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,6 @@ $ErrorActionPreference="Continue"

$_BASEDIR = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent

function EnsureMSBuild() {
$_VSWHERE = [System.IO.Path]::Combine(${env:ProgramFiles(x86)}, 'Microsoft Visual Studio\Installer\vswhere.exe')
$_VSINSTPATH = ''

if([System.IO.File]::Exists($_VSWHERE)) {
$_VSINSTPATH = & "$_VSWHERE" -latest -requires Microsoft.Component.MSBuild -property installationPath
} else {
Write-Error "Visual Studio 2022 17.14.26 or later is required"
Exit 1
}

if(-not [System.IO.Directory]::Exists($_VSINSTPATH)) {
Write-Error "Could not determine installation path to Visual Studio"
Exit 1
}

if([System.IO.File]::Exists([System.IO.Path]::Combine($_VSINSTPATH, 'MSBuild\Current\Bin\MSBuild.exe'))) {
$_MSBUILDPATH = [System.IO.Path]::Combine($_VSINSTPATH, 'MSBuild\Current\Bin\')
if ($env:PATH -split ';' -notcontains $_MSBUILDPATH) {
$env:PATH = [String]::Join(';', $env:PATH, $_MSBUILDPATH)
}
}
}

function Main([String] $target, [String] $configuration) {
# verify that the DLR submodule has been initialized
if(![System.Linq.Enumerable]::Any([System.IO.Directory]::EnumerateFileSystemEntries([System.IO.Path]::Combine($_BASEDIR, "src/dlr")))) {
Expand Down Expand Up @@ -75,7 +51,7 @@ function GenerateRunSettings([String] $framework, [String] $platform, [String] $
$doc.AppendChild($dec) | Out-Null

$runSettings = $doc.CreateElement("RunSettings")

$runConfiguration = $doc.CreateElement("RunConfiguration")
$runSettings.AppendChild($runConfiguration) | Out-Null
if ($platform) {
Expand Down
2 changes: 1 addition & 1 deletion src/dlr
Submodule dlr updated 1 files
+0 −25 make.ps1
Loading