Skip to content

Commit 976e770

Browse files
committed
Some cleanup
1 parent 8949acf commit 976e770

File tree

7 files changed

+2
-42
lines changed

7 files changed

+2
-42
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftExtensionsConfigurationAbstractions70Version)</MicrosoftExtensionsConfigurationAbstractionsVersion>
105105
<MicrosoftExtensionsLoggingVersion>$(MicrosoftExtensionsLogging70Version)</MicrosoftExtensionsLoggingVersion>
106106
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractions70Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
107-
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExte nsionsLoggingConsole70Version)</MicrosoftExtensionsLoggingConsoleVersion>
107+
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsole70Version)</MicrosoftExtensionsLoggingConsoleVersion>
108108
<SystemTextJsonVersion>$(SystemTextJson80Version)</SystemTextJsonVersion>
109109
</PropertyGroup>
110110
<PropertyGroup Label=".NET 8 Dependent" Condition=" '$(TargetFramework)' == 'net8.0' ">

src/Tests/CollectionRuleActions.UnitTests/CollectionRuleActions.UnitTests.csproj

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,4 @@
1717
<PackageReference Include="Microsoft.AspNetCore.OpenApi" GeneratePathProperty="true" />
1818
</ItemGroup>
1919

20-
<!-- Disable openapi generation based on XML comments, as this produces invalid
21-
generated code for doc comments with quotes: https://github.com/dotnet/aspnetcore/issues/60783 -->
22-
<Target Name="DisableCompileTimeOpenApiXmlGenerator" BeforeTargets="CoreCompile">
23-
<ItemGroup>
24-
<Analyzer Remove="$(PkgMicrosoft_AspNetCore_OpenApi)/analyzers/dotnet/cs/Microsoft.AspNetCore.OpenApi.SourceGenerators.dll" />
25-
</ItemGroup>
26-
</Target>
27-
28-
2920
</Project>

src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen/Microsoft.Diagnostics.Monitoring.OpenApiGen.csproj

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,12 @@
55
<TargetFrameworks>$(ToolTargetFrameworks)</TargetFrameworks>
66
<Nullable>enable</Nullable>
77
<InterceptorsNamespaces>$(InterceptorsNamespaces);Microsoft.AspNetCore.OpenApi.Generated</InterceptorsNamespaces>
8+
<DisableCompileTimeOpenApiXmlGenerator>true</DisableCompileTimeOpenApiXmlGenerator>
89
</PropertyGroup>
910

1011
<ItemGroup>
1112
<ProjectReference Include="..\..\Tools\dotnet-monitor\dotnet-monitor.csproj" />
1213
<PackageReference Include="Microsoft.AspNetCore.OpenApi" GeneratePathProperty="true" />
1314
</ItemGroup>
1415

15-
<!-- Disable openapi generation based on XML comments, as this produces invalid
16-
generated code for doc comments with quotes: https://github.com/dotnet/aspnetcore/issues/60783 -->
17-
<Target Name="DisableCompileTimeOpenApiXmlGenerator" BeforeTargets="CoreCompile">
18-
<ItemGroup>
19-
<Analyzer Remove="$(PkgMicrosoft_AspNetCore_OpenApi)/analyzers/dotnet/cs/Microsoft.AspNetCore.OpenApi.SourceGenerators.dll" />
20-
</ItemGroup>
21-
</Target>
22-
2316
</Project>

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,4 @@
2929
<InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.S3StorageTests.UnitTests" />
3030
</ItemGroup>
3131

32-
<!-- Disable openapi generation based on XML comments, as this produces invalid
33-
generated code for doc comments with quotes: https://github.com/dotnet/aspnetcore/issues/60783 -->
34-
<Target Name="DisableCompileTimeOpenApiXmlGenerator" BeforeTargets="CoreCompile">
35-
<ItemGroup>
36-
<Analyzer Remove="$(PkgMicrosoft_AspNetCore_OpenApi)/analyzers/dotnet/cs/Microsoft.AspNetCore.OpenApi.SourceGenerators.dll" />
37-
</ItemGroup>
38-
</Target>
39-
4032
</Project>

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,4 @@
183183
</None>
184184
</ItemGroup>
185185

186-
<!-- Disable openapi generation based on XML comments, as this produces invalid
187-
generated code for doc comments with quotes: https://github.com/dotnet/aspnetcore/issues/60783 -->
188-
<Target Name="DisableCompileTimeOpenApiXmlGenerator" BeforeTargets="CoreCompile">
189-
<ItemGroup>
190-
<Analyzer Remove="$(PkgMicrosoft_AspNetCore_OpenApi)/analyzers/dotnet/cs/Microsoft.AspNetCore.OpenApi.SourceGenerators.dll" />
191-
</ItemGroup>
192-
</Target>
193-
194186
</Project>

src/Tools/dotnet-monitor/Auth/AzureAd/AzureAdAuthConfigurator.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
using System;
1515
using System.Collections.Generic;
1616
using System.Threading.Tasks;
17-
using System.Collections.Generic;
1817

1918
namespace Microsoft.Diagnostics.Tools.Monitor.Auth.AzureAd
2019
{

src/Tools/dotnet-monitor/dotnet-monitor.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@
1414
<DisableCompileTimeOpenApiXmlGenerator>true</DisableCompileTimeOpenApiXmlGenerator>
1515
</PropertyGroup>
1616

17-
<!-- Disable openapi generation based on XML comments, as this produces invalid
18-
generated code for doc comments with quotes: https://github.com/dotnet/aspnetcore/issues/60783 -->
19-
<Target Name="DisableCompileTimeOpenApiXmlGenerator" BeforeTargets="CoreCompile">
20-
<ItemGroup>
21-
<Analyzer Remove="$(PkgMicrosoft_AspNetCore_OpenApi)/analyzers/dotnet/cs/Microsoft.AspNetCore.OpenApi.SourceGenerators.dll" />
22-
</ItemGroup>
23-
</Target>
2417

2518
<ItemGroup>
2619
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />

0 commit comments

Comments
 (0)