Skip to content

Commit f51eda2

Browse files
sbomersbomer
committed
Clean up projects
1 parent 07e4566 commit f51eda2

File tree

25 files changed

+28
-190
lines changed

25 files changed

+28
-190
lines changed

‎src/Directory.Build.targets

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,13 @@
136136
</ItemGroup>
137137
</Target>
138138

139+
<!-- Disable validation source generator to allow working around issues with generated code. -->
140+
<Target Name="DisableValidationSourceGenerator"
141+
BeforeTargets="CoreCompile"
142+
Condition="'$(DisableValidationSourceGenerator)' == 'true'">
143+
<ItemGroup>
144+
<Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FileName)' == 'Microsoft.AspNetCore.Http.ValidationsGenerator'" />
145+
</ItemGroup>
146+
</Target>
147+
139148
</Project>

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
55
<PackAsTool>false</PackAsTool>
6-
<TargetFrameworks>$(LatestTargetFramework)</TargetFrameworks>
6+
<TargetFrameworks>$(ToolTargetFrameworks)</TargetFrameworks>
77
<DefineConstants>$(DefineConstants);EXTENSION</DefineConstants>
88
<IsPackable>true</IsPackable>
99
<IsShippingAssembly>true</IsShippingAssembly>
@@ -40,18 +40,4 @@
4040
</EmbeddedResource>
4141
</ItemGroup>
4242

43-
<ItemGroup>
44-
<KnownFrameworkReference
45-
Update="Microsoft.NETCore.App"
46-
TargetingPackVersion="$(NetCoreAppVersion)"
47-
DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)"
48-
LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
49-
50-
<KnownFrameworkReference
51-
Update="Microsoft.AspNetCore.App"
52-
TargetingPackVersion="$(AspNetCoreAppVersion)"
53-
DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)"
54-
LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
55-
</ItemGroup>
56-
5743
</Project>

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<Project>
2-
3-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.Web" />
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
42

53
<PropertyGroup>
64
<!--
@@ -11,7 +9,6 @@
119
<IsShippingAssembly>true</IsShippingAssembly>
1210
<OutputType>Library</OutputType>
1311
<Nullable>enable</Nullable>
14-
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
1512
</PropertyGroup>
1613

1714
<ItemGroup>
@@ -44,20 +41,4 @@
4441
</EmbeddedResource>
4542
</ItemGroup>
4643

47-
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.Web" />
48-
49-
<ItemGroup>
50-
<KnownFrameworkReference
51-
Update="Microsoft.NETCore.App"
52-
TargetingPackVersion="$(NetCoreAppVersion)"
53-
DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)"
54-
LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
55-
56-
<KnownFrameworkReference
57-
Update="Microsoft.AspNetCore.App"
58-
TargetingPackVersion="$(AspNetCoreAppVersion)"
59-
DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)"
60-
LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
61-
</ItemGroup>
62-
6344
</Project>

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

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
<Project>
2-
3-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.Web" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42

53
<PropertyGroup>
64
<TargetFrameworks>$(ToolTargetFrameworks)</TargetFrameworks>
7-
<InterceptorsNamespaces>$(InterceptorsNamespaces);Microsoft.AspNetCore.Http.Validation.Generated</InterceptorsNamespaces>
8-
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
5+
<DisableCompileTimeOpenApiXmlGenerator>true</DisableCompileTimeOpenApiXmlGenerator>
96
</PropertyGroup>
107

118
<ItemGroup>
@@ -21,27 +18,4 @@
2118
<ProjectReference Include="..\Microsoft.Diagnostics.Monitoring.Tool.UnitTestsSample\Microsoft.Diagnostics.Monitoring.Tool.UnitTestsSample.csproj" />
2219
</ItemGroup>
2320

24-
<ItemGroup>
25-
<KnownFrameworkReference
26-
Update="Microsoft.NETCore.App"
27-
TargetingPackVersion="$(NetCoreAppVersion)"
28-
DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)"
29-
LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
30-
31-
<KnownFrameworkReference
32-
Update="Microsoft.AspNetCore.App"
33-
TargetingPackVersion="$(AspNetCoreAppVersion)"
34-
DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)"
35-
LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
36-
</ItemGroup>
37-
38-
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.Web" />
39-
40-
<Target Name="RemoveAnalyzer" BeforeTargets="CoreCompile">
41-
<ItemGroup>
42-
<Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FileName)' == 'Microsoft.AspNetCore.Http.ValidationsGenerator'" />
43-
</ItemGroup>
44-
</Target>
45-
46-
4721
</Project>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@
66
runtime version. This specifically allows tests to run on a version of the runtime besides whatever was included with Arcade's SDK.
77
-->
88

