Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reference source code of test helper projects for KeyVault test project #12498

Merged
merged 1 commit into from
Jun 9, 2020
Merged
Show file tree
Hide file tree
Changes from all 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
39 changes: 39 additions & 0 deletions eng/Azure.Management.Test.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<RbacSharedSources>$(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Graph.Rbac/src</RbacSharedSources>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is your plan to still move these under "common"? Also we still need to rename at least the Azure.Graph.Rbac directory has it is causes issue because it looks like a track2 library but it isn't.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets please file a tracking issue to move this after the preview work is out.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use #12209 to track the request.

<Resources201705SharedSources>$(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Management.Resources.2017_05/src</Resources201705SharedSources>
<Compute201912SharedSources>$(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Management.Compute.2019_12/src</Compute201912SharedSources>
<Network202004SharedSources>$(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Management.Network.2020_04/src</Network202004SharedSources>
<Storage201906SharedSources>$(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Management.Storage.2019_06/src</Storage201906SharedSources>
</PropertyGroup>

<ItemGroup Condition="$(TestHelperProjects.Contains('Rbac1.6'))">
<Compile Include="$(RbacSharedSources)/**/*.cs"
Link="Rbac/%(RecursiveDir)%(Filename)%(Extension)"
Exclude="$(RbacSharedSources)/Properties/AssemblyInfo.cs" />
</ItemGroup>

<ItemGroup Condition="$(TestHelperProjects.Contains('Resources201705'))">
<Compile Include="$(Resources201705SharedSources)/**/*.cs"
Link="Resources201705/%(RecursiveDir)%(Filename)%(Extension)"
Exclude="$(Resources201705SharedSources)/Properties/AssemblyInfo.cs" />
</ItemGroup>

<ItemGroup Condition="$(TestHelperProjects.Contains('Compute201912'))">
<Compile Include="$(Compute201912SharedSources)/**/*.cs"
Link="Compute201912/%(RecursiveDir)%(Filename)%(Extension)"
Exclude="$(Compute201912SharedSources)/Properties/AssemblyInfo.cs" />
</ItemGroup>

<ItemGroup Condition="$(TestHelperProjects.Contains('Network202004'))">
<Compile Include="$(Network202004SharedSources)/**/*.cs"
Link="Network202004/%(RecursiveDir)%(Filename)%(Extension)"
Exclude="$(Network202004SharedSources)/Properties/AssemblyInfo.cs" />
</ItemGroup>

<ItemGroup Condition="$(TestHelperProjects.Contains('Storage201906'))">
<Compile Include="$(Storage201906SharedSources)/**/*.cs"
Link="Storage201906/%(RecursiveDir)%(Filename)%(Extension)"
Exclude="$(Storage201906SharedSources)/Properties/AssemblyInfo.cs" />
</ItemGroup>
Comment on lines +10 to +38
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a good solution, but is this going to scale as you add more management sources? Or is this only temporary?

</Project>
2 changes: 2 additions & 0 deletions eng/Directory.Build.Data.targets
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@

<Import Project="TestFramework.targets" Condition="'$(IsTestProject)' == 'true'"/>

<Import Project="Azure.Management.Test.targets" Condition="'$(IsMgmtClientLibrary)' == 'true' and '$(IsTestProject)' == 'true'" />

<!-- CentralPackageVersions properties -->
<PropertyGroup>
<CentralPackagesFile>$(MSBuildThisFileDirectory)Packages.Data.props</CentralPackagesFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core", "..\..\core\Az
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Identity", "..\..\identity\Azure.Identity\src\Azure.Identity.csproj", "{CDBD55B6-0742-464F-8188-3BF17006FA34}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Graph.Rbac", "..\..\testcommon\Azure.Graph.Rbac\src\Azure.Graph.Rbac.csproj", "{4CACB10F-8A47-4BF5-9AA7-C8303D8E4BD2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Management.Resources", "..\..\testcommon\Azure.Management.Resources.2017_05\src\Azure.Management.Resources.csproj", "{C6E0B5FC-1382-4BBC-BE76-E7B484C60E52}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -87,30 +83,6 @@ Global
{CDBD55B6-0742-464F-8188-3BF17006FA34}.Release|x64.Build.0 = Release|Any CPU
{CDBD55B6-0742-464F-8188-3BF17006FA34}.Release|x86.ActiveCfg = Release|Any CPU
{CDBD55B6-0742-464F-8188-3BF17006FA34}.Release|x86.Build.0 = Release|Any CPU
{4CACB10F-8A47-4BF5-9AA7-C8303D8E4BD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4CACB10F-8A47-4BF5-9AA7-C8303D8E4BD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4CACB10F-8A47-4BF5-9AA7-C8303D8E4BD2}.Debug|x64.ActiveCfg = Debug|Any CPU
{4CACB10F-8A47-4BF5-9AA7-C8303D8E4BD2}.Debug|x64.Build.0 = Debug|Any CPU
{4CACB10F-8A47-4BF5-9AA7-C8303D8E4BD2}.Debug|x86.ActiveCfg = Debug|Any CPU
{4CACB10F-8A47-4BF5-9AA7-C8303D8E4BD2}.Debug|x86.Build.0 = Debug|Any CPU
{4CACB10F-8A47-4BF5-9AA7-C8303D8E4BD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4CACB10F-8A47-4BF5-9AA7-C8303D8E4BD2}.Release|Any CPU.Build.0 = Release|Any CPU
{4CACB10F-8A47-4BF5-9AA7-C8303D8E4BD2}.Release|x64.ActiveCfg = Release|Any CPU
{4CACB10F-8A47-4BF5-9AA7-C8303D8E4BD2}.Release|x64.Build.0 = Release|Any CPU
{4CACB10F-8A47-4BF5-9AA7-C8303D8E4BD2}.Release|x86.ActiveCfg = Release|Any CPU
{4CACB10F-8A47-4BF5-9AA7-C8303D8E4BD2}.Release|x86.Build.0 = Release|Any CPU
{C6E0B5FC-1382-4BBC-BE76-E7B484C60E52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C6E0B5FC-1382-4BBC-BE76-E7B484C60E52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C6E0B5FC-1382-4BBC-BE76-E7B484C60E52}.Debug|x64.ActiveCfg = Debug|Any CPU
{C6E0B5FC-1382-4BBC-BE76-E7B484C60E52}.Debug|x64.Build.0 = Debug|Any CPU
{C6E0B5FC-1382-4BBC-BE76-E7B484C60E52}.Debug|x86.ActiveCfg = Debug|Any CPU
{C6E0B5FC-1382-4BBC-BE76-E7B484C60E52}.Debug|x86.Build.0 = Debug|Any CPU
{C6E0B5FC-1382-4BBC-BE76-E7B484C60E52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C6E0B5FC-1382-4BBC-BE76-E7B484C60E52}.Release|Any CPU.Build.0 = Release|Any CPU
{C6E0B5FC-1382-4BBC-BE76-E7B484C60E52}.Release|x64.ActiveCfg = Release|Any CPU
{C6E0B5FC-1382-4BBC-BE76-E7B484C60E52}.Release|x64.Build.0 = Release|Any CPU
{C6E0B5FC-1382-4BBC-BE76-E7B484C60E52}.Release|x86.ActiveCfg = Release|Any CPU
{C6E0B5FC-1382-4BBC-BE76-E7B484C60E52}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TestHelperProjects>Rbac1.6;Resources201705;</TestHelperProjects>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\testcommon\Azure.Graph.Rbac\src\Azure.Graph.Rbac.csproj" />
<ProjectReference Include="..\..\..\testcommon\Azure.Management.Resources.2017_05\src\Azure.Management.Resources.csproj" />
<ProjectReference Include="..\src\Azure.Management.KeyVault.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

[assembly: Azure.Core.AzureResourceProviderNamespace("Microsoft.KeyVault")]