Pull WebDeployment dependencies through a package referece (dotnet#482)

* Pull WebDeployment dependencies through a package referece * Add build from source condition
mmitche · Feb 13, 2019 · cb575df · cb575df
1 parent c54ea7d
commit cb575df
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/build.cmd b/build.cmd
@@ -1,4 +1,3 @@
 @echo off
-xcopy \\aspnetci\share\tools\websdk\WebDeploy\* "%~dp0build\WebDeploy\*" /y /C /e /s /f
 powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -build -restore -pack -test %*"
 exit /b %ErrorLevel%
diff --git a/src/Publish/Package/Microsoft.NET.Sdk.Publish.csproj b/src/Publish/Package/Microsoft.NET.Sdk.Publish.csproj
@@ -24,7 +24,9 @@
       <PackagePath>tools\net46</PackagePath>
     </Content>
 
-    <Content Include="$(RepoRoot)\build\WebDeploy\**\*.*" Condition=" '$(DotNetBuildFromSource)' != 'true' ">
+    <Content Include="$(ArtifactsBinDir)\Microsoft.NET.Sdk.Publish.Tasks\$(Configuration)\net46\$(RuntimeIdenfier)\Microsoft.Web.Deployment.dll;
+                      $(ArtifactsBinDir)\Microsoft.NET.Sdk.Publish.Tasks\$(Configuration)\net46\$(RuntimeIdenfier)\Microsoft.Web.Delegation.dll"
+             Condition=" '$(DotNetBuildFromSource)' != 'true' ">
       <Pack>true</Pack>
       <PackagePath>tools\net46</PackagePath>
     </Content>

diff --git a/src/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj b/src/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj
@@ -32,6 +32,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
+    <PackageReference Include="Microsoft.WebSdk.WebDeploy" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">