From c3d083e3e8841336bd84fc84d863ec7f3b84c578 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jun 2026 15:48:09 +0000
Subject: [PATCH 1/7] Bump the nuget-dependencies group with 15 updates

Bumps HtmlAgilityPack from 1.11.30 to 1.12.4
Bumps Irony from 1.1.0 to 1.5.3
Bumps Microsoft.Build.NoTargets from 2.0.1 to 3.7.134
Bumps Microsoft.CodeAnalysis.CSharp from 4.3.1 to 5.3.0
Bumps Microsoft.CodeAnalysis.FxCopAnalyzers from 3.3.0 to 3.3.2
Bumps Microsoft.CodeAnalysis.PublicApiAnalyzers from 3.3.4 to 4.14.0
Bumps Microsoft.DotNet.GenAPI from 8.0.0-beta.24516.1 to 8.0.0-beta.26301.3
Bumps Microsoft.NET.Test.Sdk from 17.5.0-preview-20221003-04 to 18.6.0
Bumps Microsoft.SourceLink.GitHub from 1.1.1 to 10.0.300
Bumps Microsoft.Xml.SgmlReader from 1.8.16 to 1.8.30
Bumps Mono.Cecil from 0.11.4 to 0.11.6
Bumps NUnit from 3.13.2 to 4.6.1
Bumps NUnit.ConsoleRunner from 3.12.0 to 3.22.0
Bumps NUnit3TestAdapter from 4.0.0 to 6.2.0
Bumps protobuf-net from 2.4.4 to 3.2.56

---
updated-dependencies:
- dependency-name: HtmlAgilityPack
  dependency-version: 1.12.4
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-dependencies
- dependency-name: Irony
  dependency-version: 1.5.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-dependencies
- dependency-name: Microsoft.Build.NoTargets
  dependency-version: 3.7.134
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget-dependencies
- dependency-name: Microsoft.CodeAnalysis.CSharp
  dependency-version: 5.3.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget-dependencies
- dependency-name: Microsoft.CodeAnalysis.FxCopAnalyzers
  dependency-version: 3.3.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-dependencies
- dependency-name: Microsoft.CodeAnalysis.PublicApiAnalyzers
  dependency-version: 4.14.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget-dependencies
- dependency-name: Microsoft.DotNet.GenAPI
  dependency-version: 8.0.0-beta.26301.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-dependencies
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-version: 18.6.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget-dependencies
- dependency-name: Microsoft.SourceLink.GitHub
  dependency-version: 10.0.300
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget-dependencies
- dependency-name: Microsoft.Xml.SgmlReader
  dependency-version: 1.8.30
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-dependencies
- dependency-name: Mono.Cecil
  dependency-version: 0.11.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-dependencies
- dependency-name: NUnit
  dependency-version: 4.6.1
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget-dependencies
- dependency-name: NUnit.ConsoleRunner
  dependency-version: 3.22.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-dependencies
- dependency-name: NUnit3TestAdapter
  dependency-version: 6.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget-dependencies
- dependency-name: protobuf-net
  dependency-version: 3.2.56
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Directory.Build.targets                       | 108 +++++-----
 global.json                                   |  12 +-
 .../Java.Interop.Tools.Cecil.csproj           |  55 ++---
 .../Java.Interop.Tools.Diagnostics.csproj     |  45 ++--
 ....Interop.Tools.JavaCallableWrappers.csproj |  79 +++----
 src/Java.Interop/Java.Interop.csproj          | 196 +++++++++---------
 tools/jcw-gen/jcw-gen.csproj                  |  63 +++---
 7 files changed, 281 insertions(+), 277 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index b18650649..48b25e226 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-
