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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ dotnet_diagnostic.CA5391.severity = suggestion # Use antiforgery tokens in ASP.N
dotnet_diagnostic.IA6450.severity = suggestion # Custom web token handler was found
dotnet_diagnostic.IA6451.severity = suggestion # Implement required validations for app asserted actor token

# Adding the FxCopAnalyzers NuGet package automatically starts analyzing code at the default
# Adding the NetAnalyzers NuGet package automatically starts analyzing code at the default
# severity levels for each rule. We're not ready for that yet, so disable all other rules.

dotnet_diagnostic.CA2310.severity = none # Do not use insecure deserializer NetDataContractSerializer
Expand Down
22 changes: 11 additions & 11 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<!-- Add Roslyn analyzers NuGet to all projects -->
<ItemGroup Condition=" '$(DisableRoslynAnalyzers)' != 'True' ">
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -26,23 +26,23 @@
<!-- NuGet Dependencies -->
<ItemGroup>
<PackageReference Update="GitInfo" Version="2.1.2" />
<PackageReference Update="HtmlAgilityPack" Version="1.11.30" />
<PackageReference Update="Irony" Version="1.1.0" />
<PackageReference Update="HtmlAgilityPack" Version="1.12.4" />
<PackageReference Update="Irony" Version="1.5.3" />
<PackageReference Update="Microsoft.Build.Framework" Version="17.3.2" />
<PackageReference Update="Microsoft.Build.Utilities.Core" Version="17.3.2" />
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Update="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24516.1" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221003-04" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageReference Update="Microsoft.Xml.SgmlReader" Version="1.8.16" />
<PackageReference Update="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.26301.3" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="18.6.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.300" />
<PackageReference Update="Microsoft.Xml.SgmlReader" Version="1.8.30" />
<PackageReference Update="Mono.CSharp" Version="4.0.0.143" />
<PackageReference Update="Mono.Linq.Expressions" Version="2.0.0" />
<PackageReference Update="Mono.Options" Version="6.12.0.148" />
<PackageReference Update="Mono.Terminal" Version="5.4.2" />
<PackageReference Update="nunit" Version="3.13.2" />
<PackageReference Update="NUnit.ConsoleRunner" Version="3.12.0" />
<PackageReference Update="NUnit3TestAdapter" Version="4.0.0">
<PackageReference Update="nunit" Version="3.14.0" />
<PackageReference Update="NUnit.ConsoleRunner" Version="3.22.0" />
<PackageReference Update="NUnit3TestAdapter" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion build-tools/scripts/cecil.projitems
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_XamarinAndroidCecilVersion Condition=" '$(_XamarinAndroidCecilVersion)' == '' ">0.11.4</_XamarinAndroidCecilVersion>
<_XamarinAndroidCecilVersion Condition=" '$(_XamarinAndroidCecilVersion)' == '' ">0.11.6</_XamarinAndroidCecilVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(_XamarinAndroidCecilPath)' == '' ">
<PackageReference Include="Mono.Cecil" Version="$(_XamarinAndroidCecilVersion)" />
Expand Down
12 changes: 6 additions & 6 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"sdk": {
"allowPrerelease": true
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "2.0.1"
}
"sdk": {
"allowPrerelease": true
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.134"
}
}
2 changes: 1 addition & 1 deletion src/Java.Base-ref.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// GenAPI Version: 8.0.11.1601
// GenAPI Version: 8.0.14.30103
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Expand Down
2 changes: 1 addition & 1 deletion src/Java.Interop/Java.Interop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4">
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion tools/param-name-importer/HtmlLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Sgml.SgmlDtd LoadHtmlDtd ()
"HTML",
"-//W3C//DTD HTML 4.01//EN",
"file:///strict.dtd",
string.Empty, new NameTable (), new EmbeddedResourceEntityResolver ());
string.Empty, new EmbeddedResourceEntityResolver ());
}

public XElement GetJavaDocFile (string path)
Expand Down