Skip to content

Commit

Permalink
Renaming KV directory structure (#3083)
Browse files Browse the repository at this point in the history
* Rearranging kV dir structure

* fixing xml namespace issue and adjusting KV directory paths

* adjusting xml namespaces

* adjusting additional xml namespaces
  • Loading branch information
shahabhijeet authored Apr 18, 2017
1 parent 738a18d commit 9b0c880
Show file tree
Hide file tree
Showing 54 changed files with 46 additions and 18 deletions.
2 changes: 1 addition & 1 deletion AzSdk.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project ToolsVersion="15.0">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- <Import Project="tools\buildTargets\common.Build.props"/> -->
<!-- <Import Project="tools\buildTargets\common.NugetPackage.props" /> -->
</Project>
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="dirs.proj" />


Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="tools\buildTargets\common.targets" />


Expand Down
2 changes: 1 addition & 1 deletion build.proj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="directory.Build.props" />
<Import Project="directory.Build.targets" />
<Import Project="test.props" />
Expand Down
2 changes: 1 addition & 1 deletion dirs.proj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="src\dirs.proj" />
<!-- Import Condition="Exists('\dir.proj')" Project="\dir.proj" / -->
</Project>
2 changes: 1 addition & 1 deletion src/SDKs/AzSdk.reference.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project ToolsVersion="15.0">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.props'))" />
<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.5,4.0.0)" />
Expand Down
2 changes: 1 addition & 1 deletion src/SDKs/AzSdk.test.reference.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project ToolsVersion="15.0">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetPathOfFileAbove('test.props'))" />
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.7.0,2.0.0)" />
Expand Down
28 changes: 28 additions & 0 deletions src/SDKs/KeyVault/Management/Management.KeyVault.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeyVaultManagement.Tests", "KeyVaultManagement.Tests\KeyVaultManagement.Tests.csproj", "{030623AB-8A12-44B3-8CB3-2356152F9C9F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.KeyVault", "Management.KeyVault\Microsoft.Azure.Management.KeyVault.csproj", "{7AFDC922-F852-4D10-8157-9AA667DC1569}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{030623AB-8A12-44B3-8CB3-2356152F9C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{030623AB-8A12-44B3-8CB3-2356152F9C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{030623AB-8A12-44B3-8CB3-2356152F9C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{030623AB-8A12-44B3-8CB3-2356152F9C9F}.Release|Any CPU.Build.0 = Release|Any CPU
{7AFDC922-F852-4D10-8157-9AA667DC1569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7AFDC922-F852-4D10-8157-9AA667DC1569}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7AFDC922-F852-4D10-8157-9AA667DC1569}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7AFDC922-F852-4D10-8157-9AA667DC1569}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
6 changes: 3 additions & 3 deletions src/SDKs/dirs.proj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="SDKProject">
<ProjectToBuild Include="$(MSBuildThisFileDirectory)AnalysisServices\Management.Analysis\Microsoft.Azure.Management.Analysis.csproj" />
<ProjectToBuild Include="$(MSBuildThisFileDirectory)Authorization\Management.Authorization\Microsoft.Azure.Management.Authorization.csproj" />
Expand All @@ -18,7 +18,7 @@
<ProjectToBuild Include="$(MSBuildThisFileDirectory)Graph.RBAC\Graph.RBAC\Microsoft.Azure.Graph.RBAC.csproj" />
<ProjectToBuild Include="$(MSBuildThisFileDirectory)Insights\Microsoft.Azure.Insights\Microsoft.Azure.Insights.csproj" />
<ProjectToBuild Include="$(MSBuildThisFileDirectory)IotHub\Management.IotHub\Microsoft.Azure.Management.IotHub.csproj" />
<ProjectToBuild Include="$(MSBuildThisFileDirectory)KeyVault\Management.KeyVault\Microsoft.Azure.Management.KeyVault.csproj" />
<ProjectToBuild Include="$(MSBuildThisFileDirectory)KeyVault\Management\Management.KeyVault\Microsoft.Azure.Management.KeyVault.csproj" />
<ProjectToBuild Include="$(MSBuildThisFileDirectory)MachineLearning\Management.MachineLearning\Microsoft.Azure.Management.MachineLearning.csproj" />
<ProjectToBuild Include="$(MSBuildThisFileDirectory)Logic\Management.Logic\Microsoft.Azure.Management.Logic.csproj" />
<ProjectToBuild Include="$(MSBuildThisFileDirectory)Media\Management.Media\Microsoft.Azure.Management.Media.csproj" />
Expand Down Expand Up @@ -73,7 +73,7 @@
<ProjectToBuild Include="$(MSBuildThisFileDirectory)Graph.RBAC\**\*Tests.csproj" ProjectType="Test"/>
<ProjectToBuild Include="$(MSBuildThisFileDirectory)Insights\**\*Tests.csproj" ProjectType="Test"/>
<ProjectToBuild Include="$(MSBuildThisFileDirectory)IotHub\**\*Tests.csproj" ProjectType="Test"/>
<ProjectToBuild Include="$(MSBuildThisFileDirectory)KeyVault\**\*Tests.csproj" ProjectType="Test"/>
<ProjectToBuild Include="$(MSBuildThisFileDirectory)KeyVault\Management\**\*Tests.csproj" ProjectType="Test"/>
<ProjectToBuild Include="$(MSBuildThisFileDirectory)MachineLearning\**\*Tests.csproj" ProjectType="Test"/>
<ProjectToBuild Include="$(MSBuildThisFileDirectory)Logic\**\*Tests.csproj" ProjectType="Test"/>
<ProjectToBuild Include="$(MSBuildThisFileDirectory)Media\**\*Tests.csproj" ProjectType="Test"/>
Expand Down
2 changes: 1 addition & 1 deletion src/SdkCommon/ClientRuntime/clientruntime.reference.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project ToolsVersion="15.0">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.props'))" />
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
Expand Down
2 changes: 1 addition & 1 deletion src/SdkCommon/ClientRuntime/dirs.proj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NugetCommonTags>Common ClientRuntime</NugetCommonTags>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/SdkCommon/TestFramework/dirs.proj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ProjectToBuild Include="$(MSBuildThisFileDirectory)ClientRuntime.Azure.TestFramework\Microsoft.Rest.ClientRuntime.Azure.TestFramework.csproj" />
<ProjectToBuild Include="$(MSBuildThisFileDirectory)Microsoft.Azure.Test.HttpRecorder\Microsoft.Azure.Test.HttpRecorder.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/SdkCommon/TestFramework/testframework.common.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project ToolsVersion="15.0">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TestProjectType>true</TestProjectType>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/SdkCommon/dirs.proj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="ClientRuntime\dirs.proj" />
<Import Project="TestFramework\dirs.proj" />
<!--
Expand Down
2 changes: 1 addition & 1 deletion src/dirs.proj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="Sdks\dirs.proj" />
<!--
<Import Project="SdkCommon\dirs.proj" />
Expand Down
2 changes: 1 addition & 1 deletion test.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project ToolsVersion="15.0">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- <Import Project="tools\buildTargets\testTargets\test.Build.props" /> -->
<!-- <Import Project="dirs.proj" /> -->
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tools/buildTargets/common.tasks
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<UsingTask TaskName="ValidateStrongNameSignatureTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" />
<UsingTask TaskName="FilterOutAutoRestLibraries" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" />
Expand Down

0 comments on commit 9b0c880

Please sign in to comment.