Merge remote-tracking branch 'origin/stable'

To bring the new nuget defaults & the snap testing. # Conflicts: # .github/workflows/CI.yml
nblockchain · Jan 28, 2023 · e7cc6e3 · e7cc6e3
2 parents 2c6afb4 + 775267d
commit e7cc6e3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -566,6 +566,13 @@ jobs:
       run: |
         ./scripts/snap_build.sh
 
+    - name: Install snap
+      # dangerous because it's a local snap (not one from the SnapStore)
+      run: sudo snap install --dangerous *.snap
+
+    - name: Test snap
+      run: gwallet --version
+
     - uses: actions/upload-artifact@v3
       name: Upload snap package as artifact
       with:

diff --git a/NuGet.Restore.targets b/NuGet.Restore.targets
@@ -13,7 +13,10 @@
 		<Curl Condition=" '$(OS)' == 'Windows_NT' ">"$(TEMP)\curl.exe" $(CurlArgs)</Curl>
 		<Curl Condition=" '$(OS)' != 'Windows_NT' ">curl $(CurlArgs)</Curl>
 		<PowerShell Condition=" '$(PowerShell)' == '' ">%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShell>
-		<ContinueOnRestoreError Condition=" '$(ContinueOnRestoreError)' == '' ">ErrorAndContinue</ContinueOnRestoreError>  
+
+		<!-- see https://learn.microsoft.com/en-us/visualstudio/msbuild/task-element-msbuild -->
+		<ContinueOnRestoreError Condition=" '$(ContinueOnRestoreError)' == '' ">ErrorAndStop</ContinueOnRestoreError>
+
 		<RestoreVerbosity Condition="'$(RestoreVerbosity)' == ''">quiet</RestoreVerbosity>
 		<RestoreLoggingVerbosity Condition="'$(RestoreLoggingVerbosity)' == ''">normal</RestoreLoggingVerbosity>
 		<TargetsFile>$(MSBuildThisFilename)$(MSBuildThisFileExtension)</TargetsFile>
@@ -27,7 +30,7 @@
 	<ItemDefinitionGroup>
 		<RestoreSolution>
 			<Command>Restore</Command>
-			<Args>-verbosity $(RestoreVerbosity)</Args>
+			<Args>-verbosity $(RestoreLoggingVerbosity)</Args>
 		</RestoreSolution>
 	</ItemDefinitionGroup>