Merge branch 'main' into main

asbjornu · web-flow · commit 222a196d1fc3 · 2022-10-03T10:45:00.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
     -
@@ -95,7 +95,7 @@ jobs:
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
     -
@@ -161,7 +161,7 @@ jobs:
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
     -
@@ -213,7 +213,7 @@ jobs:
         path: ${{ github.workspace }}/artifacts/packages/nuget
     -
       name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
     -
@@ -273,7 +273,7 @@ jobs:
         install: true
     -
       name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
     -
@@ -331,7 +331,7 @@ jobs:
         install: true
     -
       name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
     -
@@ -421,7 +421,7 @@ jobs:
         path: ${{ github.workspace }}/artifacts/packages/nuget
     -
       name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
     -
@@ -475,7 +475,7 @@ jobs:
         path: ${{ github.workspace }}/artifacts/packages/native
     -
       name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
     -
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -59,11 +59,9 @@ jobs:
 
     -
       name: Install .NET SDKs
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          3.1.x
-          5.0.x
           6.0.x
 
     -
@@ -74,7 +72,7 @@ jobs:
     -
       name: '[Build]'
       shell: pwsh
-      run: dotnet run/build.dll --target=Build
+      run: dotnet run/build.dll --target=Build --exclusive
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -70,7 +70,7 @@ jobs:
         restore-keys: node-${{ runner.os }}
     -
       name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
     -
@@ -104,7 +104,7 @@ jobs:
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
     -
@@ -161,7 +161,7 @@ jobs:
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
     -
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v3
       -
         name: Setup .NET SDK
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '6.0.x'
       -
diff --git a/build/build/BuildLifetime.cs b/build/build/BuildLifetime.cs
@@ -36,5 +36,6 @@ private static void SetMsBuildSettingsVersion(BuildContext context)
         msBuildSettings.WithProperty("RepositoryBranch", version.GitVersion.BranchName);
         msBuildSettings.WithProperty("RepositoryCommit", version.GitVersion.Sha);
         msBuildSettings.WithProperty("NoPackageAnalysis", "true");
+        msBuildSettings.WithProperty("UseSharedCompilation", "false");
     }
 }
diff --git a/docs/input/docs/learn/how-it-works.md b/docs/input/docs/learn/how-it-works.md
@@ -5,7 +5,7 @@ RedirectFrom: docs/more-info/how-it-works
 ---
 
 GitVersion v3 works very differently to v2. Version 2 had knowledge of both
-GitFlow and GitHubFlow hard coded into it, with each branch having it's own
+GitFlow and GitHubFlow hard coded into it, with each branch having its own
 class which calculated the version for that branch type.
 
 v3 is driven by [configuration](/docs/reference/configuration), meaning most of the

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ jobs:`
`56`	`56`	`key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}`
`57`	`57`	`-`
`58`	`58`	`name: Install .NET SDK 6.0.x`
`59`		`- uses: actions/setup-dotnet@v2`
	`59`	`+ uses: actions/setup-dotnet@v3`
`60`	`60`	`with:`
`61`	`61`	`dotnet-version: '6.0.x'`
`62`	`62`	`-`
`@@ -95,7 +95,7 @@ jobs:`
`95`	`95`	`key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}`
`96`	`96`	`-`
`97`	`97`	`name: Install .NET SDK 6.0.x`
`98`		`- uses: actions/setup-dotnet@v2`
	`98`	`+ uses: actions/setup-dotnet@v3`
`99`	`99`	`with:`
`100`	`100`	`dotnet-version: '6.0.x'`
`101`	`101`	`-`
`@@ -161,7 +161,7 @@ jobs:`
`161`	`161`	`key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}`
`162`	`162`	`-`
`163`	`163`	`name: Install .NET SDK 6.0.x`
`164`		`- uses: actions/setup-dotnet@v2`
	`164`	`+ uses: actions/setup-dotnet@v3`
`165`	`165`	`with:`
`166`	`166`	`dotnet-version: '6.0.x'`
`167`	`167`	`-`
`@@ -213,7 +213,7 @@ jobs:`
`213`	`213`	`path: ${{ github.workspace }}/artifacts/packages/nuget`
`214`	`214`	`-`
`215`	`215`	`name: Install .NET SDK 6.0.x`
`216`		`- uses: actions/setup-dotnet@v2`
	`216`	`+ uses: actions/setup-dotnet@v3`
`217`	`217`	`with:`
`218`	`218`	`dotnet-version: '6.0.x'`
`219`	`219`	`-`
`@@ -273,7 +273,7 @@ jobs:`
`273`	`273`	`install: true`
`274`	`274`	`-`
`275`	`275`	`name: Install .NET SDK 6.0.x`
`276`		`- uses: actions/setup-dotnet@v2`
	`276`	`+ uses: actions/setup-dotnet@v3`
`277`	`277`	`with:`
`278`	`278`	`dotnet-version: '6.0.x'`
`279`	`279`	`-`
`@@ -331,7 +331,7 @@ jobs:`
`331`	`331`	`install: true`
`332`	`332`	`-`
`333`	`333`	`name: Install .NET SDK 6.0.x`
`334`		`- uses: actions/setup-dotnet@v2`
	`334`	`+ uses: actions/setup-dotnet@v3`
`335`	`335`	`with:`
`336`	`336`	`dotnet-version: '6.0.x'`
`337`	`337`	`-`
`@@ -421,7 +421,7 @@ jobs:`
`421`	`421`	`path: ${{ github.workspace }}/artifacts/packages/nuget`
`422`	`422`	`-`
`423`	`423`	`name: Install .NET SDK 6.0.x`
`424`		`- uses: actions/setup-dotnet@v2`
	`424`	`+ uses: actions/setup-dotnet@v3`
`425`	`425`	`with:`
`426`	`426`	`dotnet-version: '6.0.x'`
`427`	`427`	`-`
`@@ -475,7 +475,7 @@ jobs:`
`475`	`475`	`path: ${{ github.workspace }}/artifacts/packages/native`
`476`	`476`	`-`
`477`	`477`	`name: Install .NET SDK 6.0.x`
`478`		`- uses: actions/setup-dotnet@v2`
	`478`	`+ uses: actions/setup-dotnet@v3`
`479`	`479`	`with:`
`480`	`480`	`dotnet-version: '6.0.x'`
`481`	`481`	`-`
Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,9 @@ jobs:`
`59`	`59`
`60`	`60`	`-`
`61`	`61`	`name: Install .NET SDKs`
`62`		`- uses: actions/setup-dotnet@v2`
	`62`	`+ uses: actions/setup-dotnet@v3`
