From 0ada6e1305a18bd7dd1c6193f51da11b82aa2b67 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 26 Jul 2024 14:21:26 -0700
Subject: [PATCH 1/6] Add a direct reference to asn1 in the most shared project
 to resolve the CG alerts

---
 eng/Versions.props                                            | 4 ++++
 .../Microsoft.TemplateEngine.Edge.csproj                      | 1 +
 2 files changed, 5 insertions(+)

diff --git a/eng/Versions.props b/eng/Versions.props
index 3f6f080780..ef1eacaf1f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -22,4 +22,8 @@
     <!-- Dependencies from https://github.com/dotnet/command-line-api -->
     <SystemCommandLinePackageVersion>2.0.0-beta4.24324.3</SystemCommandLinePackageVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <!-- Non-maestro versions -->
+    <SystemFormatsAsn1Version>6.0.1</SystemFormatsAsn1Version>
+  </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj b/src/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj
index 3c58a55ae6..ec04d728f0 100644
--- a/src/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj
+++ b/src/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj
@@ -16,6 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="$(SrcDir)Microsoft.TemplateEngine.Abstractions\Microsoft.TemplateEngine.Abstractions.csproj" />
     <ProjectReference Include="$(SrcDir)Microsoft.TemplateEngine.Utils\Microsoft.TemplateEngine.Utils.csproj" />
+    <PackageReference Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
   </ItemGroup>
 
   <ItemGroup>

From f26dcd329cd334d7ebc8eb40278f0749b5b10905 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 30 Jul 2024 17:06:11 -0700
Subject: [PATCH 2/6] Per source build, need to add the version.details.xml
 entry

---
 eng/Version.Details.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 62f546ae12..1cd35981ff 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -27,5 +27,9 @@
       <Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
       <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
     </Dependency>
+    <Dependency Name="System.Formats.Asn1" Version="6.0.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>

From fe326737585d780ccef1363568096384fb6ae0a8 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Wed, 31 Jul 2024 11:48:17 -0700
Subject: [PATCH 3/6] add the source build info

---
 eng/Version.Details.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1cd35981ff..fad9634ee9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -30,6 +30,7 @@
     <Dependency Name="System.Formats.Asn1" Version="6.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
+      <SourceBuild RepoName="runtime" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

From 3f435665c384a6530ca3dd5d5bd60ff108846100 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Thu, 1 Aug 2024 13:19:24 -0700
Subject: [PATCH 4/6] Change the version to 8.0.1 and remove the maestro
 dependency

---
 eng/Version.Details.xml | 5 -----
 eng/Versions.props      | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fad9634ee9..62f546ae12 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -27,10 +27,5 @@
       <Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
       <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="System.Formats.Asn1" Version="6.0.1">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
-      <SourceBuild RepoName="runtime" ManagedOnly="true" />
-    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index ef1eacaf1f..621c23af27 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -24,6 +24,6 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Non-maestro versions -->
-    <SystemFormatsAsn1Version>6.0.1</SystemFormatsAsn1Version>
+    <SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
   </PropertyGroup>
 </Project>

From af7e0fc2e774582742b03ab0da90dbe266763b5f Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 13 Aug 2024 11:13:16 -0700
Subject: [PATCH 5/6] add back the version.details.xml entry

---
 eng/Version.Details.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 62f546ae12..03bce3d530 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -27,5 +27,10 @@
       <Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
       <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
     </Dependency>
+    <Dependency Name="System.Formats.Asn1" Version="8.0.1" >
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
+      <SourceBuild RepoName="runtime" ManagedOnly="true" />
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>

From a12ec4da4764489a5d96fece656840b973f21b5b Mon Sep 17 00:00:00 2001
From: Ella Hathaway <ellahath@umich.edu>
Date: Tue, 13 Aug 2024 21:27:21 +0000
Subject: [PATCH 6/6] Remove runtime intermediate dep + add asn1 to prebuilt
 baseline

---
 eng/SourceBuildPrebuiltBaseline.xml | 3 +++
 eng/Version.Details.xml             | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 5e86a6ecc7..87fa35f9be 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -6,6 +6,9 @@
     <!-- TODO: Ignore needed until https://github.com/dotnet/source-build/issues/3188 is addressed. -->
     <UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/*" />
 
+    <!-- Lifted to live version in VMR. -->
+    <UsagePattern IdentityGlob="System.Formats.Asn1/8.0.*" />
+
     <UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
   </IgnorePatterns>
 </UsageData>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 03bce3d530..e2e5ded6be 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -30,7 +30,6 @@
     <Dependency Name="System.Formats.Asn1" Version="8.0.1" >
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
-      <SourceBuild RepoName="runtime" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>