|
16 | 16 | <RunCodeAnalysis Condition=" '$(RunCodeAnalysis)' == ''">false</RunCodeAnalysis> |
17 | 17 | <IntermediateOutputPath>.nuget\</IntermediateOutputPath> |
18 | 18 | <PackagesPath>$(IntermediateOutputPath)packages</PackagesPath> |
19 | | - <CommonBuildProperties>WarningLevel=0;NoWarn=1591;Out=$(Out);Configuration=$(Configuration);RunCodeAnalysis=$(RunCodeAnalysis)</CommonBuildProperties> |
| 19 | + <CommonBuildProperties>WarningLevel=0;NoWarn=1591;Out=$(Out);Configuration=$(Configuration);RunCodeAnalysis=$(RunCodeAnalysis);PackOnBuild=true;;PackageOutputPath=$(Out)</CommonBuildProperties> |
20 | 20 | <DefaultImportance Condition=" '$(DefaultImportance)' == '' ">high</DefaultImportance> |
21 | 21 | <PS>%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe</PS> |
22 | 22 | </PropertyGroup> |
|
25 | 25 | <Solution Include="src\Build\NuGet.Build.Packaging.sln" /> |
26 | 26 | <Solution Include="src\VisualStudio\NuGet.Packaging.VisualStudio.15\NuGet.Packaging.VisualStudio.15.csproj" /> |
27 | 27 | <TestProject Include="src\Build\**\*Tests.csproj" /> |
28 | | - <PackSolution Include="src\VisualStudio\NuGet.Packaging.VisualStudio.15\NuGet.Packaging.VisualStudio.15.csproj" /> |
| 28 | + <PackProject Include="src\VisualStudio\NuGet.Packaging.VisualStudio.15\NuGet.Packaging.VisualStudio.15.csproj" /> |
29 | 29 | </ItemGroup> |
30 | 30 |
|
31 | 31 | <Target Name="All" DependsOnTargets="Build;Test;Package" /> |
|
43 | 43 | <Exec Command="rmdir $(Out) /S /Q" Condition=" Exists('$(Out)') " ContinueOnError="true" StandardOutputImportance="low" /> |
44 | 44 | <MakeDir Directories="$(Out)" Condition="!Exists('$(Out)')" /> |
45 | 45 | <Message Text="Build properties: $(CommonBuildProperties)." Importance="high" /> |
46 | | - <MSBuild Projects="@(Solution)" BuildInParallel="false" Properties="$(CommonBuildProperties);PackOnBuild=false;CreateVsixContainer=false;DeployExtension=false" /> |
| 46 | + <MSBuild Projects="@(Solution)" BuildInParallel="false" Properties="$(CommonBuildProperties);CreateVsixContainer=false;DeployExtension=false" /> |
47 | 47 | </Target> |
48 | 48 |
|
49 | 49 | <Target Name="Package" DependsOnTargets="Build"> |
50 | 50 | <MakeDir Directories="$(Out)" Condition="!Exists('$(Out)')" /> |
51 | | - <MSBuild Projects="@(PackSolution)" Properties="$(CommonBuildProperties);PackageOutputPath=$(Out);PackOnBuild=true" /> |
| 51 | + <MSBuild Projects="@(PackProject)" Properties="$(CommonBuildProperties)" /> |
52 | 52 | <ItemGroup> |
53 | 53 | <OutputFile Include="$(Out)\*.nupkg" /> |
54 | 54 | <OutputFile Include="$(Out)\*.vsix" /> |
|
74 | 74 | </Target> |
75 | 75 |
|
76 | 76 | <Target Name="Restore"> |
| 77 | + <ItemGroup> |
| 78 | + <RestoreSolution Include="external\ApiIntersect\ApiIntersect.sln" /> |
| 79 | + <RestoreSolution Include="src\Build\NuGet.Build.Packaging.sln" /> |
| 80 | + <RestoreSolution Include="src\VisualStudio\NuGet.Packaging.VisualStudio.sln" /> |
| 81 | + |
| 82 | + <RestoreSolution Include="src\Build\NuGet.Build.Packaging.Tests\Scenarios\given_a_library_with_non_nugetized_reference\b.sln" /> |
| 83 | + <RestoreSolution Include="src\Build\NuGet.Build.Packaging.Tests\Scenarios\given_a_multi_platform_solution\forms.sln" /> |
| 84 | + <RestoreSolution Include="src\Build\NuGet.Build.Packaging.Tests\Scenarios\given_library_with_json_dependencies\a.csproj" /> |
| 85 | + </ItemGroup> |
77 | 86 |
|
78 | | - <Exec Command='"$(NuGet)" Restore "external\ApiIntersect\ApiIntersect.sln" -Verbosity quiet' /> |
79 | | - <Exec Command='"$(NuGet)" Restore "src\Build\NuGet.Build.Packaging.sln" -Verbosity quiet -Config src\NuGet.Config' /> |
80 | | - <Exec Command='"$(NuGet)" Restore "src\Build\NuGet.Build.Packaging.Tests\Scenarios\given_a_library_with_non_nugetized_reference\b.sln"' /> |
81 | | - <Exec Command='"$(NuGet)" Restore "src\Build\NuGet.Build.Packaging.Tests\Scenarios\given_a_multi_platform_solution\forms.sln"' /> |
82 | | - <Exec Command='"$(NuGet)" Restore "src\Build\NuGet.Build.Packaging.Tests\Scenarios\given_library_with_json_dependencies\project.json"' /> |
83 | | - |
84 | | - <!-- Ignore error code here since NuGet will detect an incompatibility between VS2017 ProjectSystem NuGet on MSBuild 15+, and the tasks' MSBuild 14, which is intentional --> |
85 | | - <Exec Command='"$(NuGet)" Restore "src\VisualStudio\NuGet.Packaging.VisualStudio.sln" -Verbosity quiet -Config src\NuGet.Config' IgnoreExitCode='true' /> |
| 87 | + <Exec Command='"$(MSBuildBinPath)\MSBuild.exe" /t:Restore "%(RestoreSolution.Identity)" /v:Minimal' /> |
86 | 88 | </Target> |
87 | 89 |
|
88 | 90 | <Target Name="Coverage" DependsOnTargets="Build"> |
|
0 commit comments