9+
<PropertyGroup>
10+
<DotNetHostGeneratedFileName>$(IntermediateOutputPath)/$(TargetFramework)/TestDotNetHost.g.cs</DotNetHostGeneratedFileName>
11+
<NetCoreAppVersion Condition="'$(TargetFramework)' == 'net8.0'">$(MicrosoftNETCoreApp80Version)</NetCoreAppVersion>
12+
<NetCoreAppVersion Condition="'$(TargetFramework)' == 'net9.0'">$(MicrosoftNETCoreApp90Version)</NetCoreAppVersion>
13+
<NetCoreAppVersion Condition="'$(TargetFramework)' == 'net10.0'">$(MicrosoftNETCoreApp100Version)</NetCoreAppVersion>
14+
<AspNetCoreAppVersion Condition="'$(TargetFramework)' == 'net8.0'">$(MicrosoftAspNetCoreApp80Version)</AspNetCoreAppVersion>
15+
<AspNetCoreAppVersion Condition="'$(TargetFramework)' == 'net9.0'">$(MicrosoftAspNetCoreApp90Version)</AspNetCoreAppVersion>
16+
<AspNetCoreAppVersion Condition="'$(TargetFramework)' == 'net10.0'">$(MicrosoftAspNetCoreApp100Version)</AspNetCoreAppVersion>
17+
</PropertyGroup>
18+
919
<Target Name="GenerateDotNetHostSourceFile" Inputs="$(VersionsPropsPath)" Outputs="$(DotNetHostGeneratedFileName)">
1020
<PropertyGroup>
1121
<TemplateContent>$([System.IO.File]::ReadAllText('TestDotNetHost.cs.template'))</TemplateContent>

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
<Project>
2-
3-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42

53
<PropertyGroup>
64
<TargetFrameworks>$(TestTargetFrameworks)</TargetFrameworks>
75
<DefineConstants>$(DefineConstants);UNITTEST</DefineConstants>
8-
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
96
</PropertyGroup>
107

118
<ItemGroup>
@@ -38,8 +35,6 @@
3835
<InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.UnitTestApp" />
3936
</ItemGroup>
4037

41-
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
42-
4338
<Import Project="GenerateDotNetHost.targets" />
4439

4540
</Project>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<TargetFrameworks>$(TestTargetFrameworks)</TargetFrameworks>
55
<DefineConstants>$(DefineConstants);UNITTEST</DefineConstants>
6-
<NoWarn>$(NoWarn);NU1603</NoWarn>
76
</PropertyGroup>
87

98
<ItemGroup>

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFrameworks>$(ToolTargetFrameworks)</TargetFrameworks>
55
<DisableCompileTimeOpenApiXmlGenerator>true</DisableCompileTimeOpenApiXmlGenerator>
6-
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
6+
<DisableValidationSourceGenerator>true</DisableValidationSourceGenerator>
77
</PropertyGroup>
88

99
<ItemGroup>
@@ -29,15 +29,4 @@
2929
<InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.S3StorageTests.UnitTests" />
3030
</ItemGroup>
3131

32-
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
33-
<KnownFrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="$(NetCoreAppVersion)" DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)" LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
34-
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" TargetingPackVersion="$(AspNetCoreAppVersion)" DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
35-
</ItemGroup>
36-
37-
<Target Name="RemoveAnalyzer" BeforeTargets="CoreCompile">
38-
<ItemGroup>
39-
<Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FileName)' == 'Microsoft.AspNetCore.Http.ValidationsGenerator'" />
40-
</ItemGroup>
41-
</Target>
42-
4332
</Project>

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,4 @@
185185
</None>
186186
</ItemGroup>
187187

188-
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
189-
<KnownFrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="$(NetCoreAppVersion)" DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)" LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
190-
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" TargetingPackVersion="$(AspNetCoreAppVersion)" DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
191-
</ItemGroup>
192-
193-
<Target Name="RemoveAnalyzer" BeforeTargets="CoreCompile">
194-
<ItemGroup>
195-
<Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FileName)' == 'Microsoft.AspNetCore.Http.ValidationsGenerator'" />
196-
</ItemGroup>
197-
</Target>
198-
199188
</Project>

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,8 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

9-
<ItemGroup>
10-
<KnownFrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="$(NetCoreAppVersion)" DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)" LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
11-
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" TargetingPackVersion="$(AspNetCoreAppVersion)" DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
12-
</ItemGroup>
13-
149
<ItemGroup>
1510
<ProjectReference Include="..\..\Tools\dotnet-monitor\dotnet-monitor.csproj" />
1611
</ItemGroup>
1712

18-
<ItemGroup>
19-
<KnownFrameworkReference
20-
Update="Microsoft.NETCore.App"
21-
TargetingPackVersion="$(NetCoreAppVersion)"
22-
DefaultRuntimeFrameworkVersion="$(NetCoreAppVersion)"
23-
LatestRuntimeFrameworkVersion="$(NetCoreAppVersion)" />
24-
25-
<KnownFrameworkReference
26-
Update="Microsoft.AspNetCore.App"
27-
TargetingPackVersion="$(AspNetCoreAppVersion)"
28-
DefaultRuntimeFrameworkVersion="$(AspNetCoreAppVersion)"
29-
LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
30-
</ItemGroup>
31-
3213
</Project>

0 commit comments

Comments
 (0)