Merge pull request dotnet#4 from aspnet/msdeploy

Adding Support for publishing using MsDeploy
mmitche · Aug 26, 2016 · 31709ee · 31709ee
2 parents 6731e48 + 12ed7fd
commit 31709ee
Show file tree

Hide file tree

Showing 16 changed files with 5,050 additions and 38 deletions.
diff --git a/src/Microsoft.DotNet.Publishing.Targets/DeployTargets/Microsoft.Kudu.Publishing.targets b/src/Microsoft.DotNet.Publishing.Targets/DeployTargets/Microsoft.Kudu.Publishing.targets
@@ -51,6 +51,15 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     ParameterName="PublishSiteName"
     ParameterValue="$(PublishSiteName)"/>
 
+    <ValidateParameter
+    ParameterName="UserName"
+    ParameterValue="$(UserName)"/>
+
+    <ValidateParameter
+    ParameterName="Password"
+    ParameterValue="$(Password)"/>
+
+
     <PropertyGroup>
       <PublishUrl Condition=" '$(PublishUrl)'=='' ">https://{0}.scm.azurewebsites.net/api/{1}</PublishUrl>
       <DeployIndividualFiles Condition=" '$(DeployIndividualFiles)' != 'true'">false</DeployIndividualFiles>

diff --git a/src/Microsoft.DotNet.Publishing.Targets/DeployTargets/Microsoft.MSDeploy.Publishing.targets b/src/Microsoft.DotNet.Publishing.Targets/DeployTargets/Microsoft.MSDeploy.Publishing.targets
@@ -51,6 +51,18 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         ParameterName="MsDeployServiceUrl"
         ParameterValue="$(MsDeployServiceUrl)"/>
 
+      <ValidateParameter
+      ParameterName="DeployIisAppPath"
+      ParameterValue="$(DeployIisAppPath)"/>
+
+      <ValidateParameter
+      ParameterName="UserName"
+      ParameterValue="$(UserName)"/>
+
+      <ValidateParameter
+      ParameterName="Password"
+      ParameterValue="$(Password)"/>
+
     <!-- Normalize service url such as convert a server name to format like https://<server>:8172/msdeploy.axd-->
     <NormalizeServiceUrl ServiceUrl="$(MsDeployServiceUrl)" UseWMSVC="true" UseRemoteAgent="false">
       <Output TaskParameter="ResultUrl" PropertyName="MsDeployServiceUrl" />

diff --git a/src/Microsoft.DotNet.Publishing.Targets/Microsoft.DotNet.Publishing.targets b/src/Microsoft.DotNet.Publishing.Targets/Microsoft.DotNet.Publishing.targets
@@ -65,8 +65,8 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   <Import Project="$(DotNetPublishingCollectFilesDirectory)Microsoft.DotNet.$(PublishProjectType).Publishing.CollectFiles.targets"/>
 
     <!-- Extension points for pre-publish and post-publish events-->
-  <Target Name="BeforePublish" />
-  <Target Name="AfterPublish" />
+  <Target Name="PrePublish" />
+  <Target Name="PostPublish" />
   <Target Name="BeforeCollectFiles" />
   <Target Name="AfterCollectFiles" />
   <Target Name="BeforePublishFiles" />
@@ -96,9 +96,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
  -->
   <PropertyGroup>
     <DotNetPublishDependsOn>
-      BeforePublish;
+      PrePublish;
       CorePublish;
-      AfterPublish;
+      PostPublish;
     </DotNetPublishDependsOn>
   </PropertyGroup>
 

diff --git a/src/Microsoft.DotNet.Publishing.Targets/PublishProfiles/FTPProfile.pubxml b/src/Microsoft.DotNet.Publishing.Targets/PublishProfiles/FTPProfile.pubxml
@@ -14,20 +14,20 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <Password></Password>
   </PropertyGroup>
 
-  <!-- Publish extensibility -->
-  <!--
-  <Target Name="BeforePublish" />
+  <!--  To modify your publish process, add your task inside one of the targets below and uncomment it. 
+
+  <Target Name="PrePublish" />
   <Target Name="BeforeCollectFiles" />
   <Target Name="AfterCollectFiles" >
     -->
-  <!-- Removing files from the publish list -->
+  <!-- Example: Removing files from the publish list -->
   <!--
     <ItemGroup>
       <DotNetPublishFiles Remove="@(DotNetPublishFiles)" Condition="'%(Extension)' == '.user'" />
     </ItemGroup>
 
     -->
-  <!-- Adding files to the publish list -->
+  <!-- Example: Adding files to the publish list -->
   <!--
     <ItemGroup>
       <DotNetPublishFiles Include="@(None)">
@@ -37,5 +37,5 @@ by editing this MSBuild file. In order to learn more about this please visit htt
   </Target>
   <Target Name="BeforePublishFiles" />
   <Target Name="AfterPublishFiles" />
-  <Target Name="AfterPublish" />-->
+  <Target Name="PostPublish" />-->
 </Project>
diff --git a/src/Microsoft.DotNet.Publishing.Targets/PublishProfiles/FileSystemProfile.pubxml b/src/Microsoft.DotNet.Publishing.Targets/PublishProfiles/FileSystemProfile.pubxml
@@ -12,16 +12,18 @@ by editing this MSBuild file. In order to learn more about this please visit htt
   </PropertyGroup>
 
 
-  <!-- Publish extensibility --><!--
-  <Target Name="BeforePublish" />
+<!--  To modify your publish process, add your task inside one of the targets below and uncomment it. 
+
+  <Target Name="PrePublish" />
   <Target Name="BeforeCollectFiles" />
   <Target Name="AfterCollectFiles" >
-    --><!-- Removing files from the publish list --><!--
+    -->
+  <!-- Example: Removing files from the publish list --><!--
     <ItemGroup>
       <DotNetPublishFiles Remove="@(DotNetPublishFiles)" Condition="'%(Extension)' == '.user'" />
     </ItemGroup>
 
-    --><!-- Adding files to the publish list --><!--
+    --><!-- Example: Adding files to the publish list --><!--
     <ItemGroup>
       <DotNetPublishFiles Include="@(None)">
         <DestinationRelativePath>%(Filename)%(Extension)</DestinationRelativePath>
@@ -30,6 +32,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
   </Target>
   <Target Name="BeforePublishFiles" />
   <Target Name="AfterPublishFiles" />
-  <Target Name="AfterPublish" />-->
+  <Target Name="PostPublish" />-->
 
 </Project>
diff --git a/src/Microsoft.DotNet.Publishing.Targets/PublishProfiles/KuduProfile.pubxml b/src/Microsoft.DotNet.Publishing.Targets/PublishProfiles/KuduProfile.pubxml
@@ -11,20 +11,20 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <Password></Password>
   </PropertyGroup>
 
-  <!-- Publish extensibility -->
-  <!--
-  <Target Name="BeforePublish" />
+  <!--  To modify your publish process, add your task inside one of the targets below and uncomment it. 
+
+  <Target Name="PrePublish" />
   <Target Name="BeforeCollectFiles" />
   <Target Name="AfterCollectFiles" >
     -->
-  <!-- Removing files from the publish list -->
+  <!-- Example: Removing files from the publish list -->
   <!--
     <ItemGroup>
       <DotNetPublishFiles Remove="@(DotNetPublishFiles)" Condition="'%(Extension)' == '.user'" />
     </ItemGroup>
 
     -->
-  <!-- Adding files to the publish list -->
+  <!-- Example: Adding files to the publish list -->
   <!--
     <ItemGroup>
       <DotNetPublishFiles Include="@(None)">
@@ -34,5 +34,5 @@ by editing this MSBuild file. In order to learn more about this please visit htt
   </Target>
   <Target Name="BeforePublishFiles" />
   <Target Name="AfterPublishFiles" />
-  <Target Name="AfterPublish" />-->
+  <Target Name="PostPublish" />-->
 </Project>
diff --git a/src/Microsoft.DotNet.Publishing.Targets/PublishProfiles/MSDeployPackageProfile.pubxml b/src/Microsoft.DotNet.Publishing.Targets/PublishProfiles/MSDeployPackageProfile.pubxml
@@ -12,20 +12,20 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <IgnoreProjectGuid>false</IgnoreProjectGuid>
   </PropertyGroup>
 
