Merge branch 'main' into main

GitTools · Oct 3, 2022 · 222a196 · 222a196
2 parents 37dc0db + 46ce0ff
commit 222a196
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
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