diff --git a/.config/1espt/PipelineAutobaseliningConfig.yml b/.config/1espt/PipelineAutobaseliningConfig.yml
new file mode 100644
index 00000000..f94ccddf
--- /dev/null
+++ b/.config/1espt/PipelineAutobaseliningConfig.yml
@@ -0,0 +1,23 @@
+## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
+
+pipelines:
+  525:
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2024-04-05
+        eslint:
+          lastModifiedDate: 2024-04-05
+        psscriptanalyzer:
+          lastModifiedDate: 2024-04-05
+        armory:
+          lastModifiedDate: 2024-04-05
+        policheck:
+          lastModifiedDate: 2024-09-17
+      binary:
+        credscan:
+          lastModifiedDate: 2024-04-05
+        binskim:
+          lastModifiedDate: 2025-01-25
+        spotbugs:
+          lastModifiedDate: 2024-04-05
diff --git a/.config/guardian/.gdnbaselines b/.config/guardian/.gdnbaselines
new file mode 100644
index 00000000..682b41c8
--- /dev/null
+++ b/.config/guardian/.gdnbaselines
@@ -0,0 +1,155 @@
+{
+  "properties": {
+    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
+  },
+  "version": "1.0.0",
+  "baselines": {
+    "default": {
+      "name": "default",
+      "createdDate": "2024-04-05 17:53:53Z",
+      "lastUpdatedDate": "2024-04-05 17:53:53Z"
+    }
+  },
+  "results": {
+    "789cf67c8d4cd2fdd206bfba5058f673deec8f09557f1ecbcb9753e02a6f81ab": {
+      "signature": "789cf67c8d4cd2fdd206bfba5058f673deec8f09557f1ecbcb9753e02a6f81ab",
+      "alternativeSignatures": [],
+      "target": "MicroBuild/Plugins/nuget.config",
+      "line": 9,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0060",
+      "createdDate": "2024-04-05 17:53:53Z",
+      "expirationDate": "2024-09-22 17:57:29Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
+    },
+    "d53e0926c71c90172942edd165284e747846e11a2bee3ca8fd8f32575b224593": {
+      "signature": "d53e0926c71c90172942edd165284e747846e11a2bee3ca8fd8f32575b224593",
+      "alternativeSignatures": [],
+      "target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/dlabnugetcert.pfx",
+      "line": 1,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0020",
+      "createdDate": "2024-04-05 17:53:53Z",
+      "expirationDate": "2024-09-22 17:57:29Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
+    },
+    "e170f3a23081e920943abc701a4e54324b4eff5e17ed7a51646395dbe94f59c1": {
+      "signature": "e170f3a23081e920943abc701a4e54324b4eff5e17ed7a51646395dbe94f59c1",
+      "alternativeSignatures": [],
+      "target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/dynamicsha1.pfx",
+      "line": 1,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0020",
+      "createdDate": "2024-04-05 17:53:53Z",
+      "expirationDate": "2024-09-22 17:57:29Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
+    },
+    "c511df2a1a3a5294c36c9805c10256d91671f8d33ac076318fc469e6e5775e5d": {
+      "signature": "c511df2a1a3a5294c36c9805c10256d91671f8d33ac076318fc469e6e5775e5d",
+      "alternativeSignatures": [],
+      "target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/dynamicsha2.pfx",
+      "line": 1,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0020",
+      "createdDate": "2024-04-05 17:53:53Z",
+      "expirationDate": "2024-09-22 17:57:29Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
+    },
+    "9df8e8b00de1638f97776824f2713a352462001308d07c0bd764f6f4dde90c14": {
+      "signature": "9df8e8b00de1638f97776824f2713a352462001308d07c0bd764f6f4dde90c14",
+      "alternativeSignatures": [],
+      "target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/testdlab.pfx",
+      "line": 1,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0020",
+      "createdDate": "2024-04-05 17:53:53Z",
+      "expirationDate": "2024-09-22 17:57:29Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
+    },
+    "5120fcb93cf4277f3cbae37ae1a6d800d31c413c726e6e0269240184039a941e": {
+      "signature": "5120fcb93cf4277f3cbae37ae1a6d800d31c413c726e6e0269240184039a941e",
+      "alternativeSignatures": [],
+      "target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/testdlabsha2.pfx",
+      "line": 1,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0020",
+      "createdDate": "2024-04-05 17:53:53Z",
+      "expirationDate": "2024-09-22 17:57:29Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
+    },
+    "cebbc96c2a6f1edc3afcb167aa55fd6a9f89b62af067057d9582ea217dd2a75a": {
+      "signature": "cebbc96c2a6f1edc3afcb167aa55fd6a9f89b62af067057d9582ea217dd2a75a",
+      "alternativeSignatures": [],
+      "target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/vsmsappx.pfx",
+      "line": 1,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0020",
+      "createdDate": "2024-04-05 17:53:53Z",
+      "expirationDate": "2024-09-22 17:57:29Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
+    },
+    "f4ffffdcce609b0409d6c3fec1d0eaadbb63f6088303ababf340993b84ebe2b4": {
+      "signature": "f4ffffdcce609b0409d6c3fec1d0eaadbb63f6088303ababf340993b84ebe2b4",
+      "alternativeSignatures": [],
+      "target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/WinBlue.pfx",
+      "line": 1,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0020",
+      "createdDate": "2024-04-05 17:53:53Z",
+      "expirationDate": "2024-09-22 17:57:29Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
+    },
+    "3441729f19f1d38832fe6e5cc5823f19db219c0e15349fe4f74f1f54d0d22bde": {
+      "signature": "3441729f19f1d38832fe6e5cc5823f19db219c0e15349fe4f74f1f54d0d22bde",
+      "alternativeSignatures": [],
+      "target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/WP223.pfx",
+      "line": 1,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0020",
+      "createdDate": "2024-04-05 17:53:53Z",
+      "expirationDate": "2024-09-22 17:57:29Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
+    },
+    "f6b2f8d6491d6f464bf00e2dbc9129558473ed1f541a017eda0f926e2e2f10d1": {
+      "signature": "f6b2f8d6491d6f464bf00e2dbc9129558473ed1f541a017eda0f926e2e2f10d1",
+      "alternativeSignatures": [],
+      "target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/MobileTools/7Sign/tcb.pfx",
+      "line": 1,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0020",
+      "createdDate": "2024-04-05 17:53:53Z",
+      "expirationDate": "2024-09-22 17:57:29Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
+    }
+  }
+}
\ No newline at end of file
diff --git a/eng/Signing.props b/eng/Signing.props
index 8c58f1f0..5f91c439 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -1,13 +1,20 @@
 <Project>
   <PropertyGroup>
