update workflow and WeSay.proj file to point to updated sln location

sillsdev · Apr 16, 2024 · 5984d82 · 5984d82
1 parent 623ebeb
commit 5984d82
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml
@@ -35,26 +35,26 @@ jobs:
 
     # Run the unit tests
     - name: Restore
-      run: nuget restore src/WeSay.sln
+      run: nuget restore WeSay.sln
 
     - name: Build
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true # So gitversion can set environment vars during the build
-      run: msbuild src/WeSay.sln
+      run: msbuild WeSay.sln
 
     - name: Prepare to Test
       run: msbuild build/WeSay.proj /t:RestoreBuildTasks
-      
+
     - name: Test
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true # So testing files and folders can be created
       run: msbuild build/WeSay.proj /t:TestOnly /p:Configuration=Debug /p:Platform="x86" /p:CI=true /v:diag
-        
+
     - name: Test Report
       uses: jasonleenaylor/nunit-reporter@63ab85dd5da111c3f4ef95f2fb73bbe667f58db9
       if: always()
       with:
         path: output/**/TestResults.xml
         access-token: ${{ secrets.GITHUB_TOKEN }}
         reportTitle: "Test Results (${{ matrix.os }})"
-        numFailures: 
+        numFailures:
diff --git a/build/WeSay.proj b/build/WeSay.proj
@@ -46,7 +46,7 @@
 		]]></Code>
 		</Task>
 	</UsingTask>
-  
+
 	<Import Project="NuGet.targets"/>
 
 	<Target Name="RestoreBuildTasks" DependsOnTargets="CheckPrerequisites">
@@ -66,10 +66,10 @@
 	</ItemGroup>
 
 	<Target Name="Build">
-		<MSBuild Projects="$(RootDir)/src/WeSay.sln"
+		<MSBuild Projects="$(RootDir)/WeSay.sln"
 			Properties="Configuration=$(Configuration);RootDir=$(RootDir);Platform=$(Platform)" />
 	</Target>
-	
+
 	<Target Name="Test" DependsOnTargets="Build">
 		<CallTarget Targets="TestOnly" Condition="!$(RestartBuild)" />
 		<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="TestOnly"
@@ -86,7 +86,7 @@
 			<Output PropertyName="ExcludeArgument" TaskParameter="ExcludeArg" />
 		</BuildExcludeString>
 		<Message Text="Exclude Arg = $(ExcludeArgument)" />
-		<Exec Command="$(RootDir)/packages/NUnit.ConsoleRunner/tools/nunit3-console @(TestAssemblies->'%(Filename)%(Extension)', ' ')  &quot;--result:$(RootDir)/output/$(Configuration)/TestResults.xml;format=nunit3&quot; --labels=Before --x86 --agents=1 $(ExcludeArgument)" 
+		<Exec Command="$(RootDir)/packages/NUnit.ConsoleRunner/tools/nunit3-console @(TestAssemblies->'%(Filename)%(Extension)', ' ')  &quot;--result:$(RootDir)/output/$(Configuration)/TestResults.xml;format=nunit3&quot; --labels=Before --x86 --agents=1 $(ExcludeArgument)"
 			WorkingDirectory="$(RootDir)/output/$(Configuration)" />
 	</Target>
 </Project>