Skip to content

Commit 317444f

Browse files
author
John Luo
committed
Revert change that broke extensions references
Somehow we started compiling against extensions implementations, need to rework this logic
1 parent fd2027a commit 317444f

File tree

1 file changed

+55
-1
lines changed

1 file changed

+55
-1
lines changed

eng/targets/ResolveReferences.targets

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,61 @@
161161

162162
<!-- Substitute references to Extensions packages with with ref assemblies -->
163163
<ItemGroup Condition="'$(ReferenceReferenceAssemblies)' == 'true' AND '$(TargetFramework)' == 'netcoreapp3.0' AND '$(DisableExtensionsRefAssembliesSwap)' != 'true' ">
164-
<_ExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Condition=" Exists('$(MicrosoftInternalExtensionsRefsPath)%(FileName).dll') " />
164+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Abstractions" />
165+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Memory" />
166+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.SqlServer" />
167+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.StackExchangeRedis" />
168+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Abstractions" />
169+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.AzureKeyVault" />
170+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Binder" />
171+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.CommandLine" />
172+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration" />
173+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
174+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.FileExtensions" />
175+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Ini" />
176+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Json" />
177+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.KeyPerFile" />
178+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.NewtonsoftJson" />
179+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.UserSecrets" />
180+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
181+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DependencyInjection" />
182+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DiagnosticAdapter" />
183+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
184+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
185+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Abstractions" />
186+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Composite" />
187+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Embedded" />
188+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Physical" />
189+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileSystemGlobbing" />
190+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.Abstractions" />
191+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting" />
192+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.Systemd" />
193+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.WindowsServices" />
194+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Http" />
195+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Http.Polly" />
196+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Localization.Abstractions" />
197+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Localization" />
198+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Abstractions" />
199+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.AzureAppServices" />
200+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Configuration" />
201+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Console" />
202+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Debug" />
203+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging" />
204+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.EventLog" />
205+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.EventSource" />
206+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.TraceSource" />
207+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.ObjectPool" />
208+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
209+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options.DataAnnotations" />
210+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options" />
211+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Primitives" />
212+
<_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.WebEncoders" />
213+
<_ExtensionInternalRefAssemblies Include="Microsoft.JSInterop" />
214+
<_ExtensionInternalRefAssemblies Include="Mono.WebAssembly.Interop" />
215+
216+
<!-- Compute Extension and Non Extension references -->
217+
<_NonExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Exclude="@(_ExtensionInternalRefAssemblies)" />
218+
<_ExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Exclude="@(_NonExtensionPackageReferences)" />
165219

166220
<!-- Add Extensions packages with but exclude their compile assets -->
167221
<_LatestPackageReferenceWithVersion Remove="@(_ExtensionPackageReferences)" />

0 commit comments

Comments
 (0)