diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e92a0608e..16836f686 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -30,17 +30,16 @@ jobs: runs-on: windows-latest timeout-minutes: 20 steps: - - uses: actions/setup-dotnet@v4 + - uses: actions/setup-dotnet@v5 with: dotnet-version: | - 8.0 - 9.0 + 10.0 - uses: actions/checkout@v4 - name: 'Run: Clean, Test, Pack' run: ./build.cmd Clean Test Pack - name: 'Publish: publish' uses: actions/upload-artifact@v4 - if: runner.os == 'Windows' + if: runner.os == 'Linux' with: name: publish path: publish @@ -49,11 +48,10 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 20 steps: - - uses: actions/setup-dotnet@v4 + - uses: actions/setup-dotnet@v5 with: dotnet-version: | - 8.0 - 9.0 + 10.0 - uses: actions/checkout@v4 - name: 'Run: Clean, Test, Pack' run: ./build.cmd Clean Test Pack diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml index 19ed8f428..0c647d3b1 100644 --- a/.github/workflows/PR.yml +++ b/.github/workflows/PR.yml @@ -28,17 +28,16 @@ jobs: runs-on: windows-latest timeout-minutes: 20 steps: - - uses: actions/setup-dotnet@v4 + - uses: actions/setup-dotnet@v5 with: dotnet-version: | - 8.0 - 9.0 + 10.0 - uses: actions/checkout@v4 - name: 'Run: Clean, Test, Pack' run: ./build.cmd Clean Test Pack - name: 'Publish: publish' uses: actions/upload-artifact@v4 - if: runner.os == 'Windows' + if: runner.os == 'Linux' with: name: publish path: publish @@ -47,17 +46,16 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 20 steps: - - uses: actions/setup-dotnet@v4 + - uses: actions/setup-dotnet@v5 with: dotnet-version: | - 8.0 - 9.0 + 10.0 - uses: actions/checkout@v4 - name: 'Run: Clean, Test, Pack' run: ./build.cmd Clean Test Pack - name: 'Publish: publish' uses: actions/upload-artifact@v4 - if: runner.os == 'Windows' + if: runner.os == 'Linux' with: name: publish path: publish diff --git a/build/Build.GitHubAction.cs b/build/Build.GitHubAction.cs index 612976590..7ace34b75 100644 --- a/build/Build.GitHubAction.cs +++ b/build/Build.GitHubAction.cs @@ -11,7 +11,7 @@ InvokedTargets = [nameof(Clean), nameof(Test), nameof(Pack)], TimeoutMinutes = 20, CacheKeyFiles = [], - PublishCondition = "runner.os == 'Windows'" + PublishCondition = "runner.os == 'Linux'" )] [CustomGitHubActions("PR", GitHubActionsImage.WindowsLatest, @@ -21,7 +21,7 @@ TimeoutMinutes = 20, CacheKeyFiles = [], ConcurrencyCancelInProgress = true, - PublishCondition = "runner.os == 'Windows'" + PublishCondition = "runner.os == 'Linux'" )] partial class Build; @@ -37,7 +37,7 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC var newSteps = new List(job.Steps); - newSteps.Insert(0, new GitHubActionsSetupDotNetStep(["8.0", "9.0"])); + newSteps.Insert(0, new GitHubActionsSetupDotNetStep(["10.0"])); job.Steps = newSteps.ToArray(); return job; @@ -55,7 +55,7 @@ public GitHubActionsSetupDotNetStep(string[] versions) public override void Write(CustomFileWriter writer) { - writer.WriteLine("- uses: actions/setup-dotnet@v4"); + writer.WriteLine("- uses: actions/setup-dotnet@v5"); using (writer.Indent()) { diff --git a/build/_build.csproj b/build/_build.csproj index e02adb1e1..e06470950 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 $(NoWarn);CS0649;CS0169;NU1903 .. @@ -12,7 +12,7 @@ - + diff --git a/ooxml/XWPF/Usermodel/XWPFFieldRun.cs b/ooxml/XWPF/Usermodel/XWPFFieldRun.cs index 3ab2e2131..8029d1c97 100644 --- a/ooxml/XWPF/Usermodel/XWPFFieldRun.cs +++ b/ooxml/XWPF/Usermodel/XWPFFieldRun.cs @@ -25,25 +25,25 @@ namespace NPOI.XWPF.UserModel */ public class XWPFFieldRun : XWPFRun { - private CT_SimpleField field; + private CT_SimpleField _field; public XWPFFieldRun(CT_SimpleField field, CT_R run, IRunBody p) : base(run, p) { ; - this.field = field; + this._field = field; } public CT_SimpleField GetCTField() { - return field; + return _field; } public string FieldInstruction { - get { return field.instr; } - set { field.instr = value; } + get { return _field.instr; } + set { _field.instr = value; } } }