use Copy msbuild task instead of Exec

Author: Vasily Kirichenko

Ide/Nitra.VisualStudio.Plugin/Nitra.VisualStudio.Plugin.csproj

@@ -78,8 +78,7 @@
     <NuGetSource>https://www.nuget.org/api/v2</NuGetSource>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!--Import Project="$(CommonFilesPath)\NitraBuild.targets" /-->
-  <Target Name="AfterBuild"> <!-- DependsOnTargets="GetNitraBuildVersion"-->
+  <Target Name="AfterBuild">
     <Exec Command="..\..\..\..\Nitra.LanguageCompiler\$(OutputPath)Nitra.LanguageCompiler.exe /lang:$(LanguageName) /ns:Nitra /out:..\..\..\ .\Nitra.Grammar.dll" WorkingDirectory="$(TargetDir)" />
     <Exec Command="$(SolutionRoot)\NuGet\RestoreNuGetPkgs.cmd &quot;$(VsPackagePath)&quot; &quot;$(NuGetSource)&quot;" WorkingDirectory="$(VsPackagePath)" />
     <MSBuild Projects="$(VsPackageProjectPath)" Properties="Platform=x86; Configuration=$(Configuration); UseNitraFrom=ProjectReferences" />

Nitra.LanguageCompiler/Nitra.LanguageCompiler.nproj

@@ -260,21 +260,24 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(Nemerle)\Nemerle.MSBuild.targets" />
+  <ItemGroup>
+    <ExternalDependency Include="..\$(OutDir)Stage2\Nemerle.dll"/>
+    <ExternalDependency Include="..\Ide\Nitra.MSBuild.Tasks\$(OutDir)Microsoft.VisualStudio.ExtensionManager.dll"/>
+	<ExternalDependency Include="..\Ide\Nitra.MSBuild.Tasks\$(OutDir)Microsoft.VisualStudio.ExtensionManager.Implementation.dll"/>
+	<ExternalDependency Include="..\Ide\Nitra.MSBuild.Tasks\$(OutDir)Shell.Interop.dll"/>
+  </ItemGroup>
+  <ItemGroup>
+    <TemplateExternalDependency Include="..\$(OutDir)Stage2\Nemerle.dll"/>
+	<TemplateExternalDependency Include="..\$(OutDir)Stage2\Nitra.Runtime.dll"/>
+	<TemplateExternalDependency Include="..\Ide\Nitra.VisualStudio\$(OutDir)Nemerle.Diff.dll"/>
+	<TemplateExternalDependency Include="..\Ide\Nitra.VisualStudio\$(OutDir)Nitra.VisualStudio.dll"/>
+  </ItemGroup>
+  <ItemGroup>
+    <VSSDK Include="$(SolutionDir)ExternalTools\VSSDK2013\**\*.*"/>
+  </ItemGroup>
   <Target Name="AfterBuild">
-    <Exec Condition="!Exists('$(TargetDir)\Templates\XXLanguageXXVsPackage\ExternalDependencies')" Command="md $(TargetDir)\Templates\XXLanguageXXVsPackage\ExternalDependencies" />
-    <Exec Command="copy ..\$(OutDir)Stage2\Nemerle.dll $(TargetDir)Templates\XXLanguageXXVsPackage\ExternalDependencies" WorkingDirectory="$(ProjectDir)" />
-    <Exec Command="copy ..\$(OutDir)Stage2\Nitra.Runtime.dll $(TargetDir)Templates\XXLanguageXXVsPackage\ExternalDependencies" WorkingDirectory="$(ProjectDir)" />
-    <Exec Command="copy ..\Ide\Nitra.VisualStudio\$(OutDir)Nemerle.Diff.dll $(TargetDir)Templates\XXLanguageXXVsPackage\ExternalDependencies" WorkingDirectory="$(ProjectDir)" />
-    <Exec Command="copy ..\Ide\Nitra.VisualStudio\$(OutDir)Nitra.VisualStudio.dll $(TargetDir)Templates\XXLanguageXXVsPackage\ExternalDependencies" WorkingDirectory="$(ProjectDir)" />
-	
-	<Exec Command="copy ..\Ide\Nitra.MSBuild.Tasks\$(OutDir)Nitra.MSBuild.Tasks.dll $(ProjectDir)Templates\XXLanguageXXVsPackage\ExternalDependencies" WorkingDirectory="$(ProjectDir)" />
-	<Exec Command="copy ..\Ide\Nitra.MSBuild.Tasks\$(OutDir)Microsoft.VisualStudio.ExtensionManager.dll $(ProjectDir)Templates\XXLanguageXXVsPackage\ExternalDependencies" WorkingDirectory="$(ProjectDir)" />
-	<Exec Command="copy ..\Ide\Nitra.MSBuild.Tasks\$(OutDir)Microsoft.VisualStudio.ExtensionManager.Implementation.dll $(ProjectDir)Templates\XXLanguageXXVsPackage\ExternalDependencies" WorkingDirectory="$(ProjectDir)" />
-	<Exec Command="copy ..\Ide\Nitra.MSBuild.Tasks\$(OutDir)Microsoft.VisualStudio.Settings.12.0.dll $(ProjectDir)Templates\XXLanguageXXVsPackage\ExternalDependencies" WorkingDirectory="$(ProjectDir)" />
-	<Exec Command="copy ..\Ide\Nitra.MSBuild.Tasks\$(OutDir)Microsoft.VisualStudio.Shell.12.0.dll $(ProjectDir)Templates\XXLanguageXXVsPackage\ExternalDependencies" WorkingDirectory="$(ProjectDir)" />
-	<Exec Command="copy ..\Ide\Nitra.MSBuild.Tasks\$(OutDir)Shell.Interop.dll $(ProjectDir)Templates\XXLanguageXXVsPackage\ExternalDependencies" WorkingDirectory="$(ProjectDir)" />
-		
-    <Exec Condition="!Exists('$(TargetDir)\Templates\XXLanguageXXVsPackage\ExternalTools')" Command="md $(TargetDir)\Templates\XXLanguageXXVsPackage\ExternalTools" />
-    <Exec Command="xcopy $(SolutionDir)ExternalTools\VSSDK2013 $(TargetDir)Templates\XXLanguageXXVsPackage\ExternalTools\VSSDK2013 /E /I /Y" />
+	<Copy SourceFiles="@(ExternalDependency)" DestinationFolder="$(TargetDir)Templates\XXLanguageXXVsPackage\ExternalDependencies" />
+	<Copy SourceFiles="@(TemplateExternalDependency)" DestinationFolder="$(ProjectDir)Templates\XXLanguageXXVsPackage\ExternalDependencies" />
+	<Copy SourceFiles="$(VSSDK)" DestinationFolder="$(TargetDir)Templates\XXLanguageXXVsPackage\ExternalTools\VSSDK2013" />
   </Target>
 </Project>