Adding support for DotNetCoreSdkSearch and DotNetCoreSdkCompatibilityCheck

19 files changed, 770 insertions, 119 deletions

diff --git a/src/ext/NetFx/be/detectnetcore.cpp b/src/ext/NetFx/be/detectnetcore.cpp
index 42156692..aeb04203 100644
--- a/src/ext/NetFx/be/detectnetcore.cpp
+++ b/src/ext/NetFx/be/detectnetcore.cpp
@@ -60,7 +60,7 @@ HRESULT DetectNetCore(
     hr = StrAllocFormatted(&sczExePath, L"%ls%ls\\netcoresearch.exe", wzBaseDirectory, wzPlatformName);
     BextExitOnFailure(hr, "Failed to build netcoresearch.exe path.");
 
-    hr = StrAllocFormatted(&sczCommandLine, L"\"%ls\" %ls %ls", sczExePath, wzMajorVersion, wzRuntimeType);
+    hr = StrAllocFormatted(&sczCommandLine, L"\"%ls\" runtime %ls %ls", sczExePath, wzMajorVersion, wzRuntimeType);
     BextExitOnFailure(hr, "Failed to build netcoresearch.exe command line.");
 
     hr = ProcExecute(sczExePath, sczCommandLine, &hProcess, NULL, &hStdOutErr);
diff --git a/src/ext/NetFx/be/detectnetcoresdk.cpp b/src/ext/NetFx/be/detectnetcoresdk.cpp
new file mode 100644
index 00000000..08b18334
--- /dev/null
+++ b/src/ext/NetFx/be/detectnetcoresdk.cpp
@@ -0,0 +1,122 @@
+// 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"
+
+HRESULT DetectNetCoreSdk(
+    __in NETFX_NET_CORE_PLATFORM platform,
+    __in LPCWSTR wzVersion,
+    __in LPCWSTR wzBaseDirectory,
+    __inout LPWSTR* psczLatestVersion
+    )
+{
+    HRESULT hr = S_OK;
+    LPCWSTR wzPlatformName = NULL;
+    LPWSTR sczExePath = NULL;
+    LPWSTR sczCommandLine = NULL;
+    HANDLE hProcess = NULL;
+    HANDLE hStdOutErr = INVALID_HANDLE_VALUE;
+    BYTE* rgbOutput = NULL;
+    DWORD cbOutput = 0;
+    DWORD cbTotalRead = 0;
+    DWORD cbRead = 0;
+    DWORD dwExitCode = 0;
+
+    ReleaseNullStr(*psczLatestVersion);
+
+    switch (platform)
+    {
+    case NETFX_NET_CORE_PLATFORM_ARM64:
+        wzPlatformName = L"arm64";
+        break;
+    case NETFX_NET_CORE_PLATFORM_X64:
+        wzPlatformName = L"x64";
+        break;
+    case NETFX_NET_CORE_PLATFORM_X86:
+        wzPlatformName = L"x86";
+        break;
+    default:
+        BextExitWithRootFailure(hr, E_INVALIDARG, "Unknown platform: %u", platform);
+        break;
+    }
+
+    hr = StrAllocFormatted(&sczExePath, L"%ls%ls\\netcoresearch.exe", wzBaseDirectory, wzPlatformName);
+    BextExitOnFailure(hr, "Failed to build netcoresearch.exe path.");
+
+    hr = StrAllocFormatted(&sczCommandLine, L"\"%ls\" sdk %ls", sczExePath, wzVersion);
+    BextExitOnFailure(hr, "Failed to build netcoresearch.exe command line.");
+
+    hr = ProcExecute(sczExePath, sczCommandLine, &hProcess, NULL, &hStdOutErr);
+    if (HRESULT_FROM_WIN32(ERROR_EXE_MACHINE_TYPE_MISMATCH) == hr)
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    BextExitOnFailure(hr, "Failed to run: %ls", sczCommandLine);
+
+    cbOutput = 64;
+
+    rgbOutput = static_cast<BYTE*>(MemAlloc(cbOutput, TRUE));
+    BextExitOnNull(rgbOutput, hr, E_OUTOFMEMORY, "Failed to alloc output string.");
+
+    while (::ReadFile(hStdOutErr, rgbOutput + cbTotalRead, cbOutput - cbTotalRead, &cbRead, NULL))
+    {
+        cbTotalRead += cbRead;
+
+        if (cbTotalRead == cbOutput)
+        {
+            cbOutput *= 2;
+
+            const LPVOID pvNew = MemReAlloc(rgbOutput, cbOutput, TRUE);
+            BextExitOnNull(pvNew, hr, E_OUTOFMEMORY, "Failed to realloc output string.");
+
+            rgbOutput = static_cast<BYTE*>(pvNew);
+        }
+    }
+
+    if (ERROR_BROKEN_PIPE != ::GetLastError())
+    {
+        BextExitWithLastError(hr, "Failed to read netcoresearch.exe output.");
+    }
+
+    hr = ProcWaitForCompletion(hProcess, INFINITE, &dwExitCode);
+    BextExitOnFailure(hr, "Failed to wait for netcoresearch.exe to exit.");
+
+    if (0 != dwExitCode)
+    {
+        BextExitWithRootFailure(hr, E_UNEXPECTED, "netcoresearch.exe failed with exit code: 0x%x\r\nOutput:\r\n%hs", dwExitCode, rgbOutput);
+    }
+
+    if (*rgbOutput)
+    {
+        hr = StrAllocStringAnsi(psczLatestVersion, reinterpret_cast<LPSTR>(rgbOutput), 0, CP_UTF8);
+        BextExitOnFailure(hr, "Failed to widen output string: %hs", rgbOutput);
+    }
+
+LExit:
+    ReleaseFileHandle(hStdOutErr);
+    ReleaseHandle(hProcess);
+    ReleaseMem(rgbOutput);
+    ReleaseStr(sczCommandLine);
+    ReleaseStr(sczExePath);
+
+    return hr;
+}
+
+HRESULT NetfxPerformDetectNetCoreSdk(
+    __in LPCWSTR wzVariable,
+    __in NETFX_SEARCH* pSearch,
+    __in IBundleExtensionEngine* pEngine,
+    __in LPCWSTR wzBaseDirectory
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczLatestVersion = nullptr;
+    const auto& searchParams = pSearch->NetCoreSdkSearch;
+    hr = DetectNetCoreSdk(searchParams.platform, searchParams.sczVersion, wzBaseDirectory, &sczLatestVersion);
+    BextExitOnFailure(hr, "DetectNetCoreSdk failed.");
+
+    hr = pEngine->SetVariableVersion(wzVariable, sczLatestVersion);
+    BextExitOnFailure(hr, "Failed to set variable '%ls' to '%ls'", wzVariable, sczLatestVersion);
+
+LExit:
+    return hr;
+}
diff --git a/src/ext/NetFx/be/detectnetcoresdk.h b/src/ext/NetFx/be/detectnetcoresdk.h
new file mode 100644
index 00000000..025deaa2
--- /dev/null
+++ b/src/ext/NetFx/be/detectnetcoresdk.h
@@ -0,0 +1,9 @@
+#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.
+
+HRESULT NetfxPerformDetectNetCoreSdk(
+    __in LPCWSTR wzVariable,
+    __in NETFX_SEARCH* pSearch,
+    __in IBundleExtensionEngine* pEngine,
+    __in LPCWSTR wzBaseDirectory
+    );
diff --git a/src/ext/NetFx/be/netfxbe.vcxproj b/src/ext/NetFx/be/netfxbe.vcxproj
index d1084dd1..0408da72 100644
--- a/src/ext/NetFx/be/netfxbe.vcxproj
+++ b/src/ext/NetFx/be/netfxbe.vcxproj
@@ -47,6 +47,7 @@
 
   <ItemGroup>
     <ClCompile Include="detectnetcore.cpp" />
+    <ClCompile Include="detectnetcoresdk.cpp" />
     <ClCompile Include="netfxbe.cpp" />
     <ClCompile Include="NetfxBundleExtension.cpp" />
     <ClCompile Include="netfxsearch.cpp" />
@@ -57,6 +58,7 @@
 
   <ItemGroup>
     <ClInclude Include="detectnetcore.h" />
+    <ClInclude Include="detectnetcoresdk.h" />
     <ClInclude Include="NetfxBundleExtension.h" />
     <ClInclude Include="netfxsearch.h" />
     <ClInclude Include="precomp.h" />
diff --git a/src/ext/NetFx/be/netfxsearch.cpp b/src/ext/NetFx/be/netfxsearch.cpp
index 3c12161d..671e7546 100644
--- a/src/ext/NetFx/be/netfxsearch.cpp
+++ b/src/ext/NetFx/be/netfxsearch.cpp
@@ -15,7 +15,7 @@ STDMETHODIMP NetfxSearchParseFromXml(
     BSTR bstrNodeName = NULL;
 
     // Select Netfx search nodes.
-    hr = XmlSelectNodes(pixnBundleExtension, L"NetFxNetCoreSearch", &pixnNodes);
+    hr = XmlSelectNodes(pixnBundleExtension, L"NetFxNetCoreSearch|NetFxNetCoreSdkSearch", &pixnNodes);
     BextExitOnFailure(hr, "Failed to select Netfx search nodes.");
 
     // Get Netfx search node count.
@@ -50,18 +50,32 @@ STDMETHODIMP NetfxSearchParseFromXml(
         {
             pSearch->Type = NETFX_SEARCH_TYPE_NET_CORE_SEARCH;
 
+            auto& netCoreSearch = pSearch->NetCoreSearch;
             // @RuntimeType
-            hr = XmlGetAttributeUInt32(pixnNode, L"RuntimeType", reinterpret_cast<DWORD*>(&pSearch->NetCoreSearch.runtimeType));
+            hr = XmlGetAttributeUInt32(pixnNode, L"RuntimeType", reinterpret_cast<DWORD*>(&netCoreSearch.runtimeType));
             BextExitOnFailure(hr, "Failed to get @RuntimeType.");
 
             // @Platform
-            hr = XmlGetAttributeUInt32(pixnNode, L"Platform", reinterpret_cast<DWORD*>(&pSearch->NetCoreSearch.platform));
+            hr = XmlGetAttributeUInt32(pixnNode, L"Platform", reinterpret_cast<DWORD*>(&netCoreSearch.platform));
             BextExitOnFailure(hr, "Failed to get @Platform.");
 
             // @MajorVersion
-            hr = XmlGetAttributeEx(pixnNode, L"MajorVersion", &pSearch->NetCoreSearch.sczMajorVersion);
+            hr = XmlGetAttributeEx(pixnNode, L"MajorVersion", &netCoreSearch.sczMajorVersion);
             BextExitOnFailure(hr, "Failed to get @MajorVersion.");
         }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"NetFxNetCoreSdkSearch", -1))
+        {
+            pSearch->Type = NETFX_SEARCH_TYPE_NET_CORE_SDK_SEARCH;
+
+            auto& netCoreSdkSearch = pSearch->NetCoreSdkSearch;
+            // @Platform
+            hr = XmlGetAttributeUInt32(pixnNode, L"Platform", reinterpret_cast<DWORD*>(&netCoreSdkSearch.platform));
+            BextExitOnFailure(hr, "Failed to get @Platform.");
+
+            // @Version
+            hr = XmlGetAttributeEx(pixnNode, L"Version", &netCoreSdkSearch.sczVersion);
+            BextExitOnFailure(hr, "Failed to get @Version.");
+        }
         else
         {
             BextExitWithRootFailure(hr, E_UNEXPECTED, "Unexpected element name: %ls", bstrNodeName);
@@ -115,6 +129,9 @@ STDMETHODIMP NetfxSearchExecute(
     case NETFX_SEARCH_TYPE_NET_CORE_SEARCH:
         hr = NetfxPerformDetectNetCore(wzVariable, pSearch, pEngine, wzBaseDirectory);
         break;
+    case NETFX_SEARCH_TYPE_NET_CORE_SDK_SEARCH:
+        hr = NetfxPerformDetectNetCoreSdk(wzVariable, pSearch, pEngine, wzBaseDirectory);
+        break;
     default:
         hr = E_UNEXPECTED;
     }
diff --git a/src/ext/NetFx/be/netfxsearch.h b/src/ext/NetFx/be/netfxsearch.h
index ae250690..f4e4db01 100644
--- a/src/ext/NetFx/be/netfxsearch.h
+++ b/src/ext/NetFx/be/netfxsearch.h
@@ -8,6 +8,7 @@ enum NETFX_SEARCH_TYPE
 {
     NETFX_SEARCH_TYPE_NONE,
     NETFX_SEARCH_TYPE_NET_CORE_SEARCH,
+    NETFX_SEARCH_TYPE_NET_CORE_SDK_SEARCH,
 };
 
 enum NETFX_NET_CORE_RUNTIME_TYPE
@@ -40,6 +41,11 @@ typedef struct _NETFX_SEARCH
             NETFX_NET_CORE_PLATFORM platform;
             LPWSTR sczMajorVersion;
         } NetCoreSearch;
+        struct
+        {
+            NETFX_NET_CORE_PLATFORM platform;
+            LPWSTR sczVersion;
+        } NetCoreSdkSearch;
     };
 } NETFX_SEARCH;
 