`63`	`63`	`with:`
`64`	`64`	`dotnet-version: \|`
`65`		`- 3.1.x`
`66`		`- 5.0.x`
`67`	`65`	`6.0.x`
`68`	`66`
`69`	`67`	`-`
`@@ -74,7 +72,7 @@ jobs:`
`74`	`72`	`-`
`75`	`73`	`name: '[Build]'`
`76`	`74`	`shell: pwsh`
`77`		`- run: dotnet run/build.dll --target=Build`
	`75`	`+ run: dotnet run/build.dll --target=Build --exclusive`
`78`	`76`
`79`	`77`	`- name: Perform CodeQL Analysis`
`80`	`78`	`uses: github/codeql-action/analyze@v2`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ jobs:`
`70`	`70`	`restore-keys: node-${{ runner.os }}`
`71`	`71`	`-`
`72`	`72`	`name: Install .NET SDK 6.0.x`
`73`		`- uses: actions/setup-dotnet@v2`
	`73`	`+ uses: actions/setup-dotnet@v3`
`74`	`74`	`with:`
`75`	`75`	`dotnet-version: '6.0.x'`
`76`	`76`	`-`
`@@ -104,7 +104,7 @@ jobs:`
`104`	`104`	`key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}`
`105`	`105`	`-`
`106`	`106`	`name: Install .NET SDK 6.0.x`
`107`		`- uses: actions/setup-dotnet@v2`
	`107`	`+ uses: actions/setup-dotnet@v3`
`108`	`108`	`with:`
`109`	`109`	`dotnet-version: '6.0.x'`
`110`	`110`	`-`
`@@ -161,7 +161,7 @@ jobs:`
`161`	`161`	`key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}`
`162`	`162`	`-`
`163`	`163`	`name: Install .NET SDK 6.0.x`
`164`		`- uses: actions/setup-dotnet@v2`
	`164`	`+ uses: actions/setup-dotnet@v3`
`165`	`165`	`with:`
`166`	`166`	`dotnet-version: '6.0.x'`
`167`	`167`	`-`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ jobs:`
`30`	`30`	`- uses: actions/checkout@v3`
`31`	`31`	`-`
`32`	`32`	`name: Setup .NET SDK`
`33`		`- uses: actions/setup-dotnet@v2`
	`33`	`+ uses: actions/setup-dotnet@v3`
`34`	`34`	`with:`
`35`	`35`	`dotnet-version: '6.0.x'`
`36`	`36`	`-`
Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,6 @@ private static void SetMsBuildSettingsVersion(BuildContext context)`
`36`	`36`	`msBuildSettings.WithProperty("RepositoryBranch", version.GitVersion.BranchName);`
`37`	`37`	`msBuildSettings.WithProperty("RepositoryCommit", version.GitVersion.Sha);`
`38`	`38`	`msBuildSettings.WithProperty("NoPackageAnalysis", "true");`
	`39`	`+ msBuildSettings.WithProperty("UseSharedCompilation", "false");`
`39`	`40`	`}`
`40`	`41`	`}`