Fix favicon.ico build bug and modify CI to run on PR (dotnet-architec…

…ture#479)
ardalis · Nov 11, 2020 · c2fe05d · c2fe05d
1 parent 2e9ac0f
commit c2fe05d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -1,6 +1,6 @@
 name: eShopOnWeb Build and Test
 
-on: [push]
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
@@ -12,8 +12,10 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.201
+        dotnet-version: 3.1.x
+
     - name: Build with dotnet
       run: dotnet build ./eShopOnWeb.sln --configuration Release
+
     - name: Test with dotnet
       run: dotnet test ./eShopOnWeb.sln --configuration Release
diff --git a/eShopOnWeb.sln b/eShopOnWeb.sln
@@ -25,6 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		docker-compose.override.yml = docker-compose.override.yml
 		docker-compose.yml = docker-compose.yml
+		.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml
 		README.md = README.md
 	EndProjectSection
 EndProject

diff --git a/src/BlazorAdmin/wwwroot/favicon.ico b/src/BlazorAdmin/wwwroot/favicon.ico