70 files changed, 4498 insertions, 0 deletions

diff --git a/src/ext/NetFx/CustomizedNativeRecommendedRules.ruleset b/src/ext/NetFx/CustomizedNativeRecommendedRules.ruleset
new file mode 100644
index 00000000..142b141c
--- /dev/null
+++ b/src/ext/NetFx/CustomizedNativeRecommendedRules.ruleset
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Customized Microsoft Native Recommended Rules" Description="Microsoft Native Recommended Rules, -C26812" ToolsVersion="16.0">
+  <Include Path="nativerecommendedrules.ruleset" Action="Default" />
+  <Rules AnalyzerId="Microsoft.Analyzers.NativeCodeAnalysis" RuleNamespace="Microsoft.Rules.Native">
+    <!-- We need C style enums since we support BAs written in C -->
+    <Rule Id="C26812" Action="None" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/src/ext/NetFx/Directory.Build.props b/src/ext/NetFx/Directory.Build.props
new file mode 100644
index 00000000..b3c6287c
--- /dev/null
+++ b/src/ext/NetFx/Directory.Build.props
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!--
+  Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.props
+  then update all of the repos.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
+    <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages>
+
+    <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
+    <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath>
+    <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
+    <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
+
+    <Authors>WiX Toolset Team</Authors>
+    <Company>WiX Toolset</Company>
+    <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
+    <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
+    <Product>WiX Toolset</Product>
+  </PropertyGroup>
+
+  <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
+  <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
+</Project>
diff --git a/src/ext/NetFx/Directory.Build.targets b/src/ext/NetFx/Directory.Build.targets
new file mode 100644
index 00000000..2fcc765a
--- /dev/null
+++ b/src/ext/NetFx/Directory.Build.targets
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!--
+  Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.targets
+  then update all of the repos.
+-->
+<!--
+  Replace PackageReferences with ProjectReferences when the projects can be found in .sln.
+  See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
+-->
+<Project>
+  <PropertyGroup>
+    <ReplacePackageReferences>true</ReplacePackageReferences>
+    <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
+    <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')">
+
+      <PropertyGroup>
+        <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent>
+        <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir>
+        <RegexPattern>(?&lt;="[PackageName]", ")(.*)(?=", ")</RegexPattern>
+      </PropertyGroup>
+
+      <ItemGroup>
+        <!-- Keep the identity of the PackageReference -->
+        <SmartPackageReference Include="@(PackageReference)">
+          <PackageName>%(Identity)</PackageName>
+          <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution>
+        </SmartPackageReference>
+
+        <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function -->
+        <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))">
+          <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern>
+          <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath>
+        </PackageInSolution>
+
+        <ProjectReference  Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>
+
+        <!-- Remove the package references that are now referenced as projects -->
+        <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/>
+      </ItemGroup>
+
+    </When>
+  </Choose>
+
+  <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
+  <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
+</Project>
diff --git a/src/ext/NetFx/Directory.csproj.props b/src/ext/NetFx/Directory.csproj.props
new file mode 100644
index 00000000..81d24ad1
--- /dev/null
+++ b/src/ext/NetFx/Directory.csproj.props
@@ -0,0 +1,13 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!--
+  Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props
+  then update all of the repos.
+-->
+<Project>
+  <PropertyGroup>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
+    <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
+  </PropertyGroup>
+</Project>
diff --git a/src/ext/NetFx/Directory.csproj.targets b/src/ext/NetFx/Directory.csproj.targets
new file mode 100644
index 00000000..c3270426
--- /dev/null
+++ b/src/ext/NetFx/Directory.csproj.targets
@@ -0,0 +1,26 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!--
+  Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.csproj.targets
+  then update all of the repos.
+-->
+<Project>
+  <PropertyGroup>
+    <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
+    <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+  </PropertyGroup>
+
+  <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"
+          Condition=" Exists('$(MSBuildProjectName).nuspec') ">
+    <PropertyGroup>
+      <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl>
+
+      <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
+      <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath>
+      <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
+      <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties>
+      <PublishRepositoryUrl>true</PublishRepositoryUrl>
+      <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    </PropertyGroup>
+  </Target>
+
+</Project>
diff --git a/src/ext/NetFx/Directory.vcxproj.props b/src/ext/NetFx/Directory.vcxproj.props
new file mode 100644
index 00000000..47c2c143
--- /dev/null
+++ b/src/ext/NetFx/Directory.vcxproj.props
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project>
+  <PropertyGroup>
+    <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
+    <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
+    <OutDir>$(OutputPath)$(Platform)\</OutDir>
+
+    <!-- NBGV properties -->
+    <AssemblyCompany>$(Company)</AssemblyCompany>
+    <AssemblyCopyright>$(Copyright)</AssemblyCopyright>
+
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
+    <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
+      <WarningLevel>Level4</WarningLevel>
+      <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
+      <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <ExceptionHandling>false</ExceptionHandling>
+      <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
+      <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Link>
+      <SubSystem>$(ProjectSubSystem)</SubSystem>
+      <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile>
+      <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'">
+    <ClCompile>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' ">
+    <ClCompile>
+      <CallingConvention>CDecl</CallingConvention>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' ">
+    <ClCompile>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <OmitDefaultLibName>true</OmitDefaultLibName>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' ">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
+    <ClCompile>
+      <BasicRuntimeChecks></BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
+    <ClCompile>
+      <BasicRuntimeChecks></BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
+    <Link>
+      <KeyFile>$(LinkKeyFile)</KeyFile>
+      <DelaySign>$(LinkDelaySign)</DelaySign>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/src/ext/NetFx/NetFx.wixext.sln b/src/ext/NetFx/NetFx.wixext.sln
new file mode 100644
index 00000000..e830aeea
--- /dev/null
+++ b/src/ext/NetFx/NetFx.wixext.sln
@@ -0,0 +1,75 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2010
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netfxca", "src\ca\netfxca.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "netfx", "src\wixlib\netfx.wixproj", "{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Netfx.wixext", "src\wixext\WixToolset.Netfx.wixext.csproj", "{F774E291-0563-4DDD-B873-F5C31683CF4B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Netfx", "src\test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj", "{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}"
+EndProject
+Global
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                Debug|Any CPU = Debug|Any CPU
+                Debug|x64 = Debug|x64
+                Debug|x86 = Debug|x86
+                Release|Any CPU = Release|Any CPU
+                Release|x64 = Release|x64
+                Release|x86 = Release|x86
+        EndGlobalSection
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|Any CPU.ActiveCfg = Debug|Win32
+                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|Any CPU.Build.0 = Debug|Win32
+                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x64.ActiveCfg = Debug|Win32
+                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.ActiveCfg = Debug|Win32
+                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.Build.0 = Debug|Win32
+                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|Any CPU.ActiveCfg = Release|Win32
+                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|Any CPU.Build.0 = Release|Win32
+                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x64.ActiveCfg = Release|Win32
+                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.ActiveCfg = Release|Win32
+                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.Build.0 = Release|Win32
+                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|Any CPU.ActiveCfg = Debug|x86
+                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|Any CPU.Build.0 = Debug|x86
+                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|x64.ActiveCfg = Debug|x86
+                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|x86.ActiveCfg = Debug|x86
+                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|x86.Build.0 = Debug|x86
+                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|Any CPU.ActiveCfg = Release|x86
+                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|Any CPU.Build.0 = Release|x86
+                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|x64.ActiveCfg = Release|x86
+                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|x86.ActiveCfg = Release|x86
+                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|x86.Build.0 = Release|x86
+                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug|x64.Build.0 = Debug|Any CPU
+                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug|x86.Build.0 = Debug|Any CPU
+                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Release|Any CPU.Build.0 = Release|Any CPU
+                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Release|x64.ActiveCfg = Release|Any CPU
+                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Release|x64.Build.0 = Release|Any CPU
+                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Release|x86.ActiveCfg = Release|Any CPU
+                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Release|x86.Build.0 = Release|Any CPU
+                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug|x64.Build.0 = Debug|Any CPU
+                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug|x86.Build.0 = Debug|Any CPU
+                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release|Any CPU.Build.0 = Release|Any CPU
+                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release|x64.ActiveCfg = Release|Any CPU
+                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release|x64.Build.0 = Release|Any CPU
+                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release|x86.ActiveCfg = Release|Any CPU
+                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release|x86.Build.0 = Release|Any CPU
+        EndGlobalSection
+        GlobalSection(SolutionProperties) = preSolution
+                HideSolutionNode = FALSE
+        EndGlobalSection
+        GlobalSection(ExtensibilityGlobals) = postSolution
+                SolutionGuid = {E4566A6B-47D0-4EA0-989A-D763AC39105D}
+        EndGlobalSection
+EndGlobal
diff --git a/src/ext/NetFx/README.md b/src/ext/NetFx/README.md
new file mode 100644
index 00000000..a31cfd1d
--- /dev/null
+++ b/src/ext/NetFx/README.md
@@ -0,0 +1,2 @@
+# NetFx.wixext
+WixToolset.NetFx.wixext - .NET Framework WiX Toolset Extension 
diff --git a/src/ext/NetFx/appveyor.cmd b/src/ext/NetFx/appveyor.cmd
new file mode 100644
index 00000000..d7e705f0
--- /dev/null
+++ b/src/ext/NetFx/appveyor.cmd
@@ -0,0 +1,19 @@
+@setlocal
+@pushd %~dp0
+@set _C=Release
+@if /i "%1"=="debug" set _C=Debug
+
+:: Restore
+msbuild -p:Configuration=%_C% -t:Restore || exit /b
+
+:: Build
+msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj || exit /b
+
+:: Test
+dotnet test -c %_C% --no-build src\test\WixToolsetTest.Netfx || exit /b
+
+:: Pack
+msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Netfx.wixext.csproj || exit /b
+
+@popd
+@endlocal
diff --git a/src/ext/NetFx/appveyor.yml b/src/ext/NetFx/appveyor.yml
new file mode 100644
index 00000000..c53cc9cc
--- /dev/null
+++ b/src/ext/NetFx/appveyor.yml
@@ -0,0 +1,42 @@
+# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+#
+#  Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
+#  then update all of the repos.
+
+branches:
+  only:
+    - master
+    - develop
+
+image: Visual Studio 2019
+
+version: 0.0.0.{build}
+configuration: Release
+
+environment:
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  NUGET_XMLDOC_MODE: skip
+
+build_script:
+  - appveyor.cmd
+
+pull_requests:
+  do_not_increment_build_number: true
+
+nuget:
+  disable_publish_on_pr: true
+
+skip_branch_with_pr: true
+skip_tags: true
+
+artifacts:
+- path: build\Release\**\*.nupkg
+  name: nuget
+- path: build\Release\**\*.snupkg
+  name: snupkg
+
+notifications:
+- provider: Slack
+  incoming_webhook:
+    secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA=
diff --git a/src/ext/NetFx/ca/caDecor.h b/src/ext/NetFx/ca/caDecor.h
new file mode 100644
index 00000000..da274650
--- /dev/null
+++ b/src/ext/NetFx/ca/caDecor.h
@@ -0,0 +1,13 @@
+#pragma once
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+
+#if defined(_M_ARM64)
+#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_A64"
+#elif defined(_M_AMD64)
+#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X64"
+#elif defined(_M_ARM)
+#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_ARM"
+#else
+#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X86"
+#endif
diff --git a/src/ext/NetFx/ca/cost.h b/src/ext/NetFx/ca/cost.h
new file mode 100644
index 00000000..95368eba
--- /dev/null
+++ b/src/ext/NetFx/ca/cost.h
@@ -0,0 +1,7 @@
+#pragma once
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+
+const UINT COST_NGEN_BLOCKING = 5000;
+const UINT COST_NGEN_NONBLOCKING = 500;
+
diff --git a/src/ext/NetFx/ca/dllmain.cpp b/src/ext/NetFx/ca/dllmain.cpp
new file mode 100644
index 00000000..df53f872
--- /dev/null
+++ b/src/ext/NetFx/ca/dllmain.cpp
@@ -0,0 +1,26 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+#include "precomp.h"
+
+/********************************************************************
+DllMain - standard entry point for all WiX CustomActions
+
+********************************************************************/
+extern "C" BOOL WINAPI DllMain(
+    IN HINSTANCE hInst,
+    IN ULONG ulReason,
+    IN LPVOID)
+{
+    switch(ulReason)
+    {
+    case DLL_PROCESS_ATTACH:
+        WcaGlobalInitialize(hInst);
+        break;
+
+    case DLL_PROCESS_DETACH:
+        WcaGlobalFinalize();
+        break;
+    }
+
+    return TRUE;
+}
diff --git a/src/ext/NetFx/ca/netfxca.cpp b/src/ext/NetFx/ca/netfxca.cpp
new file mode 100644
index 00000000..3a71babf
--- /dev/null
+++ b/src/ext/NetFx/ca/netfxca.cpp
@@ -0,0 +1,823 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+#include "precomp.h"
+
+#define NGEN_DEBUG   0x0001
+#define NGEN_NODEP  0x0002
+#define NGEN_PROFILE 0x0004
+#define NGEN_32BIT  0x0008
+#define NGEN_64BIT  0x0010
+
+#define NGEN_TIMEOUT 60000 // 60 seconds
+
+// If you change one of these strings, be sure to change the appropriate EmptyFormattedLength variable right below
+LPCWSTR vpwzUnformattedQuotedFile = L"\"[#%s]\"";
+LPCWSTR vpwzUnformattedQuotedDirectory = L"\"[%s]\\\"";
+
+// These represent the length of the above strings in the case that the property resolves to an empty string
+const DWORD EMPTY_FORMATTED_LENGTH_QUOTED_FILE = 2;
+const DWORD EMPTY_FORMATTED_LENGTH_QUOTED_DIRECTORY = 3;
+
+LPCWSTR vcsFileId =
+    L"SELECT `File` FROM `File` WHERE `File`=?";
+enum eFileId { fiFile = 1 };
+
+LPCWSTR vcsNgenQuery =
+    L"SELECT `Wix4NetFxNativeImage`.`File_`, `Wix4NetFxNativeImage`.`Wix4NetFxNativeImage`, `Wix4NetFxNativeImage`.`Priority`, `Wix4NetFxNativeImage`.`Attributes`, `Wix4NetFxNativeImage`.`File_Application`, `Wix4NetFxNativeImage`.`Directory_ApplicationBase`, `File`.`Component_` "
+    L"FROM `Wix4NetFxNativeImage`, `File` WHERE `File`.`File`=`Wix4NetFxNativeImage`.`File_`";
+enum eNgenQuery { ngqFile = 1, ngqId, ngqPriority, ngqAttributes, ngqFileApp, ngqDirAppBase, ngqComponent };
+
+LPCWSTR vcsNgenGac =
+    L"SELECT `MsiAssembly`.`File_Application` "
+    L"FROM `File`, `MsiAssembly` WHERE `File`.`Component_`=`MsiAssembly`.`Component_` AND `File`.`File`=?";
+enum eNgenGac { nggApplication = 1 };
+
+LPCWSTR vcsNgenStrongName =
+    L"SELECT `Name`,`Value` FROM `MsiAssemblyName` WHERE `Component_`=?";
+enum eNgenStrongName { ngsnName = 1, ngsnValue };
+
+// Searches subdirectories of the given path for the highest version of ngen.exe available
+static HRESULT GetNgenVersion(
+    __in LPWSTR pwzParentPath,
+    __out LPWSTR* ppwzVersion
+    )
+{
+    Assert(pwzParentPath);
+
+    HRESULT hr = S_OK;
+    DWORD dwError = 0;
+    DWORD dwNgenFileFlags = 0;
+
+    LPWSTR pwzVersionSearch = NULL;
+    LPWSTR pwzNgen = NULL;
+    LPWSTR pwzTemp = NULL;
+    LPWSTR pwzTempVersion = NULL;
+    DWORD dwMaxMajorVersion = 0; // This stores the highest major version we've seen so far
+    DWORD dwMaxMinorVersion = 0; // This stores the minor version of the highest major version we've seen so far
+    DWORD dwMajorVersion = 0; // This stores the major version of the directory we're currently considering
+    DWORD dwMinorVersion = 0; // This stores the minor version of the directory we're currently considering
+    BOOL fFound = TRUE;
+    WIN32_FIND_DATAW wfdVersionDirectories;
+    HANDLE hFind = INVALID_HANDLE_VALUE;
+    
+    hr = StrAllocFormatted(&pwzVersionSearch, L"%s*", pwzParentPath);
+    ExitOnFailure(hr, "failed to create outer directory search string from string %ls", pwzParentPath);
+    hFind = FindFirstFileW(pwzVersionSearch, &wfdVersionDirectories);
+    if (hFind == INVALID_HANDLE_VALUE)
+    {
+        ExitWithLastError(hr, "failed to call FindFirstFileW with string %ls", pwzVersionSearch);
+    }
+
+    while (fFound)
+    {
+        pwzTempVersion = (LPWSTR)&(wfdVersionDirectories.cFileName);
+
+        // Explicitly exclude v1.1.4322, which isn't backwards compatible and is not supported
+        if (wfdVersionDirectories.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+        {
+            if (0 != lstrcmpW(L"v1.1.4322", pwzTempVersion))
+            {
+                // A potential candidate directory was found to run ngen from - let's make sure ngen actually exists here
+                hr = StrAllocFormatted(&pwzNgen, L"%s%s\\ngen.exe", pwzParentPath, pwzTempVersion);
+                ExitOnFailure(hr, "failed to create inner ngen search string with strings %ls and %ls", pwzParentPath, pwzTempVersion);
+
+                // If Ngen.exe does exist as a file here, then let's check the file version
+                if (FileExistsEx(pwzNgen, &dwNgenFileFlags) && (0 == (dwNgenFileFlags & FILE_ATTRIBUTE_DIRECTORY)))
+                {
+                    hr = FileVersion(pwzNgen, &dwMajorVersion, &dwMinorVersion);
+
+                    if (FAILED(hr))
+                    {
+                        WcaLog(LOGMSG_VERBOSE, "Failed to get version of %ls - continuing", pwzNgen);
+                    }
+                    else if (dwMajorVersion > dwMaxMajorVersion || (dwMajorVersion == dwMaxMajorVersion && dwMinorVersion > dwMaxMinorVersion))
+                    {
+                        // If the version we found is the highest we've seen so far in this search, it will be our new best-so-far candidate
+                        hr = StrAllocString(ppwzVersion, pwzTempVersion, 0);
+                        ExitOnFailure(hr, "failed to copy temp version string %ls to version string", pwzTempVersion);
+                        // Add one for the backslash after the directory name
+                        WcaLog(LOGMSG_VERBOSE, "Found highest-so-far version of ngen.exe (in directory %ls, version %u.%u.%u.%u)", *ppwzVersion, (DWORD)HIWORD(dwMajorVersion), (DWORD)LOWORD(dwMajorVersion), (DWORD)HIWORD(dwMinorVersion), (DWORD)LOWORD(dwMinorVersion));
+
+                        dwMaxMajorVersion = dwMajorVersion;
+                        dwMaxMinorVersion = dwMinorVersion;
+                    }
+                }
+                else
+                {
+                    WcaLog(LOGMSG_VERBOSE, "Ignoring %ls because it doesn't contain the file ngen.exe", pwzTempVersion);
+                }
+            }
+            else
+            {
+                WcaLog(LOGMSG_VERBOSE, "Ignoring %ls because it is from .NET Framework v1.1, which is not backwards compatible with other versions of the Framework and thus is not supported by this custom action.", pwzTempVersion);
+            }
+        }
+        else
+        {
+            WcaLog(LOGMSG_VERBOSE, "Ignoring %ls because it isn't a directory", pwzTempVersion);
+        }
+
+        fFound = FindNextFileW(hFind, &wfdVersionDirectories);
+
+        if (!fFound)
+        {
+            dwError = ::GetLastError();
+            hr = (ERROR_NO_MORE_FILES == dwError) ? ERROR_SUCCESS : HRESULT_FROM_WIN32(dwError);
+            ExitOnFailure(hr, "Failed to call FindNextFileW() with query %ls", pwzVersionSearch);
+        }
+    }
+
+    if (NULL == *ppwzVersion)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
+        ExitOnRootFailure(hr, "Searched through all subdirectories of %ls, but failed to find any version of ngen.exe", pwzParentPath);
+    }
+    else
+    {
+        WcaLog(LOGMSG_VERBOSE, "Using highest version of ngen found, located in this subdirectory: %ls, version %u.%u.%u.%u", *ppwzVersion, (DWORD)HIWORD(dwMajorVersion), (DWORD)LOWORD(dwMajorVersion), (DWORD)HIWORD(dwMinorVersion), (DWORD)LOWORD(dwMinorVersion));
+    }
+
+LExit:
+    if (hFind != INVALID_HANDLE_VALUE)
+    {
+        if (0 == FindClose(hFind))
+        {
+            dwError = ::GetLastError();
+            hr = HRESULT_FROM_WIN32(dwError);
+            WcaLog(LOGMSG_STANDARD, "Failed to close handle created by outer FindFirstFile with error %x - continuing", hr);
+        }
+        hFind = INVALID_HANDLE_VALUE;
+    }
+
+    ReleaseStr(pwzVersionSearch);
+    ReleaseStr(pwzNgen);
+    ReleaseStr(pwzTemp);
+    // Purposely don't release pwzTempVersion, because it wasn't allocated in this function, it's just a pointer to a string inside wfdVersionDirectories
+
+    return hr;
+}
+
+// Gets the path to ngen.exe
+static HRESULT GetNgenPath(
+    __out LPWSTR* ppwzNgenPath,
+    __in BOOL f64BitFramework
+    )
+{
+    Assert(ppwzNgenPath);
+    HRESULT hr = S_OK;
+
+    LPWSTR pwzVersion = NULL;
+    LPWSTR pwzWindowsFolder = NULL;
+
+    hr = WcaGetProperty(L"WindowsFolder", &pwzWindowsFolder);
+    ExitOnFailure(hr, "failed to get WindowsFolder property");
+
+    hr = StrAllocString(ppwzNgenPath, pwzWindowsFolder, 0);
+    ExitOnFailure(hr, "failed to copy to NgenPath windows folder: %ls", pwzWindowsFolder);
+
+    if (f64BitFramework)
+    {
+        WcaLog(LOGMSG_VERBOSE, "Searching for ngen under 64-bit framework path");
+
+        hr = StrAllocConcat(ppwzNgenPath, L"Microsoft.NET\\Framework64\\", 0);
+        ExitOnFailure(hr, "failed to copy platform portion of ngen path");
+    }
+    else
+    {
+        WcaLog(LOGMSG_VERBOSE, "Searching for ngen under 32-bit framework path");
+
+        hr = StrAllocConcat(ppwzNgenPath, L"Microsoft.NET\\Framework\\", 0);
+        ExitOnFailure(hr, "failed to copy platform portion of ngen path");
+    }
+
+    // We want to run the highest version of ngen possible, because they should be backwards compatible - so let's find the most appropriate directory now
+    hr = GetNgenVersion(*ppwzNgenPath, &pwzVersion);
+    ExitOnFailure(hr, "failed to search for ngen under path %ls", *ppwzNgenPath);
+
+    hr = StrAllocConcat(ppwzNgenPath, pwzVersion, 0);
+    ExitOnFailure(hr, "failed to copy version portion of ngen path");
+
+    hr = StrAllocConcat(ppwzNgenPath, L"\\ngen.exe", 0);
+    ExitOnFailure(hr, "failed to copy \"\\ngen.exe\" portion of ngen path");
+
+LExit:
+    ReleaseStr(pwzVersion);
+    ReleaseStr(pwzWindowsFolder);
+
+    return hr;
+}
+
+
+static HRESULT GetStrongName(
+    __out LPWSTR* ppwzStrongName,
+    __in LPCWSTR pwzComponent
+    )
+{
+    Assert(ppwzStrongName);
+    HRESULT hr = S_OK;
+
+    PMSIHANDLE hView = NULL;
+    PMSIHANDLE hComponentRec = NULL;
+    PMSIHANDLE hRec = NULL;
+
+    LPWSTR pwzData = NULL;
+    LPWSTR pwzName = NULL;
+    LPWSTR pwzVersion = NULL;
+    LPWSTR pwzCulture = NULL;
+    LPWSTR pwzPublicKeyToken = NULL;
+
+    hComponentRec = ::MsiCreateRecord(1);
+    hr = WcaSetRecordString(hComponentRec, 1, pwzComponent);
+    ExitOnFailure(hr, "failed to set component value in record to: %ls", pwzComponent);
+
+    // get the name value records for this component
+    hr = WcaOpenView(vcsNgenStrongName, &hView);
+    ExitOnFailure(hr, "failed to open view on Wix4NetFxNativeImage table");
+
+    hr = WcaExecuteView(hView, hComponentRec);
+    ExitOnFailure(hr, "failed to execute strong name view");
+
+    while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
+    {
+        hr = WcaGetRecordString(hRec, ngsnName, &pwzData);
+        ExitOnFailure(hr, "failed to get MsiAssemblyName.Name for component: %ls", pwzComponent);
+
+        if (0 == lstrcmpW(L"name", pwzData))
+        {
+            hr = WcaGetRecordString(hRec, ngsnValue, &pwzName);
+            ExitOnFailure(hr, "failed to get MsiAssemblyName.Value for component: %ls Name: %ls", pwzComponent, pwzData);
+        }
+        else if (0 == lstrcmpW(L"version", pwzData))
+        {
+            hr = WcaGetRecordString(hRec, ngsnValue, &pwzVersion);
+            ExitOnFailure(hr, "failed to get MsiAssemblyName.Value for component: %ls Name: %ls", pwzComponent, pwzData);
+        }
+        else if (0 == lstrcmpW(L"culture", pwzData))
+        {
+            hr = WcaGetRecordString(hRec, ngsnValue, &pwzCulture);
+            ExitOnFailure(hr, "failed to get MsiAssemblyName.Value for component: %ls Name: %ls", pwzComponent, pwzData);
+        }
+        else if (0 == lstrcmpW(L"publicKeyToken", pwzData))
+        {
+            hr = WcaGetRecordString(hRec, ngsnValue, &pwzPublicKeyToken);
+            ExitOnFailure(hr, "failed to get MsiAssemblyName.Value for component: %ls Name: %ls", pwzComponent, pwzData);
+        }
+    }
+    if (E_NOMOREITEMS == hr)
+        hr = S_OK;
+    ExitOnFailure(hr, "failed while looping through all names and values in MsiAssemblyName table for component: %ls", pwzComponent);
+
+    hr = StrAllocFormatted(ppwzStrongName, L"\"%s, Version=%s, Culture=%s, PublicKeyToken=%s\"", pwzName, pwzVersion, pwzCulture, pwzPublicKeyToken);
+    ExitOnFailure(hr, "failed to format strong name for component: %ls", pwzComponent);
+
+LExit:
+    ReleaseStr(pwzData);
+    ReleaseStr(pwzName);
+    ReleaseStr(pwzVersion);
+    ReleaseStr(pwzCulture);
+    ReleaseStr(pwzPublicKeyToken);
+
+    return hr;
+}
+
+static HRESULT CreateInstallCommand(
+    __out LPWSTR* ppwzCommandLine,
+    __in LPCWSTR pwzNgenPath,
+    __in LPCWSTR pwzFile,
+    __in int iPriority,
+    __in int iAttributes,
+    __in LPCWSTR pwzFileApp,
+    __in LPCWSTR pwzDirAppBase
+    )
+{
+    Assert(ppwzCommandLine && pwzNgenPath && *pwzNgenPath && pwzFile && *pwzFile&& pwzFileApp && pwzDirAppBase);
+    HRESULT hr = S_OK;
+
+    LPWSTR pwzQueueString = NULL;
+
+    hr = StrAllocFormatted(ppwzCommandLine, L"%s install %s", pwzNgenPath, pwzFile);
+    ExitOnFailure(hr, "failed to assemble install command line");
+
+    if (iPriority > 0)
+    {
+        hr = StrAllocFormatted(&pwzQueueString, L" /queue:%d", iPriority);
+        ExitOnFailure(hr, "failed to format queue string");
+
+        hr = StrAllocConcat(ppwzCommandLine, pwzQueueString, 0);
+        ExitOnFailure(hr, "failed to add queue string to NGEN command line");
+    }
+
+    if (NGEN_DEBUG & iAttributes)
+    {
+        hr = StrAllocConcat(ppwzCommandLine, L" /Debug", 0);
+        ExitOnFailure(hr, "failed to add debug to NGEN command line");
+    }
+
+    if (NGEN_PROFILE & iAttributes)
+    {
+        hr = StrAllocConcat(ppwzCommandLine, L" /Profile", 0);
+        ExitOnFailure(hr, "failed to add profile to NGEN command line");
+    }
+
+    if (NGEN_NODEP & iAttributes)
+    {
+        hr = StrAllocConcat(ppwzCommandLine, L" /NoDependencies", 0);
+        ExitOnFailure(hr, "failed to add no dependencies to NGEN command line");
+    }
+
+    // If it's more than just two quotes around an empty string
+    if (EMPTY_FORMATTED_LENGTH_QUOTED_FILE < lstrlenW(pwzFileApp))
+    {
+        hr = StrAllocConcat(ppwzCommandLine, L" /ExeConfig:", 0);
+        ExitOnFailure(hr, "failed to add exe config to NGEN command line");
+
+        hr = StrAllocConcat(ppwzCommandLine, pwzFileApp, 0);
+        ExitOnFailure(hr, "failed to add file app to NGEN command line");
+    }
+
+    // If it's more than just two quotes around a backslash
+    if (EMPTY_FORMATTED_LENGTH_QUOTED_DIRECTORY < lstrlenW(pwzDirAppBase))
+    {
+        hr = StrAllocConcat(ppwzCommandLine, L" /AppBase:", 0);
+        ExitOnFailure(hr, "failed to add app base to NGEN command line");
+
+        hr = StrAllocConcat(ppwzCommandLine, pwzDirAppBase, 0);
+        ExitOnFailure(hr, "failed to add dir app base to NGEN command line");
+    }
+
+LExit:
+    return hr;
+}
+
+/******************************************************************
+ FileIdExists - checks if the file ID is found in the File table
+
+ returns S_OK if the file exists; S_FALSE if not; otherwise, error
+********************************************************************/
+static HRESULT FileIdExists(
+    __in_opt LPCWSTR wzFile
+    )
+{
+    HRESULT hr = S_OK;
+    PMSIHANDLE hView = NULL;
+    PMSIHANDLE hRec = NULL;
+
+    if (!wzFile)
+    {
+        hr = S_FALSE;
+        ExitFunction();
+    }
+
+    hRec = ::MsiCreateRecord(1);
+    hr = WcaSetRecordString(hRec, fiFile, wzFile);
+    ExitOnFailure(hr, "failed to create a record with the file: %ls", wzFile);
+
+    hr = WcaTableExists(L"File");
+    if (S_OK == hr)
+    {
+        hr = WcaOpenView(vcsFileId, &hView);
+        ExitOnFailure(hr, "failed to open view on File table");
+
+        hr = WcaExecuteView(hView, hRec);
+        ExitOnFailure(hr, "failed to execute view on File table");
+
+        // Reuse the same record; the handle will be released.
+        hr = WcaFetchSingleRecord(hView, &hRec);
+        ExitOnFailure(hr, "failed to fetch File from File table");
+    }
+
+LExit:
+
+    return hr;
+}
+
+/******************************************************************
+ SchedNetFx - entry point for NetFx Custom Action
+
+********************************************************************/
+extern "C" UINT __stdcall SchedNetFx(
+    __in MSIHANDLE hInstall
+    )
+{
+    // AssertSz(FALSE, "debug SchedNetFx");
+
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+
+    LPWSTR pwzInstallCustomActionData = NULL;
+    LPWSTR pwzUninstallCustomActionData = NULL;
+    UINT uiCost = 0;
+
+    PMSIHANDLE hView = NULL;
+    PMSIHANDLE hRec = NULL;
+    PMSIHANDLE hViewGac = NULL;
+    PMSIHANDLE hRecGac = NULL;
+
+    LPWSTR pwzId = NULL;
+    LPWSTR pwzData = NULL;
+    LPWSTR pwzTemp = NULL;
+    LPWSTR pwzFile = NULL;
+    int iPriority = 0;
+    int iAssemblyCost = 0;
+    int iAttributes = 0;
+    LPWSTR pwzFileApp = NULL;
+    LPWSTR pwzDirAppBase = NULL;
+    LPWSTR pwzComponent = NULL;
+
+    INSTALLSTATE isInstalled;
+    INSTALLSTATE isAction;
+
+    LPWSTR pwz32Ngen = NULL;
+    LPWSTR pwz64Ngen = NULL;
+
+    BOOL f32NgenExeExists = FALSE;
+    BOOL f64NgenExeExists = FALSE;
+
+    BOOL fNeedInstallUpdate32 = FALSE;
+    BOOL fNeedUninstallUpdate32 = FALSE;
+    BOOL fNeedInstallUpdate64 = FALSE;
+    BOOL fNeedUninstallUpdate64 = FALSE;
+
+    // initialize
+    hr = WcaInitialize(hInstall, "SchedNetFx");
+    ExitOnFailure(hr, "failed to initialize");
+
+    hr = GetNgenPath(&pwz32Ngen, FALSE);
+    f32NgenExeExists = SUCCEEDED(hr);
+    if (HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) == hr || HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == hr)
+    {
+        hr = ERROR_SUCCESS;
+        WcaLog(LOGMSG_STANDARD, "Failed to find 32bit ngen. No actions will be scheduled to create native images for 32bit.");
+    }
+    ExitOnFailure(hr, "failed to get 32bit ngen.exe path");
+
+    hr = GetNgenPath(&pwz64Ngen, TRUE);
+    f64NgenExeExists = SUCCEEDED(hr);
+    if (HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) == hr || HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == hr)
+    {
+        hr = ERROR_SUCCESS;
+        WcaLog(LOGMSG_STANDARD, "Failed to find 64bit ngen. No actions will be scheduled to create native images for 64bit.");
+    }
+    ExitOnFailure(hr, "failed to get 64bit ngen.exe path");
+
+    // loop through all the NetFx records
+    hr = WcaOpenExecuteView(vcsNgenQuery, &hView);
+    ExitOnFailure(hr, "failed to open view on Wix4NetFxNativeImage table");
+
+    while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
+    {
+        // Get Id
+        hr = WcaGetRecordString(hRec, ngqId, &pwzId);
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Wix4NetFxNativeImage");
+
+        // Get File
+        hr = WcaGetRecordString(hRec, ngqFile, &pwzData);
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.File_ for record: %ls", pwzId);
+        hr = StrAllocFormatted(&pwzTemp, vpwzUnformattedQuotedFile, pwzData);
+        ExitOnFailure(hr, "failed to format file string for file: %ls", pwzData);
+        hr = WcaGetFormattedString(pwzTemp, &pwzFile);
+        ExitOnFailure(hr, "failed to get formatted string for file: %ls", pwzData);
+
+        // Get Priority
+        hr = WcaGetRecordInteger(hRec, ngqPriority, &iPriority);
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Priority for record: %ls", pwzId);
+
+        if (0 == iPriority)
+            iAssemblyCost = COST_NGEN_BLOCKING;
+        else
+            iAssemblyCost = COST_NGEN_NONBLOCKING;
+
+        // Get Attributes
+        hr = WcaGetRecordInteger(hRec, ngqAttributes, &iAttributes);
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Attributes for record: %ls", pwzId);
+
+        // Get File_Application or leave pwzFileApp NULL.
+        hr = WcaGetRecordFormattedString(hRec, ngqFileApp, &pwzData);
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.File_Application for record: %ls", pwzId);
+
+        // Check if the value resolves to a valid file ID.
+        if (S_OK == FileIdExists(pwzData))
+        {
+            // Resolve the file ID to a path.
+            hr = StrAllocFormatted(&pwzTemp, vpwzUnformattedQuotedFile, pwzData);
+            ExitOnFailure(hr, "failed to format file application string for file: %ls", pwzData);
+
+            hr = WcaGetFormattedString(pwzTemp, &pwzFileApp);
+            ExitOnFailure(hr, "failed to get formatted string for file application: %ls", pwzData);
+        }
+        else
+        {
+            // Assume record formatted to a path already.
+            hr = StrAllocString(&pwzFileApp, pwzData, 0);
+            ExitOnFailure(hr, "failed to allocate string for file path: %ls", pwzData);
+
+            hr = PathEnsureQuoted(&pwzFileApp, FALSE);
+            ExitOnFailure(hr, "failed to quote file path: %ls", pwzData);
+        }
+
+        // Get Directory_ApplicationBase or leave pwzDirAppBase NULL.
+        hr = WcaGetRecordFormattedString(hRec, ngqDirAppBase, &pwzData);
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Directory_ApplicationBase for record: %ls", pwzId);
+
+        if (WcaIsUnicodePropertySet(pwzData))
+        {
+            // Resolve the directory ID to a path.
+            hr = StrAllocFormatted(&pwzTemp, vpwzUnformattedQuotedDirectory, pwzData);
+            ExitOnFailure(hr, "failed to format directory application base string for property: %ls", pwzData);
+
+            hr = WcaGetFormattedString(pwzTemp, &pwzDirAppBase);
+            ExitOnFailure(hr, "failed to get formatted string for directory application base: %ls", pwzData);
+        }
+        else
+        {
+            // Assume record formatted to a path already.
+            hr = StrAllocString(&pwzDirAppBase, pwzData, 0);
+            ExitOnFailure(hr, "failed to allocate string for directory path: %ls", pwzData);
+
+            hr = PathEnsureQuoted(&pwzDirAppBase, TRUE);
+            ExitOnFailure(hr, "failed to quote and backslashify directory: %ls", pwzData);
+        }
+
+        // Get Component
+        hr = WcaGetRecordString(hRec, ngqComponent, &pwzComponent);
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Directory_ApplicationBase for record: %ls", pwzId);
+        er = ::MsiGetComponentStateW(hInstall, pwzComponent, &isInstalled, &isAction);
+        ExitOnWin32Error(er, hr, "failed to get install state for Component: %ls", pwzComponent);
+
+        //
+        // Figure out if it's going to be GAC'd.  The possibility exists that no assemblies are going to be GAC'd 
+        // so we have to check for the MsiAssembly table first.
+        //
+        if (S_OK == WcaTableExists(L"MsiAssembly"))
+        {
+            hr = WcaOpenView(vcsNgenGac, &hViewGac);
+            ExitOnFailure(hr, "failed to open view on File/MsiAssembly table");
+
+            hr = WcaExecuteView(hViewGac, hRec);
+            ExitOnFailure(hr, "failed to execute view on File/MsiAssembly table");
+
+            hr = WcaFetchSingleRecord(hViewGac, &hRecGac);
+            ExitOnFailure(hr, "failed to fetch File_Assembly from File/MsiAssembly table");
+
+            if (S_FALSE != hr)
+            {
+                hr = WcaGetRecordString(hRecGac, nggApplication, &pwzData);
+                ExitOnFailure(hr, "failed to get MsiAssembly.File_Application");
+
+                // If it's in the GAC replace the file name with the strong name
+                if (L'\0' == pwzData[0])
+                {
+                    hr = GetStrongName(&pwzFile, pwzComponent);
+                    ExitOnFailure(hr, "failed to get strong name for component: %ls", pwzData);
+                }
+            }
+        }
+
+        //
+        // Schedule the work
+        //
+        if (!(iAttributes & NGEN_32BIT) && !(iAttributes & NGEN_64BIT))
+            ExitOnFailure(hr = E_INVALIDARG, "Neither 32bit nor 64bit is specified for NGEN of file: %ls", pwzFile);
+
+        if (WcaIsInstalling(isInstalled, isAction) || WcaIsReInstalling(isInstalled, isAction))
+        {
+            if (iAttributes & NGEN_32BIT && f32NgenExeExists)
+            {
+                // Assemble the install command line
+                hr = CreateInstallCommand(&pwzData, pwz32Ngen, pwzFile, iPriority, iAttributes, pwzFileApp, pwzDirAppBase);
+                ExitOnFailure(hr, "failed to create install command line");
+
+                hr = WcaWriteStringToCaData(pwzData, &pwzInstallCustomActionData);
+                ExitOnFailure(hr, "failed to add install command to custom action data: %ls", pwzData);
+
+                hr = WcaWriteIntegerToCaData(iAssemblyCost, &pwzInstallCustomActionData);
+                ExitOnFailure(hr, "failed to add cost to custom action data: %ls", pwzData);
+
+                uiCost += iAssemblyCost;
+
+                fNeedInstallUpdate32 = TRUE;
+            }
+
+            if (iAttributes & NGEN_64BIT && f64NgenExeExists)
+            {
+                // Assemble the install command line
+                hr = CreateInstallCommand(&pwzData, pwz64Ngen, pwzFile, iPriority, iAttributes, pwzFileApp, pwzDirAppBase);
+                ExitOnFailure(hr, "failed to create install command line");
+
+                hr = WcaWriteStringToCaData(pwzData, &pwzInstallCustomActionData); // command
+                ExitOnFailure(hr, "failed to add install command to custom action data: %ls", pwzData);
+
+                hr = WcaWriteIntegerToCaData(iAssemblyCost, &pwzInstallCustomActionData); // cost
+                ExitOnFailure(hr, "failed to add cost to custom action data: %ls", pwzData);
+
+                uiCost += iAssemblyCost;
+
+                fNeedInstallUpdate64 = TRUE;
+            }
+        }
+        else if (WcaIsUninstalling(isInstalled, isAction))
+        {
+            if (iAttributes & NGEN_32BIT && f32NgenExeExists)
+            {
+                hr = StrAllocFormatted(&pwzData, L"%s uninstall %s", pwz32Ngen, pwzFile);
+                ExitOnFailure(hr, "failed to create update 32 command line");
+
+                hr = WcaWriteStringToCaData(pwzData, &pwzUninstallCustomActionData); // command
+                ExitOnFailure(hr, "failed to add install command to custom action data: %ls", pwzData);
+
+                hr = WcaWriteIntegerToCaData(COST_NGEN_NONBLOCKING, &pwzUninstallCustomActionData); // cost
+                ExitOnFailure(hr, "failed to add cost to custom action data: %ls", pwzData);
+
+                uiCost += COST_NGEN_NONBLOCKING;
+
+                fNeedUninstallUpdate32 = TRUE;
+            }
+
+            if (iAttributes & NGEN_64BIT && f64NgenExeExists)
+            {
+                hr = StrAllocFormatted(&pwzData, L"%s uninstall %s", pwz64Ngen, pwzFile);
+                ExitOnFailure(hr, "failed to create update 64 command line");
+
+                hr = WcaWriteStringToCaData(pwzData, &pwzUninstallCustomActionData); // command
+                ExitOnFailure(hr, "failed to add install command to custom action data: %ls", pwzData);
+
+                hr = WcaWriteIntegerToCaData(COST_NGEN_NONBLOCKING, &pwzUninstallCustomActionData); // cost
+                ExitOnFailure(hr, "failed to add cost to custom action data: %ls", pwzData);
+
+                uiCost += COST_NGEN_NONBLOCKING;
+
+                fNeedUninstallUpdate64 = TRUE;
+            }
+        }
+    }
+    if (E_NOMOREITEMS == hr)
+        hr = S_OK;
+    ExitOnFailure(hr, "failed while looping through all files to create native images for");
+
+    // If we need 32 bit install update
+    if (fNeedInstallUpdate32)
+    {
+        hr = StrAllocFormatted(&pwzData, L"%s update /queue", pwz32Ngen);
+        ExitOnFailure(hr, "failed to create install update 32 command line");
+
+        hr = WcaWriteStringToCaData(pwzData, &pwzInstallCustomActionData); // command
+        ExitOnFailure(hr, "failed to add install command to install custom action data: %ls", pwzData);
+
+        hr = WcaWriteIntegerToCaData(COST_NGEN_NONBLOCKING, &pwzInstallCustomActionData); // cost
+        ExitOnFailure(hr, "failed to add cost to install custom action data: %ls", pwzData);
+
+        uiCost += COST_NGEN_NONBLOCKING;
+    }
+
+    // If we need 32 bit uninstall update
+    if (fNeedUninstallUpdate32)
+    {
+        hr = StrAllocFormatted(&pwzData, L"%s update /queue", pwz32Ngen);
+        ExitOnFailure(hr, "failed to create uninstall update 32 command line");
+
+        hr = WcaWriteStringToCaData(pwzData, &pwzUninstallCustomActionData); // command
+        ExitOnFailure(hr, "failed to add install command to uninstall custom action data: %ls", pwzData);
+
+        hr = WcaWriteIntegerToCaData(COST_NGEN_NONBLOCKING, &pwzUninstallCustomActionData); // cost
+        ExitOnFailure(hr, "failed to add cost to uninstall custom action data: %ls", pwzData);
+
+        uiCost += COST_NGEN_NONBLOCKING;
+    }
+
+    // If we need 64 bit install update
+    if (fNeedInstallUpdate64)
+    {
+        hr = StrAllocFormatted(&pwzData, L"%s update /queue", pwz64Ngen);
+        ExitOnFailure(hr, "failed to create install update 64 command line");
+
+        hr = WcaWriteStringToCaData(pwzData, &pwzInstallCustomActionData); // command
+        ExitOnFailure(hr, "failed to add install command to install custom action data: %ls", pwzData);
+
+        hr = WcaWriteIntegerToCaData(COST_NGEN_NONBLOCKING, &pwzInstallCustomActionData); // cost
+        ExitOnFailure(hr, "failed to add cost to install custom action data: %ls", pwzData);
+
+        uiCost += COST_NGEN_NONBLOCKING;
+    }
+
+    // If we need 64 bit install update
+    if (fNeedUninstallUpdate64)
+    {
+        hr = StrAllocFormatted(&pwzData, L"%s update /queue", pwz64Ngen);
+        ExitOnFailure(hr, "failed to create uninstall update 64 command line");
+
+        hr = WcaWriteStringToCaData(pwzData, &pwzUninstallCustomActionData); // command
+        ExitOnFailure(hr, "failed to add install command to uninstall custom action data: %ls", pwzData);
+
+        hr = WcaWriteIntegerToCaData(COST_NGEN_NONBLOCKING, &pwzUninstallCustomActionData); // cost
+        ExitOnFailure(hr, "failed to add cost to uninstall custom action data: %ls", pwzData);
+
+        uiCost += COST_NGEN_NONBLOCKING;
+    }
+
+    // Add to progress bar
+    if ((pwzInstallCustomActionData && *pwzInstallCustomActionData) || (pwzUninstallCustomActionData && *pwzUninstallCustomActionData))
+    {
+        hr = WcaProgressMessage(uiCost, TRUE);
+        ExitOnFailure(hr, "failed to extend progress bar for NetFxExecuteNativeImage");
+    }
+
+    // Schedule the install custom action
+    if (pwzInstallCustomActionData && *pwzInstallCustomActionData)
+    {
+        hr = WcaSetProperty(L"NetFxExecuteNativeImageInstall", pwzInstallCustomActionData);
+        ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageInstall action");
+
+        hr = WcaSetProperty(L"NetFxExecuteNativeImageCommitInstall", pwzInstallCustomActionData);
+        ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageCommitInstall action");
+    }
+
+    // Schedule the uninstall custom action
+    if (pwzUninstallCustomActionData && *pwzUninstallCustomActionData)
+    {
+        hr = WcaSetProperty(L"NetFxExecuteNativeImageUninstall", pwzUninstallCustomActionData);
+        ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageUninstall action");
+
+        hr = WcaSetProperty(L"NetFxExecuteNativeImageCommitUninstall", pwzUninstallCustomActionData);
+        ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageCommitUninstall action");
+    }
+
+
+LExit:
+    ReleaseStr(pwzInstallCustomActionData);
+    ReleaseStr(pwzUninstallCustomActionData);
+    ReleaseStr(pwzId);
+    ReleaseStr(pwzData);
+    ReleaseStr(pwzTemp);
+    ReleaseStr(pwzFile);
+    ReleaseStr(pwzFileApp);
+    ReleaseStr(pwzDirAppBase);
+    ReleaseStr(pwzComponent);
+    ReleaseStr(pwz32Ngen);
+    ReleaseStr(pwz64Ngen);
+
+    if (FAILED(hr))
+        er = ERROR_INSTALL_FAILURE;
+    return WcaFinalize(er);
+}
+
+
+/******************************************************************
+ ExecNetFx - entry point for NetFx Custom Action
+
+*******************************************************************/
+extern "C" UINT __stdcall ExecNetFx(
+    __in MSIHANDLE hInstall
+    )
+{
+//    AssertSz(FALSE, "debug ExecNetFx");
+
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+
+    LPWSTR pwzCustomActionData = NULL;
+    LPWSTR pwzData = NULL;
+    LPWSTR pwz = NULL;
+    int iCost = 0;
+
+    // initialize
+    hr = WcaInitialize(hInstall, "ExecNetFx");
+    ExitOnFailure(hr, "failed to initialize");
+
+    hr = WcaGetProperty( L"CustomActionData", &pwzCustomActionData);
+    ExitOnFailure(hr, "failed to get CustomActionData");
+
+    WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %ls", pwzCustomActionData);
+
+    pwz = pwzCustomActionData;
+
+    // loop through all the passed in data
+    while (pwz && *pwz)
+    {
+        hr = WcaReadStringFromCaData(&pwz, &pwzData);
+        ExitOnFailure(hr, "failed to read command line from custom action data");
+
+        hr = WcaReadIntegerFromCaData(&pwz, &iCost);
+        ExitOnFailure(hr, "failed to read cost from custom action data");
+
+        hr = QuietExec(pwzData, NGEN_TIMEOUT, TRUE, TRUE);
+        // If we fail here it isn't critical - keep looping through to try to act on the other assemblies on our list
+        if (FAILED(hr))
+        {
+            WcaLog(LOGMSG_STANDARD, "failed to execute Ngen command (with error 0x%x): %ls, continuing anyway", hr, pwzData);
+            hr = S_OK;
+        }
+
+        // Tick the progress bar along for this assembly
+        hr = WcaProgressMessage(iCost, FALSE);
+        ExitOnFailure(hr, "failed to tick progress bar for command line: %ls", pwzData);
+    }
+
+LExit:
+    ReleaseStr(pwzCustomActionData);
+    ReleaseStr(pwzData);
+
+    if (FAILED(hr))
+        er = ERROR_INSTALL_FAILURE;
+    return WcaFinalize(er);
+}
+
diff --git a/src/ext/NetFx/ca/netfxca.def b/src/ext/NetFx/ca/netfxca.def
new file mode 100644
index 00000000..c1d01f5f
--- /dev/null
+++ b/src/ext/NetFx/ca/netfxca.def
@@ -0,0 +1,8 @@
+; Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+
+LIBRARY      "netfxca"
+
+EXPORTS
+        SchedNetFx
+        ExecNetFx
diff --git a/src/ext/NetFx/ca/netfxca.vcxproj b/src/ext/NetFx/ca/netfxca.vcxproj
new file mode 100644
index 00000000..5e25b683
--- /dev/null
+++ b/src/ext/NetFx/ca/netfxca.vcxproj
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <TargetName>netfxca</TargetName>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <ProjectModuleDefinitionFile>netfxca.def</ProjectModuleDefinitionFile>
+    <Description>WiX Toolset .NET Framework CustomAction</Description>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <PropertyGroup>
+    <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="netfxca.cpp" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ClInclude Include="cost.h" />
+    <ClInclude Include="precomp.h" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="netfxca.def" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dutil" Version="4.0.72" />
+    <PackageReference Include="WixToolset.WcaUtil" Version="4.0.19" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/src/ext/NetFx/ca/precomp.h b/src/ext/NetFx/ca/precomp.h
new file mode 100644
index 00000000..4a83c164
--- /dev/null
+++ b/src/ext/NetFx/ca/precomp.h
@@ -0,0 +1,14 @@
+#pragma once
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+
+#include <windows.h>
+#include <msiquery.h>
+
+#include "wcautil.h"
+#include "fileutil.h"
+#include "strutil.h"
+#include "pathutil.h"
+
+#include "caDecor.h"
+#include "cost.h"
diff --git a/src/ext/NetFx/nuget.config b/src/ext/NetFx/nuget.config
new file mode 100644
index 00000000..7f258709
--- /dev/null
+++ b/src/ext/NetFx/nuget.config
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" />
+    <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" />
+    <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" />
+    <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" />
+    <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" />
+    <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" />
+    <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" />
+    <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" />
+    <add key="wixtoolset-bal-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-bal-wixext" />
+    <add key="wixtoolset-util-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-util-wixext" />
+    <add key="wixburn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" />
+    <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" />
+    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>
\ No newline at end of file
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
new file mode 100644
index 00000000..72d4a682
--- /dev/null
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -0,0 +1,147 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.Netfx
+{
+    using System.IO;
+    using System.Linq;
+    using WixBuildTools.TestSupport;
+    using WixToolset.Core.TestPackage;
+    using WixToolset.Netfx;
+    using Xunit;
+
+    public class NetfxExtensionFixture
+    {
+        [Fact]
+        public void CanBuildUsingLatestDotNetCorePackages()
+        {
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
+                var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+
+                var compileResult = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),
+                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", bundleFile,
+                });
+                compileResult.AssertSuccess();
+
+                Assert.True(File.Exists(bundleFile));
+            }
+        }
+
+        [Fact]
+        public void CanBuildUsingLatestDotNetCorePackages_X64()
+        {
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
+                var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+
+                var compileResult = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"),
+                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", bundleFile,
+                });
+                compileResult.AssertSuccess();
+
+                Assert.True(File.Exists(bundleFile));
+            }
+        }
+
+        [Fact]
+        public void CanBuildUsingNativeImage()
+        {
+            var folder = TestData.Get(@"TestData\UsingNativeImage");
+            var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder });
+
+            var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4NetFxNativeImage");
+            Assert.Equal(new[]
+            {
+                "Binary:Wix4NetFxCA_X86\t[Binary data]",
+                "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t",
+                "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t",
+                "CustomAction:Wix4NetFxExecuteNativeImageInstall_X86\t3137\tWix4NetFxCA_X86\tExecNetFx\t",
+                "CustomAction:Wix4NetFxExecuteNativeImageUninstall_X86\t3137\tWix4NetFxCA_X86\tExecNetFx\t",
+                "CustomAction:Wix4NetFxScheduleNativeImage_X86\t1\tWix4NetFxCA_X86\tSchedNetFx\t",
+                "Wix4NetFxNativeImage:ExampleNgen\tfil6349_KNDJhqShNzVdHX3ihhvA6Y\t3\t8\t\t",
+            }, results.OrderBy(s => s).ToArray());
+        }
+
+        [Fact]
+        public void CanBuildUsingNativeImageX64()
+        {
+            var folder = TestData.Get(@"TestData\UsingNativeImage");
+            var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder });
+
+            var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4NetFxNativeImage");
+            Assert.Equal(new[]
+            {
+                "Binary:Wix4NetFxCA_X64\t[Binary data]",
+                "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t",
+                "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t",
+                "CustomAction:Wix4NetFxExecuteNativeImageInstall_X64\t3137\tWix4NetFxCA_X64\tExecNetFx\t",
+                "CustomAction:Wix4NetFxExecuteNativeImageUninstall_X64\t3137\tWix4NetFxCA_X64\tExecNetFx\t",
+                "CustomAction:Wix4NetFxScheduleNativeImage_X64\t1\tWix4NetFxCA_X64\tSchedNetFx\t",
+                "Wix4NetFxNativeImage:ExampleNgen\tfil6349_KNDJhqShNzVdHX3ihhvA6Y\t3\t8\t\t",
+            }, results.OrderBy(s => s).ToArray());
+        }
+
+        [Fact]
+        public void CanBuildUsingNativeImageARM64()
+        {
+            var folder = TestData.Get(@"TestData\UsingNativeImage");
+            var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder });
+
+            var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4NetFxNativeImage");
+            Assert.Equal(new[]
+            {
+                "Binary:Wix4NetFxCA_A64\t[Binary data]",
+                "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t",
+                "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t",
+                "CustomAction:Wix4NetFxExecuteNativeImageInstall_A64\t3137\tWix4NetFxCA_A64\tExecNetFx\t",
+                "CustomAction:Wix4NetFxExecuteNativeImageUninstall_A64\t3137\tWix4NetFxCA_A64\tExecNetFx\t",
+                "CustomAction:Wix4NetFxScheduleNativeImage_A64\t1\tWix4NetFxCA_A64\tSchedNetFx\t",
+                "Wix4NetFxNativeImage:ExampleNgen\tfil6349_KNDJhqShNzVdHX3ihhvA6Y\t3\t8\t\t",
+            }, results.OrderBy(s => s).ToArray());
+        }
+
+        private static void Build(string[] args)
+        {
+            var result = WixRunner.Execute(args);
+            result.AssertSuccess();
+        }
+
+        private static void BuildX64(string[] args)
+        {
+            var newArgs = args.ToList();
+            newArgs.Add("-platform");
+            newArgs.Add("x64");
+
+            var result = WixRunner.Execute(newArgs.ToArray());
+            result.AssertSuccess();
+        }
+
+        private static void BuildARM64(string[] args)
+        {
+            var newArgs = args.ToList();
+            newArgs.Add("-platform");
+            newArgs.Add("arm64");
+
+            var result = WixRunner.Execute(newArgs.ToArray());
+            result.AssertSuccess();
+        }
+    }
+}
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs
new file mode 100644
index 00000000..8e3d2c30
--- /dev/null
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs
@@ -0,0 +1,12 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
+        <BootstrapperApplication>
+            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
+        </BootstrapperApplication>
+        <Chain>
+            <PackageGroupRef Id="AspNetCoreRuntime31Redist_x86" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" />
+            <PackageGroupRef Id="DotNetCoreRuntime31Redist_x86" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs
new file mode 100644
index 00000000..fc42ac99
--- /dev/null
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs
@@ -0,0 +1,12 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
+        <BootstrapperApplication>
+            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
+        </BootstrapperApplication>
+        <Chain>
+            <PackageGroupRef Id="AspNetCoreRuntime31Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" />
+            <PackageGroupRef Id="DotNetCoreRuntime31Redist_x64" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl
new file mode 100644
index 00000000..5301bb1a
--- /dev/null
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl
@@ -0,0 +1,9 @@
+<!--
+This file contains the declaration of all the localizable strings.
+-->
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+
+  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
+  <String Id="FeatureTitle">MsiPackage</String>
+
+</WixLocalization>
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs
new file mode 100644
index 00000000..ace73680
--- /dev/null
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs
@@ -0,0 +1,15 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+
+    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
+      <ComponentGroupRef Id="ProductComponents" />
+    </Feature>
+  </Package>
+
+  <Fragment>
+      <StandardDirectory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+      </StandardDirectory>
+    </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs
new file mode 100644
index 00000000..a1c806d9
--- /dev/null
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs
@@ -0,0 +1,11 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+       <Component>
+         <File Name="fake.ddl" Source="example.txt">
+           <netfx:NativeImage Id="ExampleNgen" />
+         </File>
+       </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/example.txt b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/example.txt
new file mode 100644
index 00000000..1b4ffe8a
--- /dev/null
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/example.txt
@@ -0,0 +1 @@
+This is example.txt.
\ No newline at end of file
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
new file mode 100644
index 00000000..1c41d176
--- /dev/null
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <DebugType>embedded</DebugType>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\wixext\WixToolset.Netfx.wixext.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Target Name="CopyExtensions" AfterTargets="Build">
+    <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
+  </Target>
+</Project>
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.v3.ncrunchproject b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.v3.ncrunchproject
new file mode 100644
index 00000000..7b5b2139
--- /dev/null
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/src/ext/NetFx/wix.snk b/src/ext/NetFx/wix.snk
new file mode 100644
index 00000000..3908a66a
--- /dev/null
+++ b/src/ext/NetFx/wix.snk
diff --git a/src/ext/NetFx/wixext/NetFxCompiler.cs b/src/ext/NetFx/wixext/NetFxCompiler.cs
new file mode 100644
index 00000000..90aa8bcb
--- /dev/null
+++ b/src/ext/NetFx/wixext/NetFxCompiler.cs
@@ -0,0 +1,163 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Netfx
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Xml.Linq;
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Data;
+    using WixToolset.Netfx.Symbols;
+
+    /// <summary>
+    /// The compiler for the WiX Toolset .NET Framework Extension.
+    /// </summary>
+    public sealed class NetfxCompiler : BaseCompilerExtension
+    {
+        public override XNamespace Namespace => "http://wixtoolset.org/schemas/v4/wxs/netfx";
+
+        /// <summary>
+        /// Processes an element for the Compiler.
+        /// </summary>
+        /// <param name="parentElement">Parent element of element to process.</param>
+        /// <param name="element">Element to process.</param>
+        /// <param name="contextValues">Extra information about the context in which this element is being parsed.</param>
+        public override void ParseElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context)
+        {
+            switch (parentElement.Name.LocalName)
+            {
+                case "File":
+                    string fileId = context["FileId"];
+
+                    switch (element.Name.LocalName)
+                    {
+                        case "NativeImage":
+                            this.ParseNativeImageElement(intermediate, section, element, fileId);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedElement(parentElement, element);
+                            break;
+                    }
+                    break;
+                default:
+                    this.ParseHelper.UnexpectedElement(parentElement, element);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Parses a NativeImage element.
+        /// </summary>
+        /// <param name="element">The element to parse.</param>
+        /// <param name="fileId">The file identifier of the parent element.</param>
+        private void ParseNativeImageElement(Intermediate intermediate, IntermediateSection section, XElement element, string fileId)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
+            Identifier id = null;
+            string appBaseDirectory = null;
+            string assemblyApplication = null;
+            int attributes = 0x8; // 32bit is on by default
+            int priority = 3;
+
+            foreach (var attrib in element.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "AppBaseDirectory":
+                            appBaseDirectory = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+
+                            // See if a formatted value is specified.
+                            if (-1 == appBaseDirectory.IndexOf("[", StringComparison.Ordinal))
+                            {
+                                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Directory, appBaseDirectory);
+                            }
+                            break;
+                        case "AssemblyApplication":
+                            assemblyApplication = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+
+                            // See if a formatted value is specified.
+                            if (-1 == assemblyApplication.IndexOf("[", StringComparison.Ordinal))
+                            {
+                                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.File, assemblyApplication);
+                            }
+                            break;
+                        case "Debug":
+                            if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib))
+                            {
+                                attributes |= 0x1;
+                            }
+                            break;
+                        case "Dependencies":
+                            if (YesNoType.No == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib))
+                            {
+                                attributes |= 0x2;
+                            }
+                            break;
+                        case "Platform":
+                            string platformValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            if (0 < platformValue.Length)
+                            {
+                                switch (platformValue)
+                                {
+                                    case "32bit":
+                                        // 0x8 is already on by default
+                                        break;
+                                    case "64bit":
+                                        attributes &= ~0x8;
+                                        attributes |= 0x10;
+                                        break;
+                                    case "all":
+                                        attributes |= 0x10;
+                                        break;
+                                }
+                            }
+                            break;
+                        case "Priority":
+                            priority = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, 3);
+                            break;
+                        case "Profile":
+                            if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib))
+                            {
+                                attributes |= 0x4;
+                            }
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(element, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
+                }
+            }
+
+            if (null == id)
+            {
+                id = this.ParseHelper.CreateIdentifier("nni", fileId);
+            }
+
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
+
+            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4NetFxScheduleNativeImage", this.Context.Platform, CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
+
+            if (!this.Messaging.EncounteredError)
+            {
+                section.AddSymbol(new NetFxNativeImageSymbol(sourceLineNumbers, id)
+                {
+                    FileRef = fileId,
+                    Priority = priority,
+                    Attributes = attributes,
+                    ApplicationFileRef = assemblyApplication,
+                    ApplicationBaseDirectoryRef = appBaseDirectory,
+                });
+            }
+        }
+    }
+}
diff --git a/src/ext/NetFx/wixext/NetFxDecompiler.cs b/src/ext/NetFx/wixext/NetFxDecompiler.cs
new file mode 100644
index 00000000..e30905d1
--- /dev/null
+++ b/src/ext/NetFx/wixext/NetFxDecompiler.cs
@@ -0,0 +1,139 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Extensions
+{
+#if TODO_CONSIDER_DECOMPILER
+    using System;
+    using System.Collections;
+    using System.Diagnostics;
+    using System.Globalization;
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+    using NetFx = WixToolset.Extensions.Serialize.NetFx;
+    using Wix = WixToolset.Data.Serialize;
+
+    /// <summary>
+    /// The decompiler for the WiX Toolset .NET Framework Extension.
+    /// </summary>
+    public sealed class NetFxDecompiler : DecompilerExtension
+    {
+        /// <summary>
+        /// Creates a decompiler for NetFx Extension.
+        /// </summary>
+        public NetFxDecompiler()
+        {
+            this.TableDefinitions = NetFxExtensionData.GetExtensionTableDefinitions();
+        }
+
+        /// <summary>
+        /// Get the extensions library to be removed.
+        /// </summary>
+        /// <param name="tableDefinitions">Table definitions for library.</param>
+        /// <returns>Library to remove from decompiled output.</returns>
+        public override Library GetLibraryToRemove(TableDefinitionCollection tableDefinitions)
+        {
+            return NetFxExtensionData.GetExtensionLibrary(tableDefinitions);
+        }
+
+        /// <summary>
+        /// Decompiles an extension table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        public override void DecompileTable(Table table)
+        {
+            switch (table.Name)
+            {
+                case "NetFxNativeImage":
+                    this.DecompileNetFxNativeImageTable(table);
+                    break;
+                default:
+                    base.DecompileTable(table);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Decompile the NetFxNativeImage table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileNetFxNativeImageTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                NetFx.NativeImage nativeImage = new NetFx.NativeImage();
+
+                nativeImage.Id = (string)row[0];
+
+                switch ((int)row[2])
+                {
+                    case 0:
+                        nativeImage.Priority = NetFx.NativeImage.PriorityType.Item0;
+                        break;
+                    case 1:
+                        nativeImage.Priority = NetFx.NativeImage.PriorityType.Item1;
+                        break;
+                    case 2:
+                        nativeImage.Priority = NetFx.NativeImage.PriorityType.Item2;
+                        break;
+                    case 3:
+                        nativeImage.Priority = NetFx.NativeImage.PriorityType.Item3;
+                        break;
+                }
+
+                if (null != row[3])
+                {
+                    int attributes = (int)row[3];
+
+                    if (0x1 == (attributes & 0x1))
+                    {
+                        nativeImage.Debug = NetFx.YesNoType.yes;
+                    }
+
+                    if (0x2 == (attributes & 0x2))
+                    {
+                        nativeImage.Dependencies = NetFx.YesNoType.no;
+                    }
+
+                    if (0x4 == (attributes & 0x4))
+                    {
+                        nativeImage.Profile = NetFx.YesNoType.yes;
+                    }
+
+                    if (0x8 == (attributes & 0x8) && 0x10 == (attributes & 0x10))
+                    {
+                        nativeImage.Platform = NetFx.NativeImage.PlatformType.all;
+                    }
+                    else if (0x8 == (attributes & 0x8))
+                    {
+                        nativeImage.Platform = NetFx.NativeImage.PlatformType.Item32bit;
+                    }
+                    else if (0x10 == (attributes & 0x10))
+                    {
+                        nativeImage.Platform = NetFx.NativeImage.PlatformType.Item64bit;
+                    }
+                }
+
+                if (null != row[4])
+                {
+                    nativeImage.AssemblyApplication = (string)row[4];
+                }
+
+                if (null != row[5])
+                {
+                    nativeImage.AppBaseDirectory = (string)row[5];
+                }
+
+                Wix.File file = (Wix.File)this.Core.GetIndexedElement("File", (string)row[1]);
+                if (null != file)
+                {
+                    file.AddChild(nativeImage);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "File_", (string)row[1], "File"));
+                }
+            }
+        }
+    }
+#endif
+}
diff --git a/src/ext/NetFx/wixext/NetFxExtensionData.cs b/src/ext/NetFx/wixext/NetFxExtensionData.cs
new file mode 100644
index 00000000..0a24ef1e
--- /dev/null
+++ b/src/ext/NetFx/wixext/NetFxExtensionData.cs
@@ -0,0 +1,25 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Netfx
+{
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+    using WixToolset.Netfx.Symbols;
+
+    /// <summary>
+    /// The WiX Toolset .NET Framework Extension.
+    /// </summary>
+    public sealed class NetfxExtensionData : BaseExtensionData
+    {
+        public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
+        {
+            symbolDefinition = (name == NetfxSymbolDefinitionNames.NetFxNativeImage) ? NetfxSymbolDefinitions.NetFxNativeImage : null;
+            return symbolDefinition != null;
+        }
+
+        public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
+        {
+            return Intermediate.Load(typeof(NetfxExtensionData).Assembly, "WixToolset.Netfx.netfx.wixlib", symbolDefinitions);
+        }
+    }
+}
diff --git a/src/ext/NetFx/wixext/NetfxExtensionFactory.cs b/src/ext/NetFx/wixext/NetfxExtensionFactory.cs
new file mode 100644
index 00000000..fe618460
--- /dev/null
+++ b/src/ext/NetFx/wixext/NetfxExtensionFactory.cs
@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Netfx
+{
+    using System;
+    using System.Collections.Generic;
+    using WixToolset.Extensibility;
+
+    public class NetfxExtensionFactory : BaseExtensionFactory
+    {
+        protected override IReadOnlyCollection<Type> ExtensionTypes => new[]
+        {
+            typeof(NetfxCompiler),
+            typeof(NetfxExtensionData),
+            typeof(NetfxWindowsInstallerBackendBinderExtension),
+        };
+    }
+}
diff --git a/src/ext/NetFx/wixext/NetfxTableDefinitions.cs b/src/ext/NetFx/wixext/NetfxTableDefinitions.cs
new file mode 100644
index 00000000..1b2a4d21
--- /dev/null
+++ b/src/ext/NetFx/wixext/NetfxTableDefinitions.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Netfx
+{
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Netfx.Symbols;
+
+    public static class NetfxTableDefinitions
+    {
+        public static readonly TableDefinition NetFxNativeImage = new TableDefinition(
+            "Wix4NetFxNativeImage",
+            NetfxSymbolDefinitions.NetFxNativeImage,
+            new[]
+            {
+                new ColumnDefinition("Wix4NetFxNativeImage", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The primary key, a non-localized token.", modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "The assembly for which a native image will be generated.", modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Priority", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Integer, minValue: 0, maxValue: 3, description: "The priority for generating this native image: 0 is syncronous, 1-3 represent various levels of queued generation."),
+                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Integer, minValue: 0, maxValue: 2147483647, description: "Integer containing bit flags representing native image attributes."),
+                new ColumnDefinition("File_Application", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The application which loads this assembly.", modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Directory_ApplicationBase", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The directory containing the application which loads this assembly.", modularizeType: ColumnModularizeType.Column),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition[] All = new[]
+        {
+            NetFxNativeImage,
+        };
+    }
+}
diff --git a/src/ext/NetFx/wixext/NetfxWindowsInstallerBackendExtension.cs b/src/ext/NetFx/wixext/NetfxWindowsInstallerBackendExtension.cs
new file mode 100644
index 00000000..7d4fe475
--- /dev/null
+++ b/src/ext/NetFx/wixext/NetfxWindowsInstallerBackendExtension.cs
@@ -0,0 +1,13 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Netfx
+{
+    using System.Collections.Generic;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Extensibility;
+
+    public class NetfxWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension
+    {
+        public override IReadOnlyCollection<TableDefinition> TableDefinitions => NetfxTableDefinitions.All;
+    }
+}
diff --git a/src/ext/NetFx/wixext/Symbols/NetFxNativeImageSymbol.cs b/src/ext/NetFx/wixext/Symbols/NetFxNativeImageSymbol.cs
new file mode 100644
index 00000000..3803abd6
--- /dev/null
+++ b/src/ext/NetFx/wixext/Symbols/NetFxNativeImageSymbol.cs
@@ -0,0 +1,58 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Netfx.Symbols
+{
+    using WixToolset.Data;
+
+    public enum NetFxNativeImageSymbolFields
+    {
+        FileRef,
+        Priority,
+        Attributes,
+        ApplicationFileRef,
+        ApplicationBaseDirectoryRef,
+    }
+
+    public class NetFxNativeImageSymbol : IntermediateSymbol
+    {
+        public NetFxNativeImageSymbol() : base(NetfxSymbolDefinitions.NetFxNativeImage, null, null)
+        {
+        }
+
+        public NetFxNativeImageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(NetfxSymbolDefinitions.NetFxNativeImage, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[NetFxNativeImageSymbolFields index] => this.Fields[(int)index];
+
+        public string FileRef
+        {
+            get => this.Fields[(int)NetFxNativeImageSymbolFields.FileRef].AsString();
+            set => this.Set((int)NetFxNativeImageSymbolFields.FileRef, value);
+        }
+
+        public int Priority
+        {
+            get => this.Fields[(int)NetFxNativeImageSymbolFields.Priority].AsNumber();
+            set => this.Set((int)NetFxNativeImageSymbolFields.Priority, value);
+        }
+
+        public int Attributes
+        {
+            get => this.Fields[(int)NetFxNativeImageSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)NetFxNativeImageSymbolFields.Attributes, value);
+        }
+
+        public string ApplicationFileRef
+        {
+            get => this.Fields[(int)NetFxNativeImageSymbolFields.ApplicationFileRef].AsString();
+            set => this.Set((int)NetFxNativeImageSymbolFields.ApplicationFileRef, value);
+        }
+
+        public string ApplicationBaseDirectoryRef
+        {
+            get => this.Fields[(int)NetFxNativeImageSymbolFields.ApplicationBaseDirectoryRef].AsString();
+            set => this.Set((int)NetFxNativeImageSymbolFields.ApplicationBaseDirectoryRef, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
new file mode 100644
index 00000000..3c0f1176
--- /dev/null
+++ b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
@@ -0,0 +1,26 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Netfx.Symbols
+{
+    using WixToolset.Data;
+
+    public static class NetfxSymbolDefinitionNames
+    {
+        public static string NetFxNativeImage { get; } = "NetFxNativeImage";
+    }
+
+    public static class NetfxSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition NetFxNativeImage = new IntermediateSymbolDefinition(
+            NetfxSymbolDefinitionNames.NetFxNativeImage,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.Priority), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.ApplicationFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.ApplicationBaseDirectoryRef), IntermediateFieldType.String),
+            },
+            typeof(NetFxNativeImageSymbol));
+    }
+}
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
new file mode 100644
index 00000000..7c1d55c1
--- /dev/null
+++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <DebugType>embedded</DebugType>
+    <RootNamespace>WixToolset.Netfx</RootNamespace>
+    <Description>WiX Toolset .NET Framework Extension</Description>
+    <Title>WiX Toolset .NET Framework Extension</Title>
+    <IncludeSymbols>true</IncludeSymbols>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
+    <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
+  </ItemGroup>
+</Project>
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
new file mode 100644
index 00000000..ba3eaade
--- /dev/null
+++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="4.0">
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <description>$description$</description>
+    <authors>$authors$</authors>
+    <license type="expression">MS-RL</license>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <copyright>$copyright$</copyright>
+    <projectUrl>$projectUrl$</projectUrl>
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
+  </metadata>
+
+  <files>
+    <file src="$projectFolder$$id$.targets" target="build" />
+
+    <file src="netstandard2.0\$id$.dll" target="tools" />
+
+    <file src="ARM64\*.pdb" target="pdbs\ARM64" />
+    <file src="x86\*.pdb" target="pdbs\x86" />
+    <file src="x64\*.pdb" target="pdbs\x64" />
+  </files>
+</package>
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets
new file mode 100644
index 00000000..2ed9c488
--- /dev/null
+++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <WixToolsetNetfxWixextPath Condition=" '$(WixToolsetNetfxWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Netfx.wixext.dll</WixToolsetNetfxWixextPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <WixExtension Include="$(WixToolsetNetfxWixextPath)" />
+  </ItemGroup>
+</Project>
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.v3.ncrunchproject b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.v3.ncrunchproject
new file mode 100644
index 00000000..93e4df3d
--- /dev/null
+++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.v3.ncrunchproject
@@ -0,0 +1,7 @@
+<ProjectConfiguration>
+  <Settings>
+    <AdditionalFilesToIncludeForProject>
+      <Value>..\..\build\Debug\netfx.wixlib</Value>
+    </AdditionalFilesToIncludeForProject>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/src/ext/NetFx/wixlib/NetCore3.1.12_x64.wxs b/src/ext/NetFx/wixlib/NetCore3.1.12_x64.wxs
new file mode 100644
index 00000000..990dc0bf
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetCore3.1.12_x64.wxs
@@ -0,0 +1,58 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+    <?define NetCorePlatform = x64?>
+    <?define NetCoreIdVersion = 3112?>
+    <?define NetCoreVersion = 3.1.12?>
+    <?include NetCore3_Platform.wxi?>
+
+    <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/20cf277c-2ccf-449f-a0b8-925ba0c175e7/aa50b052ceb8a8d36a5b4f9b8d0bd91c/aspnetcore-runtime-3.1.12-win-x64.exe?>
+    <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/076a47e9-c65b-4b78-95a7-93eb988891a4/3574764590cfa650e0aa87c44d3fe384/windowsdesktop-runtime-3.1.12-win-x64.exe?>
+    <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/2fdc3009-cf5c-4cf6-8f3b-a61e83200cbb/2c71ee04b48103a7464f4e28a8bf339b/dotnet-runtime-3.1.12-win-x64.exe?>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
+
+        <PackageGroup Id="$(var.AspNetCoreRedistId)">
+            <ExePackage InstallArguments="$(var.AspNetCoreRedistInstallArguments)" RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.AspNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.AspNetCoreRedistLog)">
+                <ExePackagePayload Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.AspNetCoreRedistLink)" Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Hash="5CE9839CAE90FB2936033431F2905E97C7DC080DC50108D58714939CCCC6A265694B8259A3BF742A68BF04D9CFFB0602B0306DD401C4CE644BDB96C7D1168E59" ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Size="7841808" Version="3.1.12.21070" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
+
+        <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
+            <ExePackage InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DesktopNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DesktopNetCoreRedistLog)">
+                <ExePackagePayload Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DesktopNetCoreRedistLink)" Description="Microsoft Windows Desktop Runtime - 3.1.12 (x64)" Hash="CD69B8722B2FF175FADD6774AB6A97F89292FC57A15CEC95218E79FFF1E26F46A7EFFFB15CE0F6D22B83B991F7083BB5C04F5158F87D298EA0F204933F8ECD27" ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x64)" Size="54284816" Version="3.1.12.29719" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
+
+        <PackageGroup Id="$(var.DotNetCoreRedistId)">
+            <ExePackage InstallArguments="$(var.DotNetCoreRedistInstallArguments)" RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DotNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreRedistLog)">
+                <ExePackagePayload Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DotNetCoreRedistLink)" Description="Microsoft .NET Core Runtime - 3.1.12 (x64)" Hash="9B3F882AE5DFDC8B50D3CEC4F3292292D658B2FECB84B3F73426FB3C16E6FC6B8E7118EF559CFAE25ED7A2C175FA4D89E18986CA3C05D15F706524FBB667F702" ProductName="Microsoft .NET Core Runtime - 3.1.12 (x64)" Size="26090616" Version="3.1.12.29719" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetCore3.1.12_x86.wxs b/src/ext/NetFx/wixlib/NetCore3.1.12_x86.wxs
new file mode 100644
index 00000000..b6d5d371
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetCore3.1.12_x86.wxs
@@ -0,0 +1,58 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+    <?define NetCorePlatform = x86?>
+    <?define NetCoreIdVersion = 3112?>
+    <?define NetCoreVersion = 3.1.12?>
+    <?include NetCore3_Platform.wxi?>
+
+    <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/55d6ff56-2725-4657-bffd-fdf35d6816fd/7431d1d3533f0b1ac97df734c45c33f2/aspnetcore-runtime-3.1.12-win-x86.exe?>
+    <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/5d89a010-88bf-4e4e-ac12-a07258ddbf5f/1ff5dfe312c5bd9760f3b500b1b37597/windowsdesktop-runtime-3.1.12-win-x86.exe?>
+    <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/cbdd1603-7fa9-4957-8869-94e24963ba6c/ca0b7d1be494882d5a7433accfa3c94c/dotnet-runtime-3.1.12-win-x86.exe?>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
+
+        <PackageGroup Id="$(var.AspNetCoreRedistId)">
+            <ExePackage InstallArguments="$(var.AspNetCoreRedistInstallArguments)" RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.AspNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.AspNetCoreRedistLog)">
+                <ExePackagePayload Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.AspNetCoreRedistLink)" Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Hash="03EE5F6D3B2AF8FFE2A5154BB05E50938E2D36E98D996D9E67A3C349DD0C8B3051D5A9628F48C51E006CEA0B1F4484B4BE51920FE5CA841060B0D2C6A12FD5D2" ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Size="7841808" Version="3.1.12.21070" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
+
+        <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
+            <ExePackage InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DesktopNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DesktopNetCoreRedistLog)">
+                <ExePackagePayload Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DesktopNetCoreRedistLink)" Description="Microsoft Windows Desktop Runtime - 3.1.12 (x86)" Hash="C211A7F29D9B6FEEFCF0379B153FFBFB815157D3D494CFD7D0D84D619701EEA284BF12502094BCFF2BB2968213190454E7CE0E865FD623E78C2FCDAEBEF963DA" ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x86)" Size="48590696" Version="3.1.12.29719" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
+
+        <PackageGroup Id="$(var.DotNetCoreRedistId)">
+            <ExePackage InstallArguments="$(var.DotNetCoreRedistInstallArguments)" RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DotNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreRedistLog)">
+                <ExePackagePayload Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DotNetCoreRedistLink)" Description="Microsoft .NET Core Runtime - 3.1.12 (x86)" Hash="BA18F9028B19630D91017BEACCD8D79388125C228A83B5A62306108F3BB283617A7ED9B98785BC73192EC00E5D186DA767E940DCAB388699FAF274E437D0C16F" ProductName="Microsoft .NET Core Runtime - 3.1.12 (x86)" Size="23392184" Version="3.1.12.29719" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetCore3.1_x64.wxs b/src/ext/NetFx/wixlib/NetCore3.1_x64.wxs
new file mode 100644
index 00000000..60d7c27f
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetCore3.1_x64.wxs
@@ -0,0 +1,22 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+    <Fragment>
+        <PackageGroup Id="AspNetCoreRuntime31Redist_x64">
+            <PackageGroupRef Id="AspNetCoreRuntime3112Redist_x64" />
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <PackageGroup Id="DesktopNetCoreRuntime31Redist_x64">
+            <PackageGroupRef Id="DesktopNetCoreRuntime3112Redist_x64" />
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <PackageGroup Id="DotNetCoreRuntime31Redist_x64">
+            <PackageGroupRef Id="DotNetCoreRuntime3112Redist_x64" />
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetCore3.1_x86.wxs b/src/ext/NetFx/wixlib/NetCore3.1_x86.wxs
new file mode 100644
index 00000000..cfff07b3
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetCore3.1_x86.wxs
@@ -0,0 +1,22 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+    <Fragment>
+        <PackageGroup Id="AspNetCoreRuntime31Redist_x86">
+            <PackageGroupRef Id="AspNetCoreRuntime3112Redist_x86" />
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <PackageGroup Id="DesktopNetCoreRuntime31Redist_x86">
+            <PackageGroupRef Id="DesktopNetCoreRuntime3112Redist_x86" />
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <PackageGroup Id="DotNetCoreRuntime31Redist_x86">
+            <PackageGroupRef Id="DotNetCoreRuntime3112Redist_x86" />
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetCore3_Platform.wxi b/src/ext/NetFx/wixlib/NetCore3_Platform.wxi
new file mode 100644
index 00000000..c7aaca50
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetCore3_Platform.wxi
@@ -0,0 +1,65 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+  <?define AspNetCoreId = ASPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
+  <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
+  <?define AspNetCoreRedistLog = AspNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?>
+  <?define AspNetCoreRedistInstallArguments = /install /quiet /norestart /log &quot;[$(var.AspNetCoreRedistLog)]&quot;?>
+  <?define AspNetCoreRedistUninstallArguments = /uninstall /quiet /norestart /log &quot;[$(var.AspNetCoreRedistLog)]&quot;?>
+
+  <?define DesktopNetCoreId = DESKTOPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
+  <?define DesktopNetCoreRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
+  <?define DesktopNetCoreRedistLog = DesktopNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?>
+  <?define DesktopNetCoreRedistInstallArguments = /install /quiet /norestart /log &quot;[$(var.DesktopNetCoreRedistLog)]&quot;?>
+  <?define DesktopNetCoreRedistUninstallArguments = /uninstall /quiet /norestart /log &quot;[$(var.DesktopNetCoreRedistLog)]&quot;?>
+
+  <?define DotNetCoreId = DOTNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
+  <?define DotNetCoreRedistId = DotNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
+  <?define DotNetCoreRedistLog = DotNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?>
+  <?define DotNetCoreRedistInstallArguments = /install /quiet /norestart /log &quot;[$(var.DotNetCoreRedistLog)]&quot;?>
+  <?define DotNetCoreRedistUninstallArguments = /uninstall /quiet /norestart /log &quot;[$(var.DotNetCoreRedistLog)]&quot;?>
+
+  <?define DotNetHomeId = DOTNETHOME_$(var.NetCorePlatform)?>
+  <?define NetCoreEulaLink = https://go.microsoft.com/fwlink/?LinkId=329770?>
+
+  <Fragment>
+    <util:RegistrySearchRef Id="$(var.DotNetHomeId)" />
+    <util:DirectorySearch Id="$(var.AspNetCoreId)" Variable="$(var.AspNetCoreId)" Path="[$(var.DotNetHomeId)]\shared\Microsoft.AspNetCore.App\$(var.NetCoreVersion)" Result="exists" After="$(var.DotNetHomeId)" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearchRef Id="$(var.DotNetHomeId)" />
+    <util:DirectorySearch Id="$(var.DesktopNetCoreId)" Variable="$(var.DesktopNetCoreId)" Path="[$(var.DotNetHomeId)]\shared\Microsoft.WindowsDesktop.App\$(var.NetCoreVersion)" Result="exists" After="$(var.DotNetHomeId)" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearchRef Id="$(var.DotNetHomeId)" />
+    <util:DirectorySearch Id="$(var.DotNetCoreId)" Variable="$(var.DotNetCoreId)" Path="[$(var.DotNetHomeId)]\shared\Microsoft.NETCore.App\$(var.NetCoreVersion)" Result="exists" After="$(var.DotNetHomeId)" />
+  </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.AspNetCoreRedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.AspNetCoreRedistId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.AspNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
+  </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.DesktopNetCoreRedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.DesktopNetCoreRedistId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DesktopNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
+  </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.DotNetCoreRedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.DotNetCoreRedistId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
+  </Fragment>
+</Include>
diff --git a/src/ext/NetFx/wixlib/NetCoreShared.wxs b/src/ext/NetFx/wixlib/NetCoreShared.wxs
new file mode 100644
index 00000000..0332041a
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetCoreShared.wxs
@@ -0,0 +1,11 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+  <?foreach PLATFORM in x86;x64?>
+  <Fragment>
+    <util:RegistrySearch Id="DOTNETHOME_$(var.PLATFORM)" Variable="DOTNETHOME_$(var.PLATFORM)" Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.PLATFORM)" Value="InstallLocation" Result="value" Bitness="always32" />
+  </Fragment>
+  <?endforeach?>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx1.1.wxs b/src/ext/NetFx/wixlib/NetFx1.1.wxs
new file mode 100644
index 00000000..12f0a4e3
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx1.1.wxs
@@ -0,0 +1,191 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+    <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following location:
+
+           .NET Framework 1.1 - http://msdn.microsoft.com/library/ms994339.aspx
+    -->
+
+    <!-- set to #1 if the .NET Framework 1.1 is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11" Secure="yes">
+            <RegistrySearch Id="NetFramework11" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates the service pack level for the .NET Framework 1.1.         -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_SP_LEVEL" Secure="yes">
+            <RegistrySearch Id="NetFramework11SP" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322" Name="SP" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Location of .NET Framework 1.1 redistributable install root directory -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11INSTALLROOTDIR" Secure="yes">
+            <RegistrySearch Id="NetFxInstallRootForNetfx11Search" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot">
+                <DirectorySearch Id="NetFx11InstallRootSearch" Path="v1.1.4322" Depth="0" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Chinese (Simplified) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_ZH_CN_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11ZhCnLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\2052" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Chinese (Traditional) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_ZH_TW_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11ZhTwLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1028" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Czech language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_CS_CZ_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11CsCzLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1029" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Danish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_DA_DK_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11DaDkLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1030" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Dutch language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_NL_NL_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11NlNlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1043" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Finnish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_FI_FI_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11FiFiLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1035" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 French language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_FR_FR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11FrFrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1036" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 German language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_DE_DE_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11DeDeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1031" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Greek language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_EL_GR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11ElGrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1032" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Hungarian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_HU_HU_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11HuHuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1038" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Italian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_IT_IT_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11ItItLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1040" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Japanese language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_JA_JP_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11JaJpLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1041" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Korean language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_KO_KR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11KoKrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1042" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Norwegian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_NB_NO_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11NbNoLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1044" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Polish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_PL_PL_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11PlPlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1045" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Portuguese (Brazil) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_PT_BR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11PtBrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1046" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Portuguese (Portugal) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_PT_PT_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11PtPtLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\2070" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Russian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_RU_RU_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11RuRuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1049" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Spanish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_ES_ES_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11EsEsLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\3082" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Swedish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_SV_SE_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11SvSeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1053" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 1.1 Turkish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11_TR_TR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NetFramework11TrTrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v1.1.4322\1055" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- location of the .NET Framework 1.1 SDK installation root -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK11SDKDIR" Secure="yes">
+            <RegistrySearch Id="NetFramework11SDKDir" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="sdkInstallRootv1.1" Type="raw" />
+        </Property>
+    </Fragment>
+
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx1.wxs b/src/ext/NetFx/wixlib/NetFx1.wxs
new file mode 100644
index 00000000..68d6f13d
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx1.wxs
@@ -0,0 +1,30 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+    <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following location:
+
+           .NET Framework 1.0 - http://msdn.microsoft.com/library/ms994349.aspx
+    -->
+
+    <!-- set to 3321-3705 if the .NET Framework 1.0 is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK10" Secure="yes">
+            <RegistrySearch Id="NetFramework10" Root="HKLM" Key="SOFTWARE\Microsoft\.NETFramework\policy\v1.0" Name="3705" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Location of .NET Framework 1.0 redistributable install root directory -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK10INSTALLROOTDIR" Secure="yes">
+            <RegistrySearch Id="NetFxInstallRootForNetfx10Search" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot">
+                <DirectorySearch Id="NetFx10InstallRootSearch" Path="v1.0.3705" Depth="0" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx2.wxs b/src/ext/NetFx/wixlib/NetFx2.wxs
new file mode 100644
index 00000000..e5eef54b
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx2.wxs
@@ -0,0 +1,200 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+    <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following location:
+
+           .NET Framework 2.0 - http://msdn.microsoft.com/library/aa480243.aspx
+    -->
+
+    <!-- set to #1 if the .NET Framework 2.0 is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20" Secure="yes">
+            <RegistrySearch Id="NetFramework20" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates the service pack level for the .NET Framework 2.0.         -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_SP_LEVEL" Secure="yes">
+            <RegistrySearch Id="NetFramework20SP" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="SP" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Location of .NET Framework 2.0 redistributable install root directory -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20INSTALLROOTDIR" Secure="yes">
+            <RegistrySearch Id="NetFxInstallRootForNetfx20Search" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot">
+                <DirectorySearch Id="NetFx20InstallRootSearch" Path="v2.0.50727" Depth="0" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <!-- Location of .NET Framework 2.0 (64-bit) redistributable install root directory -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20INSTALLROOTDIR64" Secure="yes">
+            <RegistrySearch Id="NetFxInstallRootForNetfx20Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Bitness="always64">
+                <DirectorySearch Id="NetFx20InstallRootSearch64" Path="v2.0.50727" Depth="0" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Chinese (Simplified) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_ZH_CN_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20ZhCnLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\2052" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Chinese (Traditional) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_ZH_TW_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20ZhTwLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1028" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Czech language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_CS_CZ_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20CsCzLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1029" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Danish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_DA_DK_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20DaDkLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1030" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Dutch language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_NL_NL_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20NlNlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1043" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Finnish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_FI_FI_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20FiFiLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1035" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 French language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_FR_FR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20FrFrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1036" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 German language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_DE_DE_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20DeDeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1031" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Greek language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_EL_GR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20ElGrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1032" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Hungarian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_HU_HU_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20HuHuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1038" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Italian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_IT_IT_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20ItItLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1040" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Japanese language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_JA_JP_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20JaJpLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1041" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Korean language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_KO_KR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20KoKrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1042" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Norwegian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_NB_NO_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20NbNoLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1044" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Polish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_PL_PL_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20PlPlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1045" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Portuguese (Brazil) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_PT_BR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20PtBrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1046" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Portuguese (Portugal) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_PT_PT_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20PtPtLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\2070" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Russian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_RU_RU_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20RuRuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1049" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Spanish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_ES_ES_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20EsEsLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\3082" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Swedish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_SV_SE_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20SvSeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1053" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 2.0 Turkish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20_TR_TR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK20TrTrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727\1055" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- location of the .NET Framework 2.0 SDK installation root -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK20SDKDIR" Secure="yes">
+            <RegistrySearch Id="NetFramework20SDKDir" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="sdkInstallRootv2.0" Type="raw" />
+        </Property>
+    </Fragment>
+
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx3.5.wxs b/src/ext/NetFx/wixlib/NetFx3.5.wxs
new file mode 100644
index 00000000..c1a80f50
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx3.5.wxs
@@ -0,0 +1,234 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+    <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following locations:
+
+           .NET Framework 3.5 - http://msdn.microsoft.com/library/cc160716.aspx
+           .NET Framework 3.5 client profile - http://download.microsoft.com/download/5/a/a/5aa86d6c-969b-42d8-bc6b-30e02bfeccf0/NETFXClientProfile_DeploymentGuide.htm
+    -->
+
+    <!-- Indicates the service pack level for the .NET Framework 3.5 (for bundles). -->
+    <Fragment>
+        <util:RegistrySearch Id="NETFRAMEWORK35_SP_LEVEL" Variable="NETFRAMEWORK35_SP_LEVEL" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5" Value="SP" Result="value" />
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35" Secure="yes">
+            <RegistrySearch Id="NetFramework35" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates the service pack level for the .NET Framework 3.5.         -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_SP_LEVEL" Secure="yes">
+            <RegistrySearch Id="NetFramework35SP" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5" Name="SP" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Location of .NET Framework 3.5 redistributable install root directory -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35INSTALLROOTDIR" Secure="yes">
+            <RegistrySearch Id="NetFxInstallRootForNetfx35Search" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot">
+                <DirectorySearch Id="NetFx35InstallRootSearch" Path="v3.5" Depth="0" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <!-- Location of .NET Framework 3.5 (64-bit) redistributable install root directory -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35INSTALLROOTDIR64" Secure="yes">
+            <RegistrySearch Id="NetFxInstallRootForNetfx35Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Bitness="always64">
+                <DirectorySearch Id="NetFx35InstallRootSearch64" Path="v3.5" Depth="0" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Chinese (Simplified) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_ZH_CN_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35ZhCnLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\2052" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Chinese (Traditional) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_ZH_TW_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35ZhTwLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1028" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Czech language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_CS_CZ_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35CsCzLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1029" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Danish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_DA_DK_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35DaDkLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1030" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Dutch language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_NL_NL_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35NlNlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1043" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Finnish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_FI_FI_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35FiFiLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1035" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 French language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_FR_FR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35FrFrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1036" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 German language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_DE_DE_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35DeDeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1031" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Greek language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_EL_GR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35ElGrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1032" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Hungarian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_HU_HU_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35HuHuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1038" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Italian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_IT_IT_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35ItItLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1040" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Japanese language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_JA_JP_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35JaJpLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1041" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Korean language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_KO_KR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35KoKrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1042" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Norwegian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_NB_NO_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35NbNoLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1044" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Polish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_PL_PL_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35PlPlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1045" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Portuguese (Brazil) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_PT_BR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35PtBrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1046" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Portuguese (Portugal) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_PT_PT_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35PtPtLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\2070" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Russian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_RU_RU_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35RuRuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1049" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Spanish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_ES_ES_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35EsEsLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\3082" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Swedish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_SV_SE_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35SvSeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1053" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 Turkish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_TR_TR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35TrTrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5\1055" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.5 client profile is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_CLIENT" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35ClientSearch" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\DotNetClient\v3.5" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates the service pack level for the .NET Framework 3.5 client profile -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK35_CLIENT_SP_LEVEL" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK35ClientSpSearch" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\DotNetClient\v3.5" Name="SP" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- location of the Windows SDK 6.0a installation root -->
+    <Fragment>
+        <Property Id="WINDOWSSDK60ADIR" Secure="yes">
+            <RegistrySearch Id="WindowsSdk60aDir" Root="HKLM" Key="Software\Microsoft\Microsoft SDKs\Windows\v6.0A" Name="InstallationFolder" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- location of the Windows SDK 6.1 installation root -->
+    <Fragment>
+        <Property Id="WINDOWSSDK61DIR" Secure="yes">
+            <RegistrySearch Id="WindowsSdk61Dir" Root="HKLM" Key="Software\Microsoft\Microsoft SDKs\Windows\v6.1" Name="InstallationFolder" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- location of the Windows SDK 7.0 installation root -->
+    <Fragment>
+        <Property Id="WINDOWSSDK70ADIR" Secure="yes">
+            <RegistrySearch Id="WindowsSdk70aDir" Root="HKLM" Key="Software\Microsoft\Microsoft SDKs\Windows\v7.0A" Name="InstallationFolder" Type="raw" />
+        </Property>
+    </Fragment>
+
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx3.wxs b/src/ext/NetFx/wixlib/NetFx3.wxs
new file mode 100644
index 00000000..5fb279ea
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx3.wxs
@@ -0,0 +1,194 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+    <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following location:
+
+           .NET Framework 3.0 - http://msdn.microsoft.com/library/aa964979.aspx
+    -->
+
+    <!-- set to #1 if the .NET Framework 3.0 is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30" Secure="yes">
+            <RegistrySearch Id="NetFramework30" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.0\Setup" Name="InstallSuccess" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates the service pack level for the .NET Framework 3.0.         -->
+    <!-- This value will not exist until a service pack is installed.         -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_SP_LEVEL" Secure="yes">
+            <RegistrySearch Id="NetFramework30SP" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0" Name="SP" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Location of .NET Framework 3.0 redistributable install root directory -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30INSTALLROOTDIR" Secure="yes">
+            <RegistrySearch Id="NetFxInstallRootForNetfx30Search" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot">
+                <DirectorySearch Id="NetFx30InstallRootSearch" Path="v3.0" Depth="0" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <!-- Location of .NET Framework 3.0 (64-bit) redistributable install root directory -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30INSTALLROOTDIR64" Secure="yes">
+            <RegistrySearch Id="NetFxInstallRootForNetfx30Search64" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Bitness="always64">
+                <DirectorySearch Id="NetFx30InstallRootSearch64" Path="v3.0" Depth="0" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Chinese (Simplified) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_ZH_CN_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30ZhCnLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\2052" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Chinese (Traditional) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_ZH_TW_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30ZhTwLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1028" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Czech language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_CS_CZ_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30CsCzLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1029" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Danish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_DA_DK_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30DaDkLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1030" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Dutch language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_NL_NL_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30NlNlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1043" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Finnish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_FI_FI_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30FiFiLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1035" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 French language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_FR_FR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30FrFrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1036" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 German language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_DE_DE_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30DeDeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1031" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Greek language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_EL_GR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30ElGrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1032" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Hungarian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_HU_HU_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30HuHuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1038" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Italian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_IT_IT_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30ItItLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1040" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Japanese language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_JA_JP_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30JaJpLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1041" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Korean language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_KO_KR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30KoKrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1042" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Norwegian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_NB_NO_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30NbNoLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1044" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Polish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_PL_PL_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30PlPlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1045" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Portuguese (Brazil) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_PT_BR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30PtBrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1046" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Portuguese (Portugal) language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_PT_PT_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30PtPtLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\2070" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Russian language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_RU_RU_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30RuRuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1049" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Spanish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_ES_ES_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30EsEsLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\3082" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Swedish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_SV_SE_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30SvSeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1053" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- set to #1 if the .NET Framework 3.0 Turkish language pack is installed (not set otherwise) -->
+    <Fragment>
+        <Property Id="NETFRAMEWORK30_TR_TR_LANGPACK" Secure="yes">
+            <RegistrySearch Id="NETFRAMEWORK30TrTrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup\1055" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx4.5.wxs b/src/ext/NetFx/wixlib/NetFx4.5.wxs
new file mode 100644
index 00000000..443235d4
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx4.5.wxs
@@ -0,0 +1,198 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+  <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following location:
+
+           .NET Framework 4.5 - http://msdn.microsoft.com/en-us/library/5a4x27ek.aspx, http://msdn.microsoft.com/en-us/library/ee942965(v=VS.110).aspx
+    -->
+
+  <?define NetFx45MinRelease = 378389?>
+  <?define NetFx45WebLink = http://go.microsoft.com/fwlink/?LinkId=225704 ?>
+  <?define NetFx45RedistLink = http://go.microsoft.com/fwlink/?LinkId=225702 ?>
+  <?define NetFx45EulaLink = http://go.microsoft.com/fwlink/?LinkID=260867 ?>
+  <?define NetFx45WebId = NetFx45Web ?>
+  <?define NetFx45RedistId = NetFx45Redist ?>
+
+  <Fragment>
+    <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
+    <Property Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Secure="yes" />
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx45MinRelease)&quot;" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearch Id="NETFRAMEWORK45" Variable="NETFRAMEWORK45" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Value="Release" Result="value" />
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45" Secure="yes">
+      <RegistrySearch Id="NetFramework45" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Arabic language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_AR_SA_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45ArSaLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1025" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Chinese (Simplified) language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_ZH_CN_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45ZhCnLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\2052" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Chinese (Traditional) language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_ZH_TW_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45ZhTwLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1028" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Czech language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_CS_CZ_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45CsCzLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1029" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Danish language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_DA_DK_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45DaDkLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1030" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Dutch language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_NL_NL_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45NlNlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1043" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Finnish language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_FI_FI_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45FiFiLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1035" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 French language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_FR_FR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45FrFrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1036" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 German language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_DE_DE_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45DeDeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1031" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Greek language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_EL_GR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45ElGrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1032" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Hebrew language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_HE_IL_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45HeIlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1037" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Hungarian language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_HU_HU_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45HuHuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1038" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Italian language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_IT_IT_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45ItItLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1040" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Japanese language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_JA_JP_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45JaJpLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1041" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Korean language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_KO_KR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45KoKrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1042" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Norwegian language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_NB_NO_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45NbNoLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1044" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Polish language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_PL_PL_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45PlPlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1045" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Portuguese (Brazil) language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_PT_BR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45PtBrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1046" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Portuguese (Portugal) language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_PT_PT_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45PtPtLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\2070" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Russian language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_RU_RU_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45RuRuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1049" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Spanish language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_ES_ES_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45EsEsLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\3082" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Swedish language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_SV_SE_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45SvSeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1053" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.5 Turkish language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK45_TR_TR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK45TrTrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1055" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx4.wxs b/src/ext/NetFx/wixlib/NetFx4.wxs
new file mode 100644
index 00000000..295d8078
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx4.wxs
@@ -0,0 +1,416 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+  <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following location:
+
+           .NET Framework 4.0 full & client - http://msdn.microsoft.com/en-us/library/ee942965.aspx
+    -->
+
+  <?define NetFx40WebLink = http://go.microsoft.com/fwlink/?linkid=182805 ?>
+  <?define NetFx40RedistLink =  http://go.microsoft.com/fwlink/?LinkId=247729 ?>
+  <?define NetFx40ClientWebLink = http://go.microsoft.com/fwlink/?linkid=182804 ?>
+  <?define NetFx40ClientRedistLink =  http://go.microsoft.com/fwlink/?LinkId=247730 ?>
+  <?define NetFx40EulaLink = http://go.microsoft.com/fwlink/?LinkID=188993 ?>
+  <?define NetFx40WebId = NetFx40Web ?>
+  <?define NetFx40RedistId = NetFx40Redist ?>
+  <?define NetFx40ClientWebId = NetFx40ClientWeb ?>
+  <?define NetFx40ClientRedistId = NetFx40ClientRedist ?>
+
+  <Fragment>
+    <PropertyRef Id="NETFRAMEWORK40FULL" />
+    <Property Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Secure="yes" />
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="NETFRAMEWORK40FULL" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearch Id="NETFRAMEWORK40" Variable="NETFRAMEWORK40" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Value="Install" Result="value" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearch Id="NETFRAMEWORK40CLIENT" Variable="NETFRAMEWORK40CLIENT" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" Value="Install" Result="value" />
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 client is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT" Secure="yes">
+      <RegistrySearch Id="NetFramework40Client" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- Indicates the servicing level for the .NET Framework 4.0 client.         -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_SERVICING_LEVEL" Secure="yes">
+      <RegistrySearch Id="NetFramework40ClientServicing" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client" Name="Servicing" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- Location of .NET Framework 4.0 client redistributable install root directory -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENTINSTALLROOTDIR" Secure="yes">
+      <RegistrySearch Id="NetFxInstallRootForNetfx40Client" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client" Name="InstallPath" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- Location of .NET Framework 4.0 client (64-bit) redistributable install root directory -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENTINSTALLROOTDIR64" Secure="yes">
+      <RegistrySearch Id="NetFxInstallRootForNetfx40Client64" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client" Name="InstallPath" Type="raw" Bitness="always64" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 full is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL" Secure="yes">
+      <RegistrySearch Id="NetFramework40Full" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- Indicates the servicing level for the .NET Framework 4.0 full.         -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_SERVICING_LEVEL" Secure="yes">
+      <RegistrySearch Id="NetFramework40FullServicing" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full" Name="Servicing" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- Location of .NET Framework 4.0 full redistributable install root directory -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULLINSTALLROOTDIR" Secure="yes">
+      <RegistrySearch Id="NetFxInstallRootForNetfx40Full" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full" Name="InstallPath" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- Location of .NET Framework 4.0 full (64-bit) redistributable install root directory -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULLINSTALLROOTDIR64" Secure="yes">
+      <RegistrySearch Id="NetFxInstallRootForNetfx40Full64" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full" Name="InstallPath" Type="raw" Bitness="always64" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Arabic language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_AR_SA_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTArSaLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1025" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Chinese (Simplified) language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_ZH_CN_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTZhCnLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\2052" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Chinese (Traditional) language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_ZH_TW_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTZhTwLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1028" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Czech language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_CS_CZ_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTCsCzLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1029" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Danish language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_DA_DK_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTDaDkLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1030" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Dutch language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_NL_NL_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTNlNlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1043" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Finnish language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_FI_FI_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTFiFiLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1035" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client French language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_FR_FR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTFrFrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1036" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client German language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_DE_DE_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTDeDeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1031" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Greek language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_EL_GR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTElGrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1032" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Hebrew language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_HE_IL_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTHeIlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1037" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Hungarian language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_HU_HU_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTHuHuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1038" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Italian language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_IT_IT_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTItItLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1040" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Japanese language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_JA_JP_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTJaJpLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1041" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Korean language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_KO_KR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTKoKrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1042" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Norwegian language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_NB_NO_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTNbNoLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1044" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Polish language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_PL_PL_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTPlPlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1045" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Portuguese (Brazil) language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_PT_BR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTPtBrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1046" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Portuguese (Portugal) language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_PT_PT_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTPtPtLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\2070" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Russian language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_RU_RU_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTRuRuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1049" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Spanish language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_ES_ES_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTEsEsLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\3082" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Swedish language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_SV_SE_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTSvSeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1053" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Client Turkish language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40CLIENT_TR_TR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40CLIENTTrTrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Client\1055" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Arabic language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_AR_SA_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLArSaLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1025" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Chinese (Simplified) language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_ZH_CN_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLZhCnLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\2052" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Chinese (Traditional) language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_ZH_TW_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLZhTwLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1028" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Czech language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_CS_CZ_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLCsCzLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1029" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Danish language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_DA_DK_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLDaDkLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1030" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Dutch language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_NL_NL_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLNlNlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1043" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Finnish language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_FI_FI_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLFiFiLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1035" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full French language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_FR_FR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLFrFrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1036" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full German language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_DE_DE_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLDeDeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1031" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Greek language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_EL_GR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLElGrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1032" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Hebrew language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_HE_IL_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLHeIlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1037" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Hungarian language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_HU_HU_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLHuHuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1038" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Italian language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_IT_IT_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLItItLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1040" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Japanese language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_JA_JP_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLJaJpLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1041" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Korean language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_KO_KR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLKoKrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1042" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Norwegian language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_NB_NO_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLNbNoLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1044" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Polish language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_PL_PL_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLPlPlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1045" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Portuguese (Brazil) language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_PT_BR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLPtBrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1046" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Portuguese (Portugal) language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_PT_PT_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLPtPtLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\2070" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Russian language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_RU_RU_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLRuRuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1049" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Spanish language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_ES_ES_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLEsEsLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\3082" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Swedish language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_SV_SE_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLSvSeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1053" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to #1 if the .NET Framework 4.0 Full Turkish language pack is installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK40FULL_TR_TR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK40FULLTrTrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1055" Name="Install" Type="raw" />
+    </Property>
+  </Fragment>
+
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx451.wxs b/src/ext/NetFx/wixlib/NetFx451.wxs
new file mode 100644
index 00000000..88363555
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx451.wxs
@@ -0,0 +1,26 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following location:
+
+           .NET Framework 4.5/4.5.1 - http://msdn.microsoft.com/en-us/library/5a4x27ek.aspx, http://msdn.microsoft.com/en-us/library/ee942965(v=VS.110).aspx
+    -->
+
+  <?define NetFx451MinRelease = 378675 ?>
+  <?define NetFx451WebLink = http://go.microsoft.com/fwlink/?LinkId=322115 ?>
+  <?define NetFx451RedistLink = http://go.microsoft.com/fwlink/?LinkId=322116 ?>
+  <?define NetFx451EulaLink = http://wixtoolset.org/licenses/netfx451 ?>
+  <?define NetFx451WebId = NetFx451Web ?>
+  <?define NetFx451RedistId = NetFx451Redist ?>
+
+  <Fragment>
+    <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
+    <Property Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Secure="yes" />
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx451MinRelease)&quot;" />
+  </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx452.wxs b/src/ext/NetFx/wixlib/NetFx452.wxs
new file mode 100644
index 00000000..33f79db4
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx452.wxs
@@ -0,0 +1,69 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+  <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following location:
+
+           .NET Framework 4.5/4.5.1/4.5.2 - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
+    -->
+
+  <?define NetFx452MinRelease = 379893 ?>
+  <?define NetFx452WebLink = https://go.microsoft.com/fwlink/?LinkId=397707 ?>
+  <?define NetFx452RedistLink = https://go.microsoft.com/fwlink/?LinkId=397708 ?>
+  <?define NetFx452EulaLink = https://wixtoolset.org/licenses/netfx452 ?>
+  <?define NetFx452WebId = NetFx452Web ?>
+  <?define NetFx452RedistId = NetFx452Redist ?>
+
+  <Fragment>
+    <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
+    <Property Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Secure="yes" />
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx452MinRelease)&quot;" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
+
+    <WixVariable Id="NetFx452WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
+    <WixVariable Id="NetFx452WebInstallCondition" Value="" Overridable="yes" />
+    <WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" />
+
+    <PackageGroup Id="$(var.NetFx452WebId)">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx452FullWebLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx452FullWebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx452WebDetectCondition)" InstallCondition="!(wix.NetFx452WebInstallCondition)" Id="$(var.NetFx452WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullWebLog">
+        <ExePackagePayload Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe" DownloadUrl="$(var.NetFx452WebLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="90A3A5A57EA8A6508EEE0D129303C7CB012AABF651DD9A6BEFC20DA3BBDB09FC47FD087645051D3D45BFF909DFC6E6039C22C4816FBC793A847E81701248639E" ProductName="Microsoft .NET Framework 4.5.2" Size="1118920" Version="4.5.51209.34209" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.NetFx452WebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx452WebId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452WebId)" LicenseUrl="$(var.NetFx452EulaLink)" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
+
+    <WixVariable Id="NetFx452RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
+    <WixVariable Id="NetFx452RedistInstallCondition" Value="" Overridable="yes" />
+    <WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" />
+
+    <PackageGroup Id="$(var.NetFx452RedistId)">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx452FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx452FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx452RedistDetectCondition)" InstallCondition="!(wix.NetFx452RedistInstallCondition)" Id="$(var.NetFx452RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullLog">
+        <ExePackagePayload Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx452RedistLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="033D457229C4FE6EEA7B1E42A3A39DD4CF6A054C5E996CE036942DD2FE9623FD3A0634BE5DCB88506C1C61BF9FF6076F27B4ECEC38F8CF85603AF018111E584D" ProductName="Microsoft .NET Framework 4.5.2" Size="69999448" Version="4.5.51209.34209" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.NetFx452RedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx452RedistId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452RedistId)" LicenseUrl="$(var.NetFx452EulaLink)" />
+  </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx46.wxs b/src/ext/NetFx/wixlib/NetFx46.wxs
new file mode 100644
index 00000000..cb53be2e
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx46.wxs
@@ -0,0 +1,70 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+  <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following location:
+
+           .NET Framework 4.5/4.5.1/4.5.2/4.6 - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
+    -->
+
+  <?define NetFx46MinRelease = 393295 ?>
+  <?define NetFx46WebLink = https://go.microsoft.com/fwlink/?LinkId=560371 ?>
+  <?define NetFx46RedistLink = https://go.microsoft.com/fwlink/?LinkId=560369 ?>
+  <?define NetFx46EulaLink = https://go.microsoft.com/fwlink/?LinkID=558772 ?>
+  <?define NetFx46WebId = NetFx46Web ?>
+  <?define NetFx46RedistId = NetFx46Redist ?>
+
+  <Fragment>
+    <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
+    <Property Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Secure="yes" />
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx46MinRelease)&quot;" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
+
+    <WixVariable Id="NetFx46WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx46MinRelease)" Overridable="yes" />
+    <WixVariable Id="NetFx46WebInstallCondition" Value="" Overridable="yes" />
+    <WixVariable Id="NetFx46WebPackageDirectory" Value="redist\" Overridable="yes" />
+
+    <PackageGroup Id="$(var.NetFx46WebId)">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx46FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx46WebDetectCondition)" InstallCondition="!(wix.NetFx46WebInstallCondition)" Id="$(var.NetFx46WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog">
+        <ExePackagePayload Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe" DownloadUrl="$(var.NetFx46WebLink)" Description="Microsoft .NET Framework 4.6 Setup" Hash="CAA5F4D4DB0C9DF34252FCB74CF7762214F69D2419865EBC1E6717E6B1348E59A7599A8DECAAB5CEE6974E59D1AE5A749F8C4EC07C8E4C80C90E77B996B3B205" ProductName="Microsoft .NET Framework 4.6" Size="1497400" Version="4.6.81.0" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.NetFx46WebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx46WebId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46WebId)" LicenseUrl="$(var.NetFx46EulaLink)" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
+
+    <WixVariable Id="NetFx46RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx46MinRelease)" Overridable="yes" />
+    <WixVariable Id="NetFx46RedistInstallCondition" Value="" Overridable="yes" />
+    <WixVariable Id="NetFx46RedistPackageDirectory" Value="redist\" Overridable="yes" />
+
+    <PackageGroup Id="$(var.NetFx46RedistId)">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx46FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx46RedistDetectCondition)" InstallCondition="!(wix.NetFx46RedistInstallCondition)" Id="$(var.NetFx46RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog">
+        <ExePackagePayload Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx46RedistLink)" Description="Microsoft .NET Framework 4.6 Setup" Hash="C6FC54F648F822515ADACB4C27E0A6DBD6A3EAF2BA3F069C0002750894ECC453EBED8BC8D4FF2AFD73C7B3445C1DA18D43FE361EA5195AE8522249DF36B84B7E" ProductName="Microsoft .NET Framework 4.6" Size="65444688" Version="4.6.81.0" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.NetFx46RedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx46RedistId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46RedistId)" LicenseUrl="$(var.NetFx46EulaLink)" />
+  </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx461.wxs b/src/ext/NetFx/wixlib/NetFx461.wxs
new file mode 100644
index 00000000..95cc2876
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx461.wxs
@@ -0,0 +1,69 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+  <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following location:
+
+           .NET Framework 4.5/4.5.1/4.5.2/4.6/4.6.1 - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
+    -->
+
+  <?define NetFx461MinRelease = 394254 ?>
+  <?define NetFx461WebLink = https://go.microsoft.com/fwlink/?LinkId=671728 ?>
+  <?define NetFx461RedistLink = https://go.microsoft.com/fwlink/?LinkId=671743 ?>
+  <?define NetFx461EulaLink = https://referencesource.microsoft.com/license.html ?>
+  <?define NetFx461WebId = NetFx461Web ?>
+  <?define NetFx461RedistId = NetFx461Redist ?>
+
+  <Fragment>
+    <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
+    <Property Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Secure="yes" />
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx461MinRelease)&quot;" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
+
+    <WixVariable Id="NetFx461WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx461MinRelease)" Overridable="yes" />
+    <WixVariable Id="NetFx461WebInstallCondition" Value="" Overridable="yes" />
+    <WixVariable Id="NetFx461WebPackageDirectory" Value="redist\" Overridable="yes" />
+
+    <PackageGroup Id="$(var.NetFx461WebId)">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx461FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx461WebDetectCondition)" InstallCondition="!(wix.NetFx461WebInstallCondition)" Id="$(var.NetFx461WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog">
+        <ExePackagePayload Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe" DownloadUrl="$(var.NetFx461WebLink)" Description="Microsoft .NET Framework 4.6.1 Setup" Hash="97C4DD638E2E0324D60BDD1D7BE85603EDBF969898469A524FB271EBA5E22B78CA67DB1F568F5C45393381F1E76408C366AD4A68A7BB00E23D1FB820E67DE99E" ProductName="Microsoft .NET Framework 4.6.1" Size="1424328" Version="4.6.1055.0" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.NetFx461WebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx461WebId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461WebId)" LicenseUrl="$(var.NetFx461EulaLink)" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
+
+    <WixVariable Id="NetFx461RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx461MinRelease)" Overridable="yes" />
+    <WixVariable Id="NetFx461RedistInstallCondition" Value="" Overridable="yes" />
+    <WixVariable Id="NetFx461RedistPackageDirectory" Value="redist\" Overridable="yes" />
+
+    <PackageGroup Id="$(var.NetFx461RedistId)">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx461FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx461RedistDetectCondition)" InstallCondition="!(wix.NetFx461RedistInstallCondition)" Id="$(var.NetFx461RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog">
+        <ExePackagePayload Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx461RedistLink)" Description="Microsoft .NET Framework 4.6.1 Setup" Hash="43BEF5EB278CF0954EAE1A6FEEC5A9852B932270508DD10647B9EA32DFD3832ECB58172B28707216709705BF0013FCEBB0B39DB31E38786FC2DAE219622EA00F" ProductName="Microsoft .NET Framework 4.6.1" Size="67681000" Version="4.6.1055.0" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.NetFx461RedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx461RedistId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461RedistId)" LicenseUrl="$(var.NetFx461EulaLink)" />
+  </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx462.wxs b/src/ext/NetFx/wixlib/NetFx462.wxs
new file mode 100644
index 00000000..146bae5f
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx462.wxs
@@ -0,0 +1,69 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+  <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following location:
+
+           .NET Framework 4.5/4.5.1/4.5.2/4.6/4.6.1/4.6.2 - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
+    -->
+
+  <?define NetFx462MinRelease = 394802 ?>
+  <?define NetFx462WebLink = https://go.microsoft.com/fwlink/?LinkId=780596 ?>
+  <?define NetFx462RedistLink = https://go.microsoft.com/fwlink/?LinkId=780600 ?>
+  <?define NetFx462EulaLink = https://referencesource.microsoft.com/license.html ?>
+  <?define NetFx462WebId = NetFx462Web ?>
+  <?define NetFx462RedistId = NetFx462Redist ?>
+
+  <Fragment>
+    <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
+    <Property Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED" Secure="yes" />
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx462MinRelease)&quot;" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
+
+    <WixVariable Id="NetFx462WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx462MinRelease)" Overridable="yes" />
+    <WixVariable Id="NetFx462WebInstallCondition" Value="" Overridable="yes" />
+    <WixVariable Id="NetFx462WebPackageDirectory" Value="redist\" Overridable="yes" />
+
+    <PackageGroup Id="$(var.NetFx462WebId)">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx462WebDetectCondition)" InstallCondition="!(wix.NetFx462WebInstallCondition)" Id="$(var.NetFx462WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx462FullLog">
+        <ExePackagePayload Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe" DownloadUrl="$(var.NetFx462WebLink)" Description="Microsoft .NET Framework 4.6.2 Setup" Hash="72CC8904EA9AC4248874FD888E2C63737DFFF920E4002EB1426318EFD2650D1D5055DFC80C1F398278F7246A3827FC0ED3C044471C67A40CDE66D3796F854DCE" ProductName="Microsoft .NET Framework 4.6.2" Size="1408232" Version="4.6.1590.0" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.NetFx462WebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx462WebId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462WebId)" LicenseUrl="$(var.NetFx462EulaLink)" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
+
+    <WixVariable Id="NetFx462RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx462MinRelease)" Overridable="yes" />
+    <WixVariable Id="NetFx462RedistInstallCondition" Value="" Overridable="yes" />
+    <WixVariable Id="NetFx462RedistPackageDirectory" Value="redist\" Overridable="yes" />
+
+    <PackageGroup Id="$(var.NetFx462RedistId)">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx462RedistDetectCondition)" InstallCondition="!(wix.NetFx462RedistInstallCondition)" Id="$(var.NetFx462RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx462FullLog">
+        <ExePackagePayload Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx462RedistLink)" Description="Microsoft .NET Framework 4.6.2 Setup" Hash="5EFE9C21F355B91D12CB6B328737E8D01B6A7F8F815C477F6971A2267381B943BE6245E4B0021376EBE91C794812E93C7D4108348D837B2866FD86475F012908" ProductName="Microsoft .NET Framework 4.6.2" Size="62005552" Version="4.6.1590.0" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.NetFx462RedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx462RedistId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462RedistId)" LicenseUrl="$(var.NetFx462EulaLink)" />
+  </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx47.wxs b/src/ext/NetFx/wixlib/NetFx47.wxs
new file mode 100644
index 00000000..84f4a221
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx47.wxs
@@ -0,0 +1,20 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following location:
+
+           .NET Framework 4.5/4.5.1/4.5.2/4.6/4.6.1/4.6.2/4.7 - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
+    -->
+
+  <?define NetFx47MinRelease = 460798 ?>
+
+  <Fragment>
+    <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
+    <Property Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Secure="yes" />
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx47MinRelease)&quot;" />
+  </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx471.wxs b/src/ext/NetFx/wixlib/NetFx471.wxs
new file mode 100644
index 00000000..b5f825ab
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx471.wxs
@@ -0,0 +1,20 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <!--
+        .NET Framework installation state properties
+
+        Official documentation can be found at the following location:
+
+           .NET Framework 4.5/4.5.1/4.5.2/4.6/4.6.1/4.6.2/4.7/4.7.1 - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
+    -->
+
+  <?define NetFx471MinRelease = 461308 ?>
+
+  <Fragment>
+    <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
+    <Property Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Secure="yes" />
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx471MinRelease)&quot;" />
+  </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx472.wxs b/src/ext/NetFx/wixlib/NetFx472.wxs
new file mode 100644
index 00000000..57584a9e
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx472.wxs
@@ -0,0 +1,67 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+  <!--
+        .NET Framework installation state properties
+        Official documentation can be found at the following location:
+        .NET Framework 4.5/4.5.1/4.5.2/4.6/4.6.1/4.6.2/4.7/4.7.1/4.7.2 - https://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
+    -->
+
+  <?define NetFx472MinRelease = 461808 ?>
+  <?define NetFx472WebLink = https://go.microsoft.com/fwlink/?LinkId=863262 ?>
+  <?define NetFx472RedistLink = https://go.microsoft.com/fwlink/?LinkId=863258 ?>
+  <?define NetFx472EulaLink = https://referencesource.microsoft.com/license.html ?>
+  <?define NetFx472WebId = NetFx472Web ?>
+  <?define NetFx472RedistId = NetFx472Redist ?>
+
+  <Fragment>
+    <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
+    <Property Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Secure="yes" />
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx472MinRelease)&quot;" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
+
+    <WixVariable Id="NetFx472WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
+    <WixVariable Id="NetFx472WebInstallCondition" Value="" Overridable="yes" />
+    <WixVariable Id="NetFx472WebPackageDirectory" Value="redist\" Overridable="yes" />
+
+    <PackageGroup Id="$(var.NetFx472WebId)">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx472WebLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx472WebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx472WebDetectCondition)" InstallCondition="!(wix.NetFx472WebInstallCondition)" Id="$(var.NetFx472WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx472WebLog">
+        <ExePackagePayload Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe" DownloadUrl="$(var.NetFx472WebLink)" Description="Microsoft .NET Framework 4.7.2 Setup" Hash="213CDEE35D320FE126CB64FE59963DB355062A14592E0B2FC4D45C2EDEF5F6A91305D0674D27152869202E3440090DFC207A0C5EB14D812F61E437907A81887E" ProductName="Microsoft .NET Framework 4.7.2" Size="1399888" Version="4.7.3081.0" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.NetFx472WebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx472WebId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472WebId)" LicenseUrl="$(var.NetFx472EulaLink)" />
+  </Fragment>
+
+  <Fragment>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
+
+    <WixVariable Id="NetFx472RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
+    <WixVariable Id="NetFx472RedistInstallCondition" Value="" Overridable="yes" />
+    <WixVariable Id="NetFx472RedistPackageDirectory" Value="redist\" Overridable="yes" />
+
+    <PackageGroup Id="$(var.NetFx472RedistId)">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx472RedistLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx472RedistLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx472RedistDetectCondition)" InstallCondition="!(wix.NetFx472RedistInstallCondition)" Id="$(var.NetFx472RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx472RedistLog">
+        <ExePackagePayload Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx472RedistLink)" Description="Microsoft .NET Framework 4.7.2 Setup" Hash="F4EA32D8189DD269FF02D68B39D7DE866AE5F46EEA5A71BF8F4715FB0E4F8B7AC64B274DFA7BFF69B52C719E65256906C8D92FDD355F52C977175AE3E1919098" ProductName="Microsoft .NET Framework 4.7.2" Size="83940592" Version="4.7.3081.0" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.NetFx472RedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx472RedistId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472RedistId)" LicenseUrl="$(var.NetFx472EulaLink)" />
+  </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx48.wxs b/src/ext/NetFx/wixlib/NetFx48.wxs
new file mode 100644
index 00000000..bfca5092
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx48.wxs
@@ -0,0 +1,67 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+    <!--
+      .NET Framework installation state properties
+      Official documentation can be found at the following location:
+      .NET Framework 4.5/4.5.1/4.5.2/4.6/4.6.1/4.6.2/4.7/4.7.1/4.7.2/4.8 - https://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
+   -->
+
+    <?define NetFx48MinRelease = 528040 ?>
+    <?define NetFx48WebLink = https://go.microsoft.com/fwlink/?LinkId=2085155 ?>
+    <?define NetFx48RedistLink = https://go.microsoft.com/fwlink/?linkid=2088631 ?>
+    <?define NetFx48EulaLink = https://referencesource.microsoft.com/license.html ?>
+    <?define NetFx48WebId = NetFx48Web ?>
+    <?define NetFx48RedistId = NetFx48Redist ?>
+
+    <Fragment>
+        <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
+        <Property Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Secure="yes" />
+        <SetProperty Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx48MinRelease)&quot;" />
+    </Fragment>
+
+    <Fragment>
+        <util:RegistrySearchRef Id="NETFRAMEWORK45" />
+
+        <WixVariable Id="NetFx48WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
+        <WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" />
+
+        <PackageGroup Id="$(var.NetFx48WebId)">
+            <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx48WebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx48WebDetectCondition)" InstallCondition="!(wix.NetFx48WebInstallCondition)" Id="$(var.NetFx48WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48WebLog">
+                <ExePackagePayload Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe" DownloadUrl="$(var.NetFx48WebLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="B09A3F6802741BD5E4A9598FF3F890FEB760D865C98F33B3CF6951C3ADE396C9819D6ECA562CAD6C339C53FC1AF88F7936DD09CBBAC22EE16FC67BAE076646B6" ProductName="Microsoft .NET Framework 4.8" Size="1443272" Version="4.8.4115.0" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <PackageGroup Id="$(var.NetFx48WebId)AsPrereq">
+            <PackageGroupRef Id="$(var.NetFx48WebId)" />
+        </PackageGroup>
+
+        <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48WebId)" LicenseUrl="$(var.NetFx48EulaLink)" />
+    </Fragment>
+
+    <Fragment>
+        <util:RegistrySearchRef Id="NETFRAMEWORK45" />
+
+        <WixVariable Id="NetFx48RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
+        <WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="NetFx48RedistPackageDirectory" Value="redist\" Overridable="yes" />
+
+        <PackageGroup Id="$(var.NetFx48RedistId)">
+            <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx48RedistLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx48RedistLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx48RedistDetectCondition)" InstallCondition="!(wix.NetFx48RedistInstallCondition)" Id="$(var.NetFx48RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48RedistLog">
+                <ExePackagePayload Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe" DownloadUrl="$(var.NetFx48RedistLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="DE7FD1B245BAAAC3A2BA1C2C650492AB71EB689902E281DDA02B069A441BAF9B1CF067D596C2E67C27EB58C341F572D8E7D481EC5D6E3A4CFB8D0C9AA7B55181" ProductName="Microsoft .NET Framework 4.8" Size="121319368" Version="4.8.4115.0" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <PackageGroup Id="$(var.NetFx48RedistId)AsPrereq">
+            <PackageGroupRef Id="$(var.NetFx48RedistId)" />
+        </PackageGroup>
+
+        <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48RedistId)" LicenseUrl="$(var.NetFx48EulaLink)" />
+    </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFxExtension.wxs b/src/ext/NetFx/wixlib/NetFxExtension.wxs
new file mode 100644
index 00000000..63c79235
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFxExtension.wxs
@@ -0,0 +1,38 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <!--
+        .NET Framework installation state properties
+    -->
+
+  <!-- Location of .NET Framework redistributable install root directory -->
+  <Fragment>
+    <Property Id="NETFRAMEWORKINSTALLROOTDIR" Secure="yes">
+      <RegistrySearch Id="NetFxInstallRootSearch" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" />
+    </Property>
+  </Fragment>
+
+  <!-- location of the Windows SDK current active version installation root -->
+  <Fragment>
+    <Property Id="WINDOWSSDKCURRENTVERSIONDIR" Secure="yes">
+      <RegistrySearch Id="WindowsSdkCurrentVersionDir" Root="HKLM" Key="Software\Microsoft\Microsoft SDKs\Windows" Name="CurrentInstallFolder" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- The Windows SDK current active version -->
+  <Fragment>
+    <Property Id="WINDOWSSDKCURRENTVERSION" Secure="yes">
+      <RegistrySearch Id="WindowsSdkCurrentVersion" Root="HKLM" Key="Software\Microsoft\Microsoft SDKs\Windows" Name="CurrentVersion" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- Release value of .NET 4.5 and later -->
+  <Fragment>
+    <Property Id="WIXNETFX4RELEASEINSTALLED" Secure="yes">
+      <RegistrySearch Id="NetFx4ReleaseInstalled" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi b/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi
new file mode 100644
index 00000000..7bd727c5
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi
@@ -0,0 +1,28 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <?include caDecor.wxi ?>
+
+  <Fragment>
+    <CustomAction Id="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" DllEntry="SchedNetFx" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" />
+    <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" DllEntry="ExecNetFx" Execute="deferred" Impersonate="no" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" />
+    <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" DllEntry="ExecNetFx" Execute="commit" Impersonate="no" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" />
+    <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" DllEntry="ExecNetFx" Execute="deferred" Impersonate="no" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" />
+    <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" DllEntry="ExecNetFx" Execute="commit" Impersonate="no" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" />
+
+    <InstallExecuteSequence>
+      <Custom Action="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" Before="InstallFiles" Overridable="yes" />
+      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" After="MsiPublishAssemblies" Overridable="yes" Condition="RollbackDisabled &lt;&gt; 1" />
+      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled = 1" />
+      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled &lt;&gt; 1" />
+      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled = 1" />
+    </InstallExecuteSequence>
+  </Fragment>
+
+  <!-- NetFx Custom Action DLL Definitions -->
+  <Fragment>
+    <Binary Id="$(var.Prefix)NetFxCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))netfxca.dll" />
+  </Fragment>
+</Include>
diff --git a/src/ext/NetFx/wixlib/NetFxExtension_arm64.wxs b/src/ext/NetFx/wixlib/NetFxExtension_arm64.wxs
new file mode 100644
index 00000000..a0492fde
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFxExtension_arm64.wxs
@@ -0,0 +1,7 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?define platform=arm64 ?>
+    <?include NetfxExtension_Platform.wxi ?>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFxExtension_x64.wxs b/src/ext/NetFx/wixlib/NetFxExtension_x64.wxs
new file mode 100644
index 00000000..81c9d768
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFxExtension_x64.wxs
@@ -0,0 +1,7 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?define platform=x64 ?>
+    <?include NetfxExtension_Platform.wxi ?>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFxExtension_x86.wxs b/src/ext/NetFx/wixlib/NetFxExtension_x86.wxs
new file mode 100644
index 00000000..b8ad1927
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFxExtension_x86.wxs
@@ -0,0 +1,7 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?define platform=x86 ?>
+    <?include NetfxExtension_Platform.wxi ?>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/caDecor.wxi b/src/ext/NetFx/wixlib/caDecor.wxi
new file mode 100644
index 00000000..b1711518
--- /dev/null
+++ b/src/ext/NetFx/wixlib/caDecor.wxi
@@ -0,0 +1,39 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?ifdef Prefix ?>
+        <?undef Prefix ?>
+    <?endif?>
+
+    <?define Prefix="Wix4" ?>
+
+    <?ifndef platform ?>
+        <?define platform="x86" ?>
+    <?endif?>
+
+    <?if $(var.platform)="" ?>
+        <?undef platform ?>
+        <?define platform="x86" ?>
+    <?endif?>
+
+    <?ifdef Suffix ?>
+        <?undef Suffix ?>
+    <?endif?>
+
+    <?if $(var.platform)~="x86" ?>
+        <?define Suffix="_X86" ?>
+    <?endif?>
+
+    <?if $(var.platform)~="x64" ?>
+        <?define Suffix="_X64" ?>
+    <?endif?>
+
+    <?if $(var.platform)~="arm" ?>
+        <?define Suffix="_A32" ?>
+    <?endif?>
+
+    <?if $(var.platform)~="arm64" ?>
+        <?define Suffix="_A64" ?>
+    <?endif?>
+</Include>
diff --git a/src/ext/NetFx/wixlib/netfx.v3.ncrunchproject b/src/ext/NetFx/wixlib/netfx.v3.ncrunchproject
new file mode 100644
index 00000000..319cd523
--- /dev/null
+++ b/src/ext/NetFx/wixlib/netfx.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/src/ext/NetFx/wixlib/netfx.wixproj b/src/ext/NetFx/wixlib/netfx.wixproj
new file mode 100644
index 00000000..937ed0d4
--- /dev/null
+++ b/src/ext/NetFx/wixlib/netfx.wixproj
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project Sdk="WixToolset.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <BindFiles>true</BindFiles>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
+    <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
+    <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>