Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2026,8 +2026,6 @@ dotnet_diagnostic.PAS0002.severity = error # A baseline entry no longer exists i
dotnet_diagnostic.PAS0003.severity = error # A public symbol differs from its baseline entry
dotnet_diagnostic.PAS0004.severity = error # No public API baseline for this target framework
dotnet_diagnostic.PAS0005.severity = error # The public API baseline could not be read
dotnet_diagnostic.RS0016.severity = error # A public symbol is missing from the PublicAPI baseline
dotnet_diagnostic.RS0017.severity = error # A PublicAPI baseline entry no longer exists in source

###################
# Microsoft.NET.ILLink.Analyzers (IL)
Expand Down
15 changes: 10 additions & 5 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,20 @@
</ItemGroup>

<PropertyGroup>
<!-- Public-API tracking (RS0016/RS0017/RS0037). Re-enabled now the System.Reactive→Primitives seam
split has landed; baselines are regenerated with tools/generate-publicapi.*. tests/benchmarks/examples
stay off via their own Directory.Build.props. -->
<!-- Public-API tracking: one always-current PublicAPI.txt per TFM. Regenerate by running
`dotnet format analyzers` over the project for a single target framework, restricted to the
PAS0001 and PAS0003 diagnostics at severity info. -->
<TrackPublicApi Condition="'$(TrackPublicApi)' == ''">true</TrackPublicApi>
<TrackPublicApi Condition="'$(IsTestProject)' == 'true'">false</TrackPublicApi>
<!-- The WPF markup pass generates <Project>_<hash>_wpftmp.csproj in the real project's
directory, so it resolves the same baseline path and would overwrite it. -->
<TrackPublicApi Condition="$(MSBuildProjectName.EndsWith('_wpftmp'))">false</TrackPublicApi>
<EnablePublicApiBaseline>$(TrackPublicApi)</EnablePublicApiBaseline>
</PropertyGroup>
<!-- The package's own targets resolve PublicAPI/$(TargetFramework)/PublicAPI.txt per inner build
and add it to @(AdditionalFiles), so multi-targeting needs no wiring here. -->
<ItemGroup Condition="'$(TrackPublicApi)' == 'true'">
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="all" />
<AdditionalFiles Include="$(MSBuildProjectDirectory)\PublicAPI\$(TargetFramework)\PublicAPI.*.txt" />
<PackageReference Include="PublicApiSharp.Analyzers" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="'$(IsTestProject)' != 'true'">
Expand Down
10 changes: 5 additions & 5 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@

<PropertyGroup Label="Framework-Aligned Versions">
<MauiVersion Condition="$(TargetFramework.StartsWith('net10'))">10.0.90</MauiVersion>
<MauiVersion Condition="$(TargetFramework.StartsWith('net11'))">11.0.0-preview.6.26360.8</MauiVersion>
<MauiVersion Condition="$(TargetFramework.StartsWith('net11'))">11.0.0-preview.7.26406.9</MauiVersion>

<AspNetVersion Condition="$(TargetFramework.StartsWith('netstandard'))">3.1.32</AspNetVersion>
<AspNetVersion Condition="$(TargetFramework.StartsWith('net8'))">8.0.29</AspNetVersion>
<AspNetVersion Condition="$(TargetFramework.StartsWith('net9'))">9.0.18</AspNetVersion>
<AspNetVersion Condition="$(TargetFramework.StartsWith('net10'))">10.0.10</AspNetVersion>
<AspNetVersion Condition="$(TargetFramework.StartsWith('net11'))">11.0.0-preview.6.26359.118</AspNetVersion>
<AspNetVersion Condition="$(TargetFramework.StartsWith('net11'))">11.0.0-preview.7.26381.103</AspNetVersion>

<SystemTextJsonVersion>10.0.10</SystemTextJsonVersion>
<SystemTextJsonVersion Condition="$(TargetFramework.StartsWith('net11'))">11.0.0-preview.6.26359.118</SystemTextJsonVersion>
<SystemTextJsonVersion Condition="$(TargetFramework.StartsWith('net11'))">11.0.0-preview.7.26381.103</SystemTextJsonVersion>

<!-- Microsoft.Extensions.* and the runtime data packages track the framework: stable 10.0.x for
net8/9/10, the net11 preview on net11 so the net11 ReactiveUI.Primitives assemblies resolve. -->
<MicrosoftExtensionsVersion>10.0.10</MicrosoftExtensionsVersion>
<MicrosoftExtensionsVersion Condition="$(TargetFramework.StartsWith('net11'))">11.0.0-preview.6.26359.118</MicrosoftExtensionsVersion>
<MicrosoftExtensionsVersion Condition="$(TargetFramework.StartsWith('net11'))">11.0.0-preview.7.26381.103</MicrosoftExtensionsVersion>

<XamlBehaviorsWpfVersion Condition="$(TargetFramework.StartsWith('net4'))">1.1.142</XamlBehaviorsWpfVersion>
<XamlBehaviorsWpfVersion Condition="$(TargetFramework.StartsWith('net8'))">1.1.142</XamlBehaviorsWpfVersion>
Expand Down Expand Up @@ -91,7 +91,7 @@
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.31.0.145097"/>
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.6.0"/>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.6.0"/>
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.6.0"/>
<PackageVersion Include="PublicApiSharp.Analyzers" Version="1.0.7"/>
</ItemGroup>

<ItemGroup Label="Build / SourceLink / Versioning">
Expand Down
Loading
Loading