Clean up projects

Author: sbomer

src/Directory.Build.targets

@@ -136,4 +136,13 @@
     </ItemGroup>
   </Target>
 
+  <!-- Disable validation source generator to allow working around issues with generated code. -->
+  <Target Name="DisableValidationSourceGenerator"
+          BeforeTargets="CoreCompile"
+          Condition="'$(DisableValidationSourceGenerator)' == 'true'">
+    <ItemGroup>
+      <Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FileName)' == 'Microsoft.AspNetCore.Http.ValidationsGenerator'" />
+    </ItemGroup>
+  </Target>
+
 </Project>

src/Microsoft.Diagnostics.Monitoring.Extension.Common/Microsoft.Diagnostics.Monitoring.Extension.Common.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <PackAsTool>false</PackAsTool>
-    <TargetFrameworks>$(LatestTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>$(ToolTargetFrameworks)</TargetFrameworks>
     <DefineConstants>$(DefineConstants);EXTENSION</DefineConstants>
     <IsPackable>true</IsPackable>
     <IsShippingAssembly>true</IsShippingAssembly>
@@ -40,18 +40,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>
-    <KnownFrameworkReference
-      Update="Microsoft.NETCore.App"
-      TargetingPackVersion="$(NetCoreAppVersion)"
-      DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)"
-      LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
-
-    <KnownFrameworkReference
-      Update="Microsoft.AspNetCore.App"
-      TargetingPackVersion="$(AspNetCoreAppVersion)"
-      DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)"
-      LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
-  </ItemGroup>
-
 </Project>

src/Microsoft.Diagnostics.Monitoring.Options/Microsoft.Diagnostics.Monitoring.Options.csproj

@@ -1,6 +1,4 @@
-<Project>
-
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.Web" />
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <!--
@@ -11,7 +9,6 @@
     <IsShippingAssembly>true</IsShippingAssembly>
     <OutputType>Library</OutputType>
     <Nullable>enable</Nullable>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
@@ -44,20 +41,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.Web" />
-
-  <ItemGroup>
-    <KnownFrameworkReference
-      Update="Microsoft.NETCore.App"
-      TargetingPackVersion="$(NetCoreAppVersion)"
-      DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)"
-      LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
-
-    <KnownFrameworkReference
-      Update="Microsoft.AspNetCore.App"
-      TargetingPackVersion="$(AspNetCoreAppVersion)"
-      DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)"
-      LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
-  </ItemGroup>
-
 </Project>

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

@@ -1,11 +1,8 @@
-<Project>
-
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.Web" />
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>$(ToolTargetFrameworks)</TargetFrameworks>
-    <InterceptorsNamespaces>$(InterceptorsNamespaces);Microsoft.AspNetCore.Http.Validation.Generated</InterceptorsNamespaces>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <DisableCompileTimeOpenApiXmlGenerator>true</DisableCompileTimeOpenApiXmlGenerator>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,27 +18,4 @@
     <ProjectReference Include="..\Microsoft.Diagnostics.Monitoring.Tool.UnitTestsSample\Microsoft.Diagnostics.Monitoring.Tool.UnitTestsSample.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <KnownFrameworkReference
-      Update="Microsoft.NETCore.App"
-      TargetingPackVersion="$(NetCoreAppVersion)"
-      DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)"
-      LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
-
-    <KnownFrameworkReference
-      Update="Microsoft.AspNetCore.App"
-      TargetingPackVersion="$(AspNetCoreAppVersion)"
-      DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)"
-      LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
-  </ItemGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.Web" />
-
-  <Target Name="RemoveAnalyzer" BeforeTargets="CoreCompile">
-    <ItemGroup>
-      <Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FileName)' == 'Microsoft.AspNetCore.Http.ValidationsGenerator'" />
-    </ItemGroup>
-  </Target>
-
-
 </Project>

src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/GenerateDotNetHost.targets

@@ -6,6 +6,16 @@
     runtime version. This specifically allows tests to run on a version of the runtime besides whatever was included with Arcade's SDK.
    -->
 
