Author: brett
Date: Sat Jun 1 07:08:23 2013
New Revision: 1488479
URL: http://svn.apache.org/r1488479
Log:
[NPANDAY-587] Support for .NET Framework 4.5
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/DotnetSdkLocator.cs
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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -281,6 +281,75 @@
</commandFilter>
</compilerPlugin>
<compilerPlugin>
+ <identifier>MS-CS-4.5</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</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.0</identifier>
<pluginClass>npanday.executable.compiler.impl.DefaultCompiler</pluginClass>
<vendor>MICROSOFT</vendor>
@@ -662,6 +731,7 @@
<language>VB</language>
<profile>FULL</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -24,6 +24,7 @@
<executable>NCover.Console</executable>
<profile>NCover:NCover.Console</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
@@ -42,6 +43,7 @@
<executable>BuildAssembler</executable>
<profile>Microsoft:SandCastle:BuildAssembler</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
@@ -60,6 +62,7 @@
<executable>XslTransform</executable>
<profile>Microsoft:SandCastle:XslTransform</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
@@ -78,6 +81,7 @@
<executable>MRefBuilder</executable>
<profile>Microsoft:SandCastle:MRefBuilder</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
@@ -99,6 +103,7 @@
<executable>gacutil</executable>
<profile>GACUTIL</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
@@ -118,6 +123,7 @@
<executable>gacutil</executable>
<profile>GACUTIL</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -194,9 +194,8 @@ public final class DefaultCompiler
commands.add( wcfRef + "Microsoft.VisualC.STLCLR.dll" );
}
- if ( compilerContext.getVendor().equals( Vendor.MICROSOFT ) &&
- compilerContext.getFrameworkVersion().equals( "4.0" ) )
- {
+ if (compilerContext.getVendor().equals(Vendor.MICROSOFT) &&
+ (compilerContext.getFrameworkVersion().equals("4.0") ||
compilerContext.getFrameworkVersion().equals("4.5"))) {
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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -28,6 +28,7 @@
<executableVersion>5.0</executableVersion>
<profile>NCover:NCover.Console</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -23,6 +23,7 @@
<vendor>MICROSOFT</vendor>
<executable>msbuild</executable>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -28,6 +28,7 @@
<vendor>MICROSOFT</vendor>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>2.0</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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -813,19 +813,42 @@ namespace NPanday.ProjectImporter.Conver
RegistryKey root =
Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\" +
projectDigest.TargetFrameworkIdentifier);
- if (projectDigest.TargetFrameworkVersion == "v4.0")
+ int v = 0;
+ if (projectDigest.TargetFrameworkVersion == "v4.5") {
+ v = 45;
+ }
+ else if (projectDigest.TargetFrameworkVersion == "v4.0") {
+ v = 40;
+ }
+ else if (projectDigest.TargetFrameworkVersion == "v3.5") {
+ v = 35;
+ }
+ else if (projectDigest.TargetFrameworkVersion == "v3.0") {
+ v = 30;
+ }
+ else if (projectDigest.TargetFrameworkVersion == "v2.0") {
+ v = 20;
+ }
+
+
+ if (v >= 45)
+ {
+ GetTargetFrameworkDirectoriesAssemblyFoldersEx(directories,
root.OpenSubKey("v4.5.50709\\AssemblyFoldersEx"));
+ GetTargetFrameworkDirectoriesAssemblyFoldersEx(directories,
root.OpenSubKey("v4.5\\AssemblyFoldersEx"));
+ }
+ if (v >= 40)
{
GetTargetFrameworkDirectoriesAssemblyFoldersEx(directories,
root.OpenSubKey("v4.0.30319\\AssemblyFoldersEx"));
}
- if (projectDigest.TargetFrameworkVersion == "v4.0" ||
projectDigest.TargetFrameworkVersion == "v3.5")
+ if (v >= 35)
{
GetTargetFrameworkDirectoriesAssemblyFoldersEx(directories,
root.OpenSubKey("v3.5\\AssemblyFoldersEx"));
}
- if (projectDigest.TargetFrameworkVersion == "v4.0" ||
projectDigest.TargetFrameworkVersion == "v3.5" ||
projectDigest.TargetFrameworkVersion == "v3.0")
+ if (v >= 30)
{
GetTargetFrameworkDirectoriesAssemblyFoldersEx(directories,
root.OpenSubKey("v3.0\\AssemblyFoldersEx"));
}
- if (projectDigest.TargetFrameworkVersion == "v4.0" ||
projectDigest.TargetFrameworkVersion == "v3.5" ||
projectDigest.TargetFrameworkVersion == "v3.0" ||
projectDigest.TargetFrameworkVersion == "v2.0")
+ if (v >= 20)
{
GetTargetFrameworkDirectoriesAssemblyFoldersEx(directories,
root.OpenSubKey("v2.0.50727\\AssemblyFoldersEx"));
}
@@ -945,6 +968,11 @@ namespace NPanday.ProjectImporter.Conver
Dictionary<string, string> targetFrameworkDirectories = new
Dictionary<string, string>();
+ if (projectDigest.TargetFrameworkVersion == "v4.5")
+ {
+ // v4.0+ overrides the path to just include the reference
assemblies
+ AddTargetFrameworkDirectory(targetFrameworkDirectories,
"GetPathToDotNetFrameworkReferenceAssemblies", "Version45", "FrameworkRef45");
+ }
if (projectDigest.TargetFrameworkVersion == "v4.0")
{
// v4.0 overrides the path to just include the reference
assemblies
@@ -975,7 +1003,9 @@ namespace NPanday.ProjectImporter.Conver
}
// Add SDK directory
- if (projectDigest.TargetFrameworkVersion == "v4.0")
+ if (projectDigest.TargetFrameworkVersion == "v4.5")
+ AddTargetFrameworkDirectory(targetFrameworkDirectories,
"GetPathToDotNetFrameworkSdk", "Version45", "FrameworkSdk45");
+ else if (projectDigest.TargetFrameworkVersion == "v4.0")
AddTargetFrameworkDirectory(targetFrameworkDirectories,
"GetPathToDotNetFrameworkSdk", "Version40", "FrameworkSdk40");
else if (projectDigest.TargetFrameworkVersion == "v3.5")
AddTargetFrameworkDirectory(targetFrameworkDirectories,
"GetPathToDotNetFrameworkSdk", "Version35", "FrameworkSdk35");
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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -196,11 +196,11 @@ namespace NPanday.ProjectImporter.Conver
);
AddPluginConfiguration(testPlugin, "integrationTest", "true");
- // 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.0")
+ // 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")
{
- AddPluginConfiguration(testPlugin,
"executionFrameworkVersion", "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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -72,11 +72,11 @@ namespace NPanday.ProjectImporter.Conver
);
AddPluginConfiguration(testPlugin, "integrationTest", "true");
- // 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.0")
+ // 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")
{
- AddPluginConfiguration(testPlugin,
"executionFrameworkVersion", "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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -28,6 +28,7 @@
<vendor>MICROSOFT</vendor>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
</frameworkVersions>
@@ -53,6 +54,7 @@
<vendor>MICROSOFT</vendor>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
</frameworkVersions>
@@ -78,6 +80,7 @@
<vendor>MICROSOFT</vendor>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
</frameworkVersions>
@@ -103,6 +106,7 @@
<vendor>MICROSOFT</vendor>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
</frameworkVersions>
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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -29,6 +29,7 @@
<vendor>MICROSOFT</vendor>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>2.0</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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -24,6 +24,7 @@ under the License.
<executable>FxCopCmd</executable>
<profile>Microsoft:FxCop:FxCopCmd</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -24,6 +24,7 @@ under the License.
<executable>ILMerge</executable>
<profile>ILMERGE</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
@@ -42,6 +43,7 @@ under the License.
<executable>ILRepack</executable>
<profile>ILREPACK</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
@@ -60,6 +62,7 @@ under the License.
<executable>ILRepack</executable>
<profile>ILREPACK</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -24,6 +24,7 @@ under the License.
<executable>al</executable>
<profile>AL</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
@@ -43,6 +44,7 @@ under the License.
<executable>al</executable>
<profile>AL</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
<frameworkVersion>2.0.50727</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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -24,6 +24,7 @@ under the License.
<executable>resgen</executable>
<profile>RESGEN</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
@@ -43,6 +44,7 @@ under the License.
<executable>resgen</executable>
<profile>RESGEN</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -26,6 +26,7 @@ under the License.
<executable>nunit-console</executable>
<profile>NUNIT</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
@@ -45,6 +46,7 @@ under the License.
<executable>nunit-console-x86</executable>
<profile>NUNIT-x86</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -24,6 +24,7 @@ under the License.
<executable>wsdl</executable>
<profile>WSDL</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -104,6 +104,7 @@ under the License.
<executable>xsd</executable>
<profile>XSD:XML_INSTANCE</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
@@ -128,6 +129,7 @@ under the License.
<executable>xsd</executable>
<profile>XSD:SCHEMA</profile>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -41,6 +41,7 @@
<executableVersion>2</executableVersion>
<frameworkVersions>
+ <frameworkVersion>4.5</frameworkVersion>
<frameworkVersion>4.0</frameworkVersion>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/DotnetSdkLocator.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/DotnetSdkLocator.cs?rev=1488479&r1=1488478&r2=1488479&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/DotnetSdkLocator.cs
(original)
+++
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/DotnetSdkLocator.cs
Sat Jun 1 07:08:23 2013
@@ -29,6 +29,7 @@ namespace NPanday.Plugin.Settings
RegistryKey Microsoft_SDKs_NETFramework =
Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\SDKs\.NETFramework");
RegistryKey Microsoft_SDKs_Windows_70 =
Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.0");
RegistryKey Microsoft_SDKs_Windows_70a =
Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.0A");
+ RegistryKey Microsoft_SDKs_Windows_80a =
Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v8.0A");
string ProgramFilesX86(string subfolders){
string programFiles =
Environment.GetEnvironmentVariable("PROGRAMFILES(X86)")
@@ -75,7 +76,6 @@ namespace NPanday.Plugin.Settings
public string Find4_0()
{
return PathUtil.FirstExisting(
- registryFind(Microsoft_NETFramework, "sdkInstallRootv4.0"), //
does not exist, I thinkg (lcorneliussen)
// prefer 32 bit until its made explicit
registryFind(Microsoft_SDKs_Windows_70a,
"WinSDK-NetFx40Tools", "InstallationFolder"),
registryFind(Microsoft_SDKs_Windows_70a,
"WinSDK-NetFx40Tools-x86", "InstallationFolder"),
@@ -83,6 +83,16 @@ namespace NPanday.Plugin.Settings
);
}
+ public string Find4_5()
+ {
+ return PathUtil.FirstExisting(
+ // prefer 32 bit until its made explicit
+ registryFind(Microsoft_SDKs_Windows_80a,
"WinSDK-NetFx40Tools", "InstallationFolder"),
+ registryFind(Microsoft_SDKs_Windows_80a,
"WinSDK-NetFx40Tools-x86", "InstallationFolder"),
+ registryFind(Microsoft_SDKs_Windows_80a,
"WinSDK-NetFx40Tools-x64", "InstallationFolder")
+ );
+ }
+
private string registryFind(RegistryKey root, string valueKey)
{
return registryFind(root, null, valueKey);
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=1488479&r1=1488478&r2=1488479&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
Sat Jun 1 07:08:23 2013
@@ -194,6 +194,7 @@ namespace NPanday.Plugin.Settings
string sdkInstallRoot20 = sdkLocator.Find2_0();
string sdkInstallRoot35 = sdkLocator.Find3_5();
string sdkInstallRoot40 = sdkLocator.Find4_0();
+ string sdkInstallRoot45 = sdkLocator.Find4_5();
if (installRoot == null) throw new
ExecutionException("NPANDAY-9011-005");
@@ -289,6 +290,22 @@ namespace NPanday.Plugin.Settings
vendor.frameworks = vendorFrameworks;
vendors.Add(vendor);
}
+ // SDK only
+ if (new DirectoryInfo(sdkInstallRoot45).Exists)
+ {
+ npandaySettingsVendorsVendor vendor = new
npandaySettingsVendorsVendor();
+ vendor.vendorName = "MICROSOFT";
+ vendor.vendorVersion = "4.5";
+ npandaySettingsVendorsVendorFrameworksFramework[]
vendorFrameworks = new npandaySettingsVendorsVendorFrameworksFramework[1];
+ npandaySettingsVendorsVendorFrameworksFramework vf = new
npandaySettingsVendorsVendorFrameworksFramework();
+ vf.installRoot = dirInfo40.FullName;
+ vf.frameworkVersion = "4.5";
+ vendorFrameworks[0] = vf;
+ vf.sdkInstallRoot = sdkInstallRoot45;
+ FindAndAssignExecutablePaths(vf);
+ vendor.frameworks = vendorFrameworks;
+ vendors.Add(vendor);
+ }
return vendors.ToArray();
}
