From 18c4b6f12b0207755509bbd44761c98617310fd5 Mon Sep 17 00:00:00 2001 From: "Erich(Renyong) Wang" Date: Mon, 8 Jun 2020 13:07:47 +0800 Subject: [PATCH] fix random failure by changing from referencing helper project to contain source code directly --- eng/Azure.Management.Test.targets | 39 +++++++++++++++++++ eng/Directory.Build.Data.targets | 2 + .../Azure.Management.KeyVault.sln | 28 ------------- .../Azure.Management.KeyVault.Tests.csproj | 5 ++- .../tests/Properties/AssemblyInfo.cs | 4 ++ 5 files changed, 48 insertions(+), 30 deletions(-) create mode 100644 eng/Azure.Management.Test.targets create mode 100644 sdk/keyvault/Azure.Management.KeyVault/tests/Properties/AssemblyInfo.cs diff --git a/eng/Azure.Management.Test.targets b/eng/Azure.Management.Test.targets new file mode 100644 index 000000000000..fdeba55ddfa1 --- /dev/null +++ b/eng/Azure.Management.Test.targets @@ -0,0 +1,39 @@ + + + $(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Graph.Rbac/src + $(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Management.Resources.2017_05/src + $(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Management.Compute.2019_12/src + $(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Management.Network.2020_04/src + $(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Management.Storage.2019_06/src + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Directory.Build.Data.targets b/eng/Directory.Build.Data.targets index ca6e61e1f070..5c175f79409f 100644 --- a/eng/Directory.Build.Data.targets +++ b/eng/Directory.Build.Data.targets @@ -107,6 +107,8 @@ + + $(MSBuildThisFileDirectory)Packages.Data.props diff --git a/sdk/keyvault/Azure.Management.KeyVault/Azure.Management.KeyVault.sln b/sdk/keyvault/Azure.Management.KeyVault/Azure.Management.KeyVault.sln index 945ee9f0f828..389fe2727157 100644 --- a/sdk/keyvault/Azure.Management.KeyVault/Azure.Management.KeyVault.sln +++ b/sdk/keyvault/Azure.Management.KeyVault/Azure.Management.KeyVault.sln @@ -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 @@ -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 diff --git a/sdk/keyvault/Azure.Management.KeyVault/tests/Azure.Management.KeyVault.Tests.csproj b/sdk/keyvault/Azure.Management.KeyVault/tests/Azure.Management.KeyVault.Tests.csproj index dcd44f87153f..ce5064b671c5 100644 --- a/sdk/keyvault/Azure.Management.KeyVault/tests/Azure.Management.KeyVault.Tests.csproj +++ b/sdk/keyvault/Azure.Management.KeyVault/tests/Azure.Management.KeyVault.Tests.csproj @@ -1,7 +1,8 @@  + + Rbac1.6;Resources201705; + - - diff --git a/sdk/keyvault/Azure.Management.KeyVault/tests/Properties/AssemblyInfo.cs b/sdk/keyvault/Azure.Management.KeyVault/tests/Properties/AssemblyInfo.cs new file mode 100644 index 000000000000..d82c124010cd --- /dev/null +++ b/sdk/keyvault/Azure.Management.KeyVault/tests/Properties/AssemblyInfo.cs @@ -0,0 +1,4 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +[assembly: Azure.Core.AzureResourceProviderNamespace("Microsoft.KeyVault")]