diff --git a/.editorconfig b/.editorconfig index c7f7ddc0e..fa6269db1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -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 diff --git a/Directory.Build.targets b/Directory.Build.targets index b18650649..2da41427e 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -17,7 +17,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -26,23 +26,23 @@ - - + + - + - - - - + + + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/build-tools/scripts/cecil.projitems b/build-tools/scripts/cecil.projitems index 400d9ef10..9dc9cac2b 100644 --- a/build-tools/scripts/cecil.projitems +++ b/build-tools/scripts/cecil.projitems @@ -1,7 +1,7 @@ - <_XamarinAndroidCecilVersion Condition=" '$(_XamarinAndroidCecilVersion)' == '' ">0.11.4 + <_XamarinAndroidCecilVersion Condition=" '$(_XamarinAndroidCecilVersion)' == '' ">0.11.6 diff --git a/global.json b/global.json index 40c464e57..e8f86e8d7 100644 --- a/global.json +++ b/global.json @@ -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" + } } \ No newline at end of file diff --git a/src/Java.Base-ref.cs b/src/Java.Base-ref.cs index 2e9526ceb..9b3d18120 100644 --- a/src/Java.Base-ref.cs +++ b/src/Java.Base-ref.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // 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. diff --git a/src/Java.Interop/Java.Interop.csproj b/src/Java.Interop/Java.Interop.csproj index 78cd1056e..4a29f6903 100644 --- a/src/Java.Interop/Java.Interop.csproj +++ b/src/Java.Interop/Java.Interop.csproj @@ -88,7 +88,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tools/param-name-importer/HtmlLoader.cs b/tools/param-name-importer/HtmlLoader.cs index 2e690f6f2..095ed9020 100644 --- a/tools/param-name-importer/HtmlLoader.cs +++ b/tools/param-name-importer/HtmlLoader.cs @@ -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)