Skip to content

[automated] Merge branch 'release/9.0.1xx' => 'main' #8306

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 24 commits into from
Aug 21, 2024
Merged

[automated] Merge branch 'release/9.0.1xx' => 'main' #8306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 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
fa45b12
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 14, 2024
e520696
RC2 Branding
marcpopMSFT Aug 14, 2024
9e9bd47
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/templatin…
Aug 15, 2024
7778fb6
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 15, 2024
015be0e
Merge pull request #8282 from dotnet/marcpopMSFT-rc2branding
marcpopMSFT Aug 15, 2024
7bbf4c1
Merge pull request #8289 from dotnet/darc-release/8.0.3xx-151bd9ba-38…
Aug 16, 2024
af1d3bd
Merge pull request #8281 from dotnet/merge/release/8.0.1xx-to-release…
Aug 16, 2024
4f41842
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/templatin…
Aug 16, 2024
79be4b5
Fix the format
Aug 16, 2024
fde288b
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Aug 16, 2024
9a6e3e8
Merge pull request #8292 from dotnet/merge/release/8.0.3xx-to-release…
Aug 19, 2024
d3c9d01
Merge pull request #8298 from dotnet/darc-release/9.0.1xx-a2fef38b-88…
Aug 19, 2024
8133468
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/templatin…
Aug 19, 2024
d499ae1
Use central package version management
Aug 19, 2024
0ae441f
Merge pull request #8300 from dotnet/merge/release/8.0.4xx-to-release…
dsplaisted Aug 20, 2024
091537c
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Aug 21, 2024
61bc02a
Merge branch 'main' of https://github.com/dotnet/templating into merg…
Aug 21, 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
1 change: 1 addition & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" />
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
</ItemGroup>

<!-- External dependencies -->
Expand Down
2 changes: 2 additions & 0 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@

<UsageData>
<IgnorePatterns>
<!-- Lifted to live version in VMR. -->
<UsagePattern IdentityGlob="System.Formats.Asn1/8.0.*" />
</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 @@ -29,5 +29,9 @@
<Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
<SourceBuild RepoName="arcade" 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>
6 changes: 5 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">alpha</PreReleaseVersionLabel>
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">1</PreReleaseVersionIteration>
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">2</PreReleaseVersionIteration>
<UsingToolXliff>true</UsingToolXliff>
<FlagNetStandard1XDependencies>true</FlagNetStandard1XDependencies>
</PropertyGroup>
<PropertyGroup>
<!-- Command-line-api dependencies -->
<SystemCommandLinePackageVersion>2.0.0-beta4.24324.3</SystemCommandLinePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Non-maestro versions -->
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion eng/common/templates-official/steps/get-federated-access-token.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ steps:
is1ESPipeline: true

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
2 changes: 1 addition & 1 deletion eng/common/templates/steps/get-federated-access-token.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ steps:
is1ESPipeline: false

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}