-  <!-- Automatically add NRT attribute support for netstandard2.0 projects using NRT -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' AND '$(Nullable)' == 'enable' ">
-    <Compile Include="$(MSBuildThisFileDirectory)src\utils\NullableAttributes.cs" Visible="false" />
-  </ItemGroup>
-  
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' AND '$(Nullable)' == 'enable' ">
-    <DefineConstants>$(DefineConstants);INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
-  </PropertyGroup>
-
-  <!-- Automatically support the latest C# for netstandard2.0 projects -->
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <LangVersion>13.0</LangVersion>
-  </PropertyGroup>
-
-  <!-- Add Roslyn analyzers NuGet to all projects -->
-  <ItemGroup Condition=" '$(DisableRoslynAnalyzers)' != 'True' ">
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <!-- 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="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.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="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">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="protobuf-net"                                 Version="2.4.4" />
-  </ItemGroup>
-
-  <Import Project="build-tools\scripts\VersionInfo.targets" />
-
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <!-- Automatically add NRT attribute support for netstandard2.0 projects using NRT -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' AND '$(Nullable)' == 'enable' ">
+    <Compile Include="$(MSBuildThisFileDirectory)src\utils\NullableAttributes.cs" Visible="false" />
+  </ItemGroup>
+  
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' AND '$(Nullable)' == 'enable' ">
+    <DefineConstants>$(DefineConstants);INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
+  </PropertyGroup>
+
+  <!-- Automatically support the latest C# for netstandard2.0 projects -->
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <LangVersion>13.0</LangVersion>
+  </PropertyGroup>
+
+  <!-- Add Roslyn analyzers NuGet to all projects -->
+  <ItemGroup Condition=" '$(DisableRoslynAnalyzers)' != 'True' ">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <!-- NuGet Dependencies -->
+  <ItemGroup>
+    <PackageReference Update="GitInfo"                                      Version="2.1.2" />
+    <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="5.3.0" />
+    <PackageReference Update="Microsoft.CSharp"                             Version="4.7.0" />
+    <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="4.6.1" />
+    <PackageReference Update="NUnit.ConsoleRunner"                          Version="3.22.0" />
+    <PackageReference Update="NUnit3TestAdapter"                            Version="6.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Update="protobuf-net"                                 Version="3.2.56" />
+  </ItemGroup>
+
+  <Import Project="build-tools\scripts\VersionInfo.targets" />
+
+</Project>
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.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj b/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj
index 949defc3b..cb5737495 100644
--- a/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj
+++ b/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj
@@ -1,27 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
-  <Import Project="..\..\TargetFrameworkDependentValues.props" />
-
-  <PropertyGroup>
-    <OutputPath>$(ToolOutputFullPath)</OutputPath>
-  </PropertyGroup>
-
-  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
-
-  <ItemGroup>
-    <ProjectReference Include="..\Java.Interop.Localization\Java.Interop.Localization.csproj" />
-    <ProjectReference Include="..\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-  </ItemGroup>
-  
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <Import Project="..\..\TargetFrameworkDependentValues.props" />
+
+  <PropertyGroup>
+    <OutputPath>$(ToolOutputFullPath)</OutputPath>
+  </PropertyGroup>
+
+  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
+
+  <ItemGroup>
+    <ProjectReference Include="..\Java.Interop.Localization\Java.Interop.Localization.csproj" />
+    <ProjectReference Include="..\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.6" />
+  </ItemGroup>
+  
+</Project>
diff --git a/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj b/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj
index 8e4c99f32..fb4ad9707 100644
--- a/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj
+++ b/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj
@@ -1,22 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
-  <Import Project="..\..\TargetFrameworkDependentValues.props" />
-
-  <PropertyGroup>
-    <OutputPath>$(ToolOutputFullPath)</OutputPath>
-  </PropertyGroup>
-
-  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <Import Project="..\..\TargetFrameworkDependentValues.props" />
+
+  <PropertyGroup>
+    <OutputPath>$(ToolOutputFullPath)</OutputPath>
+  </PropertyGroup>
+
+  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.6" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj
index 07d9f7705..74c683022 100644
--- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj
+++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj
@@ -1,39 +1,40 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SignAssembly>true</SignAssembly>
-    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
-    <DefineConstants>$(DefineConstants);JCW_ONLY_TYPE_NAMES;HAVE_CECIL</DefineConstants>
-  </PropertyGroup>
-
-  <Import Project="..\..\TargetFrameworkDependentValues.props" />
-
-  <PropertyGroup>
-    <OutputPath>$(ToolOutputFullPath)</OutputPath>
-  </PropertyGroup>
-
-  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
-
-  <ItemGroup>
-    <Compile Include="..\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings\JavaNativeTypeManager.cs">
-      <Link>JavaNativeTypeManager.cs</Link>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Java.Interop.Localization\Java.Interop.Localization.csproj" />
-    <ProjectReference Include="..\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil.csproj" />
-    <ProjectReference Include="..\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-  </ItemGroup>
-
-  <Import Project="..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems')" />
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <SignAssembly>true</SignAssembly>
+    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
+    <DefineConstants>$(DefineConstants);JCW_ONLY_TYPE_NAMES;HAVE_CECIL</DefineConstants>
+  </PropertyGroup>
+
+  <Import Project="..\..\TargetFrameworkDependentValues.props" />
+
+  <PropertyGroup>
+    <OutputPath>$(ToolOutputFullPath)</OutputPath>
+  </PropertyGroup>
+
+  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
+
+  <ItemGroup>
+    <Compile Include="..\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings\JavaNativeTypeManager.cs">
+      <Link>JavaNativeTypeManager.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Java.Interop.Localization\Java.Interop.Localization.csproj" />
+    <ProjectReference Include="..\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil.csproj" />
+    <ProjectReference Include="..\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.6" />
+  </ItemGroup>
+
+  <Import Project="..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems')" />
+
+</Project>
diff --git a/src/Java.Interop/Java.Interop.csproj b/src/Java.Interop/Java.Interop.csproj
index 78cd1056e..1616bd030 100644
--- a/src/Java.Interop/Java.Interop.csproj
+++ b/src/Java.Interop/Java.Interop.csproj
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <XAConfigPath>..\..\bin\Build$(Configuration)\XAConfig.props</XAConfigPath>
-  </PropertyGroup>
-  <Import Condition="Exists ('$(XAConfigPath)')" Project="$(XAConfigPath)" />
-  <PropertyGroup>
-    <TargetFramework>$(DotNetTargetFramework)</TargetFramework>
-  </PropertyGroup>
-  <PropertyGroup>
-    <NoWarn>$(NoWarn);1591</NoWarn>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Nullable>enable</Nullable>
-    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-    <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
-  <Import Project="..\..\TargetFrameworkDependentValues.props" />
-  <Import Project="..\..\build-tools\trim-analyzers\trim-analyzers.props" />
-  <PropertyGroup>
-    <DefineConstants>INTEROP;FEATURE_JNIOBJECTREFERENCE_INTPTRS;$(JavaInteropDefineConstants)</DefineConstants>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework.ToLowerInvariant())\</IntermediateOutputPath>
-    <OutputPath>$(ToolOutputFullPath)</OutputPath>
-    <DocumentationFile>$(ToolOutputFullPath)Java.Interop.xml</DocumentationFile>
-    <JNIEnvGenPath>$(BuildToolOutputFullPath)</JNIEnvGenPath>
-    <Version>$(JICoreLibVersion)</Version>
-    <Standalone Condition=" '$(Standalone)' == '' ">true</Standalone>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Standalone)' == 'True' ">
-    <DefineConstants Condition=" '$(JIBuildingForNetCoreApp)' == 'True' ">FEATURE_JNIENVIRONMENT_JI_FUNCTION_POINTERS;$(DefineConstants)</DefineConstants>
-    <DefineConstants Condition=" '$(JIBuildingForNetCoreApp)' != 'True' ">FEATURE_JNIENVIRONMENT_JI_PINVOKES;$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Standalone)' != 'True' ">
-    <DefineConstants>FEATURE_JNIENVIRONMENT_JI_PINVOKES;$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Remove="Java.Interop\JniLocationException.cs" />
-  </ItemGroup>
-  <PropertyGroup>
-    <BuildDependsOn>
-      BuildJniEnvironment_g_cs;
-      BuildInteropJar;
-      $(BuildDependsOn)
-    </BuildDependsOn>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="Java.Interop\JavaPrimitiveArrays.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>JavaPrimitiveArrays.cs</LastGenOutput>
-    </None>
-    <None Include="Java.Interop\JniBuiltinMarshalers.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>JniBuiltinMarshalers.cs</LastGenOutput>
-    </None>
-    <None Include="Java.Interop\JniPeerMembers.JniInstanceMethods_Invoke.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>JniPeerMembers.JniInstanceMethods_Invoke.cs</LastGenOutput>
-    </None>
-    <None Include="Java.Interop\JniPeerMembers.JniFields.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>JniPeerMembers.JniFields.cs</LastGenOutput>
-    </None>
-    <None Include="Documentation\Java.Interop\IJavaPeerable.xml" />
-    <None Include="Documentation\Java.Interop\JniManagedPeerStates.xml" />
-    <None Include="Documentation\Java.Interop\JniEnvironment.References.xml" />
-    <ProjectReference Include="..\..\build-tools\jnienv-gen\jnienv-gen.csproj"
-        ReferenceOutputAssembly="false"
-        SkipGetTargetFrameworkProperties="$(_JniEnvSkipGetTargetFrameworkProperties)"
-        AdditionalProperties="$(_JniEnvAdditionalProperties)"
-    />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JavaPrimitiveArrays.cs">
-      <DependentUpon>JavaPrimitiveArrays.tt</DependentUpon>
-    </Compile>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JniBuiltinMarshalers.cs">
-      <DependentUpon>JniBuiltinMarshalers.tt</DependentUpon>
-    </Compile>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JniPeerMembers.JniFields.cs">
-      <DependentUpon>JniPeerMembers.JniFields.tt</DependentUpon>
-    </Compile>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JniPeerMembers.JniInstanceMethods_Invoke.cs">
-      <DependentUpon>JniPeerMembers.JniInstanceMethods_Invoke.tt</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-  </ItemGroup>
-  <Import Project="Java.Interop.targets" />
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <XAConfigPath>..\..\bin\Build$(Configuration)\XAConfig.props</XAConfigPath>
+  </PropertyGroup>
+  <Import Condition="Exists ('$(XAConfigPath)')" Project="$(XAConfigPath)" />
+  <PropertyGroup>
+    <TargetFramework>$(DotNetTargetFramework)</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);1591</NoWarn>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Nullable>enable</Nullable>
+    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+    <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <Import Project="..\..\TargetFrameworkDependentValues.props" />
+  <Import Project="..\..\build-tools\trim-analyzers\trim-analyzers.props" />
+  <PropertyGroup>
+    <DefineConstants>INTEROP;FEATURE_JNIOBJECTREFERENCE_INTPTRS;$(JavaInteropDefineConstants)</DefineConstants>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework.ToLowerInvariant())\</IntermediateOutputPath>
+    <OutputPath>$(ToolOutputFullPath)</OutputPath>
+    <DocumentationFile>$(ToolOutputFullPath)Java.Interop.xml</DocumentationFile>
+    <JNIEnvGenPath>$(BuildToolOutputFullPath)</JNIEnvGenPath>
+    <Version>$(JICoreLibVersion)</Version>
+    <Standalone Condition=" '$(Standalone)' == '' ">true</Standalone>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Standalone)' == 'True' ">
+    <DefineConstants Condition=" '$(JIBuildingForNetCoreApp)' == 'True' ">FEATURE_JNIENVIRONMENT_JI_FUNCTION_POINTERS;$(DefineConstants)</DefineConstants>
+    <DefineConstants Condition=" '$(JIBuildingForNetCoreApp)' != 'True' ">FEATURE_JNIENVIRONMENT_JI_PINVOKES;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Standalone)' != 'True' ">
+    <DefineConstants>FEATURE_JNIENVIRONMENT_JI_PINVOKES;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Java.Interop\JniLocationException.cs" />
+  </ItemGroup>
+  <PropertyGroup>
+    <BuildDependsOn>
+      BuildJniEnvironment_g_cs;
+      BuildInteropJar;
+      $(BuildDependsOn)
+    </BuildDependsOn>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="Java.Interop\JavaPrimitiveArrays.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>JavaPrimitiveArrays.cs</LastGenOutput>
+    </None>
+    <None Include="Java.Interop\JniBuiltinMarshalers.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>JniBuiltinMarshalers.cs</LastGenOutput>
+    </None>
+    <None Include="Java.Interop\JniPeerMembers.JniInstanceMethods_Invoke.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>JniPeerMembers.JniInstanceMethods_Invoke.cs</LastGenOutput>
+    </None>
+    <None Include="Java.Interop\JniPeerMembers.JniFields.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>JniPeerMembers.JniFields.cs</LastGenOutput>
+    </None>
+    <None Include="Documentation\Java.Interop\IJavaPeerable.xml" />
+    <None Include="Documentation\Java.Interop\JniManagedPeerStates.xml" />
+    <None Include="Documentation\Java.Interop\JniEnvironment.References.xml" />
+    <ProjectReference Include="..\..\build-tools\jnienv-gen\jnienv-gen.csproj"
+        ReferenceOutputAssembly="false"
+        SkipGetTargetFrameworkProperties="$(_JniEnvSkipGetTargetFrameworkProperties)"
+        AdditionalProperties="$(_JniEnvAdditionalProperties)"
+    />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JavaPrimitiveArrays.cs">
+      <DependentUpon>JavaPrimitiveArrays.tt</DependentUpon>
+    </Compile>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JniBuiltinMarshalers.cs">
+      <DependentUpon>JniBuiltinMarshalers.tt</DependentUpon>
+    </Compile>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JniPeerMembers.JniFields.cs">
+      <DependentUpon>JniPeerMembers.JniFields.tt</DependentUpon>
+    </Compile>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JniPeerMembers.JniInstanceMethods_Invoke.cs">
+      <DependentUpon>JniPeerMembers.JniInstanceMethods_Invoke.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+  </ItemGroup>
+  <Import Project="Java.Interop.targets" />
+</Project>
diff --git a/tools/jcw-gen/jcw-gen.csproj b/tools/jcw-gen/jcw-gen.csproj
index f99367616..35e2493b5 100644
--- a/tools/jcw-gen/jcw-gen.csproj
+++ b/tools/jcw-gen/jcw-gen.csproj
@@ -1,31 +1,32 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>$(DotNetTargetFramework)</TargetFramework>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-
-  <Import Project="..\..\TargetFrameworkDependentValues.props" />
-
-  <PropertyGroup>
-    <OutputPath>$(UtilityOutputFullPath)</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="jcw-gen.slnf" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Mono.Options" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-  </ItemGroup>
-
-  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers.csproj" />
-    <ProjectReference Include="..\..\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil.csproj" />
-    <ProjectReference Include="..\..\src\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(DotNetTargetFramework)</TargetFramework>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <Import Project="..\..\TargetFrameworkDependentValues.props" />
+
+  <PropertyGroup>
+    <OutputPath>$(UtilityOutputFullPath)</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="jcw-gen.slnf" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Mono.Cecil" Version="0.11.6" />
+    <PackageReference Include="Mono.Options" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers.csproj" />
+    <ProjectReference Include="..\..\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil.csproj" />
+    <ProjectReference Include="..\..\src\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
+  </ItemGroup>
+
+</Project>

