diff --git a/Directory.Packages.props b/Directory.Packages.props index f01eb48133..fa0039bb88 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,6 +9,7 @@ + diff --git a/build/template-build-and-prep-automation.yaml b/build/template-build-and-prep-automation.yaml index dffe3b4c47..a1f22fcffe 100644 --- a/build/template-build-and-prep-automation.yaml +++ b/build/template-build-and-prep-automation.yaml @@ -53,6 +53,13 @@ steps: Contents: '**/bin/**/**' TargetFolder: '$(Build.SourcesDirectory)/WAM' +- task: CopyFiles@2 + displayName: 'Copy Managed Identity DevApp Dlls' + inputs: + SourceFolder: 'tests\devapps\Managed Identity apps\ManagedIdentityAppVM' + Contents: '**\bin\**\*' + TargetFolder: '$(Build.SourcesDirectory)/ManagedIdentityAppVM' + - task: PublishPipelineArtifact@1 displayName: 'Publish Artifact: drop' inputs: @@ -112,6 +119,16 @@ steps: $errors += "Failed to find Linux runtime files in : " + $SearchInFolder + $app + "`n"; } + # Managed Identity app runtime DLL check + $managedIdentityFolder = Join-Path $(Build.SourcesDirectory) 'ManagedIdentityAppVM' + $managedIdentityDll = Join-Path $managedIdentityFolder 'bin\Release\net8.0\runtimes\win-x64\native\AttestationClientLib.dll' + + Write-Host "Checking: $managedIdentityDll" + if (-not (Test-Path -Path $managedIdentityDll -PathType Leaf)) + { + $errors += "Failed to find AttestationClientLib.dll at: $managedIdentityDll`n" + } + #exit if there are errors IF (![string]::IsNullOrWhitespace($errors)) { @@ -123,6 +140,3 @@ steps: { Write-Host "File check complete. All msalruntime dlls are present." } - - - diff --git a/src/client/Microsoft.Identity.Client.KeyAttestation/Microsoft.Identity.Client.KeyAttestation.csproj b/src/client/Microsoft.Identity.Client.KeyAttestation/Microsoft.Identity.Client.KeyAttestation.csproj index b721050b63..e786f67ae9 100644 --- a/src/client/Microsoft.Identity.Client.KeyAttestation/Microsoft.Identity.Client.KeyAttestation.csproj +++ b/src/client/Microsoft.Identity.Client.KeyAttestation/Microsoft.Identity.Client.KeyAttestation.csproj @@ -37,6 +37,10 @@ + + + + @@ -46,4 +50,4 @@ - \ No newline at end of file + diff --git a/tests/devapps/Managed Identity apps/ManagedIdentityAppVM/ManagedIdentityAppVM.csproj b/tests/devapps/Managed Identity apps/ManagedIdentityAppVM/ManagedIdentityAppVM.csproj index 6cfb7f98d1..0086c2adcb 100644 --- a/tests/devapps/Managed Identity apps/ManagedIdentityAppVM/ManagedIdentityAppVM.csproj +++ b/tests/devapps/Managed Identity apps/ManagedIdentityAppVM/ManagedIdentityAppVM.csproj @@ -5,6 +5,9 @@ net8.0 enable enable + + + true @@ -12,4 +15,18 @@ + + + + + <_AttestationClientLib>$(TargetDir)runtimes/win-x64/native/AttestationClientLib.dll + + + + + +