From 20da2339164893f5d15fad653b1020a0dbca482d Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Thu, 13 Apr 2023 08:59:05 -0500 Subject: [PATCH 1/5] =?UTF-8?q?=EF=BB=BFRemove=20'net472'=20Target=20Frame?= =?UTF-8?q?work.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Directory.Build.props | 4 +- TargetFrameworkDependentValues.props | 2 +- build-tools/automation/azure-pipelines.yaml | 101 +----------------- .../automation/templates/core-tests.yaml | 10 -- .../templates/install-dependencies.yaml | 2 +- build-tools/jnienv-gen/jnienv-gen.csproj | 2 +- .../Java.Interop.Dynamic.csproj | 2 +- .../Java.Interop.Export.csproj | 2 +- .../Java.Interop.GenericMarshaler.csproj | 9 +- .../Java.Interop.Localization.csproj | 2 +- .../Java.Interop.Tools.Cecil.csproj | 2 +- .../Java.Interop.Tools.Diagnostics.csproj | 2 +- .../Java.Interop.Tools.Generator.csproj | 2 +- ....Interop.Tools.JavaCallableWrappers.csproj | 2 +- .../Java.Interop.Tools.JavaSource.csproj | 2 +- .../Java.Interop.Tools.JavaTypeSystem.csproj | 2 +- .../Java.Interop-MonoAndroid.csproj | 1 - src/Java.Interop/Java.Interop.csproj | 11 +- .../Java.Runtime.Environment.csproj | 2 +- ...droid.Tools.AnnotationSupport.Cecil.csproj | 2 +- ...rin.Android.Tools.AnnotationSupport.csproj | 2 +- ...amarin.Android.Tools.ApiXmlAdjuster.csproj | 7 +- .../Xamarin.Android.Tools.Bytecode.csproj | 2 +- .../Xamarin.SourceWriter.csproj | 2 +- src/java-interop/java-interop.csproj | 2 +- .../Java.Interop-PerformanceTests.csproj | 2 +- .../Java.Interop-Tests.csproj | 2 +- .../Java.Interop-Tests.targets | 4 +- .../Java.Interop.Dynamic-Tests.csproj | 2 +- .../Java.Interop.Export-Tests.csproj | 6 +- .../Java.Interop.Tools.Generator-Tests.csproj | 2 +- ...op.Tools.JavaCallableWrappers-Tests.csproj | 2 +- ...Java.Interop.Tools.JavaSource-Tests.csproj | 2 +- ....Interop.Tools.JavaTypeSystem-Tests.csproj | 2 +- tests/NativeTiming/NativeTiming.csproj | 2 +- tests/TestJVM/TestJVM.csproj | 2 +- ....Android.Tools.ApiXmlAdjuster-Tests.csproj | 2 +- ...amarin.Android.Tools.Bytecode-Tests.csproj | 2 +- .../Xamarin.SourceWriter-Tests.csproj | 2 +- tests/generator-Tests/generator-Tests.csproj | 2 +- .../invocation-overhead.csproj | 2 +- .../logcat-parse-Tests.csproj | 2 +- tools/class-parse/class-parse.csproj | 2 +- tools/generator/generator.csproj | 2 +- .../java-source-utils.csproj | 2 +- tools/jcw-gen/jcw-gen.csproj | 2 +- tools/logcat-parse/logcat-parse.csproj | 2 +- .../param-name-importer.csproj | 2 +- 48 files changed, 52 insertions(+), 179 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 95d93ffc2..341d653c1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,8 +3,8 @@ Debug - - true + <_OutputPath>$(MSBuildThisFileDirectory)bin\Build$(Configuration)\ true true diff --git a/TargetFrameworkDependentValues.props b/TargetFrameworkDependentValues.props index 263520c42..5076ecf59 100644 --- a/TargetFrameworkDependentValues.props +++ b/TargetFrameworkDependentValues.props @@ -1,7 +1,7 @@ - + True diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index f334a15a7..5aebc4b4b 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -31,56 +31,8 @@ variables: DisablePipelineConfigDetector: true jobs: -- job: windows_build - displayName: Windows - .NET Framework - pool: - name: $(1ESWindowsPool) - demands: - - ImageOverride -equals $(1ESWindowsImage) - timeoutInMinutes: 20 - workspace: - clean: all - steps: - - checkout: self - submodules: recursive - - - template: templates\install-dependencies.yaml - - - task: MSBuild@1 - displayName: MSBuild Java.Interop.sln /t:Restore - inputs: - solution: Java.Interop.sln - configuration: $(Build.Configuration) - msbuildArguments: /t:Restore /p:RestoreConfigFile=$(System.DefaultWorkingDirectory)\external\xamarin-android-tools\NuGet.config - - - task: MSBuild@1 - displayName: MSBuild Java.Interop.sln /t:Prepare - inputs: - solution: Java.Interop.sln - configuration: $(Build.Configuration) - msbuildArguments: /restore /t:Prepare - - - task: MSBuild@1 - displayName: MSBuild Java.Interop.sln - inputs: - solution: Java.Interop.sln - configuration: $(Build.Configuration) - msbuildArguments: /restore - - - task: MSBuild@1 - displayName: MSBuild RunNUnitTests.targets - inputs: - solution: build-tools/scripts/RunNUnitTests.targets - configuration: $(Build.Configuration) - msbuildArguments: /p:TestAssembly="bin\Test$(Build.Configuration)\generator-Tests.dll;bin\Test$(Build.Configuration)\Java.Interop.Tools.JavaCallableWrappers-Tests.dll;bin\Test$(Build.Configuration)\logcat-parse-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll;bin\Test$(Build.Configuration)\Java.Interop.Tools.JavaTypeSystem-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.Bytecode-Tests.dll;bin\Test$(Build.Configuration)\Java.Interop.Tools.Generator-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.SourceWriter-Tests.dll" - condition: succeededOrFailed() - - - template: templates\publish-test-results.yaml - parameters: - platformName: .NET Framework - Windows - - job: windows_dotnet_build - displayName: Windows - .NET Core + displayName: Windows - .NET pool: name: $(1ESWindowsPool) demands: @@ -121,57 +73,8 @@ jobs: ArtifactName: debug condition: succeededOrFailed() -- job: mac_build - displayName: Mac - Mono - pool: - name: $(1ESMacPool) - vmImage: $(1ESMacImage) - timeoutInMinutes: 20 - workspace: - clean: all - steps: - - checkout: self - submodules: recursive - - - template: templates\install-dependencies.yaml - - - script: > - dotnet tool install --global boots && - boots https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-6.12.0.145.macos10.xamarin.universal.pkg - displayName: Install Mono - - - template: templates\core-build.yaml - - - script: | - r=0 - make run-all-tests CONFIGURATION=$(Build.Configuration) JI_MAX_JDK=$(MaxJdkVersion) || r=$? - jar cf xatb.jar -C tests/Xamarin.Android.Tools.Bytecode-Tests/obj/*/classes . - zip -r bin.zip bin - exit $r - displayName: Run Tests - - - template: templates\publish-test-results.yaml - parameters: - platformName: Mono - Mac - - - task: CopyFiles@2 - displayName: 'Copy Files to: Artifact Staging Directory' - inputs: - SourceFolder: $(System.DefaultWorkingDirectory) - Contents: | - xatb.jar - bin.zip - TargetFolder: $(Build.ArtifactStagingDirectory) - condition: succeededOrFailed() - - - task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact: debug' - inputs: - ArtifactName: debug - condition: succeededOrFailed() - - job: mac_dotnet_build - displayName: Mac - .NET Core + displayName: Mac - .NET pool: name: $(1ESMacPool) vmImage: $(1ESMacImage) diff --git a/build-tools/automation/templates/core-tests.yaml b/build-tools/automation/templates/core-tests.yaml index 756e06778..3090119ee 100644 --- a/build-tools/automation/templates/core-tests.yaml +++ b/build-tools/automation/templates/core-tests.yaml @@ -136,16 +136,6 @@ steps: continueOnError: true retryCountOnTaskFailure: 1 -- task: DotNetCoreCLI@2 - displayName: 'Tests: Java.Interop-Performance-net472' - condition: eq('${{ parameters.runNativeTests }}', 'true') - inputs: - command: test - testRunTitle: Java.Interop-Performance (net472 - ${{ parameters.platformName }}) - arguments: bin/Test$(Build.Configuration)/Java.Interop-PerformanceTests.dll - continueOnError: true - retryCountOnTaskFailure: 1 - - task: DotNetCoreCLI@2 displayName: 'Tests: Java.Interop-Performance-$(DotNetTargetFramework)' condition: eq('${{ parameters.runNativeTests }}', 'true') diff --git a/build-tools/automation/templates/install-dependencies.yaml b/build-tools/automation/templates/install-dependencies.yaml index a8a0040f5..4b96799e0 100644 --- a/build-tools/automation/templates/install-dependencies.yaml +++ b/build-tools/automation/templates/install-dependencies.yaml @@ -3,7 +3,7 @@ parameters: steps: - task: UseDotNet@2 - displayName: Use .NET Core $(DotNetCoreVersion) + displayName: Use .NET $(DotNetCoreVersion) inputs: version: $(DotNetCoreVersion) includePreviewVersions: true diff --git a/build-tools/jnienv-gen/jnienv-gen.csproj b/build-tools/jnienv-gen/jnienv-gen.csproj index 9374c20ec..a3f0ca179 100644 --- a/build-tools/jnienv-gen/jnienv-gen.csproj +++ b/build-tools/jnienv-gen/jnienv-gen.csproj @@ -2,7 +2,7 @@ Exe - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) false diff --git a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj index d1b6900e8..fd2fb69e3 100644 --- a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj +++ b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(DotNetTargetFramework) 8.0 {AD4468F8-8883-434B-9D4C-E1801BB3B52A} enable diff --git a/src/Java.Interop.Export/Java.Interop.Export.csproj b/src/Java.Interop.Export/Java.Interop.Export.csproj index e9896daef..99f978acb 100644 --- a/src/Java.Interop.Export/Java.Interop.Export.csproj +++ b/src/Java.Interop.Export/Java.Interop.Export.csproj @@ -1,7 +1,7 @@ - netstandard2.0;$(DotNetTargetFramework) + $(DotNetTargetFramework) 9.0 {B501D075-6183-4E1D-92C9-F7B5002475B1} enable diff --git a/src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj b/src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj index e7e2b6fe5..ffccf56ce 100644 --- a/src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj +++ b/src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(DotNetTargetFramework) {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF} true true @@ -20,12 +20,7 @@ - - {94BD81F7-B06F-4295-9636-F8A3B6BDC762} - Java.Interop - true - TargetFramework=netstandard2.0 - + diff --git a/src/Java.Interop.Localization/Java.Interop.Localization.csproj b/src/Java.Interop.Localization/Java.Interop.Localization.csproj index c6d6936fa..0f0eaf2b8 100644 --- a/src/Java.Interop.Localization/Java.Interop.Localization.csproj +++ b/src/Java.Interop.Localization/Java.Interop.Localization.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(DotNetTargetFramework) 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES 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 1c9e56d07..69b575a2f 100644 --- a/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj +++ b/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(DotNetTargetFramework) 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES 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 7f420d9e4..b3788ba61 100644 --- a/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj +++ b/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + $(DotNetTargetFramework) 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES diff --git a/src/Java.Interop.Tools.Generator/Java.Interop.Tools.Generator.csproj b/src/Java.Interop.Tools.Generator/Java.Interop.Tools.Generator.csproj index e2b8d1d64..ea7f4b55d 100644 --- a/src/Java.Interop.Tools.Generator/Java.Interop.Tools.Generator.csproj +++ b/src/Java.Interop.Tools.Generator/Java.Interop.Tools.Generator.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + $(DotNetTargetFramework) 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES 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 d8d7e8128..a026725e1 100644 --- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj +++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(DotNetTargetFramework) false 8.0 enable diff --git a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource.csproj b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource.csproj index a7ab19d49..477a113dd 100644 --- a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource.csproj +++ b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(DotNetTargetFramework) 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES diff --git a/src/Java.Interop.Tools.JavaTypeSystem/Java.Interop.Tools.JavaTypeSystem.csproj b/src/Java.Interop.Tools.JavaTypeSystem/Java.Interop.Tools.JavaTypeSystem.csproj index e6fe5a30e..8aa718304 100644 --- a/src/Java.Interop.Tools.JavaTypeSystem/Java.Interop.Tools.JavaTypeSystem.csproj +++ b/src/Java.Interop.Tools.JavaTypeSystem/Java.Interop.Tools.JavaTypeSystem.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(DotNetTargetFramework) enable INTERNAL_NULLABLE_ATTRIBUTES 8.0 diff --git a/src/Java.Interop/Java.Interop-MonoAndroid.csproj b/src/Java.Interop/Java.Interop-MonoAndroid.csproj index 3a6d3e802..b08c9e0c1 100644 --- a/src/Java.Interop/Java.Interop-MonoAndroid.csproj +++ b/src/Java.Interop/Java.Interop-MonoAndroid.csproj @@ -124,7 +124,6 @@ diff --git a/src/Java.Interop/Java.Interop.csproj b/src/Java.Interop/Java.Interop.csproj index 057b82ee9..14d7a4fcf 100644 --- a/src/Java.Interop/Java.Interop.csproj +++ b/src/Java.Interop/Java.Interop.csproj @@ -4,17 +4,8 @@ ..\..\bin\Build$(Configuration)\XAConfig.props - - - netstandard2.0 - <_JniEnvSkipGetTargetFrameworkProperties>true - <_JniEnvAdditionalProperties>TargetFramework=net472 - - netstandard2.0;$(DotNetTargetFramework) + $(DotNetTargetFramework) $(NoWarn);1591 diff --git a/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj b/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj index ae071741a..e699d50ed 100644 --- a/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj +++ b/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj @@ -1,7 +1,7 @@  - netstandard2.0;$(DotNetTargetFramework) + $(DotNetTargetFramework) true ..\..\product.snk true diff --git a/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/Xamarin.Android.Tools.AnnotationSupport.Cecil.csproj b/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/Xamarin.Android.Tools.AnnotationSupport.Cecil.csproj index 96844fce6..e670ba91a 100644 --- a/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/Xamarin.Android.Tools.AnnotationSupport.Cecil.csproj +++ b/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/Xamarin.Android.Tools.AnnotationSupport.Cecil.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(DotNetTargetFramework) diff --git a/src/Xamarin.Android.Tools.AnnotationSupport/Xamarin.Android.Tools.AnnotationSupport.csproj b/src/Xamarin.Android.Tools.AnnotationSupport/Xamarin.Android.Tools.AnnotationSupport.csproj index c12ad0713..181ed7cff 100644 --- a/src/Xamarin.Android.Tools.AnnotationSupport/Xamarin.Android.Tools.AnnotationSupport.csproj +++ b/src/Xamarin.Android.Tools.AnnotationSupport/Xamarin.Android.Tools.AnnotationSupport.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(DotNetTargetFramework) diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Xamarin.Android.Tools.ApiXmlAdjuster.csproj b/src/Xamarin.Android.Tools.ApiXmlAdjuster/Xamarin.Android.Tools.ApiXmlAdjuster.csproj index cb7eb5a0a..f5eb24463 100644 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Xamarin.Android.Tools.ApiXmlAdjuster.csproj +++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/Xamarin.Android.Tools.ApiXmlAdjuster.csproj @@ -1,10 +1,9 @@  - netstandard2.0 + $(DotNetTargetFramework) 8.0 enable - INTERNAL_NULLABLE_ATTRIBUTES @@ -13,10 +12,6 @@ $(TestOutputFullPath) - - - - diff --git a/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj b/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj index 83e059975..d069af6c8 100644 --- a/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj +++ b/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj @@ -1,7 +1,7 @@ - netstandard2.0;$(DotNetTargetFramework) + $(DotNetTargetFramework) 10.0 true ..\..\product.snk diff --git a/src/Xamarin.SourceWriter/Xamarin.SourceWriter.csproj b/src/Xamarin.SourceWriter/Xamarin.SourceWriter.csproj index caed97606..c6efdc899 100644 --- a/src/Xamarin.SourceWriter/Xamarin.SourceWriter.csproj +++ b/src/Xamarin.SourceWriter/Xamarin.SourceWriter.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(DotNetTargetFramework) diff --git a/src/java-interop/java-interop.csproj b/src/java-interop/java-interop.csproj index c506b678e..b0e0ab066 100644 --- a/src/java-interop/java-interop.csproj +++ b/src/java-interop/java-interop.csproj @@ -1,6 +1,6 @@ - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) java-interop JI_DLL_EXPORT MONODEVELOP JAVA_INTEROP_DLL_EXPORT . diff --git a/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj b/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj index 9402d569b..8e6f39566 100644 --- a/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj +++ b/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj @@ -1,7 +1,7 @@  - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) false true diff --git a/tests/Java.Interop-Tests/Java.Interop-Tests.csproj b/tests/Java.Interop-Tests/Java.Interop-Tests.csproj index 4afa21e4e..71af5f4bf 100644 --- a/tests/Java.Interop-Tests/Java.Interop-Tests.csproj +++ b/tests/Java.Interop-Tests/Java.Interop-Tests.csproj @@ -1,7 +1,7 @@ - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) false true 9.0 diff --git a/tests/Java.Interop-Tests/Java.Interop-Tests.targets b/tests/Java.Interop-Tests/Java.Interop-Tests.targets index e3910c046..eb63c83af 100644 --- a/tests/Java.Interop-Tests/Java.Interop-Tests.targets +++ b/tests/Java.Interop-Tests/Java.Interop-Tests.targets @@ -13,9 +13,9 @@ Lines="@(_Source)" Overwrite="True" /> - + - + diff --git a/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj b/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj index 4963196f3..09e432b11 100644 --- a/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj +++ b/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj @@ -1,7 +1,7 @@  - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) false true diff --git a/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj b/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj index 90aeccaab..3195d4690 100644 --- a/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj +++ b/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj @@ -1,7 +1,7 @@  - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) false true @@ -34,8 +34,8 @@ - - + + diff --git a/tests/Java.Interop.Tools.Generator-Tests/Java.Interop.Tools.Generator-Tests.csproj b/tests/Java.Interop.Tools.Generator-Tests/Java.Interop.Tools.Generator-Tests.csproj index 910fe9aec..5dad85b0f 100644 --- a/tests/Java.Interop.Tools.Generator-Tests/Java.Interop.Tools.Generator-Tests.csproj +++ b/tests/Java.Interop.Tools.Generator-Tests/Java.Interop.Tools.Generator-Tests.csproj @@ -1,7 +1,7 @@ - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) Java.Interop.Tools.Common_Tests false diff --git a/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj index 4bddfed55..12972354f 100644 --- a/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj +++ b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj @@ -1,7 +1,7 @@ - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) false 8.0 $(DefineConstants);HAVE_CECIL;JCW_ONLY_TYPE_NAMES diff --git a/tests/Java.Interop.Tools.JavaSource-Tests/Java.Interop.Tools.JavaSource-Tests.csproj b/tests/Java.Interop.Tools.JavaSource-Tests/Java.Interop.Tools.JavaSource-Tests.csproj index cfcbc4f55..b6b91068c 100644 --- a/tests/Java.Interop.Tools.JavaSource-Tests/Java.Interop.Tools.JavaSource-Tests.csproj +++ b/tests/Java.Interop.Tools.JavaSource-Tests/Java.Interop.Tools.JavaSource-Tests.csproj @@ -1,6 +1,6 @@  - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) False diff --git a/tests/Java.Interop.Tools.JavaTypeSystem-Tests/Java.Interop.Tools.JavaTypeSystem-Tests.csproj b/tests/Java.Interop.Tools.JavaTypeSystem-Tests/Java.Interop.Tools.JavaTypeSystem-Tests.csproj index a0fb695ce..2836ba7f2 100644 --- a/tests/Java.Interop.Tools.JavaTypeSystem-Tests/Java.Interop.Tools.JavaTypeSystem-Tests.csproj +++ b/tests/Java.Interop.Tools.JavaTypeSystem-Tests/Java.Interop.Tools.JavaTypeSystem-Tests.csproj @@ -1,7 +1,7 @@ - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) false Java.Interop.Tools.JavaTypeSystem.Tests 8.0 diff --git a/tests/NativeTiming/NativeTiming.csproj b/tests/NativeTiming/NativeTiming.csproj index 68105101b..2f6ea0284 100644 --- a/tests/NativeTiming/NativeTiming.csproj +++ b/tests/NativeTiming/NativeTiming.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + $(DotNetTargetFramework) false diff --git a/tests/TestJVM/TestJVM.csproj b/tests/TestJVM/TestJVM.csproj index 2a53924f4..4a57d4867 100644 --- a/tests/TestJVM/TestJVM.csproj +++ b/tests/TestJVM/TestJVM.csproj @@ -1,7 +1,7 @@ - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) 8.0 enable false diff --git a/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj index c6a4e3c7b..51e855039 100644 --- a/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj +++ b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj @@ -1,7 +1,7 @@ - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) false diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj b/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj index 232f069d9..b5f04a787 100644 --- a/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj @@ -1,7 +1,7 @@  - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) false 8.0 diff --git a/tests/Xamarin.SourceWriter-Tests/Xamarin.SourceWriter-Tests.csproj b/tests/Xamarin.SourceWriter-Tests/Xamarin.SourceWriter-Tests.csproj index 336caea9f..0224322d6 100644 --- a/tests/Xamarin.SourceWriter-Tests/Xamarin.SourceWriter-Tests.csproj +++ b/tests/Xamarin.SourceWriter-Tests/Xamarin.SourceWriter-Tests.csproj @@ -1,7 +1,7 @@ - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) false diff --git a/tests/generator-Tests/generator-Tests.csproj b/tests/generator-Tests/generator-Tests.csproj index 9992733b2..7ecb2f334 100644 --- a/tests/generator-Tests/generator-Tests.csproj +++ b/tests/generator-Tests/generator-Tests.csproj @@ -1,7 +1,7 @@  - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) false true 8.0 diff --git a/tests/invocation-overhead/invocation-overhead.csproj b/tests/invocation-overhead/invocation-overhead.csproj index 5bc4123fb..0f631380b 100644 --- a/tests/invocation-overhead/invocation-overhead.csproj +++ b/tests/invocation-overhead/invocation-overhead.csproj @@ -2,7 +2,7 @@ Exe - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) True True FEATURE_JNIENVIRONMENT_JI_INTPTRS;FEATURE_JNIENVIRONMENT_JI_PINVOKES;FEATURE_JNIENVIRONMENT_SAFEHANDLES;FEATURE_JNIENVIRONMENT_XA_INTPTRS diff --git a/tests/logcat-parse-Tests/logcat-parse-Tests.csproj b/tests/logcat-parse-Tests/logcat-parse-Tests.csproj index 22307113d..889db0f6a 100644 --- a/tests/logcat-parse-Tests/logcat-parse-Tests.csproj +++ b/tests/logcat-parse-Tests/logcat-parse-Tests.csproj @@ -1,7 +1,7 @@  - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) false diff --git a/tools/class-parse/class-parse.csproj b/tools/class-parse/class-parse.csproj index a1eb43cc4..eeb3049f7 100644 --- a/tools/class-parse/class-parse.csproj +++ b/tools/class-parse/class-parse.csproj @@ -1,7 +1,7 @@  - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) Exe diff --git a/tools/generator/generator.csproj b/tools/generator/generator.csproj index cfc678859..9db02eabb 100644 --- a/tools/generator/generator.csproj +++ b/tools/generator/generator.csproj @@ -1,7 +1,7 @@  - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) Exe $(DefineConstants);GENERATOR;HAVE_CECIL;JCW_ONLY_TYPE_NAMES 8.0 diff --git a/tools/java-source-utils/java-source-utils.csproj b/tools/java-source-utils/java-source-utils.csproj index 324de8669..03383d089 100644 --- a/tools/java-source-utils/java-source-utils.csproj +++ b/tools/java-source-utils/java-source-utils.csproj @@ -1,7 +1,7 @@ - net7.0 + $(DotNetTargetFramework) diff --git a/tools/jcw-gen/jcw-gen.csproj b/tools/jcw-gen/jcw-gen.csproj index 819811fda..af045d56f 100644 --- a/tools/jcw-gen/jcw-gen.csproj +++ b/tools/jcw-gen/jcw-gen.csproj @@ -1,7 +1,7 @@  - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) Exe diff --git a/tools/logcat-parse/logcat-parse.csproj b/tools/logcat-parse/logcat-parse.csproj index 76b46520e..219aa5f26 100644 --- a/tools/logcat-parse/logcat-parse.csproj +++ b/tools/logcat-parse/logcat-parse.csproj @@ -1,7 +1,7 @@  - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) Exe diff --git a/tools/param-name-importer/param-name-importer.csproj b/tools/param-name-importer/param-name-importer.csproj index bd799ce88..77ac396a2 100644 --- a/tools/param-name-importer/param-name-importer.csproj +++ b/tools/param-name-importer/param-name-importer.csproj @@ -1,6 +1,6 @@ - net472;$(DotNetTargetFramework) + $(DotNetTargetFramework) Exe From a256ad243d65bba7410b6f2aa13f737094ffffdc Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Thu, 13 Apr 2023 13:51:02 -0500 Subject: [PATCH 2/5] Test --- Directory.Build.props | 2 +- TargetFrameworkDependentValues.props | 21 +++++++++---------- .../Java.Interop.BootstrapTasks.csproj | 4 ++-- .../automation/templates/core-tests.yaml | 10 --------- .../Java.Interop.Localization.csproj | 2 +- .../Java.Interop.Tools.Cecil.csproj | 2 +- .../Java.Interop.Tools.Diagnostics.csproj | 2 +- ....Interop.Tools.JavaCallableWrappers.csproj | 2 +- .../Java.Interop-Tests.targets | 4 ++-- .../Java.Interop.Export-Tests.csproj | 4 ++-- 10 files changed, 21 insertions(+), 32 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 341d653c1..3452662e4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -54,7 +54,7 @@ False False - obj\ + diff --git a/TargetFrameworkDependentValues.props b/TargetFrameworkDependentValues.props index 5076ecf59..36e8f1e33 100644 --- a/TargetFrameworkDependentValues.props +++ b/TargetFrameworkDependentValues.props @@ -5,11 +5,12 @@ True - - $(BaseIntermediateOutputPath)\$(Configuration)-$(TargetFramework.ToLowerInvariant())\ - $(MSBuildThisFileDirectory)bin\Build$(Configuration)-$(TargetFramework.ToLowerInvariant())\ - $(MSBuildThisFileDirectory)bin\$(Configuration)-$(TargetFramework.ToLowerInvariant())\ - $(MSBuildThisFileDirectory)bin\Test$(Configuration)-$(TargetFramework.ToLowerInvariant())\ + + $(BaseIntermediateOutputPath)\$(Configuration)-$(DotNetTargetFramework.ToLowerInvariant())\ + $(MSBuildThisFileDirectory)bin\Build$(Configuration)\ + $(MSBuildThisFileDirectory)bin\Build$(Configuration)-$(DotNetTargetFramework.ToLowerInvariant())\ + $(MSBuildThisFileDirectory)bin\$(Configuration)-$(DotNetTargetFramework.ToLowerInvariant())\ + $(MSBuildThisFileDirectory)bin\Test$(Configuration)-$(DotNetTargetFramework.ToLowerInvariant())\ $(UtilityOutputFullPathCoreApps) $(ToolOutputFullPath) <_XamarinAndroidCecilPath Condition=" '$(CecilSourceDirectory)' != '' And Exists('$(UtilityOutputFullPathCoreApps)Xamarin.Android.Cecil.dll') ">$(UtilityOutputFullPathCoreApps)Xamarin.Android.Cecil.dll @@ -18,7 +19,7 @@ $(JINetCoreLibVersion) - + mono - <_JNIEnvGenPath Condition=" '$(JIBuildingForNetCoreApp)' == 'True' ">$(BuildToolOutputFullPath)jnienv-gen.dll - <_JNIEnvGenPath Condition=" '$(JIBuildingForNetCoreApp)' != 'True' ">$(BuildToolOutputFullPath)jnienv-gen.exe - <_RunJNIEnvGen Condition=" '$(JIBuildingForNetCoreApp)' == 'True' ">$(DotnetToolPath) "$(_JNIEnvGenPath)" - <_RunJNIEnvGen Condition=" '$(JIBuildingForNetCoreApp)' != 'True' ">$(Runtime) "$(_JNIEnvGenPath)" + <_JNIEnvGenPath>$(BuildToolOutputFullPath)jnienv-gen.dll + <_RunJNIEnvGen>$(DotnetToolPath) "$(_JNIEnvGenPath)" diff --git a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj index 30c985671..0a4bd36bb 100644 --- a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj +++ b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj @@ -8,11 +8,11 @@ - $(BuildToolOutputFullPath) + $(BuildToolOutputFullPathNoTF) - $(BuildToolOutputFullPath) + $(BuildToolOutputFullPathNoTF) main false diff --git a/build-tools/automation/templates/core-tests.yaml b/build-tools/automation/templates/core-tests.yaml index 3090119ee..98ad5f841 100644 --- a/build-tools/automation/templates/core-tests.yaml +++ b/build-tools/automation/templates/core-tests.yaml @@ -76,16 +76,6 @@ steps: arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Xamarin.SourceWriter-Tests.dll continueOnError: true -- task: DotNetCoreCLI@2 - displayName: 'Tests: Java.Interop' - condition: eq('${{ parameters.runNativeTests }}', 'true') - inputs: - command: test - testRunTitle: Java.Interop (netstandard2.0 - ${{ parameters.platformName }}) - arguments: bin/Test$(Build.Configuration)/Java.Interop-Tests.dll - continueOnError: true - retryCountOnTaskFailure: 1 - - task: DotNetCoreCLI@2 displayName: 'Tests: Java.Interop' condition: or(eq('${{ parameters.runNativeDotnetTests }}', 'true'), eq('${{ parameters.runNativeTests }}', 'true')) diff --git a/src/Java.Interop.Localization/Java.Interop.Localization.csproj b/src/Java.Interop.Localization/Java.Interop.Localization.csproj index 0f0eaf2b8..c6d6936fa 100644 --- a/src/Java.Interop.Localization/Java.Interop.Localization.csproj +++ b/src/Java.Interop.Localization/Java.Interop.Localization.csproj @@ -1,7 +1,7 @@ - $(DotNetTargetFramework) + netstandard2.0 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES 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 69b575a2f..1c9e56d07 100644 --- a/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj +++ b/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj @@ -1,7 +1,7 @@ - $(DotNetTargetFramework) + netstandard2.0 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES 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 b3788ba61..7f420d9e4 100644 --- a/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj +++ b/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj @@ -1,7 +1,7 @@  - $(DotNetTargetFramework) + netstandard2.0 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES 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 a026725e1..d8d7e8128 100644 --- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj +++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj @@ -1,7 +1,7 @@ - $(DotNetTargetFramework) + netstandard2.0 false 8.0 enable diff --git a/tests/Java.Interop-Tests/Java.Interop-Tests.targets b/tests/Java.Interop-Tests/Java.Interop-Tests.targets index eb63c83af..b62ad593d 100644 --- a/tests/Java.Interop-Tests/Java.Interop-Tests.targets +++ b/tests/Java.Interop-Tests/Java.Interop-Tests.targets @@ -13,9 +13,9 @@ Lines="@(_Source)" Overwrite="True" /> - + - + diff --git a/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj b/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj index 3195d4690..4d776a0cf 100644 --- a/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj +++ b/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj @@ -34,8 +34,8 @@ - - + + From ae4071baab5cf0d7f14976e7af787e5fda484938 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Thu, 11 May 2023 14:02:34 -0500 Subject: [PATCH 3/5] More changes. --- Directory.Build.props | 15 ++++----------- TargetFrameworkDependentValues.props | 16 ++-------------- .../Java.Interop.BootstrapTasks.csproj | 4 ---- .../Java.Interop.Localization.csproj | 2 +- .../Java.Interop.Tools.Cecil.csproj | 2 +- .../Java.Interop.Tools.Diagnostics.csproj | 2 +- ...ava.Interop.Tools.JavaCallableWrappers.csproj | 2 +- 7 files changed, 10 insertions(+), 33 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3452662e4..b540fa2ed 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,21 +3,14 @@ Debug - <_OutputPath>$(MSBuildThisFileDirectory)bin\Build$(Configuration)\ true true 7.0 net$(DotNetTargetFrameworkVersion) - - 1.0.0.0 + + netstandard2.0 False False - + obj\ diff --git a/TargetFrameworkDependentValues.props b/TargetFrameworkDependentValues.props index 36e8f1e33..ae7eef09c 100644 --- a/TargetFrameworkDependentValues.props +++ b/TargetFrameworkDependentValues.props @@ -19,30 +19,18 @@ $(JINetCoreLibVersion) - - mono <_JNIEnvGenPath>$(BuildToolOutputFullPath)jnienv-gen.dll <_RunJNIEnvGen>$(DotnetToolPath) "$(_JNIEnvGenPath)" - - + AllEnabledByDefault $(WarningsAsErrors);CA1307;CA1309;CA1310 - + $(NoWarn);CA1307;CA1309;CA1310 diff --git a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj index 0a4bd36bb..f8cd822d4 100644 --- a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj +++ b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj @@ -7,10 +7,6 @@ - - $(BuildToolOutputFullPathNoTF) - - $(BuildToolOutputFullPathNoTF) main diff --git a/src/Java.Interop.Localization/Java.Interop.Localization.csproj b/src/Java.Interop.Localization/Java.Interop.Localization.csproj index c6d6936fa..bedeeb52d 100644 --- a/src/Java.Interop.Localization/Java.Interop.Localization.csproj +++ b/src/Java.Interop.Localization/Java.Interop.Localization.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(MSBuildRequiredTargetFramework) 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES 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 1c9e56d07..34c79b23d 100644 --- a/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj +++ b/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(MSBuildRequiredTargetFramework) 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES 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 7f420d9e4..ab8b99673 100644 --- a/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj +++ b/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + $(MSBuildRequiredTargetFramework) 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES 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 d8d7e8128..c2e1e138a 100644 --- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj +++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(MSBuildRequiredTargetFramework) false 8.0 enable From 74724c0f4274231671187ec1ade1ec049c30930f Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Mon, 15 May 2023 14:38:37 -0500 Subject: [PATCH 4/5] TargetFramework. --- build-tools/jnienv-gen/jnienv-gen.csproj | 2 +- .../Java.Interop.Export.csproj | 2 +- .../Java.Interop-MonoAndroid.csproj | 132 ------------------ src/Java.Interop/Java.Interop.csproj | 2 +- .../Java.Runtime.Environment.csproj | 2 +- .../Xamarin.Android.Tools.Bytecode.csproj | 7 +- .../Java.Interop-PerformanceTests.csproj | 2 +- .../Java.Interop-Tests.csproj | 2 +- .../Java.Interop.Dynamic-Tests.csproj | 2 +- .../Java.Interop.Export-Tests.csproj | 2 +- .../Java.Interop.Tools.Generator-Tests.csproj | 2 +- ...op.Tools.JavaCallableWrappers-Tests.csproj | 2 +- ...Java.Interop.Tools.JavaSource-Tests.csproj | 2 +- ....Interop.Tools.JavaTypeSystem-Tests.csproj | 2 +- tests/TestJVM/TestJVM.csproj | 2 +- ....Android.Tools.ApiXmlAdjuster-Tests.csproj | 2 +- ...amarin.Android.Tools.Bytecode-Tests.csproj | 2 +- .../Xamarin.SourceWriter-Tests.csproj | 2 +- tests/generator-Tests/generator-Tests.csproj | 2 +- .../invocation-overhead.csproj | 5 +- .../logcat-parse-Tests.csproj | 2 +- tools/class-parse/class-parse.csproj | 2 +- tools/generator/generator.csproj | 2 +- tools/jcw-gen/jcw-gen.csproj | 2 +- tools/logcat-parse/logcat-parse.csproj | 2 +- .../param-name-importer.csproj | 2 +- 26 files changed, 26 insertions(+), 164 deletions(-) delete mode 100644 src/Java.Interop/Java.Interop-MonoAndroid.csproj diff --git a/build-tools/jnienv-gen/jnienv-gen.csproj b/build-tools/jnienv-gen/jnienv-gen.csproj index a3f0ca179..f560773cb 100644 --- a/build-tools/jnienv-gen/jnienv-gen.csproj +++ b/build-tools/jnienv-gen/jnienv-gen.csproj @@ -2,7 +2,7 @@ Exe - $(DotNetTargetFramework) + $(DotNetTargetFramework) false diff --git a/src/Java.Interop.Export/Java.Interop.Export.csproj b/src/Java.Interop.Export/Java.Interop.Export.csproj index 99f978acb..d56c4bfce 100644 --- a/src/Java.Interop.Export/Java.Interop.Export.csproj +++ b/src/Java.Interop.Export/Java.Interop.Export.csproj @@ -1,7 +1,7 @@ - $(DotNetTargetFramework) + $(DotNetTargetFramework) 9.0 {B501D075-6183-4E1D-92C9-F7B5002475B1} enable diff --git a/src/Java.Interop/Java.Interop-MonoAndroid.csproj b/src/Java.Interop/Java.Interop-MonoAndroid.csproj deleted file mode 100644 index b08c9e0c1..000000000 --- a/src/Java.Interop/Java.Interop-MonoAndroid.csproj +++ /dev/null @@ -1,132 +0,0 @@ - - - - - MonoAndroid - v1.0 - $(XAInstallPrefix)xbuild-frameworks - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {94BD81F7-B06F-4295-9636-F8A3B6BDC762} - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Java.Interop - Java.Interop - v4.5 - $(NoWarn);1591 - true - ..\..\product.snk - 8.0 - true - true - - - - - 0.1.0.0 - ..\..\bin\Build$(Configuration)\XAConfig.props - - - - true - portable - false - ..\..\bin\Debug - DEBUG;INTEROP;FEATURE_JNIENVIRONMENT_JI_PINVOKES;FEATURE_JNIOBJECTREFERENCE_INTPTRS;INTERNAL_NULLABLE_ATTRIBUTES;$(JavaInteropDefineConstants) - prompt - 4 - false - true - enable - ..\..\bin\Debug\Java.Interop.xml - ..\..\bin\BuildDebug - - - portable - true - ..\..\bin\Release - prompt - 4 - false - INTEROP;FEATURE_JNIENVIRONMENT_JI_PINVOKES;FEATURE_JNIOBJECTREFERENCE_INTPTRS;INTERNAL_NULLABLE_ATTRIBUTES;$(JavaInteropDefineConstants) - true - enable - ..\..\bin\Release\Java.Interop.xml - ..\..\bin\BuildRelease - - - true - ..\..\bin\$(Configuration)Net45 - $(OutputPath)\Java.Interop.xml - ..\..\bin\Build$(Configuration)\Java.Interop-MonoAndroid\ - - - - - - - - - - - - - - - - - $(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\mscorlib.dll - False - - - $(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\System.dll - False - - - $(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\System.Core.dll - False - - - - - - BuildJniEnvironment_g_cs; - BuildVersionInfo_g_cs; - BuildInteropJar; - $(BuildDependsOn) - - - - - TextTemplatingFileGenerator - JavaPrimitiveArrays.cs - - - TextTemplatingFileGenerator - JniBuiltinMarshalers.cs - - - TextTemplatingFileGenerator - JniPeerMembers.JniInstanceMethods_Invoke.cs - - - TextTemplatingFileGenerator - JniPeerMembers.JniFields.cs - - - - - - - - - - diff --git a/src/Java.Interop/Java.Interop.csproj b/src/Java.Interop/Java.Interop.csproj index 14d7a4fcf..7132b01e8 100644 --- a/src/Java.Interop/Java.Interop.csproj +++ b/src/Java.Interop/Java.Interop.csproj @@ -5,7 +5,7 @@ - $(DotNetTargetFramework) + $(DotNetTargetFramework) $(NoWarn);1591 diff --git a/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj b/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj index e699d50ed..59c6ca128 100644 --- a/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj +++ b/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj @@ -1,7 +1,7 @@  - $(DotNetTargetFramework) + $(DotNetTargetFramework) true ..\..\product.snk true diff --git a/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj b/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj index d069af6c8..1eb7a2e98 100644 --- a/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj +++ b/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj @@ -1,11 +1,10 @@ - $(DotNetTargetFramework) + $(DotNetTargetFramework) 10.0 true ..\..\product.snk - INTERNAL_NULLABLE_ATTRIBUTES enable @@ -15,10 +14,6 @@ $(TestOutputFullPath) - - - - diff --git a/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj b/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj index 8e6f39566..6d4ad663b 100644 --- a/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj +++ b/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj @@ -1,7 +1,7 @@  - $(DotNetTargetFramework) + $(DotNetTargetFramework) false true diff --git a/tests/Java.Interop-Tests/Java.Interop-Tests.csproj b/tests/Java.Interop-Tests/Java.Interop-Tests.csproj index 71af5f4bf..9e456e191 100644 --- a/tests/Java.Interop-Tests/Java.Interop-Tests.csproj +++ b/tests/Java.Interop-Tests/Java.Interop-Tests.csproj @@ -1,7 +1,7 @@ - $(DotNetTargetFramework) + $(DotNetTargetFramework) false true 9.0 diff --git a/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj b/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj index 09e432b11..705cc9e09 100644 --- a/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj +++ b/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj @@ -1,7 +1,7 @@  - $(DotNetTargetFramework) + $(DotNetTargetFramework) false true diff --git a/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj b/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj index 4d776a0cf..510f8cead 100644 --- a/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj +++ b/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj @@ -1,7 +1,7 @@  - $(DotNetTargetFramework) + $(DotNetTargetFramework) false true diff --git a/tests/Java.Interop.Tools.Generator-Tests/Java.Interop.Tools.Generator-Tests.csproj b/tests/Java.Interop.Tools.Generator-Tests/Java.Interop.Tools.Generator-Tests.csproj index 5dad85b0f..d4a598695 100644 --- a/tests/Java.Interop.Tools.Generator-Tests/Java.Interop.Tools.Generator-Tests.csproj +++ b/tests/Java.Interop.Tools.Generator-Tests/Java.Interop.Tools.Generator-Tests.csproj @@ -1,7 +1,7 @@ - $(DotNetTargetFramework) + $(DotNetTargetFramework) Java.Interop.Tools.Common_Tests false diff --git a/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj index 12972354f..10b3efb50 100644 --- a/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj +++ b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj @@ -1,7 +1,7 @@ - $(DotNetTargetFramework) + $(DotNetTargetFramework) false 8.0 $(DefineConstants);HAVE_CECIL;JCW_ONLY_TYPE_NAMES diff --git a/tests/Java.Interop.Tools.JavaSource-Tests/Java.Interop.Tools.JavaSource-Tests.csproj b/tests/Java.Interop.Tools.JavaSource-Tests/Java.Interop.Tools.JavaSource-Tests.csproj index b6b91068c..340b2ee89 100644 --- a/tests/Java.Interop.Tools.JavaSource-Tests/Java.Interop.Tools.JavaSource-Tests.csproj +++ b/tests/Java.Interop.Tools.JavaSource-Tests/Java.Interop.Tools.JavaSource-Tests.csproj @@ -1,6 +1,6 @@  - $(DotNetTargetFramework) + $(DotNetTargetFramework) False diff --git a/tests/Java.Interop.Tools.JavaTypeSystem-Tests/Java.Interop.Tools.JavaTypeSystem-Tests.csproj b/tests/Java.Interop.Tools.JavaTypeSystem-Tests/Java.Interop.Tools.JavaTypeSystem-Tests.csproj index 2836ba7f2..8a50fe039 100644 --- a/tests/Java.Interop.Tools.JavaTypeSystem-Tests/Java.Interop.Tools.JavaTypeSystem-Tests.csproj +++ b/tests/Java.Interop.Tools.JavaTypeSystem-Tests/Java.Interop.Tools.JavaTypeSystem-Tests.csproj @@ -1,7 +1,7 @@ - $(DotNetTargetFramework) + $(DotNetTargetFramework) false Java.Interop.Tools.JavaTypeSystem.Tests 8.0 diff --git a/tests/TestJVM/TestJVM.csproj b/tests/TestJVM/TestJVM.csproj index 4a57d4867..753b3dd48 100644 --- a/tests/TestJVM/TestJVM.csproj +++ b/tests/TestJVM/TestJVM.csproj @@ -1,7 +1,7 @@ - $(DotNetTargetFramework) + $(DotNetTargetFramework) 8.0 enable false diff --git a/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj index 51e855039..56f0dda1b 100644 --- a/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj +++ b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj @@ -1,7 +1,7 @@ - $(DotNetTargetFramework) + $(DotNetTargetFramework) false diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj b/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj index b5f04a787..1e5d3cace 100644 --- a/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj @@ -1,7 +1,7 @@  - $(DotNetTargetFramework) + $(DotNetTargetFramework) false 8.0 diff --git a/tests/Xamarin.SourceWriter-Tests/Xamarin.SourceWriter-Tests.csproj b/tests/Xamarin.SourceWriter-Tests/Xamarin.SourceWriter-Tests.csproj index 0224322d6..c5028668b 100644 --- a/tests/Xamarin.SourceWriter-Tests/Xamarin.SourceWriter-Tests.csproj +++ b/tests/Xamarin.SourceWriter-Tests/Xamarin.SourceWriter-Tests.csproj @@ -1,7 +1,7 @@ - $(DotNetTargetFramework) + $(DotNetTargetFramework) false diff --git a/tests/generator-Tests/generator-Tests.csproj b/tests/generator-Tests/generator-Tests.csproj index 7ecb2f334..7f54243e6 100644 --- a/tests/generator-Tests/generator-Tests.csproj +++ b/tests/generator-Tests/generator-Tests.csproj @@ -1,7 +1,7 @@  - $(DotNetTargetFramework) + $(DotNetTargetFramework) false true 8.0 diff --git a/tests/invocation-overhead/invocation-overhead.csproj b/tests/invocation-overhead/invocation-overhead.csproj index 0f631380b..096ddf687 100644 --- a/tests/invocation-overhead/invocation-overhead.csproj +++ b/tests/invocation-overhead/invocation-overhead.csproj @@ -2,11 +2,10 @@ Exe - $(DotNetTargetFramework) + $(DotNetTargetFramework) True True - FEATURE_JNIENVIRONMENT_JI_INTPTRS;FEATURE_JNIENVIRONMENT_JI_PINVOKES;FEATURE_JNIENVIRONMENT_SAFEHANDLES;FEATURE_JNIENVIRONMENT_XA_INTPTRS - $(DefineConstants);FEATURE_JNIENVIRONMENT_JI_FUNCTION_POINTERS + FEATURE_JNIENVIRONMENT_JI_INTPTRS;FEATURE_JNIENVIRONMENT_JI_PINVOKES;FEATURE_JNIENVIRONMENT_SAFEHANDLES;FEATURE_JNIENVIRONMENT_XA_INTPTRS;FEATURE_JNIENVIRONMENT_JI_FUNCTION_POINTERS diff --git a/tests/logcat-parse-Tests/logcat-parse-Tests.csproj b/tests/logcat-parse-Tests/logcat-parse-Tests.csproj index 889db0f6a..c323e0fba 100644 --- a/tests/logcat-parse-Tests/logcat-parse-Tests.csproj +++ b/tests/logcat-parse-Tests/logcat-parse-Tests.csproj @@ -1,7 +1,7 @@  - $(DotNetTargetFramework) + $(DotNetTargetFramework) false diff --git a/tools/class-parse/class-parse.csproj b/tools/class-parse/class-parse.csproj index eeb3049f7..27fec352f 100644 --- a/tools/class-parse/class-parse.csproj +++ b/tools/class-parse/class-parse.csproj @@ -1,7 +1,7 @@  - $(DotNetTargetFramework) + $(DotNetTargetFramework) Exe diff --git a/tools/generator/generator.csproj b/tools/generator/generator.csproj index 9db02eabb..ee70679ac 100644 --- a/tools/generator/generator.csproj +++ b/tools/generator/generator.csproj @@ -1,7 +1,7 @@  - $(DotNetTargetFramework) + $(DotNetTargetFramework) Exe $(DefineConstants);GENERATOR;HAVE_CECIL;JCW_ONLY_TYPE_NAMES 8.0 diff --git a/tools/jcw-gen/jcw-gen.csproj b/tools/jcw-gen/jcw-gen.csproj index af045d56f..7bd48b08e 100644 --- a/tools/jcw-gen/jcw-gen.csproj +++ b/tools/jcw-gen/jcw-gen.csproj @@ -1,7 +1,7 @@  - $(DotNetTargetFramework) + $(DotNetTargetFramework) Exe diff --git a/tools/logcat-parse/logcat-parse.csproj b/tools/logcat-parse/logcat-parse.csproj index 219aa5f26..7981f3897 100644 --- a/tools/logcat-parse/logcat-parse.csproj +++ b/tools/logcat-parse/logcat-parse.csproj @@ -1,7 +1,7 @@  - $(DotNetTargetFramework) + $(DotNetTargetFramework) Exe diff --git a/tools/param-name-importer/param-name-importer.csproj b/tools/param-name-importer/param-name-importer.csproj index 77ac396a2..17d3211c5 100644 --- a/tools/param-name-importer/param-name-importer.csproj +++ b/tools/param-name-importer/param-name-importer.csproj @@ -1,6 +1,6 @@ - $(DotNetTargetFramework) + $(DotNetTargetFramework) Exe From e1657648313028d0dd18c12c27c174aec1867175 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Tue, 16 May 2023 14:35:42 -0500 Subject: [PATCH 5/5] Address review feedback. --- Directory.Build.props | 15 ++------------- build-tools/automation/azure-pipelines.yaml | 2 +- .../templates/install-dependencies.yaml | 1 - .../Java.Interop.Dynamic.csproj | 2 +- .../Java.Interop.Localization.csproj | 2 +- .../Resources.Designer.cs | 9 +++++++++ src/Java.Interop.Localization/Resources.resx | 5 +++++ .../Java.Interop.Tools.Cecil.csproj | 2 +- .../Java.Interop.Tools.Diagnostics.csproj | 2 +- .../Enumification/ConstantEntry.cs | 10 +++++----- .../Enumification/ConstantsParser.cs | 4 ++-- .../Enumification/MethodMapEntry.cs | 6 +++--- .../Enumification/MethodMapParser.cs | 2 +- .../Java.Interop.Tools.Generator.csproj | 5 ----- .../Metadata/FixupXmlDocument.cs | 10 +++++++++- .../Utilities/Report.cs | 1 + ...Java.Interop.Tools.JavaCallableWrappers.csproj | 2 +- .../SourceJavadocToXmldocGrammar.HtmlBnfTerms.cs | 5 ++++- ...ceJavadocToXmldocGrammar.InlineTagsBnfTerms.cs | 8 ++++---- .../SourceJavadocToXmldocParser.cs | 2 +- .../Java.Interop.Tools.JavaTypeSystem.csproj | 5 ----- .../Utilities/JavaUnresolvableModel.cs | 2 +- .../JavaApiXmlLoaderExtensions.cs | 2 +- 23 files changed, 54 insertions(+), 50 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index b540fa2ed..3f8837728 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,14 +3,12 @@ Debug + true <_OutputPath>$(MSBuildThisFileDirectory)bin\Build$(Configuration)\ true true 7.0 net$(DotNetTargetFrameworkVersion) - - netstandard2.0 - $(NoWarn);CS8032;CS8981 + $(NoWarn);CS8981 diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 5aebc4b4b..d6a3d7105 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -21,7 +21,7 @@ variables: RunningOnCI: true Build.Configuration: Release MaxJdkVersion: 8 - DotNetCoreVersion: 7.0.100-rc.1.22431.12 + DotNetCoreVersion: 7.x DotNetTargetFramework: net7.0 NetCoreTargetFrameworkPathSuffix: -$(DotNetTargetFramework) 1ESWindowsPool: AzurePipelines-EO diff --git a/build-tools/automation/templates/install-dependencies.yaml b/build-tools/automation/templates/install-dependencies.yaml index 4b96799e0..7ead0e5a6 100644 --- a/build-tools/automation/templates/install-dependencies.yaml +++ b/build-tools/automation/templates/install-dependencies.yaml @@ -6,4 +6,3 @@ steps: displayName: Use .NET $(DotNetCoreVersion) inputs: version: $(DotNetCoreVersion) - includePreviewVersions: true diff --git a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj index fd2fb69e3..bd5d6f894 100644 --- a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj +++ b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj @@ -4,7 +4,7 @@ $(DotNetTargetFramework) 8.0 {AD4468F8-8883-434B-9D4C-E1801BB3B52A} - enable + annotations true true ..\..\product.snk diff --git a/src/Java.Interop.Localization/Java.Interop.Localization.csproj b/src/Java.Interop.Localization/Java.Interop.Localization.csproj index bedeeb52d..c6d6936fa 100644 --- a/src/Java.Interop.Localization/Java.Interop.Localization.csproj +++ b/src/Java.Interop.Localization/Java.Interop.Localization.csproj @@ -1,7 +1,7 @@ - $(MSBuildRequiredTargetFramework) + netstandard2.0 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES diff --git a/src/Java.Interop.Localization/Resources.Designer.cs b/src/Java.Interop.Localization/Resources.Designer.cs index d989a63e4..76e8734a8 100644 --- a/src/Java.Interop.Localization/Resources.Designer.cs +++ b/src/Java.Interop.Localization/Resources.Designer.cs @@ -402,6 +402,15 @@ public static string Generator_BG8A07 { } } + /// + /// Looks up a localized string similar to Metadata.xml element '{0}' is missing the 'path' attribute.. + /// + public static string Generator_BG8A08 { + get { + return ResourceManager.GetString("Generator_BG8A08", resourceCulture); + } + } + /// /// Looks up a localized string similar to Unknown generic argument constraint type '{0}' for member '{1}'.. /// diff --git a/src/Java.Interop.Localization/Resources.resx b/src/Java.Interop.Localization/Resources.resx index 36c78f600..95a902004 100644 --- a/src/Java.Interop.Localization/Resources.resx +++ b/src/Java.Interop.Localization/Resources.resx @@ -294,6 +294,11 @@ The following terms should not be translated: Metadata.xml. Invalid namespace transform '{0}' {0} - XML transform. (example: '<ns-replace source="example" replacement="Example" />') + + Metadata.xml element '{0}' is missing the 'path' attribute. + {0} - XML transform. (example: '<remove-node path="/api/package[@name='javax.sql']"') +The following terms should not be translated: Metadata.xml, path. + Unknown generic argument constraint type '{0}' for member '{1}'. {0} - .NET type name 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 34c79b23d..1c9e56d07 100644 --- a/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj +++ b/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj @@ -1,7 +1,7 @@ - $(MSBuildRequiredTargetFramework) + netstandard2.0 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES 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 ab8b99673..7f420d9e4 100644 --- a/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj +++ b/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj @@ -1,7 +1,7 @@  - $(MSBuildRequiredTargetFramework) + netstandard2.0 8.0 enable INTERNAL_NULLABLE_ATTRIBUTES diff --git a/src/Java.Interop.Tools.Generator/Enumification/ConstantEntry.cs b/src/Java.Interop.Tools.Generator/Enumification/ConstantEntry.cs index 9ad723054..ab9346daf 100644 --- a/src/Java.Interop.Tools.Generator/Enumification/ConstantEntry.cs +++ b/src/Java.Interop.Tools.Generator/Enumification/ConstantEntry.cs @@ -148,18 +148,18 @@ public static ConstantEntry FromElement (XElement elem) var entry = new ConstantEntry { Action = ConstantAction.None, ApiLevel = NamingConverter.ParseApiLevel (elem), - JavaSignature = elem.Parent.Parent.Attribute ("name").Value, + JavaSignature = elem.Parent?.Parent?.Attribute ("name")?.Value, Value = elem.Attribute ("value")?.Value, }; - var java_package = elem.Parent.Parent.Attribute ("name").Value.Replace ('.', '/'); - var java_type = elem.Parent.Attribute ("name").Value.Replace ('.', '$'); - var java_member = elem.Attribute ("name").Value; + var java_package = elem.Parent?.Parent?.Attribute ("name")?.Value.Replace ('.', '/'); + var java_type = elem.Parent?.Attribute ("name")?.Value.Replace ('.', '$'); + var java_member = elem.Attribute ("name")?.Value; entry.JavaSignature = $"{java_package}/{java_type}.{java_member}".TrimStart ('/'); // Interfaces get an "I:" prefix - if (elem.Parent.Name.LocalName == "interface") + if (elem.Parent?.Name.LocalName == "interface") entry.JavaSignature = "I:" + entry.JavaSignature; return entry; diff --git a/src/Java.Interop.Tools.Generator/Enumification/ConstantsParser.cs b/src/Java.Interop.Tools.Generator/Enumification/ConstantsParser.cs index 94abb9b79..cdc499e71 100644 --- a/src/Java.Interop.Tools.Generator/Enumification/ConstantsParser.cs +++ b/src/Java.Interop.Tools.Generator/Enumification/ConstantsParser.cs @@ -20,7 +20,7 @@ public static List FromEnumMapCsv (TextReader reader) var constants = new List (); var transient = false; - string s; + string? s; // Read the enum csv file while ((s = reader.ReadLine ()) != null) { @@ -105,7 +105,7 @@ public class JavaSignatureComparer : IEqualityComparer { public static JavaSignatureComparer Instance { get; } = new JavaSignatureComparer (); - public bool Equals (ConstantEntry x, ConstantEntry y) => x?.JavaSignature == y?.JavaSignature; + public bool Equals (ConstantEntry? x, ConstantEntry? y) => x?.JavaSignature == y?.JavaSignature; public int GetHashCode (ConstantEntry obj) => 0; } } diff --git a/src/Java.Interop.Tools.Generator/Enumification/MethodMapEntry.cs b/src/Java.Interop.Tools.Generator/Enumification/MethodMapEntry.cs index cde4d7e37..0d58e009a 100644 --- a/src/Java.Interop.Tools.Generator/Enumification/MethodMapEntry.cs +++ b/src/Java.Interop.Tools.Generator/Enumification/MethodMapEntry.cs @@ -38,12 +38,12 @@ public static IEnumerable FromXml (XElement element) static MethodMapEntry FromElement (XElement element, string parameterName) { var entry = new MethodMapEntry { - JavaPackage = element.Parent.Parent.XGetAttribute ("name")?.Replace ('.', '/'), - JavaType = element.Parent.XGetAttribute ("name")?.Replace ('.', '$'), + JavaPackage = element.Parent?.Parent?.XGetAttribute ("name")?.Replace ('.', '/'), + JavaType = element.Parent?.XGetAttribute ("name")?.Replace ('.', '$'), JavaName = element.XGetAttribute ("name"), ParameterName = parameterName, ApiLevel = NamingConverter.ParseApiLevel (element), - IsInterface = element.Parent.Name == "interface" + IsInterface = element.Parent?.Name == "interface" }; if (element.Name == "constructor") diff --git a/src/Java.Interop.Tools.Generator/Enumification/MethodMapParser.cs b/src/Java.Interop.Tools.Generator/Enumification/MethodMapParser.cs index 5168ed71b..781625cbc 100644 --- a/src/Java.Interop.Tools.Generator/Enumification/MethodMapParser.cs +++ b/src/Java.Interop.Tools.Generator/Enumification/MethodMapParser.cs @@ -19,7 +19,7 @@ public static List FromMethodMapCsv (TextReader reader) { var entries = new List (); - string s; + string? s; // Read the enum csv file while ((s = reader.ReadLine ()) != null) { diff --git a/src/Java.Interop.Tools.Generator/Java.Interop.Tools.Generator.csproj b/src/Java.Interop.Tools.Generator/Java.Interop.Tools.Generator.csproj index ea7f4b55d..7b25cc599 100644 --- a/src/Java.Interop.Tools.Generator/Java.Interop.Tools.Generator.csproj +++ b/src/Java.Interop.Tools.Generator/Java.Interop.Tools.Generator.csproj @@ -4,7 +4,6 @@ $(DotNetTargetFramework) 8.0 enable - INTERNAL_NULLABLE_ATTRIBUTES @@ -13,10 +12,6 @@ $(UtilityOutputFullPath) - - - - diff --git a/src/Java.Interop.Tools.Generator/Metadata/FixupXmlDocument.cs b/src/Java.Interop.Tools.Generator/Metadata/FixupXmlDocument.cs index 7202b8af5..da3214789 100644 --- a/src/Java.Interop.Tools.Generator/Metadata/FixupXmlDocument.cs +++ b/src/Java.Interop.Tools.Generator/Metadata/FixupXmlDocument.cs @@ -48,6 +48,11 @@ public void Apply (ApiXmlDocument apiDocument, string apiLevelString, int produc prev_path = path; + if (path is null) { + Report.LogCodedWarning (0, Report.WarningNodeMissingPathAttribute, null, metaitem, metaitem.ToString ()); + continue; + } + switch (metaitem.Name.LocalName) { case "remove-node": try { @@ -105,9 +110,12 @@ public void Apply (ApiXmlDocument apiDocument, string apiLevelString, int produc try { var attr_name = metaitem.XGetAttribute ("name"); - if (string.IsNullOrEmpty (attr_name)) + if (string.IsNullOrEmpty (attr_name)) { // BG4307 Report.LogCodedError (Report.ErrorMissingAttrName, metaitem, path); + continue; + } + var nodes = attr_last_cache != null ? new XElement [] { attr_last_cache } : apiDocument.ApiDocument.XPathSelectElements (path); var attr_matched = 0; diff --git a/src/Java.Interop.Tools.Generator/Utilities/Report.cs b/src/Java.Interop.Tools.Generator/Utilities/Report.cs index a5878d822..0ac90d9c7 100644 --- a/src/Java.Interop.Tools.Generator/Utilities/Report.cs +++ b/src/Java.Interop.Tools.Generator/Utilities/Report.cs @@ -71,6 +71,7 @@ public LocalizedMessage (int code, string value) public static LocalizedMessage WarningMoveNodeMatchedNoNodes => new LocalizedMessage (0x8A05, Localization.Resources.Generator_BG8A00); public static LocalizedMessage WarningRemoveAttrMatchedNoNodes => new LocalizedMessage (0x8A06, Localization.Resources.Generator_BG8A00); public static LocalizedMessage WarningInvalidNamespaceTransform => new LocalizedMessage (0x8A07, Localization.Resources.Generator_BG8A07); + public static LocalizedMessage WarningNodeMissingPathAttribute => new LocalizedMessage (0x8A08, Localization.Resources.Generator_BG8A08); public static LocalizedMessage WarningUnknownGenericConstraint => new LocalizedMessage (0x8B00, Localization.Resources.Generator_BG8B00); public static LocalizedMessage WarningBaseInterfaceNotFound => new LocalizedMessage (0x8C00, Localization.Resources.Generator_BG8C00); public static LocalizedMessage WarningBaseInterfaceInvalid => new LocalizedMessage (0x8C01, Localization.Resources.Generator_BG8C01); 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 c2e1e138a..d8d7e8128 100644 --- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj +++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj @@ -1,7 +1,7 @@ - $(MSBuildRequiredTargetFramework) + netstandard2.0 false 8.0 enable diff --git a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.HtmlBnfTerms.cs b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.HtmlBnfTerms.cs index d716da20c..f17b63600 100644 --- a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.HtmlBnfTerms.cs +++ b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.HtmlBnfTerms.cs @@ -133,7 +133,7 @@ internal void CreateRules (SourceJavadocToXmldocGrammar grammar) | CreateStartElementIgnoreAttribute ("a", "id") + InlineDeclarations + CreateEndElement ("a", grammar, optional: true) ; IgnorableElementDeclaration.AstConfig.NodeCreator = (context, parseNode) => { - var aElementValue = new XText (parseNode.ChildNodes [1].AstNode.ToString ()); + var aElementValue = new XText (parseNode.ChildNodes [1].AstNode.ToString () ?? string.Empty); parseNode.AstNode = aElementValue; }; @@ -325,6 +325,9 @@ public override void Init (GrammarData grammarData) public override Token? TryMatch (ParsingContext context, ISourceStream source) { + if (_stopChars is null) + throw new InvalidOperationException ("Init must be called before TryMatch"); + var stopIndex = source.Text.IndexOfAny (_stopChars, source.Location.Position); if (stopIndex == source.Location.Position) return null; diff --git a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.InlineTagsBnfTerms.cs b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.InlineTagsBnfTerms.cs index 347dcf4fa..f78fab170 100644 --- a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.InlineTagsBnfTerms.cs +++ b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.InlineTagsBnfTerms.cs @@ -35,7 +35,7 @@ internal void CreateRules (SourceJavadocToXmldocGrammar grammar) CodeDeclaration.Rule = grammar.ToTerm ("{@code") + InlineValue + "}"; CodeDeclaration.AstConfig.NodeCreator = (context, parseNode) => { - parseNode.AstNode = new XElement ("c", parseNode.ChildNodes [1].AstNode.ToString ().Trim ()); + parseNode.AstNode = new XElement ("c", parseNode.ChildNodes [1].AstNode?.ToString ()?.Trim ()); }; DocRootDeclaration.Rule = grammar.ToTerm ("{@docRoot}"); @@ -69,7 +69,7 @@ internal void CreateRules (SourceJavadocToXmldocGrammar grammar) if (optionalBracketMatch.ChildNodes.Count > 0 && optionalBracketMatch.ChildNodes [0].Term.Name == "}") { parseNode.AstNode = new XElement ("c", target); } else { - parseNode.AstNode = new XText (target.ToString ()); + parseNode.AstNode = new XText (target.ToString () ?? string.Empty); } }; @@ -78,13 +78,13 @@ internal void CreateRules (SourceJavadocToXmldocGrammar grammar) // TODO: *everything*; {@link target label}, but target can contain spaces! // Also need to convert to appropriate CREF value, use text for now. var target = parseNode.ChildNodes [1].AstNode.ToString (); - parseNode.AstNode = new XText (target); + parseNode.AstNode = new XText (target ?? string.Empty); }; LiteralDeclaration.Rule = grammar.ToTerm ("{@literal") + InlineValue + "}"; LiteralDeclaration.AstConfig.NodeCreator = (context, parseNode) => { var content = parseNode.ChildNodes [1].AstNode.ToString (); - parseNode.AstNode = new XText (content); + parseNode.AstNode = new XText (content ?? string.Empty); }; SeeDeclaration.Rule = grammar.ToTerm ("{@see") + InlineValue + "}"; diff --git a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocParser.cs b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocParser.cs index af671967d..ee7ae0149 100644 --- a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocParser.cs +++ b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocParser.cs @@ -128,7 +128,7 @@ IEnumerable CreateParseIterator (ParseTree parseTree) yield return node; } else { - yield return new XCData (ast?.ToString ()); + yield return new XCData (ast?.ToString () ?? string.Empty); } } diff --git a/src/Java.Interop.Tools.JavaTypeSystem/Java.Interop.Tools.JavaTypeSystem.csproj b/src/Java.Interop.Tools.JavaTypeSystem/Java.Interop.Tools.JavaTypeSystem.csproj index 8aa718304..56c996394 100644 --- a/src/Java.Interop.Tools.JavaTypeSystem/Java.Interop.Tools.JavaTypeSystem.csproj +++ b/src/Java.Interop.Tools.JavaTypeSystem/Java.Interop.Tools.JavaTypeSystem.csproj @@ -3,7 +3,6 @@ $(DotNetTargetFramework) enable - INTERNAL_NULLABLE_ATTRIBUTES 8.0 @@ -15,10 +14,6 @@ - - - - diff --git a/src/Java.Interop.Tools.JavaTypeSystem/Utilities/JavaUnresolvableModel.cs b/src/Java.Interop.Tools.JavaTypeSystem/Utilities/JavaUnresolvableModel.cs index 35deb706f..d80548005 100644 --- a/src/Java.Interop.Tools.JavaTypeSystem/Utilities/JavaUnresolvableModel.cs +++ b/src/Java.Interop.Tools.JavaTypeSystem/Utilities/JavaUnresolvableModel.cs @@ -57,7 +57,7 @@ string GetUnresolvable () if (Unresolvable is JavaParameterModel p) return p.DeclaringMethod.ToString (); - return Unresolvable.ToString (); + return Unresolvable.ToString () ?? string.Empty; } string GetReason () diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs index b08ad4374..ff4a4b40d 100644 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs +++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs @@ -33,7 +33,7 @@ public static void Load (this JavaApi api, XmlReader reader, bool isReferenceOnl if (reader.NodeType != XmlNodeType.Element || reader.LocalName != "package") throw XmlUtil.UnexpectedElementOrContent ("api", reader, "package"); - var name = reader.GetAttribute ("name"); + var name = reader.GetAttribute ("name") ?? throw new InvalidOperationException (" element must contain a 'name' attribute"); if (!api.Packages.TryGetValue (name, out var pkg)) { pkg = new JavaPackage (api);