Joe,

Did you mean to re-add this? It was deliberately removed in r1041711.

- Brett

On 27/05/2011, at 5:27 PM, joc...@apache.org wrote:

> Author: jocaba
> Date: Fri May 27 07:27:13 2011
> New Revision: 1128182
> 
> URL: http://svn.apache.org/viewvc?rev=1128182&view=rev
> Log:
> [NPANDAY-425] Msbuild Plugin does not have frameworkVersion configuration
> 
> Added configuration frameworkversion for msbuild plugin, although this will 
> still be moved to be a java code later on.
> 
> Modified:
>    
> incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/NormalPomConverter.cs
>    
> incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
>    
> incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/PomHelperUtility.cs
> 
> 
> Modified: 
> incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
> URL: 
> http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs?rev=1128182&r1=1128181&r2=1128182&view=diff
> ==============================================================================
> --- 
> incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
>  (original)
> +++ 
> incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
>  Fri May 27 07:27:13 2011
> @@ -77,6 +77,15 @@ namespace NPanday.ProjectImporter.Conver
>             Plugin aspxPlugin = AddPlugin("org.apache.npanday.plugins", 
> "maven-aspx-plugin");
>             if (!string.IsNullOrEmpty(projectDigest.TargetFramework))
>                 AddPluginConfiguration(aspxPlugin, "frameworkVersion", 
> projectDigest.TargetFramework);
> +                
> +            // add msbuild plugin config in pom if there's a 
> maven-resgen-plugin but no msbuild config 
> +            // generates resources in target/bin folder
> +            if (( FindPlugin("npanday.plugin", "maven-resgen-plugin") != 
> null  && FindPlugin("npanday.plugin", "NPanday.Plugin.Msbuild.JavaBinding") 
> == null) || ( FindPlugin("org.apache.npanday.plugins", "maven-resgen-plugin") 
> != null  && FindPlugin("org.apache.npanday.plugins", 
> "NPanday.Plugin.Msbuild.JavaBinding") == null)) 
> +            {
> +                Plugin msBuildPlugin = 
> AddPlugin("org.apache.npanday.plugins", "NPanday.Plugin.Msbuild.JavaBinding");
> +                AddPluginExecution(msBuildPlugin, "compile", "validate");
> +                AddPluginConfiguration(msBuildPlugin, "frameworkVersion", 
> ProjectDigest.TargetFramework);
> +            }    
> 
>             if (writePom)
>             {

--
Brett Porter
br...@apache.org
http://brettporter.wordpress.com/
http://au.linkedin.com/in/brettporter




Reply via email to