Add feature parameter to dotnet::install::feature

This will allow specification of different feature names. Necessary
specifically because the feature name to install .NET 3.5 on Server 2012
is not the same feature as to install 4.5.

The feature name for .NET 3.5 in Server 2012 is not AS-NET-Framework,
which we use as the default feature. This commit also updates the dotnet
type to attempt installation of the correct feature when 3.5 is
specified on Server 2012.

Author: reidmv

README.md

@@ -61,7 +61,10 @@ Ensures the state of .net on the system. Present or Absent.
 The version of .net that you want to be managed by this definition.
 
 #####`package_dir`
-If installing .NET from a directory or a mounted network location then this is that directory
+If installing .NET from a directory or a mounted network location then this is
+that directory. If the version of .NET being installed is a Windows feature, it
+may sometimes be necessary to specify package\_dir as the path to installation
+media, such as `D:\sources\sxs`.
 
 ##Reference
 

manifests/init.pp

@@ -39,9 +39,6 @@
 
   Variant[String, Undef]
   $package_dir = undef,
-
-  Variant[String, Undef]
-  $source = undef,
 ) {
 
   include dotnet::params
@@ -55,7 +52,11 @@
   case $version {
     '3.5': {
       case $windows_version {
-        '2008 R2', /^2012/:             { $type = 'feature' }
+        /^2012/: {
+          $type    = 'feature'
+          $feature = 'NET-Framework-Features'
+        }
+        '2008 R2':                      { $type = 'feature' }
         '7', '8', '8.1':                { $type = 'dism'    }
         /^2003/, '2008', 'XP', 'Vista': { $type = 'package' }
         default:                        { $type = 'err'     }
@@ -96,6 +97,8 @@
       dotnet::install::feature { "dotnet-feature-${version}":
         ensure  => $ensure,
         version => $version,
+        feature => $feature,
+        source  => $package_dir,
       }
     }
     'dism': {

manifests/install/feature.pp

@@ -1,19 +1,26 @@
 #
 define dotnet::install::feature(
+  $version,
   $ensure  = 'present',
-  $version = '',
+  $feature = 'AS-NET-Framework',
+  $source  = undef,
 ) {
 
+  $source_flag = $source ? {
+    undef   => '',
+    default => "-source ${source}",
+  }
+
   if $ensure == 'present' {
     exec { "install-dotnet-feature-${version}":
-      command   => 'Import-Module ServerManager; Add-WindowsFeature as-net-framework',
+      command   => "Import-Module ServerManager; Add-WindowsFeature ${feature} ${source_flag}",
       provider  => powershell,
       logoutput => true,
       creates   => "C:/Windows/Microsoft.NET/Framework/v${version}",
     }
   } else {
     exec { "uninstall-dotnet-feature-${version}":
-      command   => 'Import-Module ServerManager; Remove-WindowsFeature as-net-framework',
+      command   => "Import-Module ServerManager; Remove-WindowsFeature ${feature}",
       provider  => powershell,
       logoutput => true,
       onlyif    => "If (-Not(Test-Path C:/Windows/Microsoft.NET/Framework/v${version})) { Exit 1 }",