Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
1 change: 1 addition & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<!-- Add packages, then highlight all lines and go to Edit > Advanced > Sort Lines -->
<ItemGroup>
<!-- Packages for the main MSAL code -->
<PackageVersion Include="Microsoft.Azure.Security.KeyGuardAttestation" Version="1.1.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.RulesetToEditorconfigConverter" Version="3.3.3" PrivateAssets="All" />
<PackageVersion Include="Microsoft.CSharp" Version="4.5.0" />
<PackageVersion Include="Microsoft.Identity.Client.NativeInterop" Version="$(MSALRuntimeNativeInteropVersion)" IncludeAssets="all" />
Expand Down
19 changes: 16 additions & 3 deletions build/template-build-and-prep-automation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -112,6 +119,15 @@ steps:
$errors += "Failed to find Linux runtime files in : " + $SearchInFolder + $app + "`n";
}

# Managed Identity app runtime DLL check
Comment thread
bgavrilMS marked this conversation as resolved.
$managedIdentityFolder = Join-Path $(Build.SourcesDirectory) 'ManagedIdentityAppVM'
$managedIdentityDll = Join-Path $managedIdentityFolder 'bin\Release\net8.0\AttestationClientLib.dll'
Write-Host $managedIdentityDll
if (-not(Test-Path -Path $managedIdentityDll -PathType Leaf))
{
$errors += "Failed to find AttestationClientLib.dll in : " + $managedIdentityFolder + "`n";
}

#exit if there are errors
IF (![string]::IsNullOrWhitespace($errors))
{
Expand All @@ -123,6 +139,3 @@ steps:
{
Write-Host "File check complete. All msalruntime dlls are present."
}



Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
<Product>Microsoft Authentication Library</Product>
</PropertyGroup>

<!-- ─── Credential Guard package directory ────────────────────────────── -->
<PropertyGroup>
<_KeyGuardPkgDir>$(NuGetPackageRoot)microsoft.azure.security.keyguardattestation\1.1.4\</_KeyGuardPkgDir>
</PropertyGroup>

<!-- ─── File inclusions ───────────────────────────────────────────────── -->
<ItemGroup>
<Compile Include="..\Microsoft.Identity.Client\Properties\InternalsVisibleTo.cs" Link="Properties\InternalsVisibleTo.cs" />
Expand All @@ -37,10 +42,24 @@
<ProjectReference Include="..\Microsoft.Identity.Client\Microsoft.Identity.Client.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Security.KeyGuardAttestation" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetStandard)'">
<PackageReference Include="System.Security.Cryptography.Cng" />
</ItemGroup>

<!-- ─── Native DLL handling ────────────────────────────────────────────── -->
Comment thread
gladjohn marked this conversation as resolved.
Outdated
<ItemGroup Condition="'$(OS)' == 'Windows_NT' and Exists('$(_KeyGuardPkgDir)build\native\lib\x64\AttestationClientLib.dll')">
Comment thread
gladjohn marked this conversation as resolved.
Outdated
<None Include="$(_KeyGuardPkgDir)build\native\lib\x64\AttestationClientLib.dll">
<TargetPath>AttestationClientLib.dll</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<Visible>false</Visible>
</None>
</ItemGroup>

<ItemGroup Label="For public api analyzer support">
<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
Expand Down
Loading