Skip to content

Commit 6e7b08e

Browse files
authored
Merge branch 'main' into fix/github-actions-tag-build
2 parents 7adced6 + a6b0d92 commit 6e7b08e

File tree

85 files changed

+180
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+180
-130
lines changed

.github/actions/docker-test/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ inputs:
99
default: 'debian.11'
1010
targetFramework:
1111
description: '.net version'
12-
default: '7.0'
12+
default: '8.0'
1313

1414
runs:
1515
using: 'composite'

.github/dependabot.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,52 @@ updates:
55
- "dependencies"
66
commit-message:
77
prefix: "(ci deps)"
8+
groups:
9+
microsoft:
10+
patterns:
11+
- "Microsoft.*"
12+
- "System.*"
813
directory: "/build"
914
schedule:
1015
interval: daily
1116
open-pull-requests-limit: 10
17+
1218
- package-ecosystem: nuget
1319
labels:
1420
- "dependencies"
1521
commit-message:
1622
prefix: "(new-cli deps)"
23+
groups:
24+
microsoft:
25+
patterns:
26+
- "Microsoft.*"
27+
- "System.*"
28+
serilog:
29+
patterns:
30+
- "Serilog.*"
1731
directory: "/new-cli"
1832
schedule:
1933
interval: daily
20-
open-pull-requests-limit: 10
34+
open-pull-requests-limit: 10
35+
2136
- package-ecosystem: nuget
2237
labels:
2338
- "dependencies"
2439
commit-message:
2540
prefix: "(deps)"
26-
directory: "/"
41+
groups:
42+
microsoft:
43+
patterns:
44+
- "Microsoft.*"
45+
- "System.*"
46+
directory: "/src"
2747
schedule:
2848
interval: daily
2949
open-pull-requests-limit: 10
3050
ignore:
3151
- dependency-name: "Microsoft.Build"
3252
versions: ["16.9.0", "16.11.0"]
53+
3354
- package-ecosystem: github-actions
3455
labels:
3556
- "dependencies"
@@ -38,6 +59,7 @@ updates:
3859
directory: "/"
3960
schedule:
4061
interval: daily
62+
4163
- package-ecosystem: npm
4264
labels:
4365
- "dependencies"

.github/workflows/_artifacts_linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
distro: [ alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.11, ubuntu.20.04, ubuntu.22.04 ]
27-
targetFramework: [ '7.0', '6.0' ]
26+
distro: [ alpine.3.17, alpine.3.18, centos.stream.8, debian.11, fedora.37, ubuntu.20.04, ubuntu.22.04 ]
27+
targetFramework: [ '6.0', '7.0', '8.0' ]
2828

2929
steps:
3030
-

.github/workflows/_docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
distro: [ alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.11, ubuntu.20.04, ubuntu.22.04 ]
23-
targetFramework: [ '7.0', '6.0' ]
22+
distro: [ alpine.3.17, alpine.3.18, centos.stream.8, debian.11, fedora.37, ubuntu.20.04, ubuntu.22.04 ]
23+
targetFramework: [ '6.0', '7.0', '8.0' ]
2424

2525
steps:
2626
-

.github/workflows/_docker_manifests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
distro: [ alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.11, ubuntu.20.04, ubuntu.22.04 ]
16-
targetFramework: [ '7.0', '6.0' ]
15+
distro: [ alpine.3.17, alpine.3.18, centos.stream.8, debian.11, fedora.37, ubuntu.20.04, ubuntu.22.04 ]
16+
targetFramework: [ '6.0', '7.0', '8.0' ]
1717

1818
steps:
1919
-

.github/workflows/_unit_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [windows-latest, ubuntu-latest, macos-latest]
17-
targetFramework: [net7.0, net6.0]
17+
targetFramework: [ 'net8.0', 'net7.0', 'net6.0' ]
1818

1919
runs-on: ${{ matrix.os }}
2020
steps:
@@ -34,6 +34,6 @@ jobs:
3434
-
3535
name: Test Summary
3636
uses: test-summary/action@v2
37-
if: matrix.targetFramework == 'net7.0'
37+
if: matrix.targetFramework == 'net8.0'
3838
with:
3939
paths: artifacts/test-results/*.results.xml

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
paths:
99
- '**'
1010
- '!docs/**'
11-
- '!new-cli/**'
1211
- '!.github/**'
1312
- .github/workflows/codeql-analysis.yml
1413

@@ -19,7 +18,6 @@ on:
1918
paths:
2019
- '**'
2120
- '!docs/**'
22-
- '!new-cli/**'
2321
- '!.github/**'
2422
- .github/workflows/codeql-analysis.yml
2523

build/.run/Artifacts DotnetTool Test.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1616
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1717
<option name="PROJECT_KIND" value="DotNetCore" />
18-
<option name="PROJECT_TFM" value="net7.0" />
18+
<option name="PROJECT_TFM" value="net8.0" />
1919
<method v="2">
2020
<option name="Build" />
2121
</method>

build/.run/Artifacts Executable Test.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1616
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1717
<option name="PROJECT_KIND" value="DotNetCore" />
18-
<option name="PROJECT_TFM" value="net7.0" />
18+
<option name="PROJECT_TFM" value="net8.0" />
1919
<method v="2">
2020
<option name="Build" />
2121
</method>

build/.run/Artifacts MsBuildCore Test.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1616
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1717
<option name="PROJECT_KIND" value="DotNetCore" />
18-
<option name="PROJECT_TFM" value="net7.0" />
18+
<option name="PROJECT_TFM" value="net8.0" />
1919
<method v="2">
2020
<option name="Build" />
2121
</method>

0 commit comments

Comments
 (0)