From 53faf560d88dce30c67bcb1cb99a7099174cd8d8 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 4 Jun 2026 11:17:58 -0500
Subject: [PATCH 2/7] Fix duplicate Mono.Cecil PackageReference

Dependabot added inline `<PackageReference Include="Mono.Cecil" Version="0.11.6" />` to four csprojs that already pull Mono.Cecil in via the imported `build-tools/scripts/cecil.projitems`, producing NU1504 duplicate reference errors.

Bump the version inside `cecil.projitems` (the single source of truth) and remove the redundant inline references dependabot added.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 Directory.Build.targets                       | 108 +++++-----
 build-tools/scripts/cecil.projitems           |   2 +-
 .../Java.Interop.Tools.Cecil.csproj           |  55 +++--
 .../Java.Interop.Tools.Diagnostics.csproj     |  45 ++--
 ....Interop.Tools.JavaCallableWrappers.csproj |  79 ++++---
 src/Java.Interop/Java.Interop.csproj          | 196 +++++++++---------
 tools/jcw-gen/jcw-gen.csproj                  |  63 +++---
 7 files changed, 272 insertions(+), 276 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 48b25e226..4ca86b6cf 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-
-  <!-- Automatically add NRT attribute support for netstandard2.0 projects using NRT -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' AND '$(Nullable)' == 'enable' ">
-    <Compile Include="$(MSBuildThisFileDirectory)src\utils\NullableAttributes.cs" Visible="false" />
-  </ItemGroup>
-  
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' AND '$(Nullable)' == 'enable' ">
-    <DefineConstants>$(DefineConstants);INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
-  </PropertyGroup>
-
-  <!-- Automatically support the latest C# for netstandard2.0 projects -->
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <LangVersion>13.0</LangVersion>
-  </PropertyGroup>
-
-  <!-- Add Roslyn analyzers NuGet to all projects -->
-  <ItemGroup Condition=" '$(DisableRoslynAnalyzers)' != 'True' ">
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <!-- NuGet Dependencies -->
-  <ItemGroup>
-    <PackageReference Update="GitInfo"                                      Version="2.1.2" />
-    <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="5.3.0" />
-    <PackageReference Update="Microsoft.CSharp"                             Version="4.7.0" />
-    <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="4.6.1" />
-    <PackageReference Update="NUnit.ConsoleRunner"                          Version="3.22.0" />
-    <PackageReference Update="NUnit3TestAdapter"                            Version="6.2.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="protobuf-net"                                 Version="3.2.56" />
-  </ItemGroup>
-
-  <Import Project="build-tools\scripts\VersionInfo.targets" />
-
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <!-- Automatically add NRT attribute support for netstandard2.0 projects using NRT -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' AND '$(Nullable)' == 'enable' ">
+    <Compile Include="$(MSBuildThisFileDirectory)src\utils\NullableAttributes.cs" Visible="false" />
+  </ItemGroup>
+  
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' AND '$(Nullable)' == 'enable' ">
+    <DefineConstants>$(DefineConstants);INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
+  </PropertyGroup>
+
+  <!-- Automatically support the latest C# for netstandard2.0 projects -->
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <LangVersion>13.0</LangVersion>
+  </PropertyGroup>
+
+  <!-- Add Roslyn analyzers NuGet to all projects -->
+  <ItemGroup Condition=" '$(DisableRoslynAnalyzers)' != 'True' ">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <!-- NuGet Dependencies -->
+  <ItemGroup>
+    <PackageReference Update="GitInfo"                                      Version="2.1.2" />
+    <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="5.3.0" />
+    <PackageReference Update="Microsoft.CSharp"                             Version="4.7.0" />
+    <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="4.6.1" />
+    <PackageReference Update="NUnit.ConsoleRunner"                          Version="3.22.0" />
+    <PackageReference Update="NUnit3TestAdapter"                            Version="6.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Update="protobuf-net"                                 Version="3.2.56" />
+  </ItemGroup>
+
+  <Import Project="build-tools\scripts\VersionInfo.targets" />
+
+</Project>
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 @@
 <?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)" />
