Merged PR 30659: Backport #21238, #21239, #21408, #21415 - and update SDK + dependencies

and cgmanifest
This commit is contained in:
Patrick Meinecke
2024-04-05 19:47:03 +00:00
parent b0692c1f07
commit 89c9bb64ef
14 changed files with 56 additions and 43 deletions
@@ -34,7 +34,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
<PackageReference Include="System.Threading.AccessControl" Version="8.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.1" />
<PackageReference Include="System.Drawing.Common" Version="8.0.3" />
<PackageReference Include="JsonSchema.Net" Version="5.2.7" />
<!-- This section is to force the version of non-direct dependencies -->
<PackageReference Include="Json.More.Net" Version="1.9.3" />
@@ -16,6 +16,8 @@
<ItemGroup>
<!-- This section is to force the version of non-direct dependencies -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.3" />
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
@@ -35,8 +37,7 @@
<PackageReference Include="System.Private.ServiceModel" Version="4.10.3" />
<PackageReference Include="System.Web.Services.Description" Version="4.10.3" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="5.0.17" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.3" />
</ItemGroup>
</Project>
@@ -10,12 +10,11 @@
<LangVersion>11.0</LangVersion>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
<NoWarn>RS1035</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
<!-- This section is to force the version of non-direct dependencies -->
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24202.4" PrivateAssets="all" />
</ItemGroup>
</Project>