+  <PropertyGroup>
+    <DotNetHostGeneratedFileName>$(IntermediateOutputPath)/$(TargetFramework)/TestDotNetHost.g.cs</DotNetHostGeneratedFileName>
+    <NetCoreAppVersion Condition="'$(TargetFramework)' == 'net8.0'">$(MicrosoftNETCoreApp80Version)</NetCoreAppVersion>
+    <NetCoreAppVersion Condition="'$(TargetFramework)' == 'net9.0'">$(MicrosoftNETCoreApp90Version)</NetCoreAppVersion>
+    <NetCoreAppVersion Condition="'$(TargetFramework)' == 'net10.0'">$(MicrosoftNETCoreApp100Version)</NetCoreAppVersion>
+    <AspNetCoreAppVersion Condition="'$(TargetFramework)' == 'net8.0'">$(MicrosoftAspNetCoreApp80Version)</AspNetCoreAppVersion>
+    <AspNetCoreAppVersion Condition="'$(TargetFramework)' == 'net9.0'">$(MicrosoftAspNetCoreApp90Version)</AspNetCoreAppVersion>
+    <AspNetCoreAppVersion Condition="'$(TargetFramework)' == 'net10.0'">$(MicrosoftAspNetCoreApp100Version)</AspNetCoreAppVersion>
+  </PropertyGroup>
+
   <Target Name="GenerateDotNetHostSourceFile" Inputs="$(VersionsPropsPath)" Outputs="$(DotNetHostGeneratedFileName)">
     <PropertyGroup>
       <TemplateContent>$([System.IO.File]::ReadAllText('TestDotNetHost.cs.template'))</TemplateContent>

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

@@ -1,11 +1,8 @@
-<Project>
-
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>$(TestTargetFrameworks)</TargetFrameworks>
     <DefineConstants>$(DefineConstants);UNITTEST</DefineConstants>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
@@ -38,8 +35,6 @@
     <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.UnitTestApp" />
   </ItemGroup>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
   <Import Project="GenerateDotNetHost.targets" />
 
 </Project>

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

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>$(TestTargetFrameworks)</TargetFrameworks>
     <DefineConstants>$(DefineConstants);UNITTEST</DefineConstants>
-    <NoWarn>$(NoWarn);NU1603</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(ToolTargetFrameworks)</TargetFrameworks>
     <DisableCompileTimeOpenApiXmlGenerator>true</DisableCompileTimeOpenApiXmlGenerator>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <DisableValidationSourceGenerator>true</DisableValidationSourceGenerator>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,15 +29,4 @@
     <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.S3StorageTests.UnitTests" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
-    <KnownFrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="$(NetCoreAppVersion)" DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)" LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
-    <KnownFrameworkReference Update="Microsoft.AspNetCore.App" TargetingPackVersion="$(AspNetCoreAppVersion)" DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
-  </ItemGroup>
-
-  <Target Name="RemoveAnalyzer" BeforeTargets="CoreCompile">
-    <ItemGroup>
-      <Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FileName)' == 'Microsoft.AspNetCore.Http.ValidationsGenerator'" />
-    </ItemGroup>
-  </Target>
-
 </Project>

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

@@ -185,15 +185,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
-    <KnownFrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="$(NetCoreAppVersion)" DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)" LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
-    <KnownFrameworkReference Update="Microsoft.AspNetCore.App" TargetingPackVersion="$(AspNetCoreAppVersion)" DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
-  </ItemGroup>
-
-  <Target Name="RemoveAnalyzer" BeforeTargets="CoreCompile">
-    <ItemGroup>
-      <Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FileName)' == 'Microsoft.AspNetCore.Http.ValidationsGenerator'" />
-    </ItemGroup>
-  </Target>
-
 </Project>

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

@@ -6,27 +6,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <KnownFrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="$(NetCoreAppVersion)" DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)" LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
-    <KnownFrameworkReference Update="Microsoft.AspNetCore.App" TargetingPackVersion="$(AspNetCoreAppVersion)" DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Tools\dotnet-monitor\dotnet-monitor.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <KnownFrameworkReference
-      Update="Microsoft.NETCore.App"
-      TargetingPackVersion="$(NetCoreAppVersion)"
-      DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)"
-      LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
-
-    <KnownFrameworkReference
-      Update="Microsoft.AspNetCore.App"
-      TargetingPackVersion="$(AspNetCoreAppVersion)"
-      DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)"
-      LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
-  </ItemGroup>
-
 </Project>

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

