From 98a65a4cca2a1a79a19da206f3cb800c36f5e9e9 Mon Sep 17 00:00:00 2001
From: Allen Zhang <allenzhang@live.com>
Date: Thu, 10 Jun 2021 08:56:38 -0700
Subject: [PATCH] Updating the common props to respect SymbolPackageFormat
 (#1671)

---
 .../CI.Tools.Package/build/targets/common.Build.props         | 1 +
 .../CI.Tools.Package/build/targets/common.targets             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/dotnet/Mgmt.CI.BuildTools/NugetToolsPackage/CI.Tools.Package/build/targets/common.Build.props b/src/dotnet/Mgmt.CI.BuildTools/NugetToolsPackage/CI.Tools.Package/build/targets/common.Build.props
index ff8f0437d4b..0c138c21565 100644
--- a/src/dotnet/Mgmt.CI.BuildTools/NugetToolsPackage/CI.Tools.Package/build/targets/common.Build.props
+++ b/src/dotnet/Mgmt.CI.BuildTools/NugetToolsPackage/CI.Tools.Package/build/targets/common.Build.props
@@ -2,6 +2,7 @@
 	<PropertyGroup>
 		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 		<NoWarn>1591;1701;1573;CS1591;MSB3245;3245</NoWarn>
+		<SymbolPackageFormat Condition=" '$(SymbolPackageFormat)' == ''">snupkg</SymbolPackageFormat>
 	</PropertyGroup>
 	
 	<PropertyGroup Condition=" '$(TargetFramework)'=='net452' ">
diff --git a/src/dotnet/Mgmt.CI.BuildTools/NugetToolsPackage/CI.Tools.Package/build/targets/common.targets b/src/dotnet/Mgmt.CI.BuildTools/NugetToolsPackage/CI.Tools.Package/build/targets/common.targets
index 55ffa39a8e0..2d96972bf94 100644
--- a/src/dotnet/Mgmt.CI.BuildTools/NugetToolsPackage/CI.Tools.Package/build/targets/common.targets
+++ b/src/dotnet/Mgmt.CI.BuildTools/NugetToolsPackage/CI.Tools.Package/build/targets/common.targets
@@ -75,7 +75,7 @@
     <Message Text="Target ==> CleaningNugetPackages Initiated....." Importance="Low" />
     <ItemGroup>
       <_SDKPackageFilesToDelete Include="$(PackageOutputPath)\*.nupkg"/>
-      <_SDKPackageFilesToDelete Include="$(PackageOutputPath)\*.snupkg"/>
+      <_SDKPackageFilesToDelete Include="$(PackageOutputPath)\*.$(SymbolPackageFormat)"/>
       <_SDKPackageFilesToDelete Include="$(BaseIntermediateOutputPath)\*.nuspec"/>
     </ItemGroup>
     <Message Text="Cleaning Packages..... @(_SDKPackageFilesToDelete)" Condition=" '@(_SDKPackageFilesToDelete)' != '' " />
@@ -160,7 +160,7 @@
         PackageOutputPath=$(NugPkgOutPutDirPath); 
         NoPackageAnalysis=true; 
         IncludeSymbols=true;
-        SymbolPackageFormat=snupkg;
+        SymbolPackageFormat=$(SymbolPackageFormat);
         IsPackable=true;
         NoBuild=true;" Condition=" ('@(ProjectsToPackage)' != '') OR ('$(WhatIf)' != 'true') ">
       <Output TaskParameter="TargetOutputs" ItemName="SdkNuGetPackages" />