Skip to content

Commit bdb5982

Browse files
committed
Remove Blazor Compiler
1 parent 9e89a69 commit bdb5982

File tree

84 files changed

+55
-13421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+55
-13421
lines changed

build/artifacts.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ This can be done once #4246 is complete, and done in conjunction with converting
3636
<PackageArtifact Include="Microsoft.AspNetCore.Components.Analyzers" Category="ship" />
3737
<PackageArtifact Include="Microsoft.AspNetCore.Components.Browser" Category="ship" />
3838
<PackageArtifact Include="Microsoft.AspNetCore.Components.Build" Category="ship" />
39-
<PackageArtifact Include="Microsoft.AspNetCore.Components.Razor.Extensions" Category="ship" />
4039
<PackageArtifact Include="Microsoft.AspNetCore.Components.Server" Category="ship" />
4140
<PackageArtifact Include="Microsoft.AspNetCore.Components" Category="ship" />
4241
<PackageArtifact Include="Microsoft.AspNetCore.Connections.Abstractions" Category="ship" />

src/Components/Components.sln

Lines changed: 50 additions & 83 deletions
Large diffs are not rendered by default.

src/Components/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
4+
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
<UseCodebase>true</UseCodebase>
77
<!-- Don't import the directory props and targets, they aren't compatible with an old-style csproj -->
@@ -130,20 +130,6 @@
130130
<IncludeOutputGroupsInVSIXLocalOnly>
131131
</IncludeOutputGroupsInVSIXLocalOnly>
132132
</ProjectReference>
133-
<ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Components.Razor.Extensions\Microsoft.AspNetCore.Components.Razor.Extensions.csproj">
134-
<Name>Microsoft.AspNetCore.Components.Razor.Extensions</Name>
135-
<Private>False</Private>
136-
<IncludeOutputGroupsInVSIX>
137-
</IncludeOutputGroupsInVSIX>
138-
<IncludeOutputGroupsInVSIXLocalOnly>
139-
</IncludeOutputGroupsInVSIXLocalOnly>
140-
</ProjectReference>
141-
<Content Include="..\..\..\src\Microsoft.AspNetCore.Components.Razor.Extensions\bin\$(Configuration)\net461\Microsoft.AspNetCore.Components.Razor.Extensions.dll">
142-
<Link>Microsoft.AspNetCore.Components.Razor.Extensions.dll</Link>
143-
<IncludeInVSIX>true</IncludeInVSIX>
144-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
145-
<Visible>false</Visible>
146-
</Content>
147133
<ProjectReference Include="..\Microsoft.VisualStudio.LanguageServices.Blazor\Microsoft.VisualStudio.LanguageServices.Blazor.csproj">
148134
<Project>{b9f7f502-6dd2-4e77-8fd1-cbd76f695b26}</Project>
149135
<Name>Microsoft.VisualStudio.LanguageServices.Blazor</Name>
@@ -159,16 +145,6 @@
159145
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
160146
<Visible>false</Visible>
161147
</Content>
162-
<!--
163-
This is built as a P2P by Microsoft.VisualStudio.LanguageServices.Blazor. This is required, adding the P2P
164-
to this project will cause a NU1201 error that doesn't have a workaround.
165-
-->
166-
<Content Include="$(TargetDir)AngleSharp.dll">
167-
<Link>AngleSharp.dll</Link>
168-
<IncludeInVSIX>true</IncludeInVSIX>
169-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
170-
<Visible>false</Visible>
171-
</Content>
172148
</ItemGroup>
173149
<!--
174150
We need to generate the assembly attributes for our assembly using the version from the build, so

src/Components/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,10 @@
88
//
99
// The versions here need to match what the build is producing. If you change the version numbers
1010
// for the referenced assemblies, this needs to change as well.
11-
[assembly: ProvideBindingRedirection(
12-
AssemblyName = "Microsoft.AspNetCore.Components.Razor.Extensions",
13-
GenerateCodeBase = true,
14-
PublicKeyToken = "",
15-
OldVersionLowerBound = "0.0.0.0",
16-
OldVersionUpperBound = "3.0.0.0",
17-
NewVersion = "3.0.0.0")]
1811
[assembly: ProvideBindingRedirection(
1912
AssemblyName = "Microsoft.VisualStudio.LanguageServices.Blazor",
2013
GenerateCodeBase = true,
2114
PublicKeyToken = "",
2215
OldVersionLowerBound = "0.0.0.0",
2316
OldVersionUpperBound = "0.8.0.0",
24-
NewVersion = "0.8.0.0")]
25-
[assembly: ProvideBindingRedirection(
26-
AssemblyName = "AngleSharp",
27-
PublicKeyToken = "",
28-
OldVersionLowerBound = "0.0.0.0",
29-
OldVersionUpperBound = "0.9.9.0",
30-
NewVersion = "0.9.9.0")]
17+
NewVersion = "0.8.0.0")]

src/Components/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/source.extension.vsixmanifest

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
<Assets>
2121
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
2222
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="File" Path="Microsoft.VisualStudio.LanguageServices.Blazor.dll" />
23-
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="AngleSharp.dll" />
24-
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Microsoft.AspNetCore.Components.Razor.Extensions.dll" />
2523
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Microsoft.VisualStudio.LanguageServices.Blazor.dll" />
2624
<Asset Type="Microsoft.VisualStudio.VsPackage" Path="Templates.pkgdef" />
2725
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="CodeSnippets.pkgdef" />

