Standardize WiX Toolset on .NET Framework v4.5

src/Setup/Bundle/Bundle.wxs

@@ -26,10 +26,8 @@
           <Payload SourceFile='..\..\..\License.txt' />
         </BootstrapperApplicationRef>
 
-        <util:RegistrySearchRef Id="NETFRAMEWORK35_SP_LEVEL" />
-
         <Chain>
-            <PackageGroupRef Id='NetFx40Web' />
+            <PackageGroupRef Id='NetFx462Redist' />
             <PackageGroupRef Id='WixPackages' />
         </Chain>
     </Bundle>

src/Setup/CoreMsi/Lux.wxs

@@ -19,7 +19,6 @@
 
             <Component>
                 <File Source="nit.exe" />
-                <File Source="nit.exe.config" />
             </Component>
 
             <Component>

src/Setup/CoreMsi/MSBuild.wxs

@@ -15,14 +15,6 @@
                 <File Source="wix.targets" />
             </Component>
 
-            <Component>
-                <File Source="wix200x.targets" />
-            </Component>
-
-            <Component>
-                <File Source="wix2010.targets" />
-            </Component>
-
             <Component>
                 <File Source="wix.ca.targets" />
             </Component>

src/Setup/WixBA/InstallationViewModel.cs

@@ -101,7 +101,7 @@ void RootPropertyChanged(object sender, PropertyChangedEventArgs e)
         /// <summary>
         /// Gets the title for the application.
         /// </summary>
-        public string Version 
+        public string Version
         {
             get { return String.Concat("v", WixBA.Model.Version.ToString()); }
         }
