Skip to content

Commit 828d8e3

Browse files
committed
Replace setting MDP path with copy over
- Required because VS tries to load MDP from the directory and then all the other DLLs are missing. - Should be reviewed upstream in order to pack all the directory.
1 parent b759f76 commit 828d8e3

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

azure-pipelines-templates/check-mdp-for-build.yml

+20-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,26 @@ steps:
6868
eq(variables['DownloadMDP'], true),
6969
ne(variables['MDP_BUILDID'], '')
7070
)
71-
displayName: Set MDP path
71+
displayName: Copy MDP to build tool
7272
inputs:
7373
targetType: 'inline'
7474
script: |
75-
Write-Host "##vso[task.setvariable variable=NF_MDP_MSBUILDTASK_PATH]$(Pipeline.Workspace)\mdp"
75+
# Find which VS version is installed
76+
$VsWherePath = "${env:PROGRAMFILES(X86)}\Microsoft Visual Studio\Installer\vswhere.exe"
77+
78+
Write-Output "VsWherePath is: $VsWherePath"
79+
80+
$VsInstance = $(&$VSWherePath -latest -property displayName)
81+
82+
Write-Output "Latest VS is: $VsInstance"
83+
84+
# copy MDP file to msbuild location
85+
$VsPath = $(&$VsWherePath -latest -property installationPath)
86+
87+
Write-Debug "Copy MDP DLL to msbuild location"
88+
89+
$msbuildPath = $VsPath + "\MSBuild"
90+
91+
$extensionPath = $msbuildPath + "\nanoFramework\v1.0"
92+
93+
Copy-Item -Path "${env:Pipeline_Workspace}\mdp" -Destination $msbuildPath -Recurse

azure-pipelines.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,6 @@ jobs:
12881288
persistCredentials: true
12891289

12901290
- template: azure-pipelines-templates/check-mscorlib-to-test.yml
1291-
- template: azure-pipelines-templates/check-mdp-for-build.yml
12921291

12931292
# Download nanoclr from build artifacts
12941293
- task: DownloadBuildArtifacts@1
@@ -1305,6 +1304,8 @@ jobs:
13051304
inputs:
13061305
GitHubToken: $(GitHubToken)
13071306

1307+
- template: azure-pipelines-templates/check-mdp-for-build.yml
1308+
13081309
- template: azure-pipelines-templates/install-nuget.yml@templates
13091310

13101311
- task: Cache@2

0 commit comments

Comments
 (0)