diff --git a/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj b/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj
index cb5737495..949defc3b 100644
--- a/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj
+++ b/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj
@@ -1,28 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
-  <Import Project="..\..\TargetFrameworkDependentValues.props" />
-
-  <PropertyGroup>
-    <OutputPath>$(ToolOutputFullPath)</OutputPath>
-  </PropertyGroup>
-
-  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
-
-  <ItemGroup>
-    <ProjectReference Include="..\Java.Interop.Localization\Java.Interop.Localization.csproj" />
-    <ProjectReference Include="..\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-    <PackageReference Include="Mono.Cecil" Version="0.11.6" />
-  </ItemGroup>
-  
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <Import Project="..\..\TargetFrameworkDependentValues.props" />
+
+  <PropertyGroup>
+    <OutputPath>$(ToolOutputFullPath)</OutputPath>
+  </PropertyGroup>
+
+  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
+
+  <ItemGroup>
+    <ProjectReference Include="..\Java.Interop.Localization\Java.Interop.Localization.csproj" />
+    <ProjectReference Include="..\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+  </ItemGroup>
+  
+</Project>
diff --git a/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj b/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj
index fb4ad9707..8e4c99f32 100644
--- a/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj
+++ b/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj
@@ -1,23 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
-  <Import Project="..\..\TargetFrameworkDependentValues.props" />
-
-  <PropertyGroup>
-    <OutputPath>$(ToolOutputFullPath)</OutputPath>
-  </PropertyGroup>
-
-  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-    <PackageReference Include="Mono.Cecil" Version="0.11.6" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <Import Project="..\..\TargetFrameworkDependentValues.props" />
+
+  <PropertyGroup>
+    <OutputPath>$(ToolOutputFullPath)</OutputPath>
+  </PropertyGroup>
+
+  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj
index 74c683022..07d9f7705 100644
--- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj
+++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj
@@ -1,40 +1,39 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SignAssembly>true</SignAssembly>
-    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
-    <DefineConstants>$(DefineConstants);JCW_ONLY_TYPE_NAMES;HAVE_CECIL</DefineConstants>
-  </PropertyGroup>
-
-  <Import Project="..\..\TargetFrameworkDependentValues.props" />
-
-  <PropertyGroup>
-    <OutputPath>$(ToolOutputFullPath)</OutputPath>
-  </PropertyGroup>
-
-  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
-
-  <ItemGroup>
-    <Compile Include="..\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings\JavaNativeTypeManager.cs">
-      <Link>JavaNativeTypeManager.cs</Link>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Java.Interop.Localization\Java.Interop.Localization.csproj" />
-    <ProjectReference Include="..\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil.csproj" />
-    <ProjectReference Include="..\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-    <PackageReference Include="Mono.Cecil" Version="0.11.6" />
-  </ItemGroup>
-
-  <Import Project="..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems')" />
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <SignAssembly>true</SignAssembly>
+    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
+    <DefineConstants>$(DefineConstants);JCW_ONLY_TYPE_NAMES;HAVE_CECIL</DefineConstants>
+  </PropertyGroup>
+
+  <Import Project="..\..\TargetFrameworkDependentValues.props" />
+
+  <PropertyGroup>
+    <OutputPath>$(ToolOutputFullPath)</OutputPath>
+  </PropertyGroup>
+
+  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
+
+  <ItemGroup>
+    <Compile Include="..\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings\JavaNativeTypeManager.cs">
+      <Link>JavaNativeTypeManager.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Java.Interop.Localization\Java.Interop.Localization.csproj" />
+    <ProjectReference Include="..\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil.csproj" />
+    <ProjectReference Include="..\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Import Project="..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems')" />
+
+</Project>
diff --git a/src/Java.Interop/Java.Interop.csproj b/src/Java.Interop/Java.Interop.csproj
index 1616bd030..4a29f6903 100644
--- a/src/Java.Interop/Java.Interop.csproj
+++ b/src/Java.Interop/Java.Interop.csproj
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <XAConfigPath>..\..\bin\Build$(Configuration)\XAConfig.props</XAConfigPath>
-  </PropertyGroup>
-  <Import Condition="Exists ('$(XAConfigPath)')" Project="$(XAConfigPath)" />
-  <PropertyGroup>
-    <TargetFramework>$(DotNetTargetFramework)</TargetFramework>
-  </PropertyGroup>
-  <PropertyGroup>
-    <NoWarn>$(NoWarn);1591</NoWarn>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Nullable>enable</Nullable>
-    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-    <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
-  <Import Project="..\..\TargetFrameworkDependentValues.props" />
-  <Import Project="..\..\build-tools\trim-analyzers\trim-analyzers.props" />
-  <PropertyGroup>
-    <DefineConstants>INTEROP;FEATURE_JNIOBJECTREFERENCE_INTPTRS;$(JavaInteropDefineConstants)</DefineConstants>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework.ToLowerInvariant())\</IntermediateOutputPath>
-    <OutputPath>$(ToolOutputFullPath)</OutputPath>
-    <DocumentationFile>$(ToolOutputFullPath)Java.Interop.xml</DocumentationFile>
-    <JNIEnvGenPath>$(BuildToolOutputFullPath)</JNIEnvGenPath>
-    <Version>$(JICoreLibVersion)</Version>
-    <Standalone Condition=" '$(Standalone)' == '' ">true</Standalone>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Standalone)' == 'True' ">
-    <DefineConstants Condition=" '$(JIBuildingForNetCoreApp)' == 'True' ">FEATURE_JNIENVIRONMENT_JI_FUNCTION_POINTERS;$(DefineConstants)</DefineConstants>
-    <DefineConstants Condition=" '$(JIBuildingForNetCoreApp)' != 'True' ">FEATURE_JNIENVIRONMENT_JI_PINVOKES;$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Standalone)' != 'True' ">
-    <DefineConstants>FEATURE_JNIENVIRONMENT_JI_PINVOKES;$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Remove="Java.Interop\JniLocationException.cs" />
-  </ItemGroup>
-  <PropertyGroup>
-    <BuildDependsOn>
-      BuildJniEnvironment_g_cs;
-      BuildInteropJar;
-      $(BuildDependsOn)
-    </BuildDependsOn>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="Java.Interop\JavaPrimitiveArrays.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>JavaPrimitiveArrays.cs</LastGenOutput>
-    </None>
-    <None Include="Java.Interop\JniBuiltinMarshalers.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>JniBuiltinMarshalers.cs</LastGenOutput>
-    </None>
-    <None Include="Java.Interop\JniPeerMembers.JniInstanceMethods_Invoke.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>JniPeerMembers.JniInstanceMethods_Invoke.cs</LastGenOutput>
-    </None>
-    <None Include="Java.Interop\JniPeerMembers.JniFields.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>JniPeerMembers.JniFields.cs</LastGenOutput>
-    </None>
-    <None Include="Documentation\Java.Interop\IJavaPeerable.xml" />
-    <None Include="Documentation\Java.Interop\JniManagedPeerStates.xml" />
-    <None Include="Documentation\Java.Interop\JniEnvironment.References.xml" />
-    <ProjectReference Include="..\..\build-tools\jnienv-gen\jnienv-gen.csproj"
-        ReferenceOutputAssembly="false"
-        SkipGetTargetFrameworkProperties="$(_JniEnvSkipGetTargetFrameworkProperties)"
-        AdditionalProperties="$(_JniEnvAdditionalProperties)"
-    />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JavaPrimitiveArrays.cs">
-      <DependentUpon>JavaPrimitiveArrays.tt</DependentUpon>
-    </Compile>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JniBuiltinMarshalers.cs">
-      <DependentUpon>JniBuiltinMarshalers.tt</DependentUpon>
-    </Compile>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JniPeerMembers.JniFields.cs">
-      <DependentUpon>JniPeerMembers.JniFields.tt</DependentUpon>
-    </Compile>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JniPeerMembers.JniInstanceMethods_Invoke.cs">
-      <DependentUpon>JniPeerMembers.JniInstanceMethods_Invoke.tt</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-  </ItemGroup>
-  <Import Project="Java.Interop.targets" />
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <XAConfigPath>..\..\bin\Build$(Configuration)\XAConfig.props</XAConfigPath>
+  </PropertyGroup>
+  <Import Condition="Exists ('$(XAConfigPath)')" Project="$(XAConfigPath)" />
+  <PropertyGroup>
+    <TargetFramework>$(DotNetTargetFramework)</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);1591</NoWarn>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Nullable>enable</Nullable>
+    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+    <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <Import Project="..\..\TargetFrameworkDependentValues.props" />
+  <Import Project="..\..\build-tools\trim-analyzers\trim-analyzers.props" />
+  <PropertyGroup>
+    <DefineConstants>INTEROP;FEATURE_JNIOBJECTREFERENCE_INTPTRS;$(JavaInteropDefineConstants)</DefineConstants>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework.ToLowerInvariant())\</IntermediateOutputPath>
+    <OutputPath>$(ToolOutputFullPath)</OutputPath>
+    <DocumentationFile>$(ToolOutputFullPath)Java.Interop.xml</DocumentationFile>
+    <JNIEnvGenPath>$(BuildToolOutputFullPath)</JNIEnvGenPath>
+    <Version>$(JICoreLibVersion)</Version>
+    <Standalone Condition=" '$(Standalone)' == '' ">true</Standalone>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Standalone)' == 'True' ">
+    <DefineConstants Condition=" '$(JIBuildingForNetCoreApp)' == 'True' ">FEATURE_JNIENVIRONMENT_JI_FUNCTION_POINTERS;$(DefineConstants)</DefineConstants>
+    <DefineConstants Condition=" '$(JIBuildingForNetCoreApp)' != 'True' ">FEATURE_JNIENVIRONMENT_JI_PINVOKES;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Standalone)' != 'True' ">
+    <DefineConstants>FEATURE_JNIENVIRONMENT_JI_PINVOKES;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Java.Interop\JniLocationException.cs" />
+  </ItemGroup>
+  <PropertyGroup>
+    <BuildDependsOn>
+      BuildJniEnvironment_g_cs;
+      BuildInteropJar;
+      $(BuildDependsOn)
+    </BuildDependsOn>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="Java.Interop\JavaPrimitiveArrays.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>JavaPrimitiveArrays.cs</LastGenOutput>
+    </None>
+    <None Include="Java.Interop\JniBuiltinMarshalers.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>JniBuiltinMarshalers.cs</LastGenOutput>
+    </None>
+    <None Include="Java.Interop\JniPeerMembers.JniInstanceMethods_Invoke.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>JniPeerMembers.JniInstanceMethods_Invoke.cs</LastGenOutput>
+    </None>
+    <None Include="Java.Interop\JniPeerMembers.JniFields.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>JniPeerMembers.JniFields.cs</LastGenOutput>
+    </None>
+    <None Include="Documentation\Java.Interop\IJavaPeerable.xml" />
+    <None Include="Documentation\Java.Interop\JniManagedPeerStates.xml" />
+    <None Include="Documentation\Java.Interop\JniEnvironment.References.xml" />
+    <ProjectReference Include="..\..\build-tools\jnienv-gen\jnienv-gen.csproj"
+        ReferenceOutputAssembly="false"
+        SkipGetTargetFrameworkProperties="$(_JniEnvSkipGetTargetFrameworkProperties)"
+        AdditionalProperties="$(_JniEnvAdditionalProperties)"
+    />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JavaPrimitiveArrays.cs">
+      <DependentUpon>JavaPrimitiveArrays.tt</DependentUpon>
+    </Compile>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JniBuiltinMarshalers.cs">
+      <DependentUpon>JniBuiltinMarshalers.tt</DependentUpon>
+    </Compile>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JniPeerMembers.JniFields.cs">
+      <DependentUpon>JniPeerMembers.JniFields.tt</DependentUpon>
+    </Compile>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JniPeerMembers.JniInstanceMethods_Invoke.cs">
+      <DependentUpon>JniPeerMembers.JniInstanceMethods_Invoke.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+  </ItemGroup>
+  <Import Project="Java.Interop.targets" />
+</Project>
diff --git a/tools/jcw-gen/jcw-gen.csproj b/tools/jcw-gen/jcw-gen.csproj
index 35e2493b5..f99367616 100644
--- a/tools/jcw-gen/jcw-gen.csproj
+++ b/tools/jcw-gen/jcw-gen.csproj
@@ -1,32 +1,31 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>$(DotNetTargetFramework)</TargetFramework>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-
-  <Import Project="..\..\TargetFrameworkDependentValues.props" />
-
-  <PropertyGroup>
-    <OutputPath>$(UtilityOutputFullPath)</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="jcw-gen.slnf" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Mono.Cecil" Version="0.11.6" />
-    <PackageReference Include="Mono.Options" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-  </ItemGroup>
-
-  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers.csproj" />
-    <ProjectReference Include="..\..\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil.csproj" />
-    <ProjectReference Include="..\..\src\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(DotNetTargetFramework)</TargetFramework>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <Import Project="..\..\TargetFrameworkDependentValues.props" />
+
+  <PropertyGroup>
+    <OutputPath>$(UtilityOutputFullPath)</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="jcw-gen.slnf" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Mono.Options" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Import Project="..\..\build-tools\scripts\cecil.projitems" />
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers.csproj" />
+    <ProjectReference Include="..\..\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil.csproj" />
+    <ProjectReference Include="..\..\src\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
+  </ItemGroup>
+
+</Project>

