Fix failure in doc.yml (#7405)

AzureSDKAutomation · Aug 29, 2019 · 9c9b09e · 9c9b09e
1 parent 8d6d454
commit 9c9b09e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/eng/docgeneration/assets/docgen.csproj b/eng/docgeneration/assets/docgen.csproj
@@ -22,11 +22,9 @@
     <ItemGroup>
       <ECMA2YmlFiles Include="$(ECMA2YmlPath)" />
       <PopImportFiles Include="$(PopImportPath)" />
-      <RestoredDlls Include="$(NuGetPackageRoot)\**\lib\**\*.dll" />
     </ItemGroup>
 
     <Copy SourceFiles="@(ECMA2YmlFiles)" DestinationFolder="$(BuildBinariesDirectory)\ECMA2Yml" />
     <Copy SourceFiles="@(PopImportFiles)" DestinationFolder="$(BuildBinariesDirectory)\PopImport" />
-    <Copy SourceFiles="@(RestoredDlls)" DestinationFolder="$(BuildBinariesDirectory)\dll-docs\dependencies\my-api" />
   </Target>
 </Project>
diff --git a/eng/pipelines/docs.yml b/eng/pipelines/docs.yml
@@ -31,18 +31,20 @@ jobs:
         displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)"
         inputs:
           version: $(DotNetCoreSDKVersion)
-      - pwsh: dotnet build eng/service.proj /p:IncludeTests=false /p:IncludeSamples=false /p:OutputPath=$(Build.ArtifactStagingDirectory)/dll-output /p:TargetFramework=netstandard2.0
+      - pwsh: dotnet build eng/service.proj /p:IncludeTests=false /p:IncludeSamples=false /p:OutputPath=$(Build.BinariesDirectory)/dll-docs/my-api /p:TargetFramework=netstandard2.0
         displayName: Build Packages
+      - pwsh: dotnet build eng/service.proj /p:IncludeTests=false /p:IncludeSamples=false /p:OutputPath=$(Build.BinariesDirectory)/dll-docs/dependencies/my-api /p:TargetFramework=netstandard2.0 /p:CopyLocalLockFileAssemblies=true
+        displayName: Build Packages, Include Dependencies
       - pwsh: dotnet restore "$(Build.SourcesDirectory)/eng/docgeneration/assets/docgen.csproj" /p:BuildBinariesDirectory=$(Build.BinariesDirectory)
-        displayName: Restore Nuget Packages Needed
-      - task: CopyFiles@2
-        displayName: "Copy over Dlls"
+        displayName: Restore other Nuget Packages Needed
+      - task: DeleteFiles@1
+        displayName: "Delete files from $(Build.BinariesDirectory)/dll-docs/my-api"
         inputs:
-          SourceFolder: "$(Build.ArtifactStagingDirectory)/dll-output"
-          TargetFolder: "$(Build.BinariesDirectory)/dll-docs/my-api"
-          contents: |
-            *.dll
-            *.xml
+          SourceFolder: "$(Build.BinariesDirectory)/dll-docs/my-api"
+          Contents: |
+            *.json
+            *.pdb
+            *.config
       - task: CmdLine@2
         displayName: Initialize Frameworks File
         inputs: