Skip to content

Commit 73fd0fc

Browse files
Upgrade other dependencies that were bringing in Microsoft.Extensions.DependencyInjection.Abstractions 6.0.0 (#16364)
Co-authored-by: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com>
1 parent 1be4bb1 commit 73fd0fc

File tree

2 files changed

+38
-14
lines changed

2 files changed

+38
-14
lines changed

eng/Version.Details.xml

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@
5656
<Uri>https://github.com/dotnet/roslyn</Uri>
5757
<Sha>7cd773320dcccaaedb8f91c314aaa83dc7e171ce</Sha>
5858
</Dependency>
59-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.22103.2">
60-
<Uri>https://github.com/dotnet/linker</Uri>
61-
<Sha>3efd231da430baa0fd670e278f6b5c3e62834bde</Sha>
62-
</Dependency>
6359
<Dependency Name="Microsoft.SymbolManifestGenerator" Version="8.0.0-preview.24461.2">
6460
<Uri>https://github.com/dotnet/diagnostics</Uri>
6561
<Sha>3007744d190d50dc586acdb761c4ce6c0d5bdc15</Sha>
@@ -82,11 +78,27 @@
8278
<Uri>https://github.com/dotnet/runtime</Uri>
8379
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
8480
</Dependency>
85-
<!-- Latest preview version required by source-build. The dependency is loaded in during built-time
86-
by consumers of SharedFramework.Sdk (such as runtime), so we cannot use a ref pack for it -->
87-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-preview.4.23259.5">
81+
<!-- Necessary for source-build. This allows the live version of the dependency
82+
to flow in and eliminates related prebuilts. -->
83+
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2">
84+
<Uri>https://github.com/dotnet/runtime</Uri>
85+
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
86+
</Dependency>
87+
<!-- Necessary for source-build. This allows the live version of the dependency
88+
to flow in and eliminates related prebuilts. -->
89+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="8.0.1">
8890
<Uri>https://github.com/dotnet/runtime</Uri>
89-
<Sha>547c506abe05e510bd43330fc8f6d4c5961e9223</Sha>
91+
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
92+
</Dependency>
93+
<!-- Necessary for source-build. The dependency is loaded in during built-time
94+
by consumers of SharedFramework.Sdk (such as runtime), so we cannot use a ref pack for it -->
95+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.2">
96+
<Uri>https://github.com/dotnet/runtime</Uri>
97+
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
98+
</Dependency>
99+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.22-servicing.25527.7">
100+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
101+
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
90102
<SourceBuild RepoName="runtime" ManagedOnly="false" />
91103
</Dependency>
92104
<!-- Explicit dependency because msbuild has a coherency tie to this dependency. -->
@@ -95,7 +107,21 @@
95107
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
96108
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
97109
</Dependency>
98-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23475.1">
110+
<!-- Necessary for source-build. This allows the live version of the dependency
111+
to flow in and eliminates related prebuilts. -->
112+
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.1">
113+
<Uri>https://github.com/dotnet/runtime</Uri>
114+
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
115+
</Dependency>
116+
<Dependency Name="System.Text.Encodings.Web" Version="8.0.0">
117+
<Uri>https://github.com/dotnet/runtime</Uri>
118+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
119+
</Dependency>
120+
<Dependency Name="System.Text.Json" Version="8.0.5">
121+
<Uri>https://github.com/dotnet/runtime</Uri>
122+
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
123+
</Dependency>
124+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24067.1">
99125
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
100126
<Sha>0650b50b2a5263c735d12b5c36c5deb34e7e6b60</Sha>
101127
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />

eng/Versions.props

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
<!-- dotnet-symuploader -->
2424
<MicrosoftSymbolUploaderBuildTaskVersion>2.0.0-preview.1.23470.14</MicrosoftSymbolUploaderBuildTaskVersion>
2525
<MicrosoftSymbolUploaderVersion>2.0.0-preview.1.23470.14</MicrosoftSymbolUploaderVersion>
26-
<!-- linker -->
27-
<MicrosoftNETILLinkTasksVersion>6.0.100-1.22103.2</MicrosoftNETILLinkTasksVersion>
2826
<!-- msbuild -->
2927
<MicrosoftBuildFrameworkVersion>17.3.2</MicrosoftBuildFrameworkVersion>
3028
<MicrosoftBuildTasksCoreVersion>17.3.2</MicrosoftBuildTasksCoreVersion>
@@ -43,9 +41,9 @@
4341
<MicrosoftNetCompilersToolsetVersion>4.6.0</MicrosoftNetCompilersToolsetVersion>
4442
<!-- runtime -->
4543
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.2</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
46-
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0</MicrosoftExtensionsDependencyInjectionVersion>
47-
<MicrosoftExtensionsDependencyModelVersion>8.0.0-preview.4.23259.5</MicrosoftExtensionsDependencyModelVersion>
48-
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
44+
<MicrosoftExtensionsDependencyInjectionVersion>8.0.1</MicrosoftExtensionsDependencyInjectionVersion>
45+
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
46+
<MicrosoftExtensionsLoggingConsoleVersion>8.0.1</MicrosoftExtensionsLoggingConsoleVersion>
4947
<MicrosoftNETCorePlatformsVersion>5.0.0</MicrosoftNETCorePlatformsVersion>
5048
<MicrosoftNETRuntimeEmscripten2023Nodewin_x64>6.0.4</MicrosoftNETRuntimeEmscripten2023Nodewin_x64>
5149
<MicrosoftNETRuntimeEmscripten2023Pythonwin_x64>6.0.4</MicrosoftNETRuntimeEmscripten2023Pythonwin_x64>

0 commit comments

Comments
 (0)