Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions build/Build.GitHubAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -21,7 +21,7 @@
TimeoutMinutes = 20,
CacheKeyFiles = [],
ConcurrencyCancelInProgress = true,
PublishCondition = "runner.os == 'Windows'"
PublishCondition = "runner.os == 'Linux'"
)]
partial class Build;

Expand All @@ -37,7 +37,7 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC

var newSteps = new List<GitHubActionsStep>(job.Steps);

newSteps.Insert(0, new GitHubActionsSetupDotNetStep(["8.0", "9.0"]));
newSteps.Insert(0, new GitHubActionsSetupDotNetStep(["10.0"]));

job.Steps = newSteps.ToArray();
return job;
Expand All @@ -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())
{
Expand Down
4 changes: 2 additions & 2 deletions build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace></RootNamespace>
<NoWarn>$(NoWarn);CS0649;CS0169;NU1903</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
Expand All @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="9.0.4" />
<PackageReference Include="Nuke.Common" Version="10.0.0" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions ooxml/XWPF/Usermodel/XWPFFieldRun.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}

Expand Down
Loading