-    <!--
-      Signing of shipping artifacts (layout, msi, bundle) are handled separately.
-      It is therefore expected that above removal can yield an empty set.
-    -->
-    <AllowEmptySignList>true</AllowEmptySignList>
+    <UseDotNetCertificate>true</UseDotNetCertificate>
   </PropertyGroup>
 
+  <ItemGroup>
+    <FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(RID)' == 'win-x86'">
+    <ItemsToSign Include="$(ArtifactsDir)layout\**\dotnet-core-uninstall.dll;
+      $(ArtifactsDir)layout\**\dotnet-core-uninstall.resources.dll;
+      $(ArtifactsDir)layout\**\dotnet-core-uninstall.exe;
+      $(ArtifactsDir)packages\**\dotnet-core-uninstall*.msi" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(RID)' == 'osx-x64' OR '$(RID)' == 'osx-arm64'">
-    <ItemsToSign Include="$(ArtifactsBinDir)/layout/dotnet-core-uninstall/dotnet-core-uninstall" />
+    <ItemsToSign Include="$(ArtifactsDir)layout/dotnet-core-uninstall/dotnet-core-uninstall" />
   </ItemGroup>
 </Project>
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 8e846dca..846ded9c 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -10,16 +10,13 @@
   <ItemGroup>
     <ProjectReference Include="..\dotnet-core-uninstall\dotnet-core-uninstall.csproj" />
   </ItemGroup>
-
+  
   <Import Condition="'$(RID)' == 'win-x86'" Project="targets\Versions.targets" />
   <Import Condition="'$(RID)' == 'win-x86'" Project="targets\BuildCoreSdkTasks.targets" />
   <Import Condition="'$(RID)' == 'win-x86'" Project="targets\GetRuntimeInformation.targets" />
   <Import Project="targets\GenerateLayout.targets" />
   <Import Condition="'$(RID)' == 'win-x86'" Project="targets\FileExtensions.targets" />
   <Import Condition="'$(RID)' == 'win-x86'" Project="targets\GenerateMSIs.targets" />
-  <Import Condition="'$(RID)' == 'win-x86'" Project="targets\Signing.targets" />
-
-  <Target Condition="'$(RID)' == 'win-x86'" Name="GenerateMSIs" AfterTargets="Build" DependsOnTargets="GenerateLayout;GenerateDotnetCoreUninstallMsi;SignDotnetCoreUninstallMsi">
-  </Target>
+  <Target Condition="'$(RID)' == 'win-x86'" Name="GenerateMSIs" AfterTargets="Build" DependsOnTargets="GenerateLayout;GenerateDotnetCoreUninstallMsi" />
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 6e55c579..c3f4f44f 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -5,7 +5,6 @@
     <_PublishSingleFileForRid>true</_PublishSingleFileForRid>
     <_PublishSingleFileForRid Condition="'$(RID)' == 'win-x86'">false</_PublishSingleFileForRid>
     <_GenerateLayoutDependsOnTargets>CleanLayoutPath;PublishDotnetCoreUninstallProject</_GenerateLayoutDependsOnTargets>