diff --git a/src/ext/NetFx/be/precomp.h b/src/ext/NetFx/be/precomp.h
index 33aea9bc..4a774200 100644
--- a/src/ext/NetFx/be/precomp.h
+++ b/src/ext/NetFx/be/precomp.h
@@ -30,4 +30,5 @@
 #include "..\..\beDecor.h"
 #include "netfxsearch.h"
 #include "detectnetcore.h"
+#include "detectnetcoresdk.h"
 #include "NetfxBundleExtension.h"
diff --git a/src/ext/NetFx/netcoresearch/netcoresearch.cpp b/src/ext/NetFx/netcoresearch/netcoresearch.cpp
index 517f6ac4..5cf6d10b 100644
--- a/src/ext/NetFx/netcoresearch/netcoresearch.cpp
+++ b/src/ext/NetFx/netcoresearch/netcoresearch.cpp
@@ -2,16 +2,36 @@
 
 #include "precomp.h"
 
+enum class NETCORESEARCHKIND
+{
+    None,
+    Runtime,
+    Sdk,
+};
+
 struct NETCORESEARCH_STATE
 {
-    LPCWSTR wzTargetName;
-    DWORD dwMajorVersion;
+    NETCORESEARCHKIND Kind = NETCORESEARCHKIND::None;
+    union
+    {
+        struct
+        {
+            LPCWSTR wzTargetName;
+            DWORD dwMajorVersion;
+        } Runtime;
+        struct
+        {
+            DWORD dwMajorVersion;
+            DWORD dwMinorVersion;
+            DWORD dwFeatureBand;
+        }
+         Sdk;
+    } Data;
     VERUTIL_VERSION* pVersion;
 };
 
 static HRESULT GetDotnetEnvironmentInfo(
-    __in DWORD dwMajorVersion,
-    __in_z LPCWSTR wzTargetName,
+    __in NETCORESEARCH_STATE& pSearchState,
     __inout VERUTIL_VERSION** ppVersion
     );
 static void HOSTFXR_CALLTYPE GetDotnetEnvironmentInfoResult(
@@ -19,24 +39,28 @@ static void HOSTFXR_CALLTYPE GetDotnetEnvironmentInfoResult(
     __in LPVOID pvContext
     );
 
+bool string_equal_invariant(__in PCWSTR const x,__in  PCWSTR const y) { return CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, x, -1, y, -1); }
+
+HRESULT get_search_state_from_arguments(__in int argc, __in LPWSTR argv[], __out NETCORESEARCH_STATE& searchState);
+
 int __cdecl wmain(int argc, LPWSTR argv[])
 {
     HRESULT hr = S_OK;
-    DWORD dwMajorVersion = 0;
     VERUTIL_VERSION* pVersion = NULL;
+    NETCORESEARCH_STATE searchState = {};
+
+    ::SetConsoleCP(CP_UTF8);
 
     ConsoleInitialize();
 
-    if (argc != 3)
+    hr = get_search_state_from_arguments(argc, argv, OUT searchState);
+    if (FAILED(hr))
     {
-        ExitFunction1(hr = E_INVALIDARG);
+        ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to parse arguments.");
     }
 
-    hr = StrStringToUInt32(argv[1], 0, reinterpret_cast<UINT*>(&dwMajorVersion));
-    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to get target version from: %ls", argv[1]);
+    hr = GetDotnetEnvironmentInfo(searchState, &pVersion);
 
-    hr = GetDotnetEnvironmentInfo(dwMajorVersion, argv[2], &pVersion);
-    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to search for .NET Core.");
 
     if (pVersion)
     {
@@ -49,9 +73,65 @@ LExit:
     return hr;
 }
 
+HRESULT get_search_state_from_arguments(int argc, LPWSTR argv[], __out NETCORESEARCH_STATE& searchState)
+{
+    HRESULT hr = S_OK;
+    searchState = {};
+    const auto searchKind = argv[1];
+
+    if (argc < 3)
+    {
+        ExitFunction1(hr = E_INVALIDARG);
+    }
+
+
+    if (string_equal_invariant(searchKind, L"runtime"))
+    {
+        if (argc != 4)
+        {
+            ExitFunction1(hr = E_INVALIDARG);
+        }
+        searchState.Kind = NETCORESEARCHKIND::Runtime;
+
+        const PCWSTR majorVersion = argv[2];
+        const PCWSTR targetName = argv[3];
+
+        auto& data = searchState.Data.Runtime;
+
+        data.wzTargetName = targetName;
+        hr = StrStringToUInt32(majorVersion, 0, reinterpret_cast<UINT*>(&data.dwMajorVersion));
+        ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to get target version from: %ls", majorVersion);
+    }
+    else if(string_equal_invariant(searchKind, L"sdk"))
+    {
+        searchState.Kind = NETCORESEARCHKIND::Sdk;
+
+        const PCWSTR version = argv[2];
+
+        VERUTIL_VERSION* sdkVersion = nullptr;
+        hr = VerParseVersion(version, 0, FALSE, &sdkVersion);
+        if (FAILED(hr))
+        {
+            ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to parse version from: %ls", version);
+        }
+
+        auto& data = searchState.Data.Sdk;
+
+        data.dwMajorVersion = sdkVersion->dwMajor;
+        data.dwMinorVersion = sdkVersion->dwMinor;
+        data.dwFeatureBand = sdkVersion->dwPatch;
+
+        VerFreeVersion(sdkVersion);
+    }
+
+LExit:
+    return hr;
+}
+
+
+
 static HRESULT GetDotnetEnvironmentInfo(
-    __in DWORD dwMajorVersion,
-    __in_z LPCWSTR wzTargetName,
+    __in NETCORESEARCH_STATE& state,
     __inout VERUTIL_VERSION** ppVersion
     )
 {
@@ -60,10 +140,6 @@ static HRESULT GetDotnetEnvironmentInfo(
     LPWSTR sczHostfxrPath = NULL;
     HMODULE hModule = NULL;
     hostfxr_get_dotnet_environment_info_fn pfnGetDotnetEnvironmentInfo = NULL;
-    NETCORESEARCH_STATE state = { };
-
-    state.dwMajorVersion = dwMajorVersion;
-    state.wzTargetName = wzTargetName;
 
     hr = PathForCurrentProcess(&sczProcessPath, NULL);
     ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to get process path.");
@@ -102,50 +178,108 @@ LExit:
     return hr;
 }
 
+bool matches_feature_band(const int requested, const int actual)
+{
+    // we have not requested a match on feature band, so skip the check
+    if (requested == 0) return true;
+
+    const int requestedBand = requested / 100;
+    const int actualBand = actual  / 100;
+
+    if (actualBand != requestedBand) return false;
+
+    return actual >= requested;
+}
+
 static void HOSTFXR_CALLTYPE GetDotnetEnvironmentInfoResult(
     __in const hostfxr_dotnet_environment_info* pInfo,
     __in LPVOID pvContext
     )
 {
-    NETCORESEARCH_STATE* pState = reinterpret_cast<NETCORESEARCH_STATE*>(pvContext);
+    NETCORESEARCH_STATE* pState = static_cast<NETCORESEARCH_STATE*>(pvContext);
     HRESULT hr = S_OK;
-    VERUTIL_VERSION* pFrameworkVersion = NULL;
+    VERUTIL_VERSION* pDotnetVersion = nullptr;
     int nCompare = 0;
 
-    for (size_t i = 0; i < pInfo->framework_count; ++i)
-    {
-        const hostfxr_dotnet_environment_framework_info* pFrameworkInfo = pInfo->frameworks + i;
-        ReleaseVerutilVersion(pFrameworkVersion);
 
-        if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pState->wzTargetName, -1, pFrameworkInfo->name, -1))
+    if (pState->Kind == NETCORESEARCHKIND::Sdk)
+    {
+        auto& sdkData = pState->Data.Sdk;
+        for (size_t i = 0; i < pInfo->sdk_count; ++i)
         {
-            continue;
-        }
+            const hostfxr_dotnet_environment_sdk_info* pSdkInfo = pInfo->sdks + i;
+            ReleaseVerutilVersion(pDotnetVersion);
 
-        hr = VerParseVersion(pFrameworkInfo->version, 0, FALSE, &pFrameworkVersion);
-        ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to parse framework version: %ls", pFrameworkInfo->version);
+            hr = VerParseVersion(pSdkInfo->version, 0, FALSE, &pDotnetVersion);
+            ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to parse sdk version: %ls", pSdkInfo->version);
 
-        if (pFrameworkVersion->dwMajor != pState->dwMajorVersion)
-        {
-            continue;
-        }
+            if (pDotnetVersion->dwMajor != sdkData.dwMajorVersion)
+            {
+                continue;
+            }
+            if (!matches_feature_band(sdkData.dwFeatureBand, pDotnetVersion->dwPatch))
+            {
+                continue;
+            }
 
-        if (pState->pVersion)
+            if (pState->pVersion)
+            {
+                hr = VerCompareParsedVersions(pState->pVersion, pDotnetVersion, &nCompare);
+                ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to compare versions.");
+
+                if (nCompare > -1)
+                {
+                    continue;
+                }
+            }
+
+            ReleaseVerutilVersion(pState->pVersion);
+            pState->pVersion = pDotnetVersion;
+            pDotnetVersion = nullptr;
+        }
+    }
+    else if(pState->Kind == NETCORESEARCHKIND::Runtime)
+    {
+        auto& runtimeData = pState->Data.Runtime;
+        for (size_t i = 0; i < pInfo->framework_count; ++i)
         {
-            hr = VerCompareParsedVersions(pState->pVersion, pFrameworkVersion, &nCompare);
-            ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to compare versions.");
+            const hostfxr_dotnet_environment_framework_info* pFrameworkInfo = pInfo->frameworks + i;
+            ReleaseVerutilVersion(pDotnetVersion);
 
-            if (nCompare > -1)
+            if (string_equal_invariant(runtimeData.wzTargetName, pFrameworkInfo->name))
             {
                 continue;
             }
-        }
 
-        ReleaseVerutilVersion(pState->pVersion);
-        pState->pVersion = pFrameworkVersion;
-        pFrameworkVersion = NULL;
+            hr = VerParseVersion(pFrameworkInfo->version, 0, FALSE, &pDotnetVersion);
+            ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to parse framework version: %ls", pFrameworkInfo->version);
+
+            if (pDotnetVersion->dwMajor != runtimeData.dwMajorVersion)
+            {
+                continue;
+            }
+
+            if (pState->pVersion)
+            {
+                hr = VerCompareParsedVersions(pState->pVersion, pDotnetVersion, &nCompare);
+                ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to compare versions.");
+
+                if (nCompare > -1)
+                {
+                    continue;
+                }
+            }
+
+            ReleaseVerutilVersion(pState->pVersion);
+            pState->pVersion = pDotnetVersion;
+            pDotnetVersion = nullptr;
+        }
+    }
+    else
+    {
+        ConsoleWriteError(E_INVALIDARG, CONSOLE_COLOR_RED, "Invalid NETCORESEARCHKIND.");
     }
 
 LExit:
-    ReleaseVerutilVersion(pFrameworkVersion);
+    ReleaseVerutilVersion(pDotnetVersion);
 }
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3.1.12_x64.wxs b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3.1.12_x64.wxs
index 20b266a5..74e82405 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3.1.12_x64.wxs
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3.1.12_x64.wxs
@@ -5,11 +5,15 @@
     <?define NetCorePlatform = x64?>
     <?define NetCoreIdVersion = 3112?>
     <?define NetCoreVersion = 3.1.12?>
+    <?define NetCoreSdkPlatform = x64?>
+    <?define NetCoreSdkIdVersion = 31425?>
+    <?define NetCoreSdkVersion = 3.1.425?>
     <?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?>
+    <?define DotNetCoreSdkRedistLink = https://download.visualstudio.microsoft.com/download/pr/9cf7e571-76c7-4ce8-9777-37bd6c3540e9/5c01197afed195cdb6cd2ae9e49606fc/dotnet-sdk-3.1.425-win-x64.exe?>
 
     <Fragment>
         <netfx:DotNetCoreSearch Id="$(var.AspNetCoreId)" RuntimeType="aspnet" Platform="$(var.NetCorePlatform)" MajorVersion="3" Variable="$(var.AspNetCoreId)" />
@@ -55,4 +59,19 @@
             </ExePackage>
         </PackageGroup>
     </Fragment>
