Skip to content

Commit 151d771

Browse files
author
Aditya Abhishek
committed
resolve comments
1 parent ca23d23 commit 151d771

5 files changed

Lines changed: 128 additions & 133 deletions

File tree

‎src/VirtualClient/Module.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@
157157

158158
<!-- YamlDotNet -->
159159
<YamlDotNet_PackageVersion>15.1.1</YamlDotNet_PackageVersion>
160-
161-
162-
163160

164161
</PropertyGroup>
165162

‎src/VirtualClient/VirtualClient.Contracts/Enumerations.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,27 @@ public enum InstructionsType
523523
ClientServerExit = 5
524524
}
525525

526+
/// <summary>
527+
/// Enumerates the types of objects stored in Azure Key Vault.
528+
/// </summary>
529+
public enum KeyVaultObjectType
530+
{
531+
/// <summary>
532+
/// Secret type KeyVault Object
533+
/// </summary>
534+
Secret,
535+
536+
/// <summary>
537+
/// Key type KeyVault Object
538+
/// </summary>
539+
Key,
540+
541+
/// <summary>
542+
/// Certificate type KeyVault Object
543+
/// </summary>
544+
Certificate
545+
}
546+
526547
/// <summary>
527548
/// Defines different Linux distribution
528549
/// </summary>

‎src/VirtualClient/VirtualClient.Contracts/KeyVaultObjectType.cs‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎src/VirtualClient/VirtualClient.Core.FunctionalTests/VirtualClient.Core.FunctionalTests.csproj‎

Lines changed: 105 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,130 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
5-
<IsPackable>false</IsPackable>
6-
<RunCodeAnalysis>false</RunCodeAnalysis>
7-
<RunAnalyzers>false</RunAnalyzers>
8-
<RootNamespace>VirtualClient</RootNamespace>
9-
</PropertyGroup>
10-
11-
12-
<ItemGroup>
13-
<PackageReference Include="Moq" Version="$(Moq_PackageVersion)" />
14-
<PackageReference Include="NUnit" Version="$(NUnit_PackageVersion)" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3TestAdapter_PackageVersion)" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(Microsoft_NET_Test_Sdk_PackageVersion)" />
17-
</ItemGroup>
18-
19-
<ItemGroup>
20-
<ProjectReference Include="..\VirtualClient.Core\VirtualClient.Core.csproj" />
21-
<ProjectReference Include="..\VirtualClient.TestExtensions\VirtualClient.TestExtensions.csproj" />
22-
</ItemGroup>
23-
24-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Module.props))\Module.props" />
25-
26-
<PropertyGroup>
27-
<!-- We build on-->
28-
<PlatformAlias>win</PlatformAlias>
29-
<PlatformAlias Condition="'$(OS)' == 'Unix'">linux</PlatformAlias>
30-
<ArchitectureAlias>x64</ArchitectureAlias>
31-
<ArchitectureAlias Condition="'$(Platform)' == 'ARM64'">arm64</ArchitectureAlias>
32-
<PlatformArchitectureName>$(PlatformAlias)-$(ArchitectureAlias)</PlatformArchitectureName>
33-
</PropertyGroup>
34-
<!--
3+
<PropertyGroup>
4+
<TargetFramework>net9.0</TargetFramework>
5+
<IsPackable>false</IsPackable>
6+
<RunCodeAnalysis>false</RunCodeAnalysis>
7+
<RunAnalyzers>false</RunAnalyzers>
8+
<RootNamespace>VirtualClient</RootNamespace>
9+
</PropertyGroup>
10+
11+
12+
<ItemGroup>
13+
<PackageReference Include="Moq" Version="$(Moq_PackageVersion)" />
14+
<PackageReference Include="NUnit" Version="$(NUnit_PackageVersion)" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3TestAdapter_PackageVersion)" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(Microsoft_NET_Test_Sdk_PackageVersion)" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<ProjectReference Include="..\VirtualClient.Core\VirtualClient.Core.csproj" />
21+
<ProjectReference Include="..\VirtualClient.TestExtensions\VirtualClient.TestExtensions.csproj" />
22+
</ItemGroup>
23+
24+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Module.props))\Module.props" />
25+
26+
<PropertyGroup>
27+
<!-- We build on-->
28+
<PlatformAlias>win</PlatformAlias>
29+
<PlatformAlias Condition="'$(OS)' == 'Unix'">linux</PlatformAlias>
30+
<ArchitectureAlias>x64</ArchitectureAlias>
31+
<ArchitectureAlias Condition="'$(Platform)' == 'ARM64'">arm64</ArchitectureAlias>
32+
<PlatformArchitectureName>$(PlatformAlias)-$(ArchitectureAlias)</PlatformArchitectureName>
33+
</PropertyGroup>
34+
<!--
3535
Extensions Packages in Default Location
3636
-->
37-
<Target Name="CopyExtensionsPackagesToDefaultLocation" AfterTargets="Build">
38-
<Copy
39-
SourceFiles="$(OutputPath)VirtualClient.Core.FunctionalTests.dll"
40-
DestinationFiles="$(OutputPath)packages\extensions_package_1\$(PlatformArchitectureName)\Example.VirtualClient.Extensions_1.dll"
41-
ContinueOnError="false"
37+
<Target Name="CopyExtensionsPackagesToDefaultLocation" AfterTargets="Build">
38+
<Copy
39+
SourceFiles="$(OutputPath)VirtualClient.Core.FunctionalTests.dll"
40+
DestinationFiles="$(OutputPath)packages\extensions_package_1\$(PlatformArchitectureName)\Example.VirtualClient.Extensions_1.dll"
41+
ContinueOnError="false"
4242
/>
43-
44-
<Copy
45-
SourceFiles="$(ProjectDir)profiles\EXAMPLE-EXTENSIONS-1.json"
46-
DestinationFiles="$(OutputPath)packages\extensions_package_1\$(PlatformArchitectureName)\profiles\EXAMPLE-EXTENSIONS-1.json"
47-
ContinueOnError="false"
43+
44+
<Copy
45+
SourceFiles="$(ProjectDir)profiles\EXAMPLE-EXTENSIONS-1.json"
46+
DestinationFiles="$(OutputPath)packages\extensions_package_1\$(PlatformArchitectureName)\profiles\EXAMPLE-EXTENSIONS-1.json"
47+
ContinueOnError="false"
4848
/>
49-
50-
<Copy
51-
SourceFiles="$(ProjectDir)profiles\EXAMPLE-EXTENSIONS-1.yml"
52-
DestinationFiles="$(OutputPath)packages\extensions_package_1\$(PlatformArchitectureName)\profiles\EXAMPLE-EXTENSIONS-1.yml"
53-
ContinueOnError="false"
49+
50+
<Copy
51+
SourceFiles="$(ProjectDir)profiles\EXAMPLE-EXTENSIONS-1.yml"
52+
DestinationFiles="$(OutputPath)packages\extensions_package_1\$(PlatformArchitectureName)\profiles\EXAMPLE-EXTENSIONS-1.yml"
53+
ContinueOnError="false"
5454
/>
55-
56-
<Copy
57-
SourceFiles="$(ProjectDir)profiles\EXAMPLE-EXTENSIONS-2.yaml"
58-
DestinationFiles="$(OutputPath)packages\extensions_package_1\$(PlatformArchitectureName)\profiles\EXAMPLE-EXTENSIONS-2.yaml"
59-
ContinueOnError="false"
55+
56+
<Copy
57+
SourceFiles="$(ProjectDir)profiles\EXAMPLE-EXTENSIONS-2.yaml"
58+
DestinationFiles="$(OutputPath)packages\extensions_package_1\$(PlatformArchitectureName)\profiles\EXAMPLE-EXTENSIONS-2.yaml"
59+
ContinueOnError="false"
6060
/>
61-
62-
<Copy
63-
SourceFiles="$(ProjectDir)extensions_package_1.vcpkg"
64-
DestinationFiles="$(OutputPath)packages\extensions_package_1\extensions_package_1.vcpkg"
65-
ContinueOnError="false"
61+
62+
<Copy
63+
SourceFiles="$(ProjectDir)extensions_package_1.vcpkg"
64+
DestinationFiles="$(OutputPath)packages\extensions_package_1\extensions_package_1.vcpkg"
65+
ContinueOnError="false"
6666
/>
67+
68+
</Target>
6769

