Updated DocFx version and added branch env variables.

open-collar · Dec 11, 2020 · 51b6f8a · 51b6f8a
1 parent 7f3fe2d
commit 51b6f8a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -14,6 +14,20 @@ jobs:
       with:
         dotnet-version: 3.1.100
 
+    - name: Get branch name (merge)
+      if: github.event_name != 'pull_request'
+      shell: bash
+      run: |
+        echo "DOCFX_SOURCE_BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV        
+        echo "Branch: $DOCFX_SOURCE_BRANCH_NAME"
+
+    - name: Get branch name (pull request)
+      if: github.event_name == 'pull_request'
+      shell: bash
+      run: |
+        echo "DOCFX_SOURCE_BRANCH_NAME=$(echo ${GITHUB_HEAD_REF} | tr / -)" >> $GITHUB_ENV
+        echo "Branch: $DOCFX_SOURCE_BRANCH_NAME"
+
     - name: Generate revision number
       uses: einaregilsson/build-number@v3 
       with:

diff --git a/docs-src/ApiDocs/ApiDocs.csproj b/docs-src/ApiDocs/ApiDocs.csproj
@@ -11,7 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="docfx.console" Version="2.49.0">
+        <PackageReference Include="docfx.console" Version="2.56.6">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>