+
+    <Fragment>
+        <netfx:DotNetCoreSdkSearch Id="$(var.DotNetCoreSdkId)" Platform="$(var.NetCoreSdkPlatform)" Version="3.0.100" Variable="$(var.DotNetCoreSdkId)" />
+
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)DetectCondition" Value="$(var.DotNetCoreSdkId) &gt;= v$(var.NetCoreSdkVersion)" Overridable="yes" />
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)InstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)RepairArguments" Value="" Overridable="yes" />
+
+        <PackageGroup Id="$(var.DotNetCoreSdkRedistId)">
+            <ExePackage CacheId="$(var.DotNetCoreSdkRedistId)_2485A7AFA98E178CB8F30C9838346B514AEA4769" InstallArguments="$(var.DotNetCoreSdkRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)InstallCondition)" Id="$(var.DotNetCoreSdkRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreSdkRedistLog)" Cache="remove">
+                <ExePackagePayload Name="!(wix.DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)PackageDirectory)dotnet-sdk-$(var.NetCoreSdkVersion)-win-$(var.NetCoreSdkPlatform).exe" DownloadUrl="$(var.DotNetCoreSdkRedistLink)" ProductName="Microsoft .NET Core Runtime - 3.1.425 (x64)" Description="Microsoft .NET Core Runtime - 3.1.425 (x64)" CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" Size="135024384" Version="3.1.425" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
 </Wix>
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3.1.12_x86.wxs b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3.1.12_x86.wxs
index 4bd97492..9acc4dc5 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3.1.12_x86.wxs
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3.1.12_x86.wxs
@@ -5,11 +5,15 @@
     <?define NetCorePlatform = x86?>
     <?define NetCoreIdVersion = 3112?>
     <?define NetCoreVersion = 3.1.12?>