-  <!-- Publish extensibility -->
-  <!--
-  <Target Name="BeforePublish" />
+  <!--  To modify your publish process, add your task inside one of the targets below and uncomment it. 
+
+  <Target Name="PrePublish" />
   <Target Name="BeforeCollectFiles" />
   <Target Name="AfterCollectFiles" >
     -->
-  <!-- Removing files from the publish list -->
+  <!-- Example: Removing files from the publish list -->
   <!--
     <ItemGroup>
       <DotNetPublishFiles Remove="@(DotNetPublishFiles)" Condition="'%(Extension)' == '.user'" />
     </ItemGroup>
 
     -->
-  <!-- Adding files to the publish list -->
+  <!-- Example: Adding files to the publish list -->
   <!--
     <ItemGroup>
       <DotNetPublishFiles Include="@(None)">
@@ -35,5 +35,5 @@ by editing this MSBuild file. In order to learn more about this please visit htt
   </Target>
   <Target Name="BeforePublishFiles" />
   <Target Name="AfterPublishFiles" />
-  <Target Name="AfterPublish" />-->
+  <Target Name="PostPublish" />-->
 </Project>
diff --git a/src/Microsoft.DotNet.Publishing.Targets/PublishProfiles/MSDeployProfile.pubxml b/src/Microsoft.DotNet.Publishing.Targets/PublishProfiles/MSDeployProfile.pubxml
@@ -19,21 +19,20 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <IgnoreProjectGuid>false</IgnoreProjectGuid>
   </PropertyGroup>
 
-  <!-- Publish extensibility -->
-  <!--
-  <Target Name="BeforePublish" />
+
+
+<!--  To modify your publish process, add your task inside one of the targets below and uncomment it. 
+
+  <Target Name="PrePublish" />
   <Target Name="BeforeCollectFiles" />
   <Target Name="AfterCollectFiles" >
     -->
-  <!-- Removing files from the publish list -->
-  <!--
+  <!-- Example: Removing files from the publish list --><!--
     <ItemGroup>
       <DotNetPublishFiles Remove="@(DotNetPublishFiles)" Condition="'%(Extension)' == '.user'" />
     </ItemGroup>
 
-    -->
-  <!-- Adding files to the publish list -->
-  <!--
+    --><!-- Example: Adding files to the publish list --><!--
     <ItemGroup>
       <DotNetPublishFiles Include="@(None)">
         <DestinationRelativePath>%(Filename)%(Extension)</DestinationRelativePath>
@@ -42,5 +41,5 @@ by editing this MSBuild file. In order to learn more about this please visit htt
   </Target>
   <Target Name="BeforePublishFiles" />
   <Target Name="AfterPublishFiles" />
-  <Target Name="AfterPublish" />-->
+  <Target Name="PostPublish" />-->
 </Project>
diff --git a/src/Microsoft.DotNet.Publishing.Tasks/Microsoft.DotNet.Publishing.Tasks.csproj b/src/Microsoft.DotNet.Publishing.Tasks/Microsoft.DotNet.Publishing.Tasks.csproj
@@ -52,12 +52,27 @@
     <Compile Include="Kudu\KuduMetadata.cs" />
     <Compile Include="Kudu\KuduVfsDeploy.cs" />
     <Compile Include="Kudu\KuduZipDeploy.cs" />
+    <Compile Include="MsDeploy\CommonUtility.cs" />
+    <Compile Include="MsDeploy\DynamicAssembly.cs" />
+    <Compile Include="MsDeploy\IVSMSDeployTask.cs" />
+    <Compile Include="MsDeploy\MSDeploy.cs" />
+    <Compile Include="MsDeploy\NormalizeServiceUrl.cs" />
+    <Compile Include="MsDeploy\VsMsdeploy.cs" />
+    <Compile Include="MsDeploy\VsMSDeployObject.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SR.Designer.cs" />
     <Compile Include="ValidateParameter.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="SR.resx" />
+    <Compile Include="SR.Designer.cs">
+      <DependentUpon>SR.resx</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <EmbeddedResource Include="SR.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>SR.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />