diff --git a/make.ps1 b/make.ps1 index ace454293..0a016ecb9 100755 --- a/make.ps1 +++ b/make.ps1 @@ -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")))) { @@ -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) { diff --git a/src/dlr b/src/dlr index 828bdb47d..632a9e0c9 160000 --- a/src/dlr +++ b/src/dlr @@ -1 +1 @@ -Subproject commit 828bdb47d610b07ffaf6be657b810a547992839c +Subproject commit 632a9e0c91a726b84ca06bd45bb53961b69e6dcb