|
1 | 1 | <?xml version="1.0" encoding="utf-8"?>
|
2 |
| -<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 2 | +<Project ToolsVersion="14.0" DefaultTargets="Clean;Build;Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
3 | 3 | <UsingTask TaskName="Zip" AssemblyFile="$(MSBuildThisFileDirectory)target\nuget\packages\$(MSBuildTasksPackageId).$(MSBuildTasksPackageVersion)\tools\MSBuild.Community.Tasks.dll"/>
|
4 | 4 | <PropertyGroup>
|
5 | 5 | <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
|
|
11 | 11 | <ItemGroup>
|
12 | 12 | <VisualStudioVersion Include="2012">
|
13 | 13 | <SolutionFile>$(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2012.sln</SolutionFile>
|
14 |
| - <MSBuildToolsVersion>14.0</MSBuildToolsVersion> |
15 |
| - <NuGetPackageRestore>true</NuGetPackageRestore> |
| 14 | + <ToolsVersion>14.0</ToolsVersion> |
| 15 | + <VisualStudioVersion>14.0</VisualStudioVersion> |
16 | 16 | </VisualStudioVersion>
|
17 | 17 | <VisualStudioVersion Include="2015">
|
18 | 18 | <SolutionFile>$(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2015.sln</SolutionFile>
|
19 |
| - <MSBuildToolsVersion>14.0</MSBuildToolsVersion> |
20 |
| - <NuGetPackageRestore>true</NuGetPackageRestore> |
| 19 | + <ToolsVersion>14.0</ToolsVersion> |
| 20 | + <VisualStudioVersion>14.0</VisualStudioVersion> |
21 | 21 | </VisualStudioVersion>
|
22 | 22 | <VisualStudioVersion Include="2017">
|
23 | 23 | <SolutionFile>$(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2017.sln</SolutionFile>
|
24 |
| - <MSBuildToolsVersion>15.0</MSBuildToolsVersion> |
| 24 | + <ToolsVersion>15.0</ToolsVersion> |
| 25 | + <VisualStudioVersion>15.0</VisualStudioVersion> |
25 | 26 | </VisualStudioVersion>
|
26 | 27 | </ItemGroup>
|
27 | 28 | <ItemGroup>
|
|
62 | 63 | <Moniker>uap10</Moniker>
|
63 | 64 | </TargetFramework>
|
64 | 65 | </ItemGroup>
|
65 |
| - <Target Name="Clean"> |
| 66 | + <Target Name="Clean" DependsOnTargets="CleanSolution"> |
66 | 67 | <RemoveDir Directories="$(MSBuildThisFileDirectory)target"/>
|
| 68 | + </Target> |
| 69 | + <Target Name="CleanSolution" Outputs="%(VisualStudioVersion.Identity)"> |
| 70 | + |
67 | 71 | <ItemGroup>
|
68 | 72 | <ProjectToBuild Remove="@(ProjectToBuild)"/>
|
69 |
| - <ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)'"> |
70 |
| - <Properties>Configuration=Release</Properties> |
| 73 | + <ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)"> |
| 74 | + <Properties>Configuration=Release;VisualStudioVersion=%(VisualStudioVersion.VisualStudioVersion)</Properties> |
71 | 75 | </ProjectToBuild>
|
72 | 76 | </ItemGroup>
|
73 |
| - <MSBuild Projects="@(ProjectToBuild)" Targets="Clean" /> |
| 77 | + <MSBuild Projects="@(ProjectToBuild)" ToolsVersion="%(VisualStudioVersion.ToolsVersion)" Targets="Clean"/> |
74 | 78 | </Target>
|
75 | 79 | <Target Name="DownloadNuGet">
|
76 | 80 | <MakeDir Directories="$(MSBuildThisFileDirectory)target\nuget"/>
|
|
79 | 83 | FileName="$(MSBuildThisFileDirectory)target\nuget\nuget.exe"/>
|
80 | 84 | </Target>
|
81 | 85 | <Target Name="RestoreNuGetPackages" DependsOnTargets="DownloadNuGet" Outputs="%(VisualStudioVersion.Identity)">
|
82 |
| - <Message Text="Restoring nuget packages for '%(VisualStudioVersion.SolutionFile)'..." Importance="High" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)' and '%(VisualStudioVersion.NuGetPackageRestore)'=='true'"/> |
83 |
| - <Exec Command="$(NuGetExe) restore "%(VisualStudioVersion.SolutionFile)"" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)' and '%(VisualStudioVersion.NuGetPackageRestore)'=='true'"/> |
| 86 | + <Message Text="Restoring nuget packages for '%(VisualStudioVersion.SolutionFile)'..." Importance="High"/> |
| 87 | + <Exec Command="$(NuGetExe) restore "%(VisualStudioVersion.SolutionFile)""/> |
84 | 88 | </Target>
|
85 | 89 | <Target Name="Build" DependsOnTargets="RestoreNuGetPackages" Outputs="%(VisualStudioVersion.Identity)">
|
86 | 90 | <ItemGroup>
|
87 | 91 | <ProjectToBuild Remove="@(ProjectToBuild)"/>
|
88 |
| - <ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)'"> |
89 |
| - <Properties>Configuration=Release</Properties> |
| 92 | + <ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)"> |
| 93 | + <Properties>Configuration=Release;VisualStudioVersion=%(VisualStudioVersion.VisualStudioVersion)</Properties> |
90 | 94 | </ProjectToBuild>
|
91 | 95 | </ItemGroup>
|
92 |
| - <MSBuild Projects="@(ProjectToBuild)" Targets="Rebuild"/> |
| 96 | + <MSBuild Projects="@(ProjectToBuild)" ToolsVersion="%(VisualStudioVersion.ToolsVersion)" Targets="Rebuild"/> |
93 | 97 | </Target>
|
94 | 98 | <Target Name="Package" DependsOnTargets="CreateNuGetPackage;CreateBinPackage;GenerateHelpFile"/>
|
95 | 99 | <Target Name="CreateNuGetPackage" DependsOnTargets="CopyBuildOutputToPackage">
|
|
0 commit comments