You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2012/03/21 01:30:02 UTC

svn commit: r1303248 - in /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src: main/csharp/Converter/Algorithms/ test/resource/NPANDAY_537_WindowsExecutableTest/WindowsFormsApplication1/ test/resource/WpfApplication1/WpfApplic...

Author: brett
Date: Wed Mar 21 01:30:01 2012
New Revision: 1303248

URL: http://svn.apache.org/viewvc?rev=1303248&view=rev
Log:
[NPANDAY-551] POM generator should add the framework version to the resgen plugin when necessary

Modified:
    incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
    incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_537_WindowsExecutableTest/WindowsFormsApplication1/pom.test
    incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test

Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs?rev=1303248&r1=1303247&r2=1303248&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs Wed Mar 21 01:30:01 2012
@@ -154,6 +154,8 @@ namespace NPanday.ProjectImporter.Conver
                     false
                 );
 
+                if (!string.IsNullOrEmpty(projectDigest.TargetFramework))
+                    AddPluginConfiguration(embeddedResourcePlugin, "frameworkVersion", projectDigest.TargetFramework);
 
                 List<Dictionary<string, string>> embeddedResourceList = new List<Dictionary<string, string>>();
                 List<string> resourceList = new List<string>();   

Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_537_WindowsExecutableTest/WindowsFormsApplication1/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_537_WindowsExecutableTest/WindowsFormsApplication1/pom.test?rev=1303248&r1=1303247&r2=1303248&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_537_WindowsExecutableTest/WindowsFormsApplication1/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_537_WindowsExecutableTest/WindowsFormsApplication1/pom.test Wed Mar 21 01:30:01 2012
@@ -34,6 +34,7 @@
         <groupId>org.apache.npanday.plugins</groupId>
         <artifactId>maven-resgen-plugin</artifactId>
         <configuration>
+          <frameworkVersion>4.0</frameworkVersion>
           <embeddedResources>
             <embeddedResource>
               <sourceFile>Properties\Resources.resx</sourceFile>

Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test?rev=1303248&r1=1303247&r2=1303248&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test Wed Mar 21 01:30:01 2012
@@ -52,6 +52,7 @@
         <groupId>org.apache.npanday.plugins</groupId>
         <artifactId>maven-resgen-plugin</artifactId>
         <configuration>
+          <frameworkVersion>4.0</frameworkVersion>
           <embeddedResources>
             <embeddedResource>
               <sourceFile>Properties\Resources.resx</sourceFile>