68-
</Target>
69-
70-
<!--
70+
<!--
7171
Extensions Packages in User-Defined/Non-Default Location (e.g. VC_PACKAGES_PATH).
7272
-->
73-
<Target Name="CopyExtensionsPackagesToNonDefaultLocation" AfterTargets="Build">
74-
<Copy
75-
SourceFiles="$(OutputPath)VirtualClient.Core.FunctionalTests.dll"
76-
DestinationFiles="$(OutputPath)extensions_packages\extensions_package_2\$(PlatformArchitectureName)\Example.VirtualClient.Extensions_2.dll"
77-
ContinueOnError="false"
73+
<Target Name="CopyExtensionsPackagesToNonDefaultLocation" AfterTargets="Build">
74+
<Copy
75+
SourceFiles="$(OutputPath)VirtualClient.Core.FunctionalTests.dll"
76+
DestinationFiles="$(OutputPath)extensions_packages\extensions_package_2\$(PlatformArchitectureName)\Example.VirtualClient.Extensions_2.dll"
77+
ContinueOnError="false"
7878
/>
79-
80-
<Copy
81-
SourceFiles="$(ProjectDir)profiles\EXAMPLE-EXTENSIONS-1.json"
82-
DestinationFiles="$(OutputPath)extensions_packages\extensions_package_2\$(PlatformArchitectureName)\profiles\EXAMPLE-EXTENSIONS-2.json"
83-
ContinueOnError="false"
79+
80+
<Copy
81+
SourceFiles="$(ProjectDir)profiles\EXAMPLE-EXTENSIONS-1.json"
82+
DestinationFiles="$(OutputPath)extensions_packages\extensions_package_2\$(PlatformArchitectureName)\profiles\EXAMPLE-EXTENSIONS-2.json"
83+
ContinueOnError="false"
8484
/>
85-
86-
<Copy
87-
SourceFiles="$(ProjectDir)extensions_package_2.vcpkg"
88-
DestinationFiles="$(OutputPath)extensions_packages\extensions_package_2\extensions_package_2.vcpkg"
89-
ContinueOnError="false"
85+
86+
<Copy
87+
SourceFiles="$(ProjectDir)extensions_package_2.vcpkg"
88+
DestinationFiles="$(OutputPath)extensions_packages\extensions_package_2\extensions_package_2.vcpkg"
89+
ContinueOnError="false"
9090
/>
91-
92-
<Copy
93-
SourceFiles="$(OutputPath)VirtualClient.Core.FunctionalTests.dll"
94-
DestinationFiles="$(OutputPath)extensions_packages\extensions_package_3\$(PlatformArchitectureName)\Example.VirtualClient.Extensions_3.dll"
95-
ContinueOnError="false"
91+
92+
<Copy
93+
SourceFiles="$(OutputPath)VirtualClient.Core.FunctionalTests.dll"
94+
DestinationFiles="$(OutputPath)extensions_packages\extensions_package_3\$(PlatformArchitectureName)\Example.VirtualClient.Extensions_3.dll"
95+
ContinueOnError="false"
9696
/>
97-
98-
<Copy
99-
SourceFiles="$(ProjectDir)profiles\EXAMPLE-EXTENSIONS-1.yml"
100-
DestinationFiles="$(OutputPath)extensions_packages\extensions_package_3\$(PlatformArchitectureName)\profiles\EXAMPLE-EXTENSIONS-3.yml"
101-
ContinueOnError="false"
97+
98+
<Copy
99+
SourceFiles="$(ProjectDir)profiles\EXAMPLE-EXTENSIONS-1.yml"
100+
DestinationFiles="$(OutputPath)extensions_packages\extensions_package_3\$(PlatformArchitectureName)\profiles\EXAMPLE-EXTENSIONS-3.yml"
101+
ContinueOnError="false"
102102
/>
103-
104-
<Copy
105-
SourceFiles="$(ProjectDir)extensions_package_3.vcpkg"
106-
DestinationFiles="$(OutputPath)extensions_packages\extensions_package_3\extensions_package_3.vcpkg"
107-
ContinueOnError="false"
103+
104+
<Copy
105+
SourceFiles="$(ProjectDir)extensions_package_3.vcpkg"
106+
DestinationFiles="$(OutputPath)extensions_packages\extensions_package_3\extensions_package_3.vcpkg"
107+
ContinueOnError="false"
108108
/>
109+
110+
</Target>
109111