+    <?define NetCoreSdkPlatform = x86?>
+    <?define NetCoreSdkIdVersion = 31425?>
+    <?define NetCoreSdkVersion = 3.1.425?>
     <?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?>
+    <?define DotNetCoreSdkRedistLink = https://download.visualstudio.microsoft.com/download/pr/d595e303-d26d-447c-92e7-5dc32c8e70b9/0669c3a6247a96a98ea96b1698294970/dotnet-sdk-3.1.425-win-x86.zip?>
 
     <Fragment>
         <netfx:DotNetCoreSearch Id="$(var.AspNetCoreId)" RuntimeType="aspnet" Platform="$(var.NetCorePlatform)" MajorVersion="3" Variable="$(var.AspNetCoreId)" />
@@ -55,4 +59,19 @@
             </ExePackage>
         </PackageGroup>
     </Fragment>
+
+    <Fragment>
+        <netfx:DotNetCoreSdkSearch Id="$(var.DotNetCoreSdkId)" Platform="$(var.NetCoreSdkPlatform)" Version="3.0.100" Variable="$(var.DotNetCoreSdkId)" />
+
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)DetectCondition" Value="$(var.DotNetCoreSdkId) &gt;= v$(var.NetCoreSdkVersion)" Overridable="yes" />
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)InstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)RepairArguments" Value="" Overridable="yes" />
+
+        <PackageGroup Id="$(var.DotNetCoreSdkRedistId)">
+            <ExePackage CacheId="$(var.DotNetCoreSdkRedistId)_2485A7AFA98E178CB8F30C9838346B514AEA4769" InstallArguments="$(var.DotNetCoreSdkRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)InstallCondition)" Id="$(var.DotNetCoreSdkRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreSdkRedistLog)" Cache="remove">
+                <ExePackagePayload Name="!(wix.DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)PackageDirectory)dotnet-sdk-$(var.NetCoreSdkVersion)-win-$(var.NetCoreSdkPlatform).exe" DownloadUrl="$(var.DotNetCoreSdkRedistLink)" ProductName="Microsoft .NET Core SDK - 3.1.425 (x86)" Description="Microsoft .NET Core Runtime - 3.1.12 (x86)" CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" Size="124974936" Version="3.1.425" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
 </Wix>
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3_Platform.wxi b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3_Platform.wxi
index f0b97d33..2933196d 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3_Platform.wxi
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3_Platform.wxi
@@ -21,6 +21,12 @@
   <?define DotNetCoreRedistInstallArguments = /install /quiet /log "[$(var.DotNetCoreRedistLog)]"?>
   <?define DotNetCoreRedistUninstallArguments = /uninstall /quiet /log "[$(var.DotNetCoreRedistLog)]"?>
 
+  <?define DotNetCoreSdkId = DOTNETCORESDK3_$(var.NetCoreSdkPlatform)?>
+  <?define DotNetCoreSdkRedistId = DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist_$(var.NetCoreSdkPlatform)?>
+  <?define DotNetCoreSdkRedistLog = DotNetCoreSdk$(var.NetCoreSdkIdVersion)RedistLog?>
+  <?define DotNetCoreSdkRedistInstallArguments = /install /quiet /log "[$(var.DotNetCoreSdkRedistLog)]"?>
+  <?define DotNetCoreSdkRedistUninstallArguments = /uninstall /quiet /log "[$(var.DotNetCoreSdkRedistLog)]"?>
+
   <?define NetCoreEulaLink = https://go.microsoft.com/fwlink/?LinkId=329770?>
 
   <Fragment>
@@ -46,4 +52,12 @@
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
   </Fragment>
+
+    <Fragment>
+    <PackageGroup Id="$(var.DotNetCoreSdkRedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.DotNetCoreSdkRedistId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreSdkRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
+  </Fragment>
 </Include>
diff --git a/src/ext/NetFx/wixext/NetFxCompiler.cs b/src/ext/NetFx/wixext/NetFxCompiler.cs
index 563cd19d..7a37cf90 100644
--- a/src/ext/NetFx/wixext/NetFxCompiler.cs
+++ b/src/ext/NetFx/wixext/NetFxCompiler.cs
@@ -49,6 +49,12 @@ namespace WixToolset.Netfx
                         case "DotNetCoreSearchRef":
                             this.ParseDotNetCoreSearchRefElement(intermediate, section, element);
                             break;
+                        case "DotNetCoreSdkSearch":
+                            this.ParseDotNetCoreSdkSearchElement(intermediate, section, element);
+                            break;
+                        case "DotNetCoreSdkSearchRef":
+                            this.ParseDotNetCoreSdkSearchRefElement(intermediate, section, element);
+                            break;
                         case "DotNetCompatibilityCheck":
                             this.ParseDotNetCompatibilityCheckElement(intermediate, section, element);
                             break;
@@ -69,6 +75,12 @@ namespace WixToolset.Netfx
                         case "DotNetCoreSearchRef":
                             this.ParseDotNetCoreSearchRefElement(intermediate, section, element);
                             break;
+                        case "DotNetCoreSdkSearch":
+                            this.ParseDotNetCoreSdkSearchElement(intermediate, section, element);
+                            break;
+                        case "DotNetCoreSdkSearchRef":
+                            this.ParseDotNetCoreSdkSearchRefElement(intermediate, section, element);
+                            break;
                         default:
                             this.ParseHelper.UnexpectedElement(parentElement, element);
                             break;
@@ -248,6 +260,137 @@ namespace WixToolset.Netfx
             this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
         }
 
+        private void ParseDotNetCoreSdkSearchElement(Intermediate intermediate, IntermediateSection section, XElement element)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
+            Identifier id = null;
+            string variable = null;
+            string condition = null;
+            string after = null;
+            NetCoreSdkSearchPlatform? platform = null;
+            string version = null;
+
+            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 "Variable":
+                            variable = this.ParseHelper.GetAttributeBundleVariableNameValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Condition":
+                            condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "After":
+                            after = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Platform":
+                            var platformValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (platformValue)
+                            {
+                                case "arm64":
+                                    platform = NetCoreSdkSearchPlatform.Arm64;
+                                    break;
+                                case "x64":
+                                    platform = NetCoreSdkSearchPlatform.X64;
+                                    break;
+                                case "x86":
+                                    platform = NetCoreSdkSearchPlatform.X86;
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Platform", platformValue, "arm64", "x64", "x86"));
+                                    break;
+                            }
+                            break;
+                        case "Version":
+                            // .NET Core had a different deployment strategy before .NET Core 3.0 which would require different detection logic.
+                            version = this.ParseHelper.GetAttributeVersionValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(element, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
+                }
+            }
+
+            if (id == null)
+            {
+                id = this.ParseHelper.CreateIdentifier("dncss", variable, condition, after);
+            }
+
+            if (!platform.HasValue)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Platform"));
+            }
+
+            
+            if (String.IsNullOrEmpty(version))
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Version"));
+            }
+
+            var ver = Version.Parse(version);
+            if (ver.Major == 4)
+            {
+                this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Version", version, "3.*", "5+.*"));
+            }
+
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
+
+            var bundleExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBundleExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
+            if (bundleExtensionId == null)
+            {
+                this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName));
+            }
+
+            if (!this.Messaging.EncounteredError)
+            {
+                this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bundleExtensionId);
+
+                section.AddSymbol(new NetFxNetCoreSdkSearchSymbol(sourceLineNumbers, id)
+                {
+                    Platform = platform.Value,
+                    Version = version,
+                });
+            }
+        }
+
+        private void ParseDotNetCoreSdkSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement element)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
+
+            foreach (var attrib in element.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, NetfxSymbolDefinitions.NetFxNetCoreSdkSearch, refId);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(element, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
+                }
+            }
+
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
+        }
+
         /// <summary>
         /// Parses a NativeImage element.
         /// </summary>
