Skip to content

Commit 757afa1

Browse files
Move analyzers into separate solution
1 parent 0a170e1 commit 757afa1

35 files changed

+70
-33
lines changed

Diff for: Razor.sln

-25
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,6 @@ EndProject
172172
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Utilities.Shared.Test", "src\Shared\Microsoft.AspNetCore.Razor.Utilities.Shared.Test\Microsoft.AspNetCore.Razor.Utilities.Shared.Test.csproj", "{7275F376-1B63-49D3-8078-0F7CA15CC637}"
173173
EndProject
174174
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Utilities.Shared", "src\Shared\Microsoft.AspNetCore.Razor.Utilities.Shared\Microsoft.AspNetCore.Razor.Utilities.Shared.csproj", "{BAFE178B-7AD4-41AE-A75D-9B920B9EA050}"
175-
ProjectSection(ProjectDependencies) = postProject
176-
{7E1535D1-1896-406D-A58C-E734FBA482FE} = {7E1535D1-1896-406D-A58C-E734FBA482FE}
177-
EndProjectSection
178-
EndProject
179-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Razor.Diagnostics.Analyzers", "src\Shared\Razor.Diagnostics.Analyzers\Razor.Diagnostics.Analyzers.csproj", "{7E1535D1-1896-406D-A58C-E734FBA482FE}"
180-
EndProject
181-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Razor.Diagnostics.Analyzers.Test", "src\Shared\Razor.Diagnostics.Analyzers.Test\Razor.Diagnostics.Analyzers.Test.csproj", "{66744CCD-2F35-494F-9A1C-8FC3CE1EF729}"
182175
EndProject
183176
Global
184177
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -724,22 +717,6 @@ Global
724717
{BAFE178B-7AD4-41AE-A75D-9B920B9EA050}.Release|Any CPU.Build.0 = Release|Any CPU
725718
{BAFE178B-7AD4-41AE-A75D-9B920B9EA050}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
726719
{BAFE178B-7AD4-41AE-A75D-9B920B9EA050}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
727-
{7E1535D1-1896-406D-A58C-E734FBA482FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
728-
{7E1535D1-1896-406D-A58C-E734FBA482FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
729-
{7E1535D1-1896-406D-A58C-E734FBA482FE}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
730-
{7E1535D1-1896-406D-A58C-E734FBA482FE}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
731-
{7E1535D1-1896-406D-A58C-E734FBA482FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
732-
{7E1535D1-1896-406D-A58C-E734FBA482FE}.Release|Any CPU.Build.0 = Release|Any CPU
733-
{7E1535D1-1896-406D-A58C-E734FBA482FE}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
734-
{7E1535D1-1896-406D-A58C-E734FBA482FE}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
735-
{66744CCD-2F35-494F-9A1C-8FC3CE1EF729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
736-
{66744CCD-2F35-494F-9A1C-8FC3CE1EF729}.Debug|Any CPU.Build.0 = Debug|Any CPU
737-
{66744CCD-2F35-494F-9A1C-8FC3CE1EF729}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
738-
{66744CCD-2F35-494F-9A1C-8FC3CE1EF729}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
739-
{66744CCD-2F35-494F-9A1C-8FC3CE1EF729}.Release|Any CPU.ActiveCfg = Release|Any CPU
740-
{66744CCD-2F35-494F-9A1C-8FC3CE1EF729}.Release|Any CPU.Build.0 = Release|Any CPU
741-
{66744CCD-2F35-494F-9A1C-8FC3CE1EF729}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
742-
{66744CCD-2F35-494F-9A1C-8FC3CE1EF729}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
743720
EndGlobalSection
744721
GlobalSection(SolutionProperties) = preSolution
745722
HideSolutionNode = FALSE
@@ -819,8 +796,6 @@ Global
819796
{4126E0A6-1CA9-44B1-AD22-66EDB9FEE7AD} = {92463391-81BE-462B-AC3C-78C6C760741F}
820797
{7275F376-1B63-49D3-8078-0F7CA15CC637} = {3AE210D1-C435-4693-BF79-2EF13ED554B9}
821798
{BAFE178B-7AD4-41AE-A75D-9B920B9EA050} = {3AE210D1-C435-4693-BF79-2EF13ED554B9}
822-
{7E1535D1-1896-406D-A58C-E734FBA482FE} = {3AE210D1-C435-4693-BF79-2EF13ED554B9}
823-
{66744CCD-2F35-494F-9A1C-8FC3CE1EF729} = {3AE210D1-C435-4693-BF79-2EF13ED554B9}
824799
EndGlobalSection
825800
GlobalSection(ExtensibilityGlobals) = postSolution
826801
SolutionGuid = {0035341D-175A-4D05-95E6-F1C2785A1E26}

Diff for: eng/AfterSolutionBuild.targets

+5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22

33
<Target Name="_PublishLanguageServerRids" AfterTargets="Pack" Condition="'$(DotNetBuildFromSource)' != 'true'">
44
<PropertyGroup>
5+
<AnalyzersSolutionPath>$(MSBuildThisFileDirectory)..\src\Analyzers\Analyzers.sln</AnalyzersSolutionPath>
56
<LanguageServerProject>$(MSBuildThisFileDirectory)..\src\Razor\src\rzls\rzls.csproj</LanguageServerProject>
67
<RazorSolutionPath>$(MSBuildThisFileDirectory)..\Razor.sln</RazorSolutionPath>
78
</PropertyGroup>
89

10+
<MSBuild Projects="$(AnalyzersSolutionPath)"
11+
Targets="Restore" />
12+
<MSBuild Projects="$(AnalyzersSolutionPath)"
13+
Targets="Build" />
914
<MSBuild Projects="$(RazorSolutionPath)"
1015
Targets="Restore" />
1116
<MSBuild Projects="$(LanguageServerProject)"

Diff for: eng/Build.props

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9+
<ProjectToBuild Include="$(RepoRoot)src\Analyzers\Analyzers.sln" BuildInParallel="false" />
10+
911
<ProjectToBuild Condition="'$(OS)'=='WINDOWS_NT' and '$(SdkTaskProjects)'==''" Include="$(MSBuildThisFileDirectory)..\Razor.sln" />
1012

1113
<!-- Exclude VSIX projects on non-Windows -->

Diff for: src/Analyzers/Analyzers.sln

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.8.34117.57
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Razor.Diagnostics.Analyzers", "Razor.Diagnostics.Analyzers\Razor.Diagnostics.Analyzers.csproj", "{42438A8F-6284-443A-A518-9AAD5371A403}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Razor.Diagnostics.Analyzers.Test", "Razor.Diagnostics.Analyzers.Test\Razor.Diagnostics.Analyzers.Test.csproj", "{C886DAB3-E7ED-4ED2-9D14-342762B30CA1}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Any CPU = Debug|Any CPU
13+
Release|Any CPU = Release|Any CPU
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{42438A8F-6284-443A-A518-9AAD5371A403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{42438A8F-6284-443A-A518-9AAD5371A403}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{42438A8F-6284-443A-A518-9AAD5371A403}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{42438A8F-6284-443A-A518-9AAD5371A403}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{C886DAB3-E7ED-4ED2-9D14-342762B30CA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{C886DAB3-E7ED-4ED2-9D14-342762B30CA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{C886DAB3-E7ED-4ED2-9D14-342762B30CA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{C886DAB3-E7ED-4ED2-9D14-342762B30CA1}.Release|Any CPU.Build.0 = Release|Any CPU
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {F62A910A-9F8F-44CD-B8D7-8D7A88FF902A}
30+
EndGlobalSection
31+
EndGlobal

Diff for: src/Analyzers/Directory.Build.props

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Project>
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
3+
4+
<PropertyGroup>
5+
<PackageTags>aspnetcore;cshtml;razor</PackageTags>
6+
<IsPackable>true</IsPackable>
7+
<IsShipping>true</IsShipping>
8+
<IncludeSymbols>true</IncludeSymbols>
9+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
10+
11+
<!-- In theory we want to have this property set, but our pipeline doesn't set the access tokens yet -->
12+
<PublishWindowsPdb Condition="'$(DotNetSymbolServerTokenMsdl)'!='' and '$(DotNetSymbolServerTokenSymWeb)'!=''">true</PublishWindowsPdb>
13+
14+
<RollForward Condition="'$(IsTestProject)' == 'true'">LatestMajor</RollForward>
15+
</PropertyGroup>
16+
17+
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
18+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion)" NoWarn="NU1608" />
19+
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(Tooling_MicrosoftCodeAnalysisBannedApiAnalyzersPackageVersion)" />
20+
<PackageReference Include="Roslyn.Diagnostics.Analyzers" Version="$(Tooling_RoslynDiagnosticsAnalyzersPackageVersion)" />
21+
</ItemGroup>
22+
23+
</Project>

Diff for: src/Shared/Razor.Diagnostics.Analyzers.Test/Razor.Diagnostics.Analyzers.Test.csproj renamed to src/Analyzers/Razor.Diagnostics.Analyzers.Test/Razor.Diagnostics.Analyzers.Test.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks);$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks)</TargetFrameworks>
55
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(DefaultNetFxTargetFramework)</TargetFrameworks>
6+
<IsShippingPackage>false</IsShippingPackage>
67
</PropertyGroup>
78

89
<ItemGroup>
@@ -12,7 +13,6 @@
1213
</ItemGroup>
1314

1415
<ItemGroup>
15-
<ProjectReference Include="..\Microsoft.AspNetCore.Razor.Utilities.Shared\Microsoft.AspNetCore.Razor.Utilities.Shared.csproj" />
1616
<ProjectReference Include="..\Razor.Diagnostics.Analyzers\Razor.Diagnostics.Analyzers.csproj" />
1717
</ItemGroup>
1818

Diff for: src/Shared/Razor.Diagnostics.Analyzers.Test/Verifiers/CSharpAnalyzerVerifier`1+Test.cs renamed to src/Analyzers/Razor.Diagnostics.Analyzers.Test/Verifiers/CSharpAnalyzerVerifier`1+Test.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the MIT license. See License.txt in the project root for license information.
33

4-
using Microsoft.AspNetCore.Razor;
54
using Microsoft.CodeAnalysis.CSharp.Testing;
65
using Microsoft.CodeAnalysis.Diagnostics;
76
using Microsoft.CodeAnalysis.Testing.Verifiers;
@@ -17,8 +16,8 @@ public Test()
1716
{
1817
SolutionTransforms.Add((solution, projectId) =>
1918
{
20-
var compilationOptions = solution.GetProject(projectId).AssumeNotNull().CompilationOptions;
21-
compilationOptions = compilationOptions.AssumeNotNull().WithSpecificDiagnosticOptions(
19+
var compilationOptions = solution.GetProject(projectId)!.CompilationOptions;
20+
compilationOptions = compilationOptions!.WithSpecificDiagnosticOptions(
2221
compilationOptions.SpecificDiagnosticOptions.SetItems(CSharpVerifierHelper.NullableWarnings));
2322
solution = solution.WithProjectCompilationOptions(projectId, compilationOptions);
2423

Diff for: src/Shared/Razor.Diagnostics.Analyzers/Razor.Diagnostics.Analyzers.csproj renamed to src/Analyzers/Razor.Diagnostics.Analyzers/Razor.Diagnostics.Analyzers.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
7+
<ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
8+
<IsShippingPackage>false</IsShippingPackage>
79
</PropertyGroup>
810

911
<ItemGroup>

Diff for: src/Compiler/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@
4141
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" PrivateAssets="All" />
4242
<PackageReference Include="Roslyn.Diagnostics.Analyzers" PrivateAssets="All" />
4343

44-
<Analyzer Include="$(ArtifactsBinDir)\Razor.Diagnostics.Analyzers\$(Configuration)\netstandard2.0\Razor.Diagnostics.Analyzers.dll" />
44+
<Analyzer Include="$(ArtifactsBinDir)Razor.Diagnostics.Analyzers\$(Configuration)\netstandard2.0\Razor.Diagnostics.Analyzers.dll" />
4545
</ItemGroup>
4646
</Project>

Diff for: src/Razor/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageReference Include="Roslyn.Diagnostics.Analyzers" Version="$(Tooling_RoslynDiagnosticsAnalyzersPackageVersion)" />
1010

1111
<Analyzer Condition="'$(IsApiShim)' != 'true'"
12-
Include="$(ArtifactsBinDir)\Razor.Diagnostics.Analyzers\$(Configuration)\netstandard2.0\Razor.Diagnostics.Analyzers.dll" />
12+
Include="$(ArtifactsBinDir)Razor.Diagnostics.Analyzers\$(Configuration)\netstandard2.0\Razor.Diagnostics.Analyzers.dll" />
1313
</ItemGroup>
1414

1515
</Project>

Diff for: src/Shared/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PackageReference Include="Roslyn.Diagnostics.Analyzers" Version="$(Tooling_RoslynDiagnosticsAnalyzersPackageVersion)" />
2121

2222
<Analyzer Condition="'$(ProjectName)' != 'Razor.Diagnostics.Analyzers' AND '$(ProjectName)' != 'Razor.Diagnostics.Analyzers.Test'"
23-
Include="$(ArtifactsBinDir)\Razor.Diagnostics.Analyzers\$(Configuration)\netstandard2.0\Razor.Diagnostics.Analyzers.dll" />
23+
Include="$(ArtifactsBinDir)Razor.Diagnostics.Analyzers\$(Configuration)\netstandard2.0\Razor.Diagnostics.Analyzers.dll" />
2424
</ItemGroup>
2525

2626
</Project>

0 commit comments

Comments
 (0)