From b568cf3750a26ab7a6a3fff72d365e01564ce158 Mon Sep 17 00:00:00 2001
From: Abhijeet Shah <abhishah@microsoft.com>
Date: Wed, 19 Apr 2017 18:55:24 -0700
Subject: [PATCH] simplifying targets

---
 AzSdk.props                             |  5 +----
 build.proj                              |  1 +
 src/SDKs/Cdn/Cdn.Tests/Cdn.Tests.csproj |  4 ++--
 test.props                              | 17 ++++-------------
 tools/buildTargets/common.targets       | 22 ++++++++++++++++++++--
 5 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/AzSdk.props b/AzSdk.props
index eedadbf931bc4..a85a1f0e52e2d 100644
--- a/AzSdk.props
+++ b/AzSdk.props
@@ -1,10 +1,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="DebugBuildOptions" Condition=" '$(Configuration)|$(Platform)'=='Debug|AnyCPU' ">
+  <PropertyGroup>
     <SignAssembly>true</SignAssembly>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <PropertyGroup Label="ReleaseBuildOptions" Condition=" '$(Configuration)|$(Platform)'=='Release|AnyCPU' ">    
-    <DelaySign>false</DelaySign>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/build.proj b/build.proj
index b3332193f2bb4..f4598dec2ee25 100644
--- a/build.proj
+++ b/build.proj
@@ -10,4 +10,5 @@
 	<Target Name="PublishNuget" DependsOnTargets="$(PublishNugetDependsOn)" />
 	<Target Name="RunTests" DependsOnTargets="$(RunTestProjectsDependsOn)" />
   <Target Name="SignNuget" DependsOnTargets="$(SignNugetDependsOn)" />  
+  <Target Name="Help" DependsOnTargets="$(HelpDependsOn)" />  
 </Project>
diff --git a/src/SDKs/Cdn/Cdn.Tests/Cdn.Tests.csproj b/src/SDKs/Cdn/Cdn.Tests/Cdn.Tests.csproj
index b9929e6d27e6b..f767dad3ddc01 100644
--- a/src/SDKs/Cdn/Cdn.Tests/Cdn.Tests.csproj
+++ b/src/SDKs/Cdn/Cdn.Tests/Cdn.Tests.csproj
@@ -13,8 +13,8 @@
   <ItemGroup>    
     <PackageReference Include="Microsoft.Azure.ResourceManager" Version="1.1.0-preview" />
 
-    <ProjectReference Include="..\Management.Cdn\Microsoft.Azure.Management.Cdn.csproj" />
-    <!--<PackageReference Include="Microsoft.Azure.Management.Cdn" Version="3.1.0-preview" />-->
+    <!--<ProjectReference Include="..\Management.Cdn\Microsoft.Azure.Management.Cdn.csproj" />-->
+    <PackageReference Include="Microsoft.Azure.Management.Cdn" Version="3.0.1-preview" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test.props b/test.props
index d37addb082973..95b213ae5abd5 100644
--- a/test.props
+++ b/test.props
@@ -2,25 +2,16 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RestorePackagesPath>$(LibraryNugetPackageFolder)</RestorePackagesPath>
-    <NugetCommonProfileTags>RandomTag</NugetCommonProfileTags>
+    <NugetCommonProfileTags/>
     <PackageOutputPath>$(BuiltPackageOutputDir)</PackageOutputPath>
     <AddProjectReferenceForDebuggingPurpose>false</AddProjectReferenceForDebuggingPurpose>
     <AddNugetReferenceForCIandCmdlineBuild>true</AddNugetReferenceForCIandCmdlineBuild>
     <SkipBuildingTestProject>false</SkipBuildingTestProject>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">1.1.0</RuntimeFrameworkVersion>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'net452' ">$(PackageTargetFallback);net452;dnxcore50</PackageTargetFallback>
-  </PropertyGroup>
-  <PropertyGroup Label="DebugBuildOptions" Condition=" '$(Configuration)|$(Platform)'=='Debug|AnyCPU' ">
     <SignAssembly>true</SignAssembly>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
-  <PropertyGroup Label="ReleaseBuildOptions" Condition=" '$(Configuration)|$(Platform)'=='Release|AnyCPU' ">
-    <DelaySign>false</DelaySign>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(TargetFramework)'=='net452' ">
     <DefineConstants>FullNetFx</DefineConstants>
     <OutputPath>bin\$(Configuration)\</OutputPath>
@@ -39,8 +30,8 @@
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
 		<!-- <PackageReference Include="Microsoft.NETCore.App" Version="1.0.2" /> -->
 	</ItemGroup>  
-  <!-- <ItemGroup> -->
-	  <!-- <Compile Include="$(LibraryToolsFolder)\DisableTestRunParallel.cs" Link="DisableTestRunParallel.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" /> -->
-  <!-- </ItemGroup>   -->
+   <ItemGroup> 
+	   <Compile Include="$(LibraryToolsFolder)\DisableTestRunParallel.cs" Link="DisableTestRunParallel.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" /> 
+   </ItemGroup>   
   
 </Project>
\ No newline at end of file
diff --git a/tools/buildTargets/common.targets b/tools/buildTargets/common.targets
index 6bace9e0bdcff..f07b4bf2e412e 100644
--- a/tools/buildTargets/common.targets
+++ b/tools/buildTargets/common.targets
@@ -64,6 +64,10 @@
       Package;
       PublishingNuget
     </PublishNugetDependsOn>
+
+    <HelpDependsOn>
+      DisplayHelp
+    </HelpDependsOn>
     
   </PropertyGroup>
   
@@ -214,12 +218,26 @@
 		<Message Text="Categorized SDK Scoped Projects ..... @(ScopedProjects)" Condition=" '$(Scope)' != 'All'" />
 	  <Message Text="Categorized Test Scoped Projects ..... @(ScopedTestProjects)" Condition=" '$(Scope)' != 'All'" />
     <Message Text="Categorized SDK Projects ..... @(SDKProject)" Condition=" '$(Scope)' == 'All'" />
-    <Message Text="Categorized Test Projects ..... @(SDKTestProject)" Condition=" '$(Scope)' == 'All'" />
-    
+    <Message Text="Categorized Test Projects ..... @(SDKTestProject)" Condition=" '$(Scope)' == 'All'" />    
     <!--
     <ScopedProjects Remove="@(KVSamples)"/>
     -->
   </Target>
+  
+  <Target Name="DisplayHelp">
+    <Message Text="msbuild build.proj /t:Build"/>
+    <Message Text="---- will build and create nuget pacakge for the entire repo"/>
+  
+    <Message Text="msbuild build.proj /t:Build /p:Scope=SDKs\Compute" />
+    <Message Text="---- will build Microsoft.Azure.Management.Compute and Compute.Tests project and create nuget pacakge for Compute"/>
+  
+  <Message Text="msbuild build.proj /t:RunTests" />
+  <Message Text="----- will Build and Run tests for the entire repo" />
+  
+  <Message Text="msbuild build.proj /t:RunTests /p:Scope=SDKs\Compute" />
+  <Message Text="----- will Build Compute nuget package and run compute test" />
+  </Target>
+    
   <Target Name="GetScopedProjects" Condition=" '$(Scope)' != 'All'">
     <ItemGroup>
       <SDKProject Include="@(ScopedProjects)" />