Skip to content

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' #8281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 16, 2024
Merged

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' #8281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0ada6e1
Add a direct reference to asn1 in the most shared project to resolve …
marcpopMSFT Jul 26, 2024
f26dcd3
Per source build, need to add the version.details.xml entry
marcpopMSFT Jul 31, 2024
fe32673
add the source build info
marcpopMSFT Jul 31, 2024
3f43566
Change the version to 8.0.1 and remove the maestro dependency
marcpopMSFT Aug 1, 2024
af7e0fc
add back the version.details.xml entry
marcpopMSFT Aug 13, 2024
a12ec4d
Remove runtime intermediate dep + add asn1 to prebuilt baseline
ellahathaway Aug 13, 2024
b8bd284
Merge pull request #8246 from dotnet/marcpopMSTF-fixformsreference
marcpopMSFT Aug 14, 2024
9e9bd47
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/templatin…
v-wuzhai Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 4 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 4 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 1 addition & 0 deletions src/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading