Skip to content

Commit

Permalink
Fix ci build (#187)
Browse files Browse the repository at this point in the history
* again

* maybe explicit restore ?

* attempt to remove .bin/.obj folders

* update Avalonia version here as well (temporary)

* Revert "attempt to remove .bin/.obj folders"

This reverts commit 5fecc99.

* Revert "maybe explicit restore ?"

This reverts commit 22c232a.

* change version manually & temporarily avoid upgrading of Avalonia.Skia package
  • Loading branch information
FoggyFinder authored Jan 31, 2021
1 parent 40b8ddf commit a7e11ba
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
with:
dotnet-version: '3.1.401'
- name: Setup NuGet
uses: NuGet/[email protected].2
uses: NuGet/[email protected].5
- name: Setup MSBuild Path
uses: warrenbuckley/Setup-MSBuild@v1
uses: microsoft/setup-msbuild@v1.0.2
- name: Restore NuGet Packages
run: nuget restore CSharpMath.sln
- name: Build Everything
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test
name: Test

on: [push, pull_request]
jobs:
Expand All @@ -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 -inc Avalonia -u CSharpMath.Xaml.Tests.NuGet
dotnet outdated -pre Always -inc CSharpMath -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ItemGroup>
<PackageReference Include="CSharpMath.Avalonia" Version="0.5.0-alpha4" />
<PackageReference Include="CSharpMath.Forms" Version="0.5.0-alpha4" />
<PackageReference Include="Avalonia.Skia" Version="0.10.0-preview2" />
<PackageReference Include="Avalonia.Skia" Version="0.10.0-preview5" />
<Compile Include="../CSharpMath.Xaml.Tests/XamarinFormsCrc64.cs" Link="XamarinFormsCrc64.cs" />
<Compile Include="../CSharpMath.Xaml.Tests/XamarinFormsMockPlatformServices.cs" Link="XamarinFormsMockPlatformServices.cs" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--Directory.Build.props: MSBuild properties that are included in every project-->
<!--Directory.Build.props: MSBuild properties that are included in every project-->
<!--Info: https://docs.microsoft.com/en-us/visualstudio/msbuild/customize-your-build?view=vs-2019#directorybuildprops-and-directorybuildtargets-->
<Project InitialTargets="SetDefaultPackageVersion">
<PropertyGroup Condition="$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Ios'))">
Expand Down

0 comments on commit a7e11ba

Please sign in to comment.