Fixed generating of nuget packages.

Author: VladD2

Common/NitraBuild.targets

@@ -69,7 +69,8 @@
     <AL LinkResources="$(OutputPath)\policy.0.1.$(AssemblyName).config" OutputAssembly="$(OutputPath)\policy.0.1.$(AssemblyName).dll" KeyFile="$(KeyOriginatorFile)" Platform="$(Platform)" />
   </Target>
 
-  <Target Name="NugetPack" Condition=" ('$(Stage)' == 'Stage1') And ('$(CoreCompileExecuted)' == 'true') " DependsOnTargets="GetNitraBuildVersion; GetNemerleBuildVersion">
+  <Target Name="NugetPack" Condition=" ('$(Stage)' == 'Stage1') " DependsOnTargets="GetNitraBuildVersion; GetNemerleBuildVersion">
+    <Message Text="!!!! Run NugetPack Target" Importance="High" />
     <PropertyGroup>
       <Nuget>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\ExternalTools\Nuget.exe'))</Nuget>
       <NugetOutput>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\bin\$(Configuration)\NuGetSource'))</NugetOutput>

Nitra/DotNetLang/DotNetLang.nproj

@@ -292,7 +292,7 @@
   </ItemGroup>
   <Import Project="$(Nemerle)\Nemerle.MSBuild.targets" />
   <Import Project="$(CommonFilesPath)\NitraBuild.targets" />
-  <Target Name="AfterBuild" Condition=" '$(Stage)' == '' ">
+  <Target Name="AfterBuild" Condition=" '$(Stage)' == 'Stage1' ">
     <CallTarget Targets="BuildPolicy01Assembly; NugetPack" />
   </Target>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
@@ -302,4 +302,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
   </Target>
-</Project>
+</Project>

Nitra/Nitra.Compiler/Nitra.Compiler.nproj

@@ -455,7 +455,7 @@
   </ItemGroup>
   <Import Project="$(Nemerle)\Nemerle.MSBuild.targets" />
   <Import Project="$(CommonFilesPath)\NitraBuild.targets" />
-  <Target Name="AfterBuild" Condition=" '$(Stage)' == 'Stage2' ">
+  <Target Name="AfterBuild" Condition=" '$(Stage)' == 'Stage1' ">
     <CallTarget Targets="NugetPack" />
   </Target>
 </Project>

Nitra/Nitra.Grammar/Nitra.Grammar.nproj

@@ -738,7 +738,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
   </Target>
-  <Target Name="AfterBuild" Condition=" '$(Stage)' == 'Stage2' ">
+  <Target Name="AfterBuild" Condition=" '$(Stage)' == 'Stage1' ">
     <CallTarget Targets="NugetPack" />
   </Target>
-</Project>
+</Project>

Nitra/Nitra.Runtime/Nitra.Runtime.nproj

@@ -889,7 +889,7 @@
   </ItemGroup>
   <Import Project="$(Nemerle)\Nemerle.MSBuild.targets" />
   <Import Project="$(CommonFilesPath)\NitraBuild.targets" />
-  <Target Name="AfterBuild" Condition=" '$(Stage)' == '' ">
+  <Target Name="AfterBuild" Condition=" '$(Stage)' == 'Stage1' ">
     <CallTarget Targets="BuildPolicy01Assembly; NugetPack" />
   </Target>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />