From 0c7b85351c19baf418ea047990c77754afc93573 Mon Sep 17 00:00:00 2001
From: Harrison Deng <yunyangdeng@gmail.com>
Date: Thu, 1 Dec 2022 17:35:20 +0000
Subject: [PATCH] Updated Jenkinsfile.

All "dotnet restore" commands are now part of the "install" stage.
---
 Jenkinsfile | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a1a9f8a..b824a7c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,16 +7,13 @@ pipeline {
                 sh 'echo "mamba activate props" >> ~/.bashrc'
                 sh 'node --version && npm --version'
                 sh 'cd Props && npm install'
+                sh 'dotnet restore Props.Shop/Props.Shop.sln'
+                sh 'dotnet restore Props.Shop/Props.Shop.Tests.sln'
+                sh 'dotnet restore Props.Tests'
             }
         }
         stage("Props.Shop") {
             stages {
-                stage("Restore") {
-                    steps {
-                        sh 'dotnet restore Props.Shop/Props.Shop.sln'
-                        sh 'dotnet restore Props.Shop/Props.Shop.Tests.sln'
-                    }
-                }
                 stage("Test") {
                     steps {
                         sh 'dotnet test --logger xunit --no-restore Props.Shop/Props.Shop.Tests.sln'
@@ -34,11 +31,6 @@ pipeline {
         }
         stage("Props") {
             stages {
-                stage("Restore") {
-                    steps {
-                        sh 'dotnet restore Props.Tests'
-                    }
-                }
                 stage("Test") {
                     steps {
                         sh 'dotnet test --logger xunit --no-restore Props.Tests'