From be8b79ee776110e3eee7f5d3b8dd8be355757282 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 4 Jun 2026 11:32:05 -0500
Subject: [PATCH 3/7] Replace deprecated FxCopAnalyzers with NetAnalyzers

Microsoft.CodeAnalysis.FxCopAnalyzers is deprecated (CA9998) in favor of Microsoft.CodeAnalysis.NetAnalyzers. Switch the Directory.Build.targets reference and update the matching .editorconfig comment.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .editorconfig           | 2 +-
 Directory.Build.targets | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 4ca86b6cf..ffec29e36 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -17,7 +17,7 @@
 
   <!-- Add Roslyn analyzers NuGet to all projects -->
   <ItemGroup Condition=" '$(DisableRoslynAnalyzers)' != 'True' ">
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From 312530741573b90f6807d6e35fe6ef0e2d7d1692 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 4 Jun 2026 14:02:04 -0500
Subject: [PATCH 4/7] Revert protobuf-net to 2.4.4

protobuf-net 3.x split the assembly into protobuf-net + protobuf-net.Core and made breaking API changes that don't compile against KotlinProtobufDefinition.cs. Stay on 2.4.4 for now.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index ffec29e36..33d5a1417 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -46,7 +46,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Update="protobuf-net"                                 Version="3.2.56" />
+    <PackageReference Update="protobuf-net"                                 Version="2.4.4" />
   </ItemGroup>
 
   <Import Project="build-tools\scripts\VersionInfo.targets" />