-    <_GenerateLayoutDependsOnTargets Condition="'$(RID)' == 'win-x86'">CleanLayoutPath;PublishDotnetCoreUninstallProject;SignLayout</_GenerateLayoutDependsOnTargets>
     
   </PropertyGroup>
 
diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets
deleted file mode 100644
index b98d63b8..00000000
--- a/src/redist/targets/Signing.targets
+++ /dev/null
@@ -1,121 +0,0 @@
-<Project>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.SignTool" Version="$(MicrosoftDotNetSignToolVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
-  <Target Name="SetSignProps" Condition="'$(SignCoreDotnetCoreUninstall)' == 'true'">
-
-    <MakeDir Directories="$(ArtifactsTmpDir)" Condition="!Exists('$(ArtifactsTmpDir)')" />
-
-    <PropertyGroup>
-      <ExternalCertificateId Condition="'$(ExternalCertificateId)' == ''">3PartySHA2</ExternalCertificateId>
-      <InternalCertificateId Condition="'$(InternalCertificateId)' == ''">Microsoft400</InternalCertificateId>
-      <NugetCertificateId Condition="'$(NugetCertificateId)' == ''">NuGet</NugetCertificateId>
-    </PropertyGroup>
-
-
-    <!-- Logic copied from https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj -->
-
-    <ItemGroup>
-      <!--
-      This is intended to hold information about the certificates used for signing.
-      For now the only information required is whether or not the certificate can be
-      used for signing already signed files - DualSigningAllowed==true.
-    -->
-      <CertificatesSignInfo Include="3PartyDual" DualSigningAllowed="true" />
-      <CertificatesSignInfo Include="3PartySHA2" DualSigningAllowed="true" />
-
-      <!-- List of container files that will be opened and checked for files that need to be signed. -->
-      <!--<ItemsToSign Include="$(ArtifactsPackagesDir)**\*.nupkg" />
-      <ItemsToSign Include="$(VisualStudioSetupOutputPath)**\*.vsix" />-->
-
-      <!--
-      Map of file extensions to default certificate name. Files with these extensions are
-      signed with the specified certificate. Particularly useful for files that don't have
-      a public key token.
-      The certificate can be overriden using the StrongNameSignInfo or the FileSignInfo item group.
-    -->
-      <FileExtensionSignInfo Include=".jar" CertificateName="MicrosoftJAR" />
-      <FileExtensionSignInfo Include=".msi;.js;.ps1;.psd1;.psm1;.psc1;.py" CertificateName="Microsoft400" />
-      <FileExtensionSignInfo Include=".dll;.exe" CertificateName="Microsoft400" />
-      <FileExtensionSignInfo Include=".nupkg" CertificateName="NuGet" />
-      <FileExtensionSignInfo Include=".vsix" CertificateName="VsixSHA2" />
-      <FileExtensionSignInfo Include=".zip" CertificateName="None" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <!-- Control whether an empty ItemsToSign item group is allowed when calling SignToolTask. -->
-      <AllowEmptySignList>false</AllowEmptySignList>
-    </PropertyGroup>
-
-    <!-- Allow repository to customize signing configuration -->
-    <!--<Import Project="$(RepositoryEngineeringDir)Signing.props" Condition="Exists('$(RepositoryEngineeringDir)Signing.props')" />-->
-
-    <!-- Logic copied from https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj -->
-    <Error Text="The value of DotNetSignType is invalid: '$(DotNetSignType)'" Condition="'$(DotNetSignType)' != 'real' and '$(DotNetSignType)' != 'test' and '$(DotNetSignType)' != ''" />
-
-    <PropertyGroup>
-      <_DryRun>true</_DryRun>
-      <_DryRun Condition="'$(OfficialBuild)' == 'true'">false</_DryRun>
-
-      <_TestSign>false</_TestSign>
-      <_TestSign Condition="'$(DotNetSignType)' == 'test'">true</_TestSign>
-
-      <_DesktopMSBuildRequired>false</_DesktopMSBuildRequired>
-      <_DesktopMSBuildRequired Condition="'$(_DryRun)' != 'true' and '$(MSBuildRuntimeType)' == 'Core'">true</_DesktopMSBuildRequired>
-    </PropertyGroup>
-
-    <!-- We only need this if we are going to use the executable version. -->
-    <Exec Command='"$(NuGetPackageRoot)vswhere\$(VSWhereVersion)\tools\vswhere.exe" -latest -prerelease -property installationPath -requires Microsoft.Component.MSBuild' ConsoleToMsBuild="true" StandardErrorImportance="high" Condition="$(_DesktopMSBuildRequired)">
-      <Output TaskParameter="ConsoleOutput" PropertyName="_VSInstallDir" />
-    </Exec>
-
-    <PropertyGroup>
-      <_DesktopMSBuildPath Condition="$(_DesktopMSBuildRequired)">$(_VSInstallDir)\MSBuild\Current\Bin\msbuild.exe</_DesktopMSBuildPath>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="SignLayout" Condition="'$(SignCoreDotnetCoreUninstall)' == 'true'" DependsOnTargets="SetSignProps">
-
-    <ItemGroup>
-      <!-- External files -->
-      <LayoutFilesToSign Include="$(DotnetCoreUninstallOutputDirectory)**/Newtonsoft.Json.dll">
-        <CertificateName>$(ExternalCertificateId)</CertificateName>
-      </LayoutFilesToSign>
-      <!-- Built binaries -->
-      <LayoutFilesToSign Include="$(DotnetCoreUninstallOutputDirectory)**/dotnet-core-uninstall.dll;
-                            $(DotnetCoreUninstallOutputDirectory)**/dotnet-core-uninstall.resources.dll;
-                            $(DotnetCoreUninstallOutputDirectory)**/dotnet-core-uninstall.exe">
-        <CertificateName>$(InternalCertificateId)</CertificateName>
-      </LayoutFilesToSign>
-
-
-      <LayoutFileSignInfo Include="@(LayoutFilesToSign->'%(Filename)%(Extension)')">
-        <CertificateName>%(CertificateName)</CertificateName>
-      </LayoutFileSignInfo>
-      <DistinctLayoutFileSignInfo Include="@(LayoutFileSignInfo->Distinct())" />
-    </ItemGroup>
-
-    <Error Condition="'$(AllowEmptySignList)' != 'true' AND '@(LayoutFilesToSign)' == ''" Text="List of files to sign is empty. Make sure that LayoutFilesToSign is configured correctly." />
-
-    <Microsoft.DotNet.SignTool.SignToolTask DryRun="$(_DryRun)" TestSign="$(_TestSign)" CertificatesSignInfo="$(CertificatesSignInfo)" ItemsToSign="@(LayoutFilesToSign)" StrongNameSignInfo="@(StrongNameSignInfo)" FileSignInfo="@(DistinctLayoutFileSignInfo)" FileExtensionSignInfo="@(FileExtensionSignInfo)" TempDir="$(ArtifactsTmpDir)" LogDir="$(ArtifactsLogDir)" MSBuildPath="$(_DesktopMSBuildPath)" SNBinaryPath="$(NuGetPackageRoot)sn\$(SNVersion)\sn.exe" MicroBuildCorePath="$(NuGetPackageRoot)microbuild.core\$(MicroBuildCoreVersion)"/>
-
-  </Target>
-
-  <Target Name="SignDotnetCoreUninstallMsi" Condition="'$(SignCoreDotnetCoreUninstall)' == 'true'" DependsOnTargets="SetSignProps">
-
-    <ItemGroup>
-      <DotnetCoreUninstallMsiFilesToSign Include="$(DotnetCoreUninstallMSIInstallerFile)" />
-      <DotnetCoreUninstallMsiFilesToSign Include="$(ArtifactsShippingPackagesDir)*.cab" />
-
-      <DotnetCoreUninstallMsiFileSignInfo Include="@(DotnetCoreUninstallMsiFilesToSign->'%(Filename)%(Extension)')">
-        <CertificateName>$(InternalCertificateId)</CertificateName>
-      </DotnetCoreUninstallMsiFileSignInfo>
-      <DistinctDotnetCoreUninstallMsiFileSignInfo Include="@(DotnetCoreUninstallMsiFileSignInfo->Distinct())" />
-    </ItemGroup>
-
-    <Microsoft.DotNet.SignTool.SignToolTask DryRun="$(_DryRun)" TestSign="$(_TestSign)" CertificatesSignInfo="$(CertificatesSignInfo)" ItemsToSign="@(DotnetCoreUninstallMsiFilesToSign)" StrongNameSignInfo="@(StrongNameSignInfo)" FileSignInfo="@(DistinctDotnetCoreUninstallMsiFileSignInfo)" FileExtensionSignInfo="@(FileExtensionSignInfo)" TempDir="$(ArtifactsTmpDir)" LogDir="$(ArtifactsLogDir)" MSBuildPath="$(_DesktopMSBuildPath)" SNBinaryPath="$(NuGetPackageRoot)sn\$(SNVersion)\sn.exe" MicroBuildCorePath="$(NuGetPackageRoot)microbuild.core\$(MicroBuildCoreVersion)"/>
-
-  </Target>
-
-</Project>