Skip to content

Commit 7fa9bf9

Browse files
authored
Merge pull request #8864 from dotnet/marcpopMSFT-updatepackages
Update the nuget and microsoft extensions packages
2 parents abdca53 + c17826b commit 7fa9bf9

File tree

4 files changed

+25
-28
lines changed

4 files changed

+25
-28
lines changed

Diff for: Directory.Packages.props

+6-14
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.8.3" />
1717

1818
<!-- NuGet dependencies -->
19-
<PackageVersion Include="NuGet.Configuration" Version="6.8.1" />
20-
<PackageVersion Include="NuGet.Credentials" Version="6.8.1" />
21-
<PackageVersion Include="NuGet.Protocol" Version="6.8.1" />
19+
<PackageVersion Include="NuGet.Configuration" Version="6.12.1" />
20+
<PackageVersion Include="NuGet.Credentials" Version="6.12.1" />
21+
<PackageVersion Include="NuGet.Protocol" Version="6.12.1" />
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="8.0.0" />
28-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
29-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
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)" />
3030
<PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" />
3131
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
3232
</ItemGroup>
@@ -58,12 +58,4 @@
5858
<PackageVersion Update="NuGet.Credentials" Version="$(NuGetCredentialsVersion)" Condition="'$(NuGetCredentialsVersion)' != ''" />
5959
<PackageVersion Update="NuGet.Protocol" Version="$(NuGetProtocolVersion)" Condition="'$(NuGetProtocolVersion)' != ''" />
6060
</ItemGroup>
61-
62-
<!-- Logging dependencies -->
63-
<ItemGroup>
64-
<PackageReference Update="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
65-
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
66-
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
67-
</ItemGroup>
68-
6961
</Project>

Diff for: eng/SourceBuildPrebuiltBaseline.xml

+5
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,10 @@
55
<IgnorePatterns>
66
<!-- Lifted to live version in VMR. -->
77
<UsagePattern IdentityGlob="System.Formats.Asn1/9.0.*" />
8+
<!--Runtime versions -->
9+
<UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/9.0.*" />
10+
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/9.0.*" />
11+
<UsagePattern IdentityGlob="Microsoft.Extensions.Logging.Abstractions/9.0.*" />
12+
<UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/9.0.*" />
813
</IgnorePatterns>
914
</UsageData>

Diff for: eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
99
</Dependency>
1010
<!-- Intermediate is necessary for source build. -->
11-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24413.1">
11+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25204.3">
1212
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
13-
<Sha>1b838a42e4952b8fdf212cb1b43c5ce4d69f27b3</Sha>
13+
<Sha>643689c88b1d5a0f1561383972c4189a0c673abe</Sha>
1414
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
1515
</Dependency>
1616
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.24324.3">
@@ -34,21 +34,21 @@
3434
<Uri>https://github.com/dotnet/runtime</Uri>
3535
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.3">
3838
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
39-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
39+
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0">
41+
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3">
4242
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
43-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
43+
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0">
45+
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.3">
4646
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
47-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
47+
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0">
49+
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.3">
5050
<Uri>https://github.com/dotnet/runtime</Uri>
51-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
51+
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
5252
</Dependency>
5353
</ToolsetDependencies>
5454
</Dependencies>

Diff for: eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<PropertyGroup>
2121
<!-- Non-maestro versions -->
2222
<SystemFormatsAsn1Version>9.0.0</SystemFormatsAsn1Version>
23-
<MicrosoftExtensionsLoggingPackageVersion>9.0.0</MicrosoftExtensionsLoggingPackageVersion>
24-
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>9.0.0</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
25-
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.0</MicrosoftExtensionsLoggingConsolePackageVersion>
26-
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>9.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
23+
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>
24+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
25+
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.3</MicrosoftExtensionsLoggingConsolePackageVersion>
26+
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
2727
</PropertyGroup>
2828
</Project>

0 commit comments

Comments
 (0)