Skip to content

Commit 222a196

Browse files
asbjornuasbjornu
authored
Merge branch 'main' into main
2 parents 37dc0db + 46ce0ff commit 222a196

File tree

6 files changed

+16
-17
lines changed

6 files changed

+16
-17
lines changed

‎.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
5757
-
5858
name: Install .NET SDK 6.0.x
59-
uses: actions/setup-dotnet@v2
59+
uses: actions/setup-dotnet@v3
6060
with:
6161
dotnet-version: '6.0.x'
6262
-
@@ -95,7 +95,7 @@ jobs:
9595
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
9696
-
9797
name: Install .NET SDK 6.0.x
98-
uses: actions/setup-dotnet@v2
98+
uses: actions/setup-dotnet@v3
9999
with:
100100
dotnet-version: '6.0.x'
101101
-
@@ -161,7 +161,7 @@ jobs:
161161
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
162162
-
163163
name: Install .NET SDK 6.0.x
164-
uses: actions/setup-dotnet@v2
164+
uses: actions/setup-dotnet@v3
165165
with:
166166
dotnet-version: '6.0.x'
167167
-
@@ -213,7 +213,7 @@ jobs:
213213
path: ${{ github.workspace }}/artifacts/packages/nuget
214214
-
215215
name: Install .NET SDK 6.0.x
216-
uses: actions/setup-dotnet@v2
216+
uses: actions/setup-dotnet@v3
217217
with:
218218
dotnet-version: '6.0.x'
219219
-
@@ -273,7 +273,7 @@ jobs:
273273
install: true
274274
-
275275
name: Install .NET SDK 6.0.x
276-
uses: actions/setup-dotnet@v2
276+
uses: actions/setup-dotnet@v3
277277
with:
278278
dotnet-version: '6.0.x'
279279
-
@@ -331,7 +331,7 @@ jobs:
331331
install: true
332332
-
333333
name: Install .NET SDK 6.0.x
334-
uses: actions/setup-dotnet@v2
334+
uses: actions/setup-dotnet@v3
335335
with:
336336
dotnet-version: '6.0.x'
337337
-
@@ -421,7 +421,7 @@ jobs:
421421
path: ${{ github.workspace }}/artifacts/packages/nuget
422422
-
423423
name: Install .NET SDK 6.0.x
424-
uses: actions/setup-dotnet@v2
424+
uses: actions/setup-dotnet@v3
425425
with:
426426
dotnet-version: '6.0.x'
427427
-
@@ -475,7 +475,7 @@ jobs:
475475
path: ${{ github.workspace }}/artifacts/packages/native
476476
-
477477
name: Install .NET SDK 6.0.x
478-
uses: actions/setup-dotnet@v2
478+
uses: actions/setup-dotnet@v3
479479
with:
480480
dotnet-version: '6.0.x'
481481
-

‎.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,9 @@ jobs:
5959

6060
-
6161
name: Install .NET SDKs
62-
uses: actions/setup-dotnet@v2
62+
uses: actions/setup-dotnet@v3
6363
with:
6464
dotnet-version: |
65-
3.1.x
66-
5.0.x
6765
6.0.x
6866
6967
-
@@ -74,7 +72,7 @@ jobs:
7472
-
7573
name: '[Build]'
7674
shell: pwsh
77-
run: dotnet run/build.dll --target=Build
75+
run: dotnet run/build.dll --target=Build --exclusive
7876

7977
- name: Perform CodeQL Analysis
8078
uses: github/codeql-action/analyze@v2

‎.github/workflows/docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
restore-keys: node-${{ runner.os }}
7171
-
7272
name: Install .NET SDK 6.0.x
73-
uses: actions/setup-dotnet@v2
73+
uses: actions/setup-dotnet@v3
7474
with:
7575
dotnet-version: '6.0.x'
7676
-
@@ -104,7 +104,7 @@ jobs:
104104
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
105105
-
106106
name: Install .NET SDK 6.0.x
107-
uses: actions/setup-dotnet@v2
107+
uses: actions/setup-dotnet@v3
108108
with:
109109
dotnet-version: '6.0.x'
110110
-
@@ -161,7 +161,7 @@ jobs:
161161
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
162162
-
163163
name: Install .NET SDK 6.0.x
164-
uses: actions/setup-dotnet@v2
164+
uses: actions/setup-dotnet@v3
165165
with:
166166
dotnet-version: '6.0.x'
167167
-

‎.github/workflows/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@v3
3131
-
3232
name: Setup .NET SDK
33-
uses: actions/setup-dotnet@v2
33+
uses: actions/setup-dotnet@v3
3434
with:
3535
dotnet-version: '6.0.x'
3636
-

‎build/build/BuildLifetime.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@ private static void SetMsBuildSettingsVersion(BuildContext context)
3636
msBuildSettings.WithProperty("RepositoryBranch", version.GitVersion.BranchName);
3737
msBuildSettings.WithProperty("RepositoryCommit", version.GitVersion.Sha);
3838
msBuildSettings.WithProperty("NoPackageAnalysis", "true");
39+
msBuildSettings.WithProperty("UseSharedCompilation", "false");
3940
}
4041
}

‎docs/input/docs/learn/how-it-works.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RedirectFrom: docs/more-info/how-it-works
55
---
66

77
GitVersion v3 works very differently to v2. Version 2 had knowledge of both
8-
GitFlow and GitHubFlow hard coded into it, with each branch having it's own
8+
GitFlow and GitHubFlow hard coded into it, with each branch having its own
99
class which calculated the version for that branch type.
1010

1111
v3 is driven by [configuration](/docs/reference/configuration), meaning most of the

0 commit comments

Comments
 (0)