@@ -1,6 +1,4 @@
-<Project>
-
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.Web" />
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -26,20 +24,4 @@
     <Compile Include="..\Microsoft.Diagnostics.Monitoring.StartupHook.UnitTests\ParameterCapturing\SampleMethods.cs" Link="Scenarios\FunctionProbes\SampleMethods.cs"/>
   </ItemGroup>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.Web" />
-
-  <ItemGroup>
-    <KnownFrameworkReference
-      Update="Microsoft.NETCore.App"
-      TargetingPackVersion="$(NetCoreAppVersion)"
-      DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)"
-      LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
-
-    <KnownFrameworkReference
-      Update="Microsoft.AspNetCore.App"
-      TargetingPackVersion="$(AspNetCoreAppVersion)"
-      DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)"
-      LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
-  </ItemGroup>
-
 </Project>

src/Tools/dotnet-monitor/Auth/ApiKey/MonitorApiKeyPostConfigure.cs

@@ -12,7 +12,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using System.Threading;
 
 namespace Microsoft.Diagnostics.Tools.Monitor.Auth.ApiKey
 {

src/Tools/dotnet-monitor/CollectionRules/ActionOptionsDependencyAnalyzer.cs

@@ -7,7 +7,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Text;

src/Tools/dotnet-monitor/CollectionRules/Actions/ICollectionRuleActionOperations.cs

@@ -4,7 +4,6 @@
 #nullable disable
 
 using Microsoft.Extensions.Configuration;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 

src/Tools/dotnet-monitor/CollectionRules/Configuration/CollectionRuleBindingHelper.cs

@@ -1,12 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Actions;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options;
-using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
-using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers;
-using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers.EventCounterShortcuts;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Triggers;
 using Microsoft.Extensions.Configuration;
 

src/Tools/dotnet-monitor/CollectionRules/Configuration/CollectionRulePostConfigureNamedOptions.cs

@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System;
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Actions;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options;

src/Tools/dotnet-monitor/Commands/CollectCommandHandler.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http.Validation;
 using Microsoft.Diagnostics.Monitoring;
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Tools.Monitor.Auth;

src/Tools/dotnet-monitor/Commands/GenerateApiKeyCommandHandler.cs

@@ -12,7 +12,6 @@
 using System.IO;
 using System.Text;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 
 namespace Microsoft.Diagnostics.Tools.Monitor.Commands
 {

src/Tools/dotnet-monitor/ConfigurationTokenParser.cs

@@ -1,14 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.Diagnostics.Tools.Monitor.CollectionRules;
-using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Actions;
-using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;

src/Tools/dotnet-monitor/Egress/Extension/EgressExtension.OutputParser.cs

@@ -8,7 +8,6 @@
 using System;
 using System.Diagnostics;
 using System.Text.Json;
-using System.Text.Json.Serialization.Metadata;
 using System.Threading;
 using System.Threading.Tasks;
 

src/Tools/dotnet-monitor/Egress/Extension/EgressExtension.cs

@@ -20,7 +20,6 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 

src/Tools/dotnet-monitor/Egress/Extension/EgressExtensionFactory.cs

@@ -2,11 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using Microsoft.AspNetCore.Http.Validation;
 using Microsoft.Diagnostics.Tools.Monitor.Egress.Configuration;
 using Microsoft.Diagnostics.Tools.Monitor.Extensibility;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace Microsoft.Diagnostics.Tools.Monitor.Egress.Extension
 {

src/Tools/dotnet-monitor/Exceptions/ExceptionsOperation.cs

@@ -17,7 +17,6 @@
 using Utils = Microsoft.Diagnostics.Monitoring.WebApi.Utilities;
 using Models = Microsoft.Diagnostics.Monitoring.WebApi.Models;
 using NameFormatter = Microsoft.Diagnostics.Monitoring.WebApi.Stacks.NameFormatter;
-using System.Text.Json.Serialization;
 
 namespace Microsoft.Diagnostics.Tools.Monitor.Exceptions
 {

src/Tools/dotnet-monitor/ValidatableTypes.cs

@@ -5,7 +5,6 @@
 using Microsoft.AspNetCore.Http.Validation.Generated;
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Monitoring.WebApi.Models;
-using Microsoft.Diagnostics.Tools.Monitor;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers;