Skip to content

Commit 657f35a

Browse files
SimonZhao888SimonZhao888
authored
Merge pull request #9220 from dotnet/merge/release/9.0.1xx-to-release/9.0.3xx
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx'
2 parents 157b764 + 2f93a8a commit 657f35a

File tree

4 files changed

+71
-16
lines changed

4 files changed

+71
-16
lines changed

‎Directory.Packages.props‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,20 @@
1616
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.8.3" />
1717

1818
<!-- NuGet dependencies -->
19-
<PackageVersion Include="NuGet.Configuration" Version="6.13.2" />
20-
<PackageVersion Include="NuGet.Credentials" Version="6.13.2" />
21-
<PackageVersion Include="NuGet.Protocol" Version="6.13.2" />
19+
<PackageVersion Include="NuGet.Configuration" Version="$(NuGetConfigurationVersion)" />
20+
<PackageVersion Include="NuGet.Credentials" Version="$(NuGetCredentialsVersion)" />
21+
<PackageVersion Include="NuGet.Protocol" Version="$(NuGetProtocolVersion)" />
2222

2323
<!-- Roslyn-analyzers dependencies -->
2424
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
2525

2626
<!-- Runtime dependencies -->
27-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
28-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
29-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
27+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" />
28+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
29+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
3030
<PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" />
3131
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
32+
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
3233
</ItemGroup>
3334

3435
<!-- External dependencies -->
@@ -50,12 +51,6 @@
5051
<PackageVersion Update="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" Condition="'$(MicrosoftBuildFrameworkVersion)' != ''" />
5152
<PackageVersion Update="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" Condition="'$(MicrosoftBuildUtilitiesCoreVersion)' != ''" />
5253
<PackageVersion Update="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)" Condition="'$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)' != ''" />
53-
<PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" Condition="'$(MicrosoftExtensionsLoggingAbstractionsVersion)' != ''" />
54-
<PackageVersion Update="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" Condition="'$(MicrosoftExtensionsLoggingConsoleVersion)' != ''" />
55-
<PackageVersion Update="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" Condition="'$(MicrosoftExtensionsLoggingVersion)' != ''" />
5654
<PackageVersion Update="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" Condition="'$(NewtonsoftJsonVersion)' != ''" />
57-
<PackageVersion Update="NuGet.Configuration" Version="$(NuGetConfigurationVersion)" Condition="'$(NuGetConfigurationVersion)' != ''" />
58-
<PackageVersion Update="NuGet.Credentials" Version="$(NuGetCredentialsVersion)" Condition="'$(NuGetCredentialsVersion)' != ''" />
59-
<PackageVersion Update="NuGet.Protocol" Version="$(NuGetProtocolVersion)" Condition="'$(NuGetProtocolVersion)' != ''" />
6055
</ItemGroup>
6156
</Project>

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,15 @@
1010
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/9.0.*" />
1111
<UsagePattern IdentityGlob="Microsoft.Extensions.Logging.Abstractions/9.0.*" />
1212
<UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/9.0.*" />
13+
<UsagePattern IdentityGlob="NuGet.Common/6.12.*" />
14+
<UsagePattern IdentityGlob="NuGet.Configuration/6.12.*" />
15+
<UsagePattern IdentityGlob="NuGet.Credentials/6.12.*" />
16+
<UsagePattern IdentityGlob="NuGet.Frameworks/6.12.*" />
17+
<UsagePattern IdentityGlob="NuGet.Packaging/6.12.*" />
18+
<UsagePattern IdentityGlob="NuGet.Protocol/6.12.*" />
19+
<UsagePattern IdentityGlob="NuGet.Versioning/6.12.*" />
20+
<UsagePattern IdentityGlob="System.IO.Pipelines/9.0.*" />
21+
<UsagePattern IdentityGlob="System.Text.Encodings.Web/9.0.*" />
22+
<UsagePattern IdentityGlob="System.Text.Json/9.0.*" />
1323
</IgnorePatterns>
1424
</UsageData>

