-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix random failure by changing from referencing helper project to con…
…tain source code directly
- Loading branch information
1 parent
d6ea0ea
commit 18c4b6f
Showing
5 changed files
with
48 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> | ||
| <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> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 3 additions & 2 deletions
5
sdk/keyvault/Azure.Management.KeyVault/tests/Azure.Management.KeyVault.Tests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
4 changes: 4 additions & 0 deletions
4
sdk/keyvault/Azure.Management.KeyVault/tests/Properties/AssemblyInfo.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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")] |