From 2455f147820792e6aa837a413718e3f6b6f033eb Mon Sep 17 00:00:00 2001
From: Ankit Jain <ankit.jain@microsoft.com>
Date: Wed, 1 Aug 2018 23:57:10 -0400
Subject: [PATCH] [mono] Small improvements to the sdk update script

- don't copy unnecessary files from the sdk nugets like netcoreapp*,
.signature.p7s etc files
- slightly better error handling
---
 mono/build/sdks_and_nugets/deploy_from_nugets.proj | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/mono/build/sdks_and_nugets/deploy_from_nugets.proj b/mono/build/sdks_and_nugets/deploy_from_nugets.proj
index 7039020781f..230f8423f41 100644
--- a/mono/build/sdks_and_nugets/deploy_from_nugets.proj
+++ b/mono/build/sdks_and_nugets/deploy_from_nugets.proj
@@ -13,6 +13,12 @@
             Inputs="@(FilesToCopy)"
             Outputs="@(FilesToCopy->'%(OutputDirectory)\%(RecursiveDir)\%(FileName)%(Extension)')">
 
+        <ItemGroup>
+            <FilesToCopy Remove="@(FilesToCopy)" Condition="$([System.String]::new('%(FilesToCopy.RecursiveDir)').Contains('netcoreapp'))" />
+            <FilesToCopy Remove="@(FilesToCopy)" Condition="$([System.String]::new('%(FilesToCopy.RecursiveDir)').Contains('GenerateDeps'))" />
+            <FilesToCopy Remove="@(FilesToCopy)" Condition="'%(FilesToCopy.Extension)' == '.p7s'" />
+        </ItemGroup>
+
         <Copy
             SourceFiles="@(FilesToCopy)"
             DestinationFiles="@(FilesToCopy->'%(OutputDirectory)\%(RecursiveDir)\%(FileName)%(Extension)')">
@@ -20,7 +26,7 @@
         </Copy>
 
         <Exec Command="chmod -x @(CopiedFiles->'%(Identity)', ' ')"
-              Condition="'$(OS)' != 'Windows_NT'" />
+              Condition="'$(OS)' != 'Windows_NT' and '@(CopiedFiles)' != ''" />
     </Target>
 
     <Target Name="EnsureDependencyRestored"
@@ -35,5 +41,10 @@
             Projects="$(MSBuildThisFileDirectory)\sdks\sdks.csproj"
             Targets="Restore"
             Properties="DependencyPackageName=$(DependencyPackageName);DependencyPackageVersion=$(DependencyPackageVersion)"/>
+
+        <Error
+            Condition="!Exists('$(DependencyNuPkgPath)/$(DependencyPackageName.ToLower()).nuspec')"
+            Text="Tried to restore, but seems to have failed for Sdk/nuget named '$(DependencyPackageName)' version '$(DependencyPackageVersion)'" />
+
     </Target>
 </Project>