removing binplacing azure DNS in to stack folder, fixing merge conflicts

Author: bganapa

src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj

@@ -114,7 +114,6 @@
     <ItemGroup>
       <OutFiles Include="$(OutDir)\**\*.*" />
     </ItemGroup>
-    <Copy SourceFiles="@(OutFiles)" DestinationFiles="@(OutFiles->'..\..\..\Stack\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Dns\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(MarkdownFiles)" DestinationFolder="$(OutputPath)\help\" ContinueOnError="false" />
   </Target>
 </Project>

src/StackAdmin/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj

@@ -62,7 +62,7 @@
     <Compile Include="ScenarioTests\DnsTestsBase.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Resources\Commands.Resources\Commands.Resources.csproj">
+    <ProjectReference Include="..\..\Resources\Commands.Resources\Commands.Resources.csproj">
       <Project>{e1f5201d-6067-430e-b303-4e367652991b}</Project>
       <Name>Commands.Resources</Name>
     </ProjectReference>

src/StackAdmin/Stack.sln

@@ -77,6 +77,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Test", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns", "Dns\Commands.Dns\Commands.Dns.csproj", "{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns.Test", "Dns\Commands.Dns.Test\Commands.Dns.Test.csproj", "{81E4373B-42EC-445E-9A40-06C44F29099A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -483,6 +487,30 @@ Global
 		{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|x64.Build.0 = Release|Any CPU
 		{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|x86.ActiveCfg = Release|Any CPU
 		{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|x86.Build.0 = Release|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|x64.Build.0 = Debug|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|x86.Build.0 = Debug|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|x64.ActiveCfg = Release|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|x64.Build.0 = Release|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|x86.ActiveCfg = Release|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|x86.Build.0 = Release|Any CPU
+		{81E4373B-42EC-445E-9A40-06C44F29099A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81E4373B-42EC-445E-9A40-06C44F29099A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81E4373B-42EC-445E-9A40-06C44F29099A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{81E4373B-42EC-445E-9A40-06C44F29099A}.Debug|x64.Build.0 = Debug|Any CPU
+		{81E4373B-42EC-445E-9A40-06C44F29099A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{81E4373B-42EC-445E-9A40-06C44F29099A}.Debug|x86.Build.0 = Debug|Any CPU
+		{81E4373B-42EC-445E-9A40-06C44F29099A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81E4373B-42EC-445E-9A40-06C44F29099A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81E4373B-42EC-445E-9A40-06C44F29099A}.Release|x64.ActiveCfg = Release|Any CPU
+		{81E4373B-42EC-445E-9A40-06C44F29099A}.Release|x64.Build.0 = Release|Any CPU
+		{81E4373B-42EC-445E-9A40-06C44F29099A}.Release|x86.ActiveCfg = Release|Any CPU
+		{81E4373B-42EC-445E-9A40-06C44F29099A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -502,6 +530,7 @@ Global
 		{E3F4FE4B-108C-4369-8237-0EDBD9DDA369} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{BDF9F606-E419-4F24-B84F-B3BE6A92E9FA} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{4C2FE49A-09E1-4979-AD46-CD64FD04C8F7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{81E4373B-42EC-445E-9A40-06C44F29099A} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E3BEFC51-2FF1-4E69-B5D2-36E4D7446B7C}