Remove api-* and ucrtbase*.

Commit migrated from https://github.com/dotnet/core-setup/commit/f82494712d2a66eff9d6eff5a1bbf683096e1455

diff --git a/src/installer/buildpipeline/security/DotNet-Core-Setup-Security-Windows.json b/src/installer/buildpipeline/security/DotNet-Core-Setup-Security-Windows.json
index 278f62f..ccf8971 100644 (file)
--- a/src/installer/buildpipeline/security/DotNet-Core-Setup-Security-Windows.json
+++ b/src/installer/buildpipeline/security/DotNet-Core-Setup-Security-Windows.json
@@ -112,7 +112,7 @@
       "enabled": true,
       "continueOnError": true,
       "alwaysRun": false,
-      "displayName": "Remove files other than DLLs, PDBs and TXT",
+      "displayName": "Remove api-*, ucrtbase*, and files other than DLLs, PDBs and TXT",
       "timeoutInMinutes": 0,
       "condition": "succeeded()",
       "task": {
@@ -125,7 +125,7 @@
         "scriptName": "",
         "arguments": "$(Build.SourcesDirectory)",
         "workingFolder": "$(Build.SourcesDirectory)",
-        "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$extList = \".dll\", \".pdb\", \".txt\"\ngci $secDir -Recurse | where { !$_.PSIsContainer } | % {\nif ($extList -inotcontains $_.Extension)\n{\n    rm $_.FullName -Force -ErrorAction SilentlyContinue\n    Write-Host \"Removed $($_.FullName)\"\n}\n}\n\n",
+        "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$extList = \".dll\", \".pdb\", \".txt\"\ngci $secDir -Recurse | where { !$_.PSIsContainer } | % {\nif ($extList -inotcontains $_.Extension -or $_.BaseName -like \"api-*\" -or $_.BaseName -like \"ucrtbase*\")\n{\n    rm $_.FullName -Force\n    Write-Host \"Removed $($_.FullName)\"\n}\n}\n\n",
         "failOnStandardError": "true"
       }
     },

diff --git a/src/installer/buildpipeline/security/dir.props b/src/installer/buildpipeline/security/dir.props
index 9024fa7..28bd945 100644 (file)
--- a/src/installer/buildpipeline/security/dir.props
+++ b/src/installer/buildpipeline/security/dir.props
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\dir.props" />
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/installer/buildpipeline/security/syncAzure.targets b/src/installer/buildpipeline/security/syncAzure.targets
index 0bdd148..a170c33 100644 (file)
--- a/src/installer/buildpipeline/security/syncAzure.targets
+++ b/src/installer/buildpipeline/security/syncAzure.targets
@@ -26,4 +26,4 @@
                         BlobNamePrefix="$(BlobName)"
                         DownloadDirectory="$(DownloadDirectory)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>