From 1605d589e733ec90959b7415583c2bf284eec5aa Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 4 Jun 2026 15:58:45 -0500
Subject: [PATCH 5/7] Adapt to SgmlDtd.Parse signature change in SgmlReader
 1.8.30

Microsoft.Xml.SgmlReader 1.8.24 removed the unused XmlNameTable parameter from SgmlDtd.Parse. Drop the `new NameTable ()` argument from HtmlLoader.LoadHtmlDtd to match the new 6-argument overload.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 tools/param-name-importer/HtmlLoader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)

From 01b5114b1210ae7fe112caa0189a0091456ad54a Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 4 Jun 2026 18:36:47 -0500
Subject: [PATCH 6/7] Stay on latest NUnit 3.x

NUnit 4.x has API breaking changes that don't compile against the existing tests (e.g. `CollectionAssert` moved to NUnit.Framework.Legacy, and `Assert.AreEqual` overloads taking `dynamic` no longer resolve). Pin nunit to 3.14.0 (latest 3.x) and NUnit3TestAdapter to 4.6.0 (the last release that still supports NUnit 3.x; 5.0+ requires NUnit 4).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 Directory.Build.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 33d5a1417..2da41427e 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -40,9 +40,9 @@
     <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="4.6.1" />
+    <PackageReference Update="nunit"                                        Version="3.14.0" />
     <PackageReference Update="NUnit.ConsoleRunner"                          Version="3.22.0" />
-    <PackageReference Update="NUnit3TestAdapter"                            Version="6.2.0">
+    <PackageReference Update="NUnit3TestAdapter"                            Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From 4ee225beef37c487e7810788e253a11ce3c15600 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Fri, 5 Jun 2026 08:38:51 -0500
Subject: [PATCH 7/7] Regenerate Java.Base-ref.cs for new GenAPI version

Microsoft.DotNet.GenAPI 8.0.0-beta.26301.3 stamps a new version (8.0.14.30103) in the auto-generated header. The build regenerates `src/Java.Base-ref.cs` and the `Ensure no modified committed files` CI step then fails on the version-comment diff. Update the committed file to match.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Java.Base-ref.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
 //------------------------------------------------------------------------------
 // <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.