110-
</Target>
111-
112-
<!--
112+
<!--
113113
Extensions Binaries in User-Defined/Non-Default Location (e.g. VC_LIBRARY_PATH).
114114
-->
115-
<Target Name="CopyExtensionsBinariesToNonDefaultLocationInOutput" AfterTargets="Build">
116-
<Copy
117-
SourceFiles="$(OutputPath)VirtualClient.Core.FunctionalTests.dll"
118-
DestinationFiles="$(OutputPath)extensions\extensions_1\Example.VirtualClient.Extensions_4.dll"
119-
ContinueOnError="false"
115+
<Target Name="CopyExtensionsBinariesToNonDefaultLocationInOutput" AfterTargets="Build">
116+
<Copy
117+
SourceFiles="$(OutputPath)VirtualClient.Core.FunctionalTests.dll"
118+
DestinationFiles="$(OutputPath)extensions\extensions_1\Example.VirtualClient.Extensions_4.dll"
119+
ContinueOnError="false"
120120
/>
121-
122-
<Copy
123-
SourceFiles="$(OutputPath)VirtualClient.Core.FunctionalTests.dll"
124-
DestinationFiles="$(OutputPath)extensions\extensions_2\Example.VirtualClient.Extensions_5.dll"
125-
ContinueOnError="false"
121+
122+
<Copy
123+
SourceFiles="$(OutputPath)VirtualClient.Core.FunctionalTests.dll"
124+
DestinationFiles="$(OutputPath)extensions\extensions_2\Example.VirtualClient.Extensions_5.dll"
125+
ContinueOnError="false"
126126
/>
127-
128-
</Target>
127+
128+
</Target>
129129

130130
</Project>

‎website/docs/guides/0620-integration-key-vault.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Virtual Client can retrieve secrets and certificates from Azure Key Vault for us
3232

3333
## Authentication Preliminaries
3434

35-
### Referencing Certificates on Linux
35+
### Installing Certificates on Linux
3636

3737
Virtual Client is a .NET application. Certificates used on a Linux system must be X.509 certificates containing a private key (e.g., PKCS#12, *.pfx). Certificates must be installed in the expected location for the user running Virtual Client:
3838

@@ -43,7 +43,7 @@ Ensure the user has read/write access to this directory and the certificate file
4343

4444
sudo chmod -R 700 /home/{user}/.dotnet/corefx/cryptography/x509stores/my/
4545

46-
### Referencing Certificates on Windows
46+
### Installing Certificates on Windows
4747

4848
Virtual Client will look for certificates in these stores:
4949

0 commit comments

Comments
 (0)