‎eng/Version.Details.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@
3434
<Uri>https://github.com/dotnet/runtime</Uri>
3535
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
3636
</Dependency>
37+
<Dependency Name="System.IO.Pipelines" Version="9.0.3">
38+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
39+
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
40+
</Dependency>
41+
<Dependency Name="System.Text.Encodings.Web" Version="9.0.3">
42+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
43+
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
44+
</Dependency>
45+
<Dependency Name="System.Text.Json" Version="9.0.3">
46+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
47+
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
48+
</Dependency>
3749
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.3">
3850
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
3951
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
@@ -50,5 +62,33 @@
5062
<Uri>https://github.com/dotnet/runtime</Uri>
5163
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
5264
</Dependency>
65+
<Dependency Name="NuGet.Common" Version="6.12.4">
66+
<Uri>https://github.com/nuget/nuget.client</Uri>
67+
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
68+
</Dependency>
69+
<Dependency Name="NuGet.Configuration" Version="6.12.4">
70+
<Uri>https://github.com/nuget/nuget.client</Uri>
71+
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
72+
</Dependency>
73+
<Dependency Name="NuGet.Credentials" Version="6.12.4">
74+
<Uri>https://github.com/nuget/nuget.client</Uri>
75+
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
76+
</Dependency>
77+
<Dependency Name="NuGet.Frameworks" Version="6.12.4">
78+
<Uri>https://github.com/nuget/nuget.client</Uri>
79+
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
80+
</Dependency>
81+
<Dependency Name="NuGet.Packaging" Version="6.12.4">
82+
<Uri>https://github.com/nuget/nuget.client</Uri>
83+
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
84+
</Dependency>
85+
<Dependency Name="NuGet.Protocol" Version="6.12.4">
86+
<Uri>https://github.com/nuget/nuget.client</Uri>
87+
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
88+
</Dependency>
89+
<Dependency Name="NuGet.Versioning" Version="6.12.4">
90+
<Uri>https://github.com/nuget/nuget.client</Uri>
91+
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
92+
</Dependency>
5393
</ToolsetDependencies>
5494
</Dependencies>

‎eng/Versions.props‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,19 @@
2020
<PropertyGroup>
2121
<!-- Non-maestro versions -->
2222
<SystemFormatsAsn1Version>9.0.0</SystemFormatsAsn1Version>
23-
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>
24-
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
25-
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.3</MicrosoftExtensionsLoggingConsolePackageVersion>
26-
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
23+
<SystemIOPipelinesVersion>9.0.3</SystemIOPipelinesVersion>
24+
<SystemTextEncodingsWebVersion>9.0.3</SystemTextEncodingsWebVersion>
25+
<SystemTextJsonVersion>9.0.3</SystemTextJsonVersion>
26+
<MicrosoftExtensionsLoggingVersion>9.0.3</MicrosoftExtensionsLoggingVersion>
27+
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.3</MicrosoftExtensionsLoggingAbstractionsVersion>
28+
<MicrosoftExtensionsLoggingConsoleVersion>9.0.3</MicrosoftExtensionsLoggingConsoleVersion>
29+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.3</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
30+
<NuGetCommonVersion>6.12.4</NuGetCommonVersion>
31+
<NuGetConfigurationVersion>6.12.4</NuGetConfigurationVersion>
32+
<NuGetCredentialsVersion>6.12.4</NuGetCredentialsVersion>
33+
<NuGetFrameworksVersion>6.12.4</NuGetFrameworksVersion>
34+
<NuGetPackagingVersion>6.12.4</NuGetPackagingVersion>
35+
<NuGetProtocolVersion>6.12.4</NuGetProtocolVersion>
36+
<NuGetVersioningVersion>6.12.4</NuGetVersioningVersion>
2737
</PropertyGroup>
2838
</Project>

0 commit comments

Comments
 (0)