@@ -389,66 +532,19 @@ namespace WixToolset.Netfx
                             property = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                             break;
                         case "RuntimeType":
-                            runtimeType = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
-                            switch (runtimeType.ToLower())
-                            {
-                                case "aspnet":
-                                    runtimeType = "Microsoft.AspNetCore.App";
-                                    break;
-                                case "desktop":
-                                    runtimeType = "Microsoft.WindowsDesktop.App";
-                                    break;
-                                case "core":
-                                    runtimeType = "Microsoft.NETCore.App";
-                                    break;
-                                default:
-                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, runtimeType, "aspnet", "desktop", "core"));
-                                    break;
-                            }
+                            runtimeType = this.ParseRuntimeType(element, sourceLineNumbers, attrib);
                             break;
                         case "Platform":
-                            platform = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
-                            switch (platform.ToLower())
-                            {
-                                case "x86":
-                                case "x64":
-                                case "arm64":
-                                    platform = platform.ToLower();
-                                    break;
-                                default:
-                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, platform, "x86", "x64", "arm64"));
-                                    break;
-                            }
+                            platform = this.ParsePlatform(element, sourceLineNumbers, attrib);
+                            break;
+                        case "FeatureBand":
+                            platform = this.ParseFeatureBand(element, sourceLineNumbers, attrib);
                             break;
                         case "Version":
                             version = this.ParseHelper.GetAttributeVersionValue(sourceLineNumbers, attrib);
                             break;
                         case "RollForward":
-                            rollForward = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
-                            switch (rollForward.ToLowerInvariant())
-                            {
-                                case "latestmajor":
-                                    rollForward = "LatestMajor";
-                                    break;
-                                case "major":
-                                    rollForward = "Major";
-                                    break;
-                                case "latestminor":
-                                    rollForward = "LatestMinor";
-                                    break;
-                                case "minor":
-                                    rollForward = "Minor";
-                                    break;
-                                case "latestpatch":
-                                    rollForward = "LatestPatch";
-                                    break;
-                                case "disable":
-                                    rollForward = "Disable";
-                                    break;
-                                default:
-                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, rollForward, "latestmajor", "major", "latestminor", "minor", "latestpatch", "disable"));
-                                    break;
-                            }
+                            rollForward = this.ParseRollForward(element, sourceLineNumbers, attrib);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -503,6 +599,97 @@ namespace WixToolset.Netfx
             }
         }
 
+        private string ParseRollForward(XElement element, SourceLineNumber sourceLineNumbers, XAttribute attrib)
+        {
+            string rollForward;
+            rollForward = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+            switch (rollForward.ToLowerInvariant())
+            {
+                case "latestmajor":
+                    rollForward = "LatestMajor";
+                    break;
+                case "major":
+                    rollForward = "Major";
+                    break;
+                case "latestminor":
+                    rollForward = "LatestMinor";
+                    break;
+                case "minor":
+                    rollForward = "Minor";
+                    break;
+                case "latestpatch":
+                    rollForward = "LatestPatch";
+                    break;
+                case "disable":
+                    rollForward = "Disable";
+                    break;
+                default:
+                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName,
+                        attrib.Name.LocalName, rollForward, "latestmajor", "major", "latestminor", "minor", "latestpatch", "disable"));
+                    break;
+            }
+
+            return rollForward;
+        }
+
+        private string ParsePlatform(XElement element, SourceLineNumber sourceLineNumbers, XAttribute attrib)
+        {
+            string platform;
+            platform = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+            switch (platform.ToLower())
+            {
+                case "x86":
+                case "x64":
+                case "arm64":
+                    platform = platform.ToLower();
+                    break;
+                default:
+                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName,
+                        attrib.Name.LocalName, platform, "x86", "x64", "arm64"));
+                    break;
+            }
+
+            return platform;
+        }
+
+        private string ParseFeatureBand(XElement element, SourceLineNumber sourceLineNumbers, XAttribute attrib)
+        {
+            string featureBand = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+
+            if (!Int32.TryParse(featureBand, out var intFeatureBand) || (100 > intFeatureBand) || (intFeatureBand > 999))
+            {
+                this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName,
+                    attrib.Name.LocalName, featureBand, "An integer in the range [100 - 999]"));
+
+            }
+
+            return featureBand;
+        }
+
+        private string ParseRuntimeType(XElement element, SourceLineNumber sourceLineNumbers, XAttribute attrib)
+        {
+            var runtimeType = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+            switch (runtimeType.ToLower())
+            {
+                case "aspnet":
+                    runtimeType = "Microsoft.AspNetCore.App";
+                    break;
+                case "desktop":
+                    runtimeType = "Microsoft.WindowsDesktop.App";
+                    break;
+                case "core":
+                    runtimeType = "Microsoft.NETCore.App";
+                    break;
+                default:
+                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName,
+                        attrib.Name.LocalName, runtimeType, "aspnet", "desktop", "core"));
+                    break;
+            }
+
+            return runtimeType;
+        }
+
+
         /// <summary>
         /// Parses a DotNetCompatibilityCheckRef element.
         /// </summary>
diff --git a/src/ext/NetFx/wixext/NetfxTableDefinitions.cs b/src/ext/NetFx/wixext/NetfxTableDefinitions.cs
index 6be1abe7..114275c3 100644
--- a/src/ext/NetFx/wixext/NetfxTableDefinitions.cs
+++ b/src/ext/NetFx/wixext/NetfxTableDefinitions.cs
@@ -40,7 +40,7 @@ namespace WixToolset.Netfx
         public static readonly TableDefinition[] All = new[]
         {
             NetFxNativeImage,
-            NetFxDotNetCompatibilityCheck
+            NetFxDotNetCompatibilityCheck,
         };
     }
 }
diff --git a/src/ext/NetFx/wixext/Symbols/NetFxDotNetCompatibilityCheckSymbol.cs b/src/ext/NetFx/wixext/Symbols/NetFxDotNetCompatibilityCheckSymbol.cs
index a46cf17f..ea1b16c5 100644
--- a/src/ext/NetFx/wixext/Symbols/NetFxDotNetCompatibilityCheckSymbol.cs
+++ b/src/ext/NetFx/wixext/Symbols/NetFxDotNetCompatibilityCheckSymbol.cs
@@ -11,11 +11,11 @@ namespace WixToolset.Netfx
             NetfxSymbolDefinitionType.NetFxDotNetCompatibilityCheck.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbollFields.RuntimeType), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbollFields.Platform), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbollFields.Version), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbollFields.RollForward), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbollFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbolFields.RuntimeType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbolFields.Platform), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbolFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbolFields.RollForward), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbolFields.Property), IntermediateFieldType.String),
             },
             typeof(NetFxDotNetCompatibilityCheckSymbol));
     }
@@ -25,7 +25,7 @@ namespace WixToolset.Netfx.Symbols
 {
     using WixToolset.Data;
 
-    public enum NetFxDotNetCompatibilityCheckSymbollFields
+    public enum NetFxDotNetCompatibilityCheckSymbolFields
     {
         RuntimeType,
         Platform,
@@ -44,36 +44,36 @@ namespace WixToolset.Netfx.Symbols
         {
         }
 
-        public IntermediateField this[NetFxDotNetCompatibilityCheckSymbollFields index] => this.Fields[(int)index];
+        public IntermediateField this[NetFxDotNetCompatibilityCheckSymbolFields index] => this.Fields[(int)index];
 
         public string RuntimeType
         {
-            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbollFields.RuntimeType].AsString();
-            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbollFields.RuntimeType, value);
+            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbolFields.RuntimeType].AsString();
+            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbolFields.RuntimeType, value);
         }
 
         public string Platform
         {
-            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbollFields.Platform].AsString();
-            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbollFields.Platform, value);
+            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbolFields.Platform].AsString();
+            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbolFields.Platform, value);
         }
 
         public string Version
         {
-            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbollFields.Version].AsString();
-            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbollFields.Version, value);
+            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbolFields.Version].AsString();
+            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbolFields.Version, value);
         }
 
         public string RollForward
         {
-            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbollFields.RollForward].AsString();
-            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbollFields.RollForward, value);
+            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbolFields.RollForward].AsString();
+            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbolFields.RollForward, value);
         }
 
         public string Property
         {
-            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbollFields.Property].AsString();
-            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbollFields.Property, value);
+            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbolFields.Property].AsString();
+            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbolFields.Property, value);
         }
     }
 }
diff --git a/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSdkSymbol.cs b/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSdkSymbol.cs
new file mode 100644
index 00000000..86b750ea
--- /dev/null
+++ b/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSdkSymbol.cs
@@ -0,0 +1,64 @@
+// 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.Netfx.Symbols;
+
+    public static partial class NetfxSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition NetFxNetCoreSdkSearch = new IntermediateSymbolDefinition(
+            NetfxSymbolDefinitionType.NetFxNetCoreSdkSearch.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(NetFxNetCoreSdkSearchSymbolFields.Platform), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(NetFxNetCoreSdkSearchSymbolFields.Version), IntermediateFieldType.String),
+            },
+            typeof(NetFxNetCoreSearchSymbol));
+    }
+}
+
+namespace WixToolset.Netfx.Symbols
+{
+    using WixToolset.Data;
+
+
+    public enum NetCoreSdkSearchPlatform
+    {
+        X86,
+        X64,
+        Arm64,
+    }
+
+    public enum NetFxNetCoreSdkSearchSymbolFields
+    {
+        Platform,
+        Version,
+    }
+
+
+    public class NetFxNetCoreSdkSearchSymbol : IntermediateSymbol
+    {
+        public NetFxNetCoreSdkSearchSymbol() : base(NetfxSymbolDefinitions.NetFxNetCoreSdkSearch, null, null)
+        {
+        }
+
+        public NetFxNetCoreSdkSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(NetfxSymbolDefinitions.NetFxNetCoreSdkSearch, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[NetFxNetCoreSdkSearchSymbolFields index] => this.Fields[(int)index];
+
+        public NetCoreSdkSearchPlatform Platform
+        {
+            get => (NetCoreSdkSearchPlatform)this.Fields[(int)NetFxNetCoreSdkSearchSymbolFields.Platform].AsNumber();
+            set => this.Set((int)NetFxNetCoreSdkSearchSymbolFields.Platform, (int)value);
+        }
+
+        public string Version
+        {
+            get => this.Fields[(int)NetFxNetCoreSdkSearchSymbolFields.Version].AsString();
+            set => this.Set((int)NetFxNetCoreSdkSearchSymbolFields.Version, value);
+        }
+    }
+}
diff --git a/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
index ad729dd4..00c52f9e 100644
--- a/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
+++ b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
@@ -10,7 +10,8 @@ namespace WixToolset.Netfx
     {
         NetFxNativeImage,
         NetFxNetCoreSearch,
-        NetFxDotNetCompatibilityCheck
+        NetFxNetCoreSdkSearch,
+        NetFxDotNetCompatibilityCheck,
     }
 
     public static partial class NetfxSymbolDefinitions
@@ -36,7 +37,10 @@ namespace WixToolset.Netfx
 
                 case NetfxSymbolDefinitionType.NetFxNetCoreSearch:
                     return NetfxSymbolDefinitions.NetFxNetCoreSearch;
-                    
+
+                case NetfxSymbolDefinitionType.NetFxNetCoreSdkSearch:
+                    return NetfxSymbolDefinitions.NetFxNetCoreSdkSearch;
+
                 case NetfxSymbolDefinitionType.NetFxDotNetCompatibilityCheck:
                     return NetfxSymbolDefinitions.NetFxDotNetCompatibilityCheck;
 
@@ -48,6 +52,7 @@ namespace WixToolset.Netfx
         static NetfxSymbolDefinitions()
         {
             NetFxNetCoreSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
+            NetFxNetCoreSdkSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
         }
     }
 }
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6.0.9_x86.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6.0.9_x86.wxs
index 6bfef872..c2232674 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6.0.9_x86.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6.0.9_x86.wxs
@@ -5,11 +5,15 @@
     <?define NetCorePlatform = x86?>
     <?define NetCoreIdVersion = 609?>
     <?define NetCoreVersion = 6.0.9?>
+    <?define NetCoreSdkPlatform = x86?>
+    <?define NetCoreSdkIdVersion = 60403?>
+    <?define NetCoreSdkVersion = 6.0.403?>
     <?include NetCore6_Platform.wxi?>
 
     <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/8f583028-b802-4661-b8dd-47139b0561ce/3c0cd3bdc6051759ccae40f78982c86e/aspnetcore-runtime-6.0.9-win-x86.exe?>
     <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/925f9407-2767-4341-857a-43cdfad71e17/0b84db913bdbb1dcf02db937a3cd3f63/windowsdesktop-runtime-6.0.9-win-x86.exe?>
     <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/6020f3fc-5cf8-4e25-bc7f-dcf8744137ac/4cb5ced4e015e426fddc554b130c3052/dotnet-runtime-6.0.9-win-x86.exe?>
