Fix NuGet for real (#153)

* Fix NuGet for real * Update Release.yml * Include Avalonia in updating to prerelease * Update Release.yml * Update CSharpMath.Evaluation.csproj * Update Test.yml * Update Test.cs * Update Test.yml * Update test image
verybadcat · Aug 3, 2020 · cd5be4a · cd5be4a
1 parent 337d493
commit cd5be4a
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -51,6 +51,11 @@ jobs:
         file_glob: true
         overwrite: true
     - name: Upload to NuGet
-      run: dotnet nuget push .nupkgs/ -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
-      # If .nupkgs/* is used instead of .nupkg/ as the path, then not all files will be uploaded
-      # So CSharpMath.0.5.0-alpha.nupkg and CSharpMath.0.5.0-alpha.snupkg will be uploaded but not others e.g. CSharpMath.Rendering.0.5.0-alpha.nupkg
+      run: |
+         for x in `ls .nupkgs/*.nupkg`
+         do
+           # Use --skip-duplicate since we want re-runs of this workflow to succeed in case of network issues
+           dotnet nuget push $x -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json  --skip-duplicate
+         done
+      # Following command does not work... https://github.com/NuGet/Home/issues/9867
+      # dotnet nuget push .nupkgs/ -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json  --skip-duplicate
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
@@ -22,7 +22,7 @@ jobs:
         dotnet tool install -g dotnet-outdated
         update() {
           dotnet outdated -u CSharpMath.Xaml.Tests.NuGet
-          dotnet outdated -pre Always -inc CSharpMath -u CSharpMath.Xaml.Tests.NuGet
+          dotnet outdated -pre Always -inc CSharpMath -inc Avalonia -u CSharpMath.Xaml.Tests.NuGet
         }
         # retry 5 times since dotnet outdated fails often: https://github.com/jerriep/dotnet-outdated/issues/299
         update || update || update || update || update
@@ -64,6 +64,12 @@ jobs:
       with:
         name: CSharpMath.Rendering.Tests results
         path: CSharpMath.Rendering.Tests/*/*.png
+    - name: Upload CSharpMath.Xaml.Tests.NuGet results as CI artifacts
+      uses: actions/upload-artifact@v2
+      if: always()
+      with:
+        name: CSharpMath.Xaml.Tests.NuGet results
+        path: CSharpMath.Xaml.Tests.NuGet/*.png
     - name: Upload NuGet packages as CI artifacts
       uses: actions/upload-artifact@v2
       if: always()
@@ -75,7 +81,13 @@ jobs:
       run: |
         # Non-Windows platforms require --store-password-in-clear-text: https://github.com/NuGet/Home/issues/1851
         dotnet nuget add source https://nuget.pkg.github.com/verybadcat/index.json -n github -u verybadcat -p ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text
-        dotnet nuget push .nupkgs/*.nupkg --source "github" --skip-duplicate # Don't let GitHub Releases interpret .snupkg as .nupkg
+        for x in `ls .nupkgs/*.nupkg` # Don't let GitHub Releases interpret .snupkg as .nupkg
+        do
+          # Use --skip-duplicate since we want re-runs of this workflow to succeed in case of network issues
+          dotnet nuget push $x --source "github" --skip-duplicate
+        done
+      # Following command does not work... https://github.com/NuGet/Home/issues/9867
+      # dotnet nuget push .nupkgs/*.nupkg --source "github" --skip-duplicate # Don't let GitHub Releases interpret .snupkg as .nupkg
   Ios:
     runs-on: macos-latest
     steps:

diff --git a/CSharpMath.Evaluation/CSharpMath.Evaluation.csproj b/CSharpMath.Evaluation/CSharpMath.Evaluation.csproj
@@ -3,11 +3,17 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <Description>
+      Can convert CSharpMath.Atom.MathList parsed from LaTeX with CSharpMath.Atom.LaTeXParser
+      into actual mathematical expressions that are evaluatable with AngouriMath.
+      Supports arithmetic, trigonometry, symbolic simplification and expansion,
+      as well as matrices, sets, and equation solving.
+    </Description>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\CSharpMath\CSharpMath.csproj" />
     <PackageReference Include="AngouriMath" Version="1.1.0.3-beta" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/CSharpMath.Xaml.Tests.NuGet/Test.cs b/CSharpMath.Xaml.Tests.NuGet/Test.cs
@@ -16,9 +16,9 @@ public void TestImage() {
         new Avalonia.MathView { LaTeX = "1", FontSize = 50 }.Painter.DrawAsPng(avalonia);
 
       using (var forms = System.IO.File.OpenRead(File(nameof(Forms))))
-        Xunit.Assert.Contains(forms.Length, new[] { 344L, 797 }); // 797 on Mac, 344 on Ubuntu
+        Xunit.Assert.Equal(292, forms.Length);
       using (var avalonia = System.IO.File.OpenRead(File(nameof(Avalonia))))
-        Xunit.Assert.Equal(344, avalonia.Length);
+        Xunit.Assert.Equal(292, avalonia.Length);
     }
   }
 }
diff --git a/CSharpMath.Xaml.Tests.NuGet/Test.png b/CSharpMath.Xaml.Tests.NuGet/Test.png