diff --git a/.github/workflows/generateclasses.yaml b/.github/workflows/generateclasses.yaml index 8d678285..205ae3cb 100644 --- a/.github/workflows/generateclasses.yaml +++ b/.github/workflows/generateclasses.yaml @@ -40,8 +40,8 @@ jobs: DOTNET_CreateDumpDiagnostics: 1 DOTNET_CreateDumpVerboseDiagnostics: 1 DOTNET_EnableCrashReport: 1 - JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_6 }} - JNet_Version: 2.6.6 + JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_9 }} + JNet_Version: 2.6.9 PDFBox_Version: 3.0.7 FONTCACHE_FOLDER: ${{ github.workspace }}\fontcache @@ -86,10 +86,10 @@ jobs: run: mvn "-DmavenSkipMain=true" --file ./src/jvm/netpdf/pom.xml --no-transfer-progress package - name: Clear C# generated files - run: Remove-Item .\src\net\NetPDF\Generated\* -Recurse -Force -Exclude README.md + run: Remove-Item .\src\net\NetPDF\Generated\* -Recurse -Force -Exclude README.md,.editorconfig - name: Clear Java generated files - run: Remove-Item .\src\jvm\netpdf\src\main\java\org\mases\netpdf\generated\* -Recurse -Force -Exclude README.md,.editorconfig + run: Remove-Item .\src\jvm\netpdf\src\main\java\org\mases\netpdf\generated\* -Recurse -Force -Exclude README.md - name: Get last workflow run of JNet if: ${{ inputs.UseLastRepositoryBuild == true }} @@ -128,7 +128,7 @@ jobs: - name: Use latest unpublished NuGet of JNetReflector if: ${{ inputs.UseLastRepositoryBuild == true && inputs.UseLatestJNetReflectorSource == false }} - run: dotnet tool update -g MASES.JNetReflector + run: dotnet tool update --prerelease -g MASES.JNetReflector - name: Download latest published version of JNetReflector if: ${{ inputs.UseLastRepositoryBuild == false && inputs.UseLatestJNetReflectorSource == false }} diff --git a/.github/workflows/update_version.yaml b/.github/workflows/update_version.yaml index c3d79147..694a6afb 100644 --- a/.github/workflows/update_version.yaml +++ b/.github/workflows/update_version.yaml @@ -12,7 +12,7 @@ on: required: true type: string PreReleaseCurrentVersion: - description: 'The current version pre-release tag' + description: 'The current version pre-release tag (without dash, e.g. rc)' required: false type: string NewVersion: @@ -20,49 +20,83 @@ on: required: true type: string PreReleaseNewVersion: - description: 'The new version pre-release tag' + description: 'The new version pre-release tag (without dash, e.g. rc)' required: false type: string - -# This workflow contains one job called "build_documentation" + +# This workflow contains one job called "update_version" jobs: update_version: # The type of runner that the job will run on runs-on: windows-2022 # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Runs a set of commands using the runners shell + steps: # Support longpaths - name: Support long paths run: git config --system core.longpaths true - + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v7 with: fetch-depth: '1' + # Compute pre-release tags with dash (used by nuspec, csproj, props) + # psd1 uses the raw input directly (no dash) + - name: Compute pre-release tags + run: | + $preC = if ('${{ inputs.PreReleaseCurrentVersion }}') { '-${{ inputs.PreReleaseCurrentVersion }}' } else { '' } + $preN = if ('${{ inputs.PreReleaseNewVersion }}') { '-${{ inputs.PreReleaseNewVersion }}' } else { '' } + echo "PRE_C=$preC" >> $env:GITHUB_ENV + echo "PRE_N=$preN" >> $env:GITHUB_ENV + + # pom.xml: no pre-release, version only - run: (Get-Content ${{ github.workspace }}\src\jvm\netpdf\pom.xml).Replace('${{ inputs.CurrentVersion }}.0', '${{ inputs.NewVersion }}.0') | Set-Content ${{ github.workspace }}\src\jvm\netpdf\pom.xml - - - run: (Get-Content ${{ github.workspace }}\src\net\Common\Common.props).Replace('${{ inputs.CurrentVersion }}.0${{ inputs.PreReleaseCurrentVersion }}', '${{ inputs.NewVersion }}.0${{ inputs.PreReleaseNewVersion }}') | Set-Content ${{ github.workspace }}\src\net\Common\Common.props - - run: (Get-Content ${{ github.workspace }}\src\net\NetPDFCLI\NetPDFCLI.nuspec).Replace('${{ inputs.CurrentVersion }}${{ inputs.PreReleaseCurrentVersion }}', '${{ inputs.NewVersion }}${{ inputs.PreReleaseNewVersion }}') | Set-Content ${{ github.workspace }}\src\net\NetPDFCLI\NetPDFCLI.nuspec + # Common.props: uses dash-prefixed pre-release tag + - run: (Get-Content ${{ github.workspace }}\src\net\Common\Common.props).Replace('${{ inputs.CurrentVersion }}.0${{ env.PRE_C }}', '${{ inputs.NewVersion }}.0${{ env.PRE_N }}') | Set-Content ${{ github.workspace }}\src\net\Common\Common.props + + # nuspec files: uses dash-prefixed pre-release tag + - run: (Get-Content ${{ github.workspace }}\src\net\NetPDFCLI\NetPDFCLI.nuspec).Replace('${{ inputs.CurrentVersion }}${{ env.PRE_C }}', '${{ inputs.NewVersion }}${{ env.PRE_N }}') | Set-Content ${{ github.workspace }}\src\net\NetPDFCLI\NetPDFCLI.nuspec + + # psd1 files: ModuleVersion and Prerelease are updated separately + # ModuleVersion accepts only numeric version, Prerelease uses raw input (no dash) + - name: Update MASES.NetPDFPS.psd1 + run: | + $f = '${{ github.workspace }}\src\net\NetPDFPS\MASES.NetPDFPS.psd1' + (Get-Content $f). + Replace("ModuleVersion = '${{ inputs.CurrentVersion }}'", "ModuleVersion = '${{ inputs.NewVersion }}'"). + Replace("Prerelease = '${{ inputs.PreReleaseCurrentVersion }}'", "Prerelease = '${{ inputs.PreReleaseNewVersion }}'") | + Set-Content $f + + - name: Update MASES.NetPDFPSCore.psd1 + run: | + $f = '${{ github.workspace }}\src\net\NetPDFPS\MASES.NetPDFPSCore.psd1' + (Get-Content $f). + Replace("ModuleVersion = '${{ inputs.CurrentVersion }}'", "ModuleVersion = '${{ inputs.NewVersion }}'"). + Replace("Prerelease = '${{ inputs.PreReleaseCurrentVersion }}'", "Prerelease = '${{ inputs.PreReleaseNewVersion }}'") | + Set-Content $f + + - name: Update MASES.NetPDFPSFramework.psd1 + run: | + $f = '${{ github.workspace }}\src\net\NetPDFPS\MASES.NetPDFPSFramework.psd1' + (Get-Content $f). + Replace("ModuleVersion = '${{ inputs.CurrentVersion }}'", "ModuleVersion = '${{ inputs.NewVersion }}'"). + Replace("Prerelease = '${{ inputs.PreReleaseCurrentVersion }}'", "Prerelease = '${{ inputs.PreReleaseNewVersion }}'") | + Set-Content $f - - run: (Get-Content ${{ github.workspace }}\src\net\NetPDFPS\MASES.NetPDFPS.psd1).Replace('${{ inputs.CurrentVersion }}${{ inputs.PreReleaseCurrentVersion }}', '${{ inputs.NewVersion }}${{ inputs.PreReleaseNewVersion }}') | Set-Content ${{ github.workspace }}\src\net\NetPDFPS\MASES.NetPDFPS.psd1 - - run: (Get-Content ${{ github.workspace }}\src\net\NetPDFPS\MASES.NetPDFPSCore.psd1).Replace('${{ inputs.CurrentVersion }}${{ inputs.PreReleaseCurrentVersion }}', '${{ inputs.NewVersion }}${{ inputs.PreReleaseNewVersion }}') | Set-Content ${{ github.workspace }}\src\net\NetPDFPS\MASES.NetPDFPSCore.psd1 - - run: (Get-Content ${{ github.workspace }}\src\net\NetPDFPS\MASES.NetPDFPSFramework.psd1).Replace('${{ inputs.CurrentVersion }}${{ inputs.PreReleaseCurrentVersion }}', '${{ inputs.NewVersion }}${{ inputs.PreReleaseNewVersion }}') | Set-Content ${{ github.workspace }}\src\net\NetPDFPS\MASES.NetPDFPSFramework.psd1 + # csproj templates: uses dash-prefixed pre-release tag + - run: (Get-Content ${{ github.workspace }}\src\net\templates\templates\netpdfApp\netpdfApp.csproj).Replace('${{ inputs.CurrentVersion }}${{ env.PRE_C }}', '${{ inputs.NewVersion }}${{ env.PRE_N }}') | Set-Content ${{ github.workspace }}\src\net\templates\templates\netpdfApp\netpdfApp.csproj - - run: (Get-Content ${{ github.workspace }}\src\net\templates\templates\netpdfApp\netpdfApp.csproj).Replace('${{ inputs.CurrentVersion }}${{ inputs.PreReleaseCurrentVersion }}', '${{ inputs.NewVersion }}${{ inputs.PreReleaseNewVersion }}') | Set-Content ${{ github.workspace }}\src\net\templates\templates\netpdfApp\netpdfApp.csproj - - name: Request a PR to commit changes uses: peter-evans/create-pull-request@v8 with: branch-suffix: short-commit-hash add-paths: src/*.* - commit-message: Update version from ${{ inputs.CurrentVersion }}${{ inputs.PreReleaseCurrentVersion }} to ${{ inputs.NewVersion }}${{ inputs.PreReleaseNewVersion }} - title: Update version from ${{ inputs.CurrentVersion }}${{ inputs.PreReleaseCurrentVersion }} to ${{ inputs.NewVersion }}${{ inputs.PreReleaseNewVersion }} + commit-message: Update version from ${{ inputs.CurrentVersion }}${{ env.PRE_C }} to ${{ inputs.NewVersion }}${{ env.PRE_N }} + title: Update version from ${{ inputs.CurrentVersion }}${{ env.PRE_C }} to ${{ inputs.NewVersion }}${{ env.PRE_N }} body: | Automated changes by GitHub action fix #47 reviewers: masesdevelopers assignees: masesdevelopers - labels: enhancement, Docker, java, NetPDF, NetPDF CLI, NetPDF PowerShell, NetPDF Template, .NET \ No newline at end of file + labels: enhancement, Docker, java, NetPDF, NetPDF CLI, NetPDF PowerShell, NetPDF Template, .NET \ No newline at end of file diff --git a/src/documentation/docfx.json b/src/documentation/docfx.json index de40723f..3dfca59c 100644 --- a/src/documentation/docfx.json +++ b/src/documentation/docfx.json @@ -1,6 +1,7 @@ { "metadata": [ { + "filter": "filterConfig.yml", "src": [ { "files": [ "**.csproj" ], diff --git a/src/documentation/filterConfig.yml b/src/documentation/filterConfig.yml new file mode 100644 index 00000000..abb72d16 --- /dev/null +++ b/src/documentation/filterConfig.yml @@ -0,0 +1,13 @@ +apiRules: +- exclude: + uidRegex: ^System\.Exception + type: Member +- exclude: + uidRegex: ^System\.Object + type: Member +- exclude: + uidRegex: ^MASES\.JCOBridge\. + type: Member +- exclude: + uidRegex: ^System\.Dynamic\.DynamicObject + type: Member \ No newline at end of file diff --git a/src/jvm/netpdf/pom.xml b/src/jvm/netpdf/pom.xml index 4275337d..8ef4dabd 100644 --- a/src/jvm/netpdf/pom.xml +++ b/src/jvm/netpdf/pom.xml @@ -43,7 +43,7 @@ ${java.version} ${basedir}/classpathfile.classpath false - 2.6.6.0 + 2.6.9.0 3.0.7 3.0.10.0 ${basedir}/../../../ diff --git a/src/net/Common/Common.props b/src/net/Common/Common.props index a1196c52..cb5a3033 100644 --- a/src/net/Common/Common.props +++ b/src/net/Common/Common.props @@ -45,14 +45,6 @@ - - - $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) - - - - - true diff --git a/src/net/Directory.Build.targets b/src/net/Directory.Build.targets new file mode 100644 index 00000000..0b1220dd --- /dev/null +++ b/src/net/Directory.Build.targets @@ -0,0 +1,9 @@ + + + + $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) + + + + + \ No newline at end of file diff --git a/src/net/NetPDF/Generated/.editorconfig b/src/net/NetPDF/Generated/.editorconfig new file mode 100644 index 00000000..4b087d56 --- /dev/null +++ b/src/net/NetPDF/Generated/.editorconfig @@ -0,0 +1,8 @@ +[*.cs] +generated_code = true +dotnet_analyzer_diagnostic.severity = none +dotnet_diagnostic.CS0108.severity = none +dotnet_diagnostic.CS0114.severity = none +dotnet_diagnostic.CS0419.severity = none +dotnet_diagnostic.CS1574.severity = none +dotnet_diagnostic.CS0612.severity = none diff --git a/src/net/NetPDF/NetPDF.csproj b/src/net/NetPDF/NetPDF.csproj index de22c679..7ccdcf19 100644 --- a/src/net/NetPDF/NetPDF.csproj +++ b/src/net/NetPDF/NetPDF.csproj @@ -43,7 +43,7 @@ - + All None diff --git a/src/net/NetPDFPS/MASES.NetPDFPS.psd1 b/src/net/NetPDFPS/MASES.NetPDFPS.psd1 index 1dbe496c..12810127 100644 --- a/src/net/NetPDFPS/MASES.NetPDFPS.psd1 +++ b/src/net/NetPDFPS/MASES.NetPDFPS.psd1 @@ -73,6 +73,8 @@ PrivateData = @{ PSData = @{ + Prerelease = '' + Tags = @('NetPDFPS', 'NetPDF', 'PSEdition_Core', 'PSEdition_Desktop', 'Windows', 'Linux', 'JVM', 'Java', 'PDFBox', 'PDF', 'bridge', 'gateway') LicenseUri = 'https://github.com/masesgroup/NetPDF/blob/master/LICENSE' diff --git a/src/net/NetPDFPS/MASES.NetPDFPSCore.psd1 b/src/net/NetPDFPS/MASES.NetPDFPSCore.psd1 index 375c3715..867fed22 100644 --- a/src/net/NetPDFPS/MASES.NetPDFPSCore.psd1 +++ b/src/net/NetPDFPS/MASES.NetPDFPSCore.psd1 @@ -94,7 +94,9 @@ PrivateData = @{ PSData = @{ - Tags = @('NetPDFPS', 'NetPDF', 'PSEdition_Core', 'PSEdition_Desktop', 'Windows', 'Linux', 'JVM', 'Java', 'PDFBox', 'PDF', 'bridge', 'gateway') + Prerelease = '' + + Tags = @('NetPDFPS', 'NetPDF', 'PSEdition_Core', 'Windows', 'Linux', 'JVM', 'Java', 'PDFBox', 'PDF', 'bridge', 'gateway') LicenseUri = 'https://github.com/masesgroup/NetPDF/blob/master/LICENSE' diff --git a/src/net/NetPDFPS/MASES.NetPDFPSFramework.psd1 b/src/net/NetPDFPS/MASES.NetPDFPSFramework.psd1 index c7ba578f..4c05f706 100644 --- a/src/net/NetPDFPS/MASES.NetPDFPSFramework.psd1 +++ b/src/net/NetPDFPS/MASES.NetPDFPSFramework.psd1 @@ -94,7 +94,9 @@ PrivateData = @{ PSData = @{ - Tags = @('NetPDFPS', 'NetPDF', 'PSEdition_Core', 'PSEdition_Desktop', 'Windows', 'Linux', 'JVM', 'Java', 'PDFBox', 'PDF', 'bridge', 'gateway') + Prerelease = '' + + Tags = @('NetPDFPS', 'NetPDF', 'PSEdition_Desktop', 'Windows', 'Linux', 'JVM', 'Java', 'PDFBox', 'PDF', 'bridge', 'gateway') LicenseUri = 'https://github.com/masesgroup/NetPDF/blob/master/LICENSE'