+    <?define DotNetCoreSdkRedistLink = https://download.visualstudio.microsoft.com/download/pr/c2bf9927-2746-4126-b839-1080b360f348/17191138699683165a20fde56571f433/dotnet-sdk-6.0.403-win-x86.exe?>
 
     <Fragment>
         <netfx:DotNetCoreSearch Id="$(var.AspNetCoreId)" RuntimeType="aspnet" Platform="$(var.NetCorePlatform)" MajorVersion="6" Variable="$(var.AspNetCoreId)" />
@@ -55,4 +59,19 @@
             </ExePackage>
         </PackageGroup>
     </Fragment>
+
+    <Fragment>
+        <netfx:DotNetCoreSdkSearch Id="$(var.DotNetCoreSdkId)" Platform="$(var.NetCoreSdkPlatform)" Version="6.0.200" Variable="$(var.DotNetCoreSdkId)" />
+
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)DetectCondition" Value="$(var.DotNetCoreSdkId) &gt;= v$(var.NetCoreSdkVersion)" Overridable="yes" />
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)InstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)RepairArguments" Value="" Overridable="yes" />
+
+        <PackageGroup Id="$(var.DotNetCoreSdkRedistId)">
+            <ExePackage CacheId="$(var.DotNetCoreSdkRedistId)_2485A7AFA98E178CB8F30C9838346B514AEA4769" InstallArguments="$(var.DotNetCoreSdkRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)InstallCondition)" Id="$(var.DotNetCoreSdkRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreSdkRedistLog)" Cache="remove">
+                <ExePackagePayload Name="!(wix.DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)PackageDirectory)dotnet-sdk-$(var.NetCoreSdkVersion)-win-$(var.NetCoreSdkPlatform).exe" DownloadUrl="$(var.DotNetCoreSdkRedistLink)" ProductName="Microsoft .NET 6.0 SDK - 6.0.403 (x86)" Description="Microsoft .NET SDK - 6.0.403 (x86)" CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" Size="194236520" Version="6.0.403" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
 </Wix>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi b/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi
index d508bcaf..8f084b43 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi
@@ -21,6 +21,12 @@
   <?define DotNetCoreRedistInstallArguments = /install /quiet /log "[$(var.DotNetCoreRedistLog)]"?>
   <?define DotNetCoreRedistUninstallArguments = /uninstall /quiet /log "[$(var.DotNetCoreRedistLog)]"?>
 
+  <?define DotNetCoreSdkId = DOTNETCORERUNTIME6_$(var.NetCoreSdkPlatform)?>
+  <?define DotNetCoreSdkRedistId = DotNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCoreSdkPlatform)?>
+  <?define DotNetCoreSdkRedistLog = DotNetCoreRuntime$(var.NetCoreSdkIdVersion)RedistLog?>
+  <?define DotNetCoreSdkRedistInstallArguments = /install /quiet /log "[$(var.DotNetCoreSdkRedistLog)]"?>
+  <?define DotNetCoreSdkRedistUninstallArguments = /uninstall /quiet /log "[$(var.DotNetCoreSdkRedistLog)]"?>
+
   <?define NetCoreEulaLink = https://go.microsoft.com/fwlink/?LinkId=329770?>
 
   <Fragment>
@@ -46,4 +52,12 @@
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
   </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.DotNetCoreSdkRedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.DotNetCoreSdkRedistId)" />
+    </PackageGroup>
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreSdkRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
+  </Fragment>
 </Include>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/NetCore6.0.9_x64.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/NetCore6.0.9_x64.wxs
index f2345693..e9ccdc51 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/NetCore6.0.9_x64.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/NetCore6.0.9_x64.wxs
@@ -5,11 +5,15 @@
     <?define NetCorePlatform = x64?>
     <?define NetCoreIdVersion = 609?>
     <?define NetCoreVersion = 6.0.9?>
+    <?define NetCoreSdkPlatform = x64?>
+    <?define NetCoreSdkIdVersion = 60403?>
+    <?define NetCoreSdkVersion = 6.0.403?>
     <?include ..\TestBAWixlib\NetCore6_Platform.wxi?>
 
     <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/98dbe241-8b77-4be0-b130-a5fb6af8d724/27b655adce6250da42be9440abe847a2/aspnetcore-runtime-6.0.9-win-x64.exe?>
     <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/fe8415d4-8a35-4af9-80a5-51306a96282d/05f9b2a1b4884238e69468e49b3a5453/windowsdesktop-runtime-6.0.9-win-x64.exe?>
     <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/9dc77a6b-0276-4ad5-9bfa-d84b546686ef/f01bbcf2dc0e7f5dbd0a7d337fd4cd43/dotnet-runtime-6.0.9-win-x64.exe?>
+    <?define DotNetCoreSdkRedistLink = https://download.visualstudio.microsoft.com/download/pr/08ada4db-1e64-4829-b36d-5beb71f67bff/b77050cf7e0c71d3b95418651db1a9b8/dotnet-sdk-6.0.403-win-x64.exe?>
 
     <Fragment>
         <netfx:DotNetCoreSearch Id="$(var.AspNetCoreId)" RuntimeType="aspnet" Platform="$(var.NetCorePlatform)" MajorVersion="6" Variable="$(var.AspNetCoreId)" />
@@ -55,4 +59,19 @@
             </ExePackage>
         </PackageGroup>
     </Fragment>
+
+    <Fragment>
+        <netfx:DotNetCoreSdkSearch Id="$(var.DotNetCoreSdkId)" Platform="$(var.NetCoreSdkPlatform)" Version="6.0.200" Variable="$(var.DotNetCoreSdkId)" />
+
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)DetectCondition" Value="$(var.DotNetCoreSdkId) &gt;= v$(var.NetCoreSdkVersion)" Overridable="yes" />
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)InstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)RepairArguments" Value="" Overridable="yes" />
+
+        <PackageGroup Id="$(var.DotNetCoreSdkRedistId)">
+            <ExePackage CacheId="$(var.DotNetCoreSdkRedistId)_2485A7AFA98E178CB8F30C9838346B514AEA4769" InstallArguments="$(var.DotNetCoreSdkRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)InstallCondition)" Id="$(var.DotNetCoreSdkRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreSdkRedistLog)" Cache="remove">
+                <ExePackagePayload Name="!(wix.DotNetCoreSdk$(var.NetCoreSdkIdVersion)Redist$(var.NetCoreSdkPlatform)PackageDirectory)dotnet-sdk-$(var.NetCoreSdkVersion)-win-$(var.NetCoreSdkPlatform).exe" DownloadUrl="$(var.DotNetCoreSdkRedistLink)" ProductName="Microsoft .NET 6.0 SDK - 6.0.403 (x64)" Description="Microsoft .NET SDK - 6.0.403 (x64)" CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" Size="205722192" Version="6.0.403" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
 </Wix>