Merge branch 'main' into develop

microsoft · Jun 1, 2023 · d7e054c · d7e054c
2 parents d2c8810 + c5cc3ec
commit d7e054c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/Code-Scanning.yml b/.github/workflows/Code-Scanning.yml
@@ -43,10 +43,9 @@ jobs:
         languages: ${{ matrix.language }}
 
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v1.3.1
 
     - name: Retrieve and build all available solutions
-      id: build-all-samples
       run: |
           .\Build-AllSamples.ps1 -Verbose -ThrottleLimit 1
       env:

diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
@@ -22,7 +22,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Add MSBuild to PATH
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.3.1
 
       - name: Get changed files
         id: get-changed-files
@@ -31,10 +31,16 @@ jobs:
           separator: ","
 
       - name: Retrieve and build solutions from changed files
-        id: build-changed-samples
         run: |
           $changedFiles = "${{ steps.get-changed-files.outputs.all_changed_files }}".Split(',')
           .\.github\scripts\Build-ChangedSamples.ps1 -ChangedFiles $changedFiles -Verbose
         env:
           WDS_Configuration: ${{ matrix.configuration }}
           WDS_Platform: ${{ matrix.platform }}
+
+      - name: Archive logs
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: logs
+          path: _logs
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,12 +22,18 @@ jobs:
           submodules: 'recursive'
 
       - name: Add MSBuild to PATH
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.3.1
 
       - name: Retrieve and build all available solutions
-        id: build-all-samples
         run: |
           .\Build-AllSamples.ps1 -Verbose
         env:
           WDS_Configuration: ${{ matrix.configuration }}
           WDS_Platform: ${{ matrix.platform }}
+
+      - name: Archive logs
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: logs
+          path: _logs
diff --git a/Build-SampleSet.ps1 b/Build-SampleSet.ps1
@@ -20,7 +20,7 @@ if ($PSBoundParameters.ContainsKey('Verbose')) {
 }
 
 New-Item -ItemType Directory -Force -Path $LogFilesDirectory | Out-Null
-$sampleBuilderFilePath = "$LogFilesDirectory\overview.htm"
+$sampleBuilderFilePath = "$LogFilesDirectory\_overview.htm"
 
 
 Remove-Item  -Recurse -Path $LogFilesDirectory 2>&1 | Out-Null

diff --git a/Building-Locally.md b/Building-Locally.md
@@ -72,5 +72,5 @@ Excluded:             56
 Unsupported:          230
 Failed:               0
 Log files directory:  .\_logs
-Overview report:      .\_logs\overview.htm
+Overview report:      .\_logs\_overview.htm
 ```