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 2014/03/18 12:55:55 UTC
svn commit: r1578852 - in /incubator/npanday/trunk:
components/dotnet-core/src/main/resources/META-INF/npanday/
components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/
components/dotnet-model/executable-plugins/src/test/resources/ ...
Author: brett
Date: Tue Mar 18 12:55:54 2014
New Revision: 1578852
URL: http://svn.apache.org/r1578852
Log:
[NPANDAY-613] support .NET 4.5.1
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java
incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/resources/sample-executable-plugins.xml
incubator/npanday/trunk/components/dotnet-msbuild/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/components/dotnet-nuget/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/SilverlightPomConverter.cs
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/SettingsGeneratorMojo.cs
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml Tue Mar 18 12:55:54 2014
@@ -281,6 +281,76 @@
</commandFilter>
</compilerPlugin>
<compilerPlugin>
+ <identifier>MS-CS-4.5.1</identifier>
+ <pluginClass>npanday.executable.compiler.impl.DefaultCompiler</pluginClass>
+ <vendor>MICROSOFT</vendor>
+ <executable>csc</executable>
+ <language>C_SHARP</language>
+ <profile>FULL</profile>
+ <frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
+ <frameworkVersion>4.5</frameworkVersion>
+ <frameworkVersion>4.0</frameworkVersion>
+ <frameworkVersion>3.5</frameworkVersion>
+ <frameworkVersion>3.0</frameworkVersion>
+ <frameworkVersion>2.0.50727</frameworkVersion>
+ </frameworkVersions>
+ <platforms>
+ <platform>
+ <operatingSystem>Windows</operatingSystem>
+ <architecture>x86</architecture>
+ </platform>
+ </platforms>
+ <commandFilter>
+ <includes>
+ <include>addmodule</include>
+ <include>appconfig</include>
+ <include>baseaddress</include>
+ <include>bugreport</include>
+ <include>checked</include>
+ <include>codepage</include>
+ <include>debug</include>
+ <include>define</include>
+ <include>delaysign</include>
+ <include>doc</include>
+ <include>errorreport</include>
+ <include>filealign</include>
+ <include>fullpaths</include>
+ <!-- ignored:
+ <include>help</include>
+ <include>incremental</include>
+ -->
+ <include>keycontainer</include>
+ <include>keyfile</include>
+ <include>langversion</include>
+ <include>lib</include>
+ <include>link</include>
+ <include>linkresource</include>
+ <include>main</include>
+ <include>noconfig</include>
+ <include>nologo</include>
+ <include>nostdlib</include>
+ <include>nowarn</include>
+ <include>nowin32manifest</include>
+ <include>optimize</include>
+ <include>out</include>
+ <include>pdb</include>
+ <include>platform</include>
+ <include>recurse</include>
+ <include>reference</include>
+ <include>resource</include>
+ <include>target</include>
+ <include>unsafe</include>
+ <include>utf8output</include>
+ <include>warn</include>
+ <include>warnaserror</include>
+ <include>win32icon</include>
+ <include>win32manifest</include>
+ <include>win32res</include>
+ </includes>
+ </commandFilter>
+ </compilerPlugin>
+ <compilerPlugin>
<identifier>MS-CS-4.5</identifier>
<pluginClass>npanday.executable.compiler.impl.DefaultCompiler</pluginClass>
<vendor>MICROSOFT</vendor>
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -24,6 +24,7 @@
<executable>NCover.Console</executable>
<profile>NCover:NCover.Console</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -43,6 +44,7 @@
<executable>BuildAssembler</executable>
<profile>Microsoft:SandCastle:BuildAssembler</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -62,6 +64,7 @@
<executable>XslTransform</executable>
<profile>Microsoft:SandCastle:XslTransform</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -81,6 +84,7 @@
<executable>MRefBuilder</executable>
<profile>Microsoft:SandCastle:MRefBuilder</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -103,6 +107,7 @@
<executable>gacutil</executable>
<profile>GACUTIL</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -123,6 +128,7 @@
<executable>gacutil</executable>
<profile>GACUTIL</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
Modified: incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java (original)
+++ incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java Tue Mar 18 12:55:54 2014
@@ -199,7 +199,9 @@ public final class DefaultCompiler
}
if (compilerContext.getVendor().equals(Vendor.MICROSOFT) &&
- (compilerContext.getFrameworkVersion().equals("4.0") || compilerContext.getFrameworkVersion().equals("4.5"))) {
+ (compilerContext.getFrameworkVersion().equals("4.0") ||
+ compilerContext.getFrameworkVersion().equals("4.5") ||
+ compilerContext.getFrameworkVersion().equals("4.5.1"))) {
String frameworkPath = System.getenv( "SystemRoot" ) + "\\Microsoft.NET\\Framework\\v4.0.30319\\";
//TODO: This is a hard-coded path: Don't have a registry value either.
List<String> libraryNames = Arrays.asList("Microsoft.Build.Tasks.v4.0.dll",
Modified: incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/resources/sample-executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/resources/sample-executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/resources/sample-executable-plugins.xml (original)
+++ incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/resources/sample-executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -28,6 +28,7 @@
<executableVersion>5.0</executableVersion>
<profile>NCover:NCover.Console</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
Modified: incubator/npanday/trunk/components/dotnet-msbuild/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-msbuild/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-msbuild/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/components/dotnet-msbuild/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -23,6 +23,7 @@
<vendor>MICROSOFT</vendor>
<executable>msbuild</executable>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
Modified: incubator/npanday/trunk/components/dotnet-nuget/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-nuget/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-nuget/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/components/dotnet-nuget/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -28,6 +28,7 @@
<vendor>MICROSOFT</vendor>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
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=1578852&r1=1578851&r2=1578852&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 Tue Mar 18 12:55:54 2014
@@ -827,41 +827,48 @@ namespace NPanday.ProjectImporter.Conver
RegistryKey root = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\" + projectDigest.TargetFrameworkIdentifier);
int v = 0;
- if (projectDigest.TargetFrameworkVersion == "v4.5") {
- v = 45;
+ if (projectDigest.TargetFrameworkVersion == "v4.5.1") {
+ v = 451;
+ }
+ else if (projectDigest.TargetFrameworkVersion == "v4.5") {
+ v = 450;
}
else if (projectDigest.TargetFrameworkVersion == "v4.0") {
- v = 40;
+ v = 400;
}
else if (projectDigest.TargetFrameworkVersion == "v3.5") {
- v = 35;
+ v = 350;
}
else if (projectDigest.TargetFrameworkVersion == "v3.0") {
- v = 30;
+ v = 300;
}
else if (projectDigest.TargetFrameworkVersion == "v2.0") {
- v = 20;
+ v = 200;
}
- if (v >= 45)
+ if (v >= 451)
+ {
+ GetTargetFrameworkDirectoriesAssemblyFoldersEx(directories, root.OpenSubKey("v4.5.1\\AssemblyFoldersEx"));
+ }
+ if (v >= 450)
{
GetTargetFrameworkDirectoriesAssemblyFoldersEx(directories, root.OpenSubKey("v4.5.50709\\AssemblyFoldersEx"));
GetTargetFrameworkDirectoriesAssemblyFoldersEx(directories, root.OpenSubKey("v4.5\\AssemblyFoldersEx"));
}
- if (v >= 40)
+ if (v >= 400)
{
GetTargetFrameworkDirectoriesAssemblyFoldersEx(directories, root.OpenSubKey("v4.0.30319\\AssemblyFoldersEx"));
}
- if (v >= 35)
+ if (v >= 350)
{
GetTargetFrameworkDirectoriesAssemblyFoldersEx(directories, root.OpenSubKey("v3.5\\AssemblyFoldersEx"));
}
- if (v >= 30)
+ if (v >= 300)
{
GetTargetFrameworkDirectoriesAssemblyFoldersEx(directories, root.OpenSubKey("v3.0\\AssemblyFoldersEx"));
}
- if (v >= 20)
+ if (v >= 200)
{
GetTargetFrameworkDirectoriesAssemblyFoldersEx(directories, root.OpenSubKey("v2.0.50727\\AssemblyFoldersEx"));
}
@@ -981,6 +988,11 @@ namespace NPanday.ProjectImporter.Conver
Dictionary<string, string> targetFrameworkDirectories = new Dictionary<string, string>();
+ if (projectDigest.TargetFrameworkVersion == "v4.5.1")
+ {
+ // v4.0+ overrides the path to just include the reference assemblies
+ AddTargetFrameworkDirectory(targetFrameworkDirectories, "GetPathToDotNetFrameworkReferenceAssemblies", "Version451", "FrameworkRef451");
+ }
if (projectDigest.TargetFrameworkVersion == "v4.5")
{
// v4.0+ overrides the path to just include the reference assemblies
@@ -1016,7 +1028,9 @@ namespace NPanday.ProjectImporter.Conver
}
// Add SDK directory
- if (projectDigest.TargetFrameworkVersion == "v4.5")
+ if (projectDigest.TargetFrameworkVersion == "v4.5.1")
+ AddTargetFrameworkDirectory(targetFrameworkDirectories, "GetPathToDotNetFrameworkSdk", "Version451", "FrameworkSdk451");
+ else if (projectDigest.TargetFrameworkVersion == "v4.5")
AddTargetFrameworkDirectory(targetFrameworkDirectories, "GetPathToDotNetFrameworkSdk", "Version45", "FrameworkSdk45");
else if (projectDigest.TargetFrameworkVersion == "v4.0")
AddTargetFrameworkDirectory(targetFrameworkDirectories, "GetPathToDotNetFrameworkSdk", "Version40", "FrameworkSdk40");
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs Tue Mar 18 12:55:54 2014
@@ -183,7 +183,7 @@ namespace NPanday.ProjectImporter.Conver
// for running .net framework 4.0+ unit tests add new parameter in order to tell NUnit which runtime to
// use. If there is a way to get this parameter from maven-compile-plugin use it
- if (projectDigest.TargetFramework == "4.5" || projectDigest.TargetFramework == "4.0")
+ if (projectDigest.TargetFramework == "4.5.1" || projectDigest.TargetFramework == "4.5" || projectDigest.TargetFramework == "4.0")
{
AddPluginConfiguration(testPlugin, "executionFrameworkVersion", projectDigest.TargetFramework);
}
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/SilverlightPomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/SilverlightPomConverter.cs?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/SilverlightPomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/SilverlightPomConverter.cs Tue Mar 18 12:55:54 2014
@@ -74,7 +74,7 @@ namespace NPanday.ProjectImporter.Conver
// for running .net framework 4.0 unit tests add new parameter in order to tell NUnit which runtime to
// use. If there is a way to get this parameter from maven-compile-plugin use it
- if (projectDigest.TargetFramework == "4.5" || projectDigest.TargetFramework == "4.0")
+ if (projectDigest.TargetFramework == "4.5.1" || projectDigest.TargetFramework == "4.5" || projectDigest.TargetFramework == "4.0")
{
AddPluginConfiguration(testPlugin, "executionFrameworkVersion", projectDigest.TargetFramework);
}
Modified: incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -28,6 +28,7 @@
<vendor>MICROSOFT</vendor>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -54,6 +55,7 @@
<vendor>MICROSOFT</vendor>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -80,6 +82,7 @@
<vendor>MICROSOFT</vendor>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -106,6 +109,7 @@
<vendor>MICROSOFT</vendor>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
Modified: incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -29,6 +29,7 @@
<vendor>MICROSOFT</vendor>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
Modified: incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -24,6 +24,7 @@ under the License.
<executable>FxCopCmd</executable>
<profile>Microsoft:FxCop:FxCopCmd</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
Modified: incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -24,6 +24,7 @@ under the License.
<executable>ILMerge</executable>
<profile>ILMERGE</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -43,6 +44,7 @@ under the License.
<executable>ILRepack</executable>
<profile>ILREPACK</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -62,6 +64,7 @@ under the License.
<executable>ILRepack</executable>
<profile>ILREPACK</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
Modified: incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -24,6 +24,7 @@ under the License.
<executable>al</executable>
<profile>AL</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -44,6 +45,7 @@ under the License.
<executable>al</executable>
<profile>AL</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
Modified: incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -24,6 +24,7 @@ under the License.
<executable>resgen</executable>
<profile>RESGEN</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -44,6 +45,7 @@ under the License.
<executable>resgen</executable>
<profile>RESGEN</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
Modified: incubator/npanday/trunk/plugins/maven-test-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-test-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-test-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/plugins/maven-test-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -26,6 +26,7 @@ under the License.
<executable>nunit-console</executable>
<profile>NUNIT</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -46,6 +47,7 @@ under the License.
<executable>nunit-console-x86</executable>
<profile>NUNIT-x86</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
Modified: incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -24,6 +24,7 @@ under the License.
<executable>wsdl</executable>
<profile>WSDL</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
Modified: incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -104,6 +104,7 @@ under the License.
<executable>xsd</executable>
<profile>XSD:XML_INSTANCE</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
@@ -129,6 +130,7 @@ under the License.
<executable>xsd</executable>
<profile>XSD:SCHEMA</profile>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
Modified: incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Mar 18 12:55:54 2014
@@ -41,6 +41,7 @@
<executableVersion>2</executableVersion>
<frameworkVersions>
+ <frameworkVersion>4.5.1</frameworkVersion>
<frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/SettingsGeneratorMojo.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/SettingsGeneratorMojo.cs?rev=1578852&r1=1578851&r2=1578852&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/SettingsGeneratorMojo.cs (original)
+++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/SettingsGeneratorMojo.cs Tue Mar 18 12:55:54 2014
@@ -307,6 +307,21 @@ namespace NPanday.Plugin.Settings
vendor.frameworks = vendorFrameworks;
vendors.Add(vendor);
}
+ else if (sdk == "v4.5.1")
+ {
+ npandaySettingsVendorsVendor vendor = new npandaySettingsVendorsVendor();
+ vendor.vendorName = "MICROSOFT";
+ vendor.vendorVersion = "4.5.1";
+ npandaySettingsVendorsVendorFrameworksFramework[] vendorFrameworks = new npandaySettingsVendorsVendorFrameworksFramework[1];
+ npandaySettingsVendorsVendorFrameworksFramework vf = new npandaySettingsVendorsVendorFrameworksFramework();
+ vf.installRoot = dirInfo40.FullName;
+ vf.frameworkVersion = "4.5.1";
+ vendorFrameworks[0] = vf;
+ vf.sdkInstallRoot = sdkInstallRoot40;
+ FindAndAssignExecutablePaths(vf);
+ vendor.frameworks = vendorFrameworks;
+ vendors.Add(vendor);
+ }
}
return vendors.ToArray();
}