@@ -275,7 +275,7 @@ public ICommand TryAgainCommand
             {
                 if (this.tryAgainCommand == null)
                 {
-                    this.tryAgainCommand = new RelayCommand(param => 
+                    this.tryAgainCommand = new RelayCommand(param =>
                         {
                             this.root.Canceled = false;
                             WixBA.Plan(WixBA.Model.PlannedAction);
@@ -436,29 +436,6 @@ private void DetectComplete(object sender, DetectCompleteEventArgs e)
             }
             else if (Hresult.Succeeded(e.Status))
             {
-                // block if CLR v2 isn't available; sorry, it's needed for the MSBuild tasks
-                if (WixBA.Model.Engine.EvaluateCondition("NOT NETFRAMEWORK35_SP_LEVEL"))
-                {
-                    string message = "WiX Toolset requires the .NET Framework 3.5.1 Windows feature to be enabled.";
-                    WixBA.Model.Engine.Log(LogLevel.Verbose, message);
-
-                    if (Display.Full == WixBA.Model.Command.Display)
-                    {
-                        WixBA.Dispatcher.Invoke((Action)delegate()
-                            {
-                                MessageBox.Show(message, "WiX Toolset", MessageBoxButton.OK, MessageBoxImage.Error);
-                                if (null != WixBA.View)
-                                {
-                                    WixBA.View.Close();
-                                }
-                            }
-                        );
-                    }
-
-                    this.root.InstallState = InstallationState.Failed;
-                    return;
-                }
-
                 if (this.Downgrade)
                 {
                     // TODO: What behavior do we want for downgrade?

src/Setup/WixBA/WixBA.BootstrapperCore.config

@@ -9,12 +9,9 @@
         </sectionGroup>
     </configSections>
     <startup useLegacyV2RuntimeActivationPolicy="true">
-        <supportedRuntime version="v4.0" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
     <wix.bootstrapper>
-        <host assemblyName="WixBA">
-            <supportedFramework version="v4\Full" />
-            <supportedFramework version="v4\Client" />
-        </host>
+        <host assemblyName="WixBA" />
     </wix.bootstrapper>
 </configuration>

src/Setup/WixBA/WixBA.csproj

@@ -8,7 +8,6 @@
     <AssemblyName>WixBA</AssemblyName>
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.Tools.WindowsInstallerXml.UX</RootNamespace>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/Setup/Zip/binaries.zipproj

@@ -46,8 +46,6 @@
     <Stage Include="$(OutputPath)winterop.dll" />
     <Stage Include="$(OutputPath)wix.dll" />
     <Stage Include="$(OutputPath)wix.targets" />
-    <Stage Include="$(OutputPath)wix200x.targets" />
-    <Stage Include="$(OutputPath)wix2010.targets" />
     <Stage Include="$(OutputPath)WixCop.exe" />
     <Stage Include="$(OutputPath)WixTasks.dll" />
     <!--<Stage Include="$(OutputPath)wui.dll" />-->

src/ext/VSExtension/wixext/WixVSExtension.MSBuild12/WixVSExtension.MSBuild12.csproj

@@ -8,7 +8,6 @@
     <AssemblyName>WixVSExtension.MSBuild12</AssemblyName>
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.Tools.WindowsInstallerXml.Extensions.WixVSExtension</RootNamespace>
-    <TargetFrameworkVersion>4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />

src/ext/VSExtension/wixext/WixVSExtension.MSBuild14/WixVSExtension.MSBuild14.csproj

@@ -8,7 +8,6 @@
     <AssemblyName>WixVSExtension.MSBuild14</AssemblyName>
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.Tools.WindowsInstallerXml.Extensions.WixVSExtension</RootNamespace>
-    <TargetFrameworkVersion>4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />

src/ext/lux/ca/CustomAction.config

@@ -4,28 +4,6 @@
 
 <configuration>
     <startup useLegacyV2RuntimeActivationPolicy="true">
-
-        <!--
-          Use supportedRuntime tags to explicitly specify the version(s) of the .NET Framework runtime that
-          the custom action should run on. If no versions are specified, the chosen version of the runtime
-          will be the "best" match to what Microsoft.Deployment.WindowsInstaller.dll was built against.
-
-          WARNING: leaving the version unspecified is dangerous as it introduces a risk of compatibility
-          problems with future versions of the .NET Framework runtime. It is highly recommended that you specify
-          only the version(s) of the .NET Framework runtime that you have tested against.
-
-          Note for .NET Framework v3.0 and v3.5, the runtime version is still v2.0.
-
-          In order to enable .NET Framework version 2.0 runtime activation policy, which is to load all assemblies 
-          by using the latest supported runtime, @useLegacyV2RuntimeActivationPolicy="true".
-
-          For more information, see http://msdn.microsoft.com/en-us/library/bbx34a2h.aspx
-        -->
-        <supportedRuntime version="v4.0" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
-
-    <!--
-      Add additional configuration settings here. For more information on application config files,
-      see http://msdn.microsoft.com/en-us/library/kza1yk3a.aspx
-    -->
 </configuration>

src/ext/lux/ca/LuxCustomActions.csproj

@@ -8,7 +8,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.Tools.WindowsInstallerXml.Extensions</RootNamespace>
     <AssemblyName>LuxCustomActions</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/ext/lux/lux/app.config

@@ -6,7 +6,4 @@
     <appSettings>
         <add key="extensions" value="WixDifxAppExtension;WixDirectXExtension;WixFirewallExtension;WixGamingExtension;WixIIsExtension;WixLuxExtension;WixNetFxExtension;WixSqlExtension;WixUIExtension;WixUtilExtension;WixVSExtension" />
     </appSettings>
-    <startup>
-        <supportedRuntime version="v4.0" />
-    </startup>
 </configuration>

src/ext/lux/nit/nit.csproj

@@ -27,7 +27,6 @@
       <ResourcesLogicalName>$(RootNamespace).Data.Messages.resources</ResourcesLogicalName>
     </MsgGenSource>
     <EmbeddedNativeResource Include="nit.rc" />
-    <None Include="app.config" />
     <EmbeddedResource Include="NitStrings.resx">
       <SubType>Designer</SubType>
       <Generator>ResXFileCodeGenerator</Generator>

src/tools/WixTasks/WixTasks.csproj

@@ -10,7 +10,6 @@
     <RootNamespace>Microsoft.Tools.WindowsInstallerXml.Build.Tasks</RootNamespace>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <CreateDocumentationFile>true</CreateDocumentationFile>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
 
@@ -53,12 +52,6 @@
     <Content Include="wix.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="wix200x.targets">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="wix2010.targets">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="wix.ca.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -82,12 +75,4 @@
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
-<!--
-  <Target Name="AfterBuild">
-    <Copy SourceFiles="$(TargetPath);$(OutDir)wix.targets;$(OutDir)wix200x.targets;$(OutDir)wix2010.targets" DestinationFolder="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\" SkipUnchangedFiles="true" ContinueOnError="true" />
-    <CreateItem Include="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\$(TargetFileName);$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\wix.targets;$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\wix200x.targets;$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\wix2010.targets">
-      <Output TaskParameter="Include" ItemName="FileWrites" />
-    </CreateItem>
-  </Target>
--->
 </Project>