src/Components/blazor/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/BlazorProjectEngineFactory.cs

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/Components/blazor/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/Microsoft.VisualStudio.LanguageServices.Blazor.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,4 @@
1515
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.6.46" />
1616
</ItemGroup>
1717

18-
<ItemGroup>
19-
<ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Components.Razor.Extensions\Microsoft.AspNetCore.Components.Razor.Extensions.csproj" />
20-
</ItemGroup>
2118
</Project>

src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<ItemGroup>
2020
<!-- Assemblies built by this project -->
2121
<SignedPackageFile Include="$(TargetFileName)" Certificate="$(AssemblySigningCertName)" />
22-
<SignedPackageFile Include="Microsoft.AspNetCore.Components.TagHelperWorkaround.dll" Certificate="$(AssemblySigningCertName)" />
2322
<SignedPackageFile Include="Microsoft.AspNetCore.Components.Browser.JS.dll" Certificate="$(AssemblySigningCertName)" />
2423
<SignedPackageFile Include="Microsoft.AspNetCore.Components.Build.exe" Certificate="$(AssemblySigningCertName)" />
2524

@@ -31,10 +30,6 @@
3130
<SignedPackageFile Include="Mono.Cecil.Rocks.dll" Certificate="$(AssemblySigning3rdPartyCertName)" />
3231

3332
<!-- Assemblies which should be signed by other build. -->
34-
<ExcludePackageFileFromSigning Include="Microsoft.AspNetCore.Razor.Language.dll" />
35-
<ExcludePackageFileFromSigning Include="Microsoft.CodeAnalysis.CSharp.dll" />
36-
<ExcludePackageFileFromSigning Include="Microsoft.CodeAnalysis.dll" />
37-
<ExcludePackageFileFromSigning Include="Microsoft.CodeAnalysis.Razor.dll" />
3833
<ExcludePackageFileFromSigning Include="Microsoft.Extensions.CommandLineUtils.dll" />
3934
<ExcludePackageFileFromSigning Include="Microsoft.Extensions.FileProviders.Abstractions.dll" />
4035
<ExcludePackageFileFromSigning Include="Microsoft.Extensions.FileProviders.Composite.dll" />
@@ -67,13 +62,8 @@
6762

6863
<ItemGroup>
6964
<ProjectReference Include="..\Microsoft.AspNetCore.Components.Browser.JS\Microsoft.AspNetCore.Components.Browser.JS.csproj" />
70-
<ProjectReference Include="..\Microsoft.AspNetCore.Components.Razor.Extensions\Microsoft.AspNetCore.Components.Razor.Extensions.csproj" />
71-
<ProjectReference Include="..\Microsoft.AspNetCore.Components.TagHelperWorkaround\Microsoft.AspNetCore.Components.TagHelperWorkaround.csproj" />
7265
<ProjectReference Include="..\Microsoft.AspNetCore.Components\Microsoft.AspNetCore.Components.csproj" />
7366

74-
<!-- Intentionally include Razor.Design's MSBuild assets for everyone who reference Blazor.Build -->
75-
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="$(MicrosoftAspNetCoreRazorDesignPackageVersion)" PrivateAssets="None" />
76-
7767
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
7868
<PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="$(AspNetCorePackageVersion)" />
7969
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(AspNetCorePackageVersion)" />

src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.nuspec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@
1313
<repository type="git" url="https://github.com/aspnet/aspnetcore" commit="$repositorycommit$" />
1414
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1515
<dependencies>
16-
<dependency id="Microsoft.AspNetCore.Razor.Design" version="$razorversion$" include="all" />
1716
<dependency id="Microsoft.AspNetCore.Components.Analyzers" version="$version$" include="all" />
1817
<dependency id="Microsoft.AspNetCore.Blazor.Mono" version="$blazormonoversion$" include="all" />
1918
</dependencies>
2019
</metadata>
2120
<files>
2221
<file src="..\..\THIRD-PARTY-NOTICES.txt" />
23-
<file src="$publishdir$netcoreapp3.0\Microsoft.AspNetCore.Components.TagHelperWorkaround.dll" target="lib/netstandard1.0/" />
2422
<file src="build\**" target="build" />
2523
<file src="targets\**" target="targets" />
2624
<file src="$publishdir$netcoreapp3.0\**\*" target="tools/" />

src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@
3333

3434
<ItemGroup>
3535
<PackageReference Include="Microsoft.AspNetCore.Blazor.Mono" Version="$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
36-
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
3736
</ItemGroup>
3837

3938
<!-- This is used as a P2P when building the repo. Normal Blazor projects will get this as a reference through the Blazor.Build package -->
4039
<ItemGroup>
41-
<ProjectReference Include="$(MSBuildThisFileDirectory)..\Microsoft.AspNetCore.Components.TagHelperWorkaround\Microsoft.AspNetCore.Components.TagHelperWorkaround.csproj" PrivateAssets="all" />
4240
<!-- Ensures these projects are built before the consuming project, but without
4341
adding a runtime dependency on the .dll (to be equivalent to a <PackageDependency>
4442
given that the packed version of this project wouldn't add a .dll reference) -->

0 commit comments

Comments
 (0)