Author: brett Date: Mon Jan 2 17:33:40 2012 New Revision: 1226488 URL: http://svn.apache.org/viewvc?rev=1226488&view=rev Log: [NPANDAY-480] CSPACK resolution needs the framework version
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.test incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld/pom.test incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld/pom.test Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs?rev=1226488&r1=1226487&r2=1226488&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs Mon Jan 2 17:33:40 2012 @@ -78,7 +78,14 @@ namespace NPanday.ProjectImporter.Conver // override the one from the parent to add new types for Azure AddProjectReferenceDependenciesToList(); - AddPlugin("org.apache.npanday.plugins", "azure-maven-plugin"); + Plugin plugin = AddPlugin("org.apache.npanday.plugins", "azure-maven-plugin"); + if (!string.IsNullOrEmpty(projectDigest.TargetFramework)) + AddPluginConfiguration(plugin, "frameworkVersion", projectDigest.TargetFramework); + else + { + // TODO: crude hack until the plugin doesn't require this and picks the right minimum default + AddPluginConfiguration(plugin, "frameworkVersion", "4.0"); + } if (writePom) { Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.test URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.test?rev=1226488&r1=1226487&r2=1226488&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.test (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.test Mon Jan 2 17:33:40 2012 @@ -16,6 +16,9 @@ <groupId>org.apache.npanday.plugins</groupId> <artifactId>azure-maven-plugin</artifactId> <extensions>true</extensions> + <configuration> + <frameworkVersion>4.0</frameworkVersion> + </configuration> </plugin> </plugins> </build> Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld/pom.test URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld/pom.test?rev=1226488&r1=1226487&r2=1226488&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld/pom.test (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld/pom.test Mon Jan 2 17:33:40 2012 @@ -16,6 +16,9 @@ <groupId>org.apache.npanday.plugins</groupId> <artifactId>azure-maven-plugin</artifactId> <extensions>true</extensions> + <configuration> + <frameworkVersion>4.0</frameworkVersion> + </configuration> </plugin> </plugins> </build> Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld/pom.test URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld/pom.test?rev=1226488&r1=1226487&r2=1226488&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld/pom.test (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld/pom.test Mon Jan 2 17:33:40 2012 @@ -16,6 +16,9 @@ <groupId>org.apache.npanday.plugins</groupId> <artifactId>azure-maven-plugin</artifactId> <extensions>true</extensions> + <configuration> + <frameworkVersion>4.0</frameworkVersion> + </configuration> </plugin> </plugins> </build>