Skip to content

Commit 15eaa3d

Browse files
authored
Merge branch 'main' into feature/doctags
2 parents 6dd3a9a + 87c04fc commit 15eaa3d

Some content is hidden

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

62 files changed

+186
-63
lines changed

.github/workflows/_artifacts_linux.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ on:
1414

1515
env:
1616
DOTNET_INSTALL_DIR: "./.dotnet"
17-
17+
DOTNET_ROLL_FORWARD: "Major"
18+
1819
jobs:
1920
artifacts:
2021
name: ${{ matrix.distro }} - net${{ matrix.targetFramework }}

.github/workflows/_artifacts_windows.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
on:
22
workflow_call:
33

4+
env:
5+
DOTNET_INSTALL_DIR: "./.dotnet"
6+
DOTNET_ROLL_FORWARD: "Major"
7+
48
jobs:
59
artifacts:
610
name: ${{ matrix.package }}

.github/workflows/_build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
on:
22
workflow_call:
33

4+
env:
5+
DOTNET_INSTALL_DIR: "./.dotnet"
6+
DOTNET_ROLL_FORWARD: "Major"
7+
48
jobs:
59
build:
610
name: ${{ matrix.os }}

.github/workflows/_docker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010

1111
env:
1212
DOTNET_INSTALL_DIR: "./.dotnet"
13+
DOTNET_ROLL_FORWARD: "Major"
1314

1415
jobs:
1516
docker:

.github/workflows/_docker_manifests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33

44
env:
55
DOTNET_INSTALL_DIR: "./.dotnet"
6+
DOTNET_ROLL_FORWARD: "Major"
67

78
jobs:
89
manifest:

.github/workflows/_publish.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
on:
22
workflow_call:
33

4+
env:
5+
DOTNET_INSTALL_DIR: "./.dotnet"
6+
DOTNET_ROLL_FORWARD: "Major"
7+
48
jobs:
59
publish:
610
name: ${{ matrix.taskName }}

.github/workflows/_unit_tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
on:
22
workflow_call:
33

4+
env:
5+
DOTNET_INSTALL_DIR: "./.dotnet"
6+
DOTNET_ROLL_FORWARD: "Major"
7+
48
jobs:
59
unit_test:
610
name: ${{ matrix.os }} - ${{ matrix.targetFramework }}

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
types: [ release ]
2525

2626
env:
27-
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
27+
DOTNET_ROLL_FORWARD: "Major"
2828
DOTNET_CLI_TELEMETRY_OPTOUT: 1
2929
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
3030
DOTNET_NOLOGO: 1

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929
permissions:
3030
contents: read
3131
env:
32-
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
32+
DOTNET_ROLL_FORWARD: "Major"
3333
DOTNET_CLI_TELEMETRY_OPTOUT: 1
3434
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
3535
DOTNET_NOLOGO: 1

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
- mkdocs.yml
2626
- .github/workflows/docs.yml
2727
env:
28-
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
28+
DOTNET_ROLL_FORWARD: "Major"
2929
DOTNET_CLI_TELEMETRY_OPTOUT: 1
3030
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
3131
DOTNET_NOLOGO: 1

0 commit comments

Comments
 (0)