Merge pull request #8292 from dotnet/merge/release/8.0.3xx-to-release…

…/8.0.4xx

[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx'

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>

eng/Version.Details.xml

@@ -27,5 +27,9 @@
  <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>
+ </Dependency>
  </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -22,4 +22,8 @@
  <!-- Dependencies from https://github.com/dotnet/command-line-api -->
  <SystemCommandLinePackageVersion>2.0.0-beta4.23407.1</SystemCommandLinePackageVersion>
  </PropertyGroup>
+ <PropertyGroup>
+ <!-- Non-maestro versions -->
+ <SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
+ </PropertyGroup>
 </Project>

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>