зеркало из https://github.com/dotnet/razor.git
Stop shipping and NGEN'ing various .NET runtime binaries
Razor tooling has shipped and NGEN'd versions of the Microsoft.Extensions.* assemblies that it uses (and a couple other assemblies). However, in recent months, these assemblies have been added to Visual Studio in `Common7\IDE\PublicAssemblies`. So, Razor no longer needs to ship them.
This commit is contained in:
Dustin Campbell
Родитель
b16dc7981c
Коммит
c7e9f0d4c9
|
|
@ -9,7 +9,7 @@
|
|||
<_MicrosoftVisualStudioShellPackagesVersion>17.9.36524</_MicrosoftVisualStudioShellPackagesVersion>
|
||||
<_MicrosoftVisualStudioPackagesVersion>17.10.72-preview</_MicrosoftVisualStudioPackagesVersion>
|
||||
<_VisualStudioLanguageServerProtocolVersion>17.10.34-preview</_VisualStudioLanguageServerProtocolVersion>
|
||||
<_MicrosoftExtensionsPackageVersion>6.0.0</_MicrosoftExtensionsPackageVersion>
|
||||
<_MicrosoftExtensionsPackageVersion>8.0.0</_MicrosoftExtensionsPackageVersion>
|
||||
<_BenchmarkDotNetPackageVersion>0.13.5.2136</_BenchmarkDotNetPackageVersion>
|
||||
<_MicrosoftVisualStudioExtensibilityTestingVersion>0.1.187-beta</_MicrosoftVisualStudioExtensibilityTestingVersion>
|
||||
<_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.11.0-beta1.24170.2</_MicrosoftCodeAnalysisAnalyzersPackageVersion>
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
<PackageVersion Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(_MicrosoftVisualStudioPackagesVersion)" />
|
||||
<!--
|
||||
This package should use _VisualStudioLanguageServerProtocolVersion, but as of updating there was
|
||||
a mismatch in published versions (17.10.108-preview was not published).Next time this is updated please switch back to
|
||||
a mismatch in published versions (17.10.108-preview was not published).Next time this is updated please switch back to
|
||||
_VisualStudioLanguageServerProtocolVersion if possible
|
||||
-->
|
||||
<PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client.Implementation" Version="17.10.108-preview" />
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
|
||||
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
|
||||
<PackageVersion Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" />
|
||||
<PackageVersion Include="System.Text.Encodings.Web" Version="6.0.0" />
|
||||
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
|
||||
<PackageVersion Include="System.Text.Json" Version="6.0.0" />
|
||||
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
|
||||
<PackageVersion Include="xunit" Version="$(_XunitPackageVersion)" />
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the MIT license. See License.txt in the project root for license information.
|
||||
|
||||
using Microsoft.VisualStudio.Shell;
|
||||
|
||||
[assembly: ProvideBindingRedirection(
|
||||
AssemblyName = "Microsoft.Extensions.DependencyInjection",
|
||||
GenerateCodeBase = true,
|
||||
PublicKeyToken = "adb9793829ddae60",
|
||||
OldVersionLowerBound = "0.0.0.0",
|
||||
OldVersionUpperBound = "6.0.0.0",
|
||||
NewVersion = "6.0.0.0")]
|
||||
[assembly: ProvideBindingRedirection(
|
||||
AssemblyName = "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
GenerateCodeBase = true,
|
||||
PublicKeyToken = "adb9793829ddae60",
|
||||
OldVersionLowerBound = "0.0.0.0",
|
||||
OldVersionUpperBound = "6.0.0.0",
|
||||
NewVersion = "6.0.0.0")]
|
||||
[assembly: ProvideBindingRedirection(
|
||||
AssemblyName = "Microsoft.Extensions.ObjectPool",
|
||||
GenerateCodeBase = true,
|
||||
PublicKeyToken = "adb9793829ddae60",
|
||||
OldVersionLowerBound = "0.0.0.0",
|
||||
OldVersionUpperBound = "8.0.0.0",
|
||||
NewVersion = "8.0.0.0")]
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the MIT license. See License.txt in the project root for license information.
|
||||
|
||||
using Microsoft.VisualStudio.Shell;
|
||||
|
||||
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.ObjectPool.dll")]
|
||||
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.DependencyInjection.dll")]
|
||||
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.DependencyInjection.Abstractions.dll")]
|
||||
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.IO.Pipelines.dll")]
|
||||
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Threading.Channels.dll")]
|
||||
|
|
@ -131,18 +131,6 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!--
|
||||
***************************************************************************************************************************************
|
||||
NOTE: Adding OSS components to this list must be reviewed against our component governance standards. For now this is a curated list. You can read more about the CG process at https://aka.ms/component-governance
|
||||
***************************************************************************************************************************************
|
||||
-->
|
||||
<RazorNgendVSIXSourceItem Include="$(OutputPath)Microsoft.Extensions.ObjectPool.dll" />
|
||||
<RazorNgendVSIXSourceItem Include="$(OutputPath)Microsoft.Extensions.DependencyInjection.dll" />
|
||||
<RazorNgendVSIXSourceItem Include="$(OutputPath)Microsoft.Extensions.DependencyInjection.Abstractions.dll" />
|
||||
<RazorNgendVSIXSourceItem Include="$(OutputPath)System.IO.Pipelines.dll" />
|
||||
<RazorNgendVSIXSourceItem Include="$(OutputPath)System.Runtime.CompilerServices.Unsafe.dll" />
|
||||
<RazorNgendVSIXSourceItem Include="$(OutputPath)System.Threading.Channels.dll" />
|
||||
|
||||
<VSIXSourceItem Include="$(OutputPath)Microsoft.VisualStudio.LanguageServer.Protocol.dll" />
|
||||
<VSIXSourceItem Include="$(OutputPath)Microsoft.VisualStudio.LanguageServer.Protocol.Extensions.dll" />
|
||||
<VSIXSourceItem Include="$(OutputPath)Microsoft.VisualStudio.LanguageServer.Protocol.Internal.dll" />
|
||||
|
|
|
|||
|
|
@ -32,12 +32,6 @@
|
|||
<!-- ServiceHub assets are added by msbuild target -->
|
||||
<!--#SERVICEHUB_ASSETS#-->
|
||||
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.CodeAnalysis.Razor.Compiler.dll" />
|
||||
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.Extensions.ObjectPool.dll" />
|
||||
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.Extensions.DependencyInjection.dll" />
|
||||
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.Extensions.DependencyInjection.Abstractions.dll" />
|
||||
<Asset Type="Microsoft.VisualStudio.Assembly" Path="System.IO.Pipelines.dll" />
|
||||
<Asset Type="Microsoft.VisualStudio.Assembly" Path="System.Runtime.CompilerServices.Unsafe.dll" />
|
||||
<Asset Type="Microsoft.VisualStudio.Assembly" Path="System.Threading.Channels.dll" />
|
||||
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.AspNetCore.Razor.LanguageServer.dll" />
|
||||
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.CodeAnalysis.Razor.Workspaces.dll" />
|
||||
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.VisualStudio.LanguageServices.Razor.dll" />
|
||||
|
|
@ -50,7 +44,6 @@
|
|||
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.dll" />
|
||||
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.dll" />
|
||||
<Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.CodeAnalysis.Razor.Compiler.dll" />
|
||||
<Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.Extensions.ObjectPool.dll" />
|
||||
<Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.AspNetCore.Razor.Utilities.Shared.dll" />
|
||||
</Assets>
|
||||
</PackageManifest>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче