Skip to content

Commit 81d0e62

Browse files
TIHanbaronfel
authored andcommitted
Added some utilities that will be helpful for testing (#7321)
1 parent a2edefb commit 81d0e62

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

eng/Build.ps1

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,25 @@ function Prepare-TempDir() {
277277
Copy-Item (Join-Path $RepoRoot "tests\Resources\Directory.Build.targets") $TempDir
278278
}
279279

280+
function EnablePreviewSdks() {
281+
if (Test-Path variable:global:_MSBuildExe) {
282+
return
283+
}
284+
$vsInfo = LocateVisualStudio
285+
if ($vsInfo -eq $null) {
286+
# Preview SDKs are allowed when no Visual Studio instance is installed
287+
return
288+
}
289+
290+
$vsId = $vsInfo.instanceId
291+
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
292+
293+
$instanceDir = Join-Path ${env:USERPROFILE} "AppData\Local\Microsoft\VisualStudio\$vsMajorVersion.0_$vsId"
294+
Create-Directory $instanceDir
295+
$sdkFile = Join-Path $instanceDir "sdk.txt"
296+
'UsePreviews=True' | Set-Content $sdkFile
297+
}
298+
280299
try {
281300
Process-Arguments
282301

@@ -288,6 +307,7 @@ try {
288307

289308
if ($ci) {
290309
Prepare-TempDir
310+
EnablePreviewSdks
291311

292312
# enable us to build netcoreapp2.1 binaries
293313
$global:_DotNetInstallDir = Join-Path $RepoRoot ".dotnet"

eng/Versions.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@
100100
<MicrosoftCodeAnalysisEditorFeaturesWpfVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesWpfVersion>
101101
<MicrosoftCodeAnalysisExternalAccessFSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisExternalAccessFSharpVersion>
102102
<MicrosoftCodeAnalysisWorkspacesCommonVersion>$(RoslynVersion)</MicrosoftCodeAnalysisWorkspacesCommonVersion>
103+
<MicrosoftCodeAnalysisCSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCSharpVersion>
104+
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.17</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
103105
<MicrosoftVisualStudioLanguageServicesVersion>$(RoslynVersion)</MicrosoftVisualStudioLanguageServicesVersion>
104106
<!-- Microsoft Build packages -->
105107
<MicrosoftBuildOverallPackagesVersion>16.0.461</MicrosoftBuildOverallPackagesVersion>
@@ -166,7 +168,8 @@
166168
<MicrosoftCompositionVersion>1.0.30</MicrosoftCompositionVersion>
167169
<MicrosoftMSXMLVersion>8.0.0-alpha</MicrosoftMSXMLVersion>
168170
<MicrosoftNetCompilersVersion>2.7.0</MicrosoftNetCompilersVersion>
169-
<MicrosoftNETCoreILDAsmVersion>2.0.3</MicrosoftNETCoreILDAsmVersion>
171+
<MicrosoftNETCoreILDAsmVersion>3.0.0-preview-27318-01</MicrosoftNETCoreILDAsmVersion>
172+
<MicrosoftNETCoreILAsmVersion>3.0.0-preview-27318-01</MicrosoftNETCoreILAsmVersion>
170173
<MicrosoftNETTestSdkVersion>15.8.0</MicrosoftNETTestSdkVersion>
171174
<MicrosoftVisualFSharpTypeProvidersRedistVersion>1.0.0</MicrosoftVisualFSharpTypeProvidersRedistVersion>
172175
<MicrosoftWin32RegistryVersion>4.3.0</MicrosoftWin32RegistryVersion>

0 commit comments

Comments
 (0)