Skip to content

Commit a7e11ba

Browse files
authored
Fix ci build (#187)
* 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
1 parent 40b8ddf commit a7e11ba

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/Build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
with:
1414
dotnet-version: '3.1.401'
1515
- name: Setup NuGet
16-
uses: NuGet/[email protected].2
16+
uses: NuGet/[email protected].5
1717
- name: Setup MSBuild Path
18-
uses: warrenbuckley/Setup-MSBuild@v1
18+
uses: microsoft/setup-msbuild@v1.0.2
1919
- name: Restore NuGet Packages
2020
run: nuget restore CSharpMath.sln
2121
- name: Build Everything

.github/workflows/Test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test
1+
name: Test
22

33
on: [push, pull_request]
44
jobs:
@@ -22,7 +22,7 @@ jobs:
2222
dotnet tool install -g dotnet-outdated
2323
update() {
2424
dotnet outdated -u CSharpMath.Xaml.Tests.NuGet
25-
dotnet outdated -pre Always -inc CSharpMath -inc Avalonia -u CSharpMath.Xaml.Tests.NuGet
25+
dotnet outdated -pre Always -inc CSharpMath -u CSharpMath.Xaml.Tests.NuGet
2626
}
2727
# retry 5 times since dotnet outdated fails often: https://github.com/jerriep/dotnet-outdated/issues/299
2828
update || update || update || update || update

CSharpMath.Xaml.Tests.NuGet/CSharpMath.Xaml.Tests.NuGet.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ItemGroup>
33
<PackageReference Include="CSharpMath.Avalonia" Version="0.5.0-alpha4" />
44
<PackageReference Include="CSharpMath.Forms" Version="0.5.0-alpha4" />
5-
<PackageReference Include="Avalonia.Skia" Version="0.10.0-preview2" />
5+
<PackageReference Include="Avalonia.Skia" Version="0.10.0-preview5" />
66
<Compile Include="../CSharpMath.Xaml.Tests/XamarinFormsCrc64.cs" Link="XamarinFormsCrc64.cs" />
77
<Compile Include="../CSharpMath.Xaml.Tests/XamarinFormsMockPlatformServices.cs" Link="XamarinFormsMockPlatformServices.cs" />
88
</ItemGroup>

Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!--Directory.Build.props: MSBuild properties that are included in every project-->
1+
<!--Directory.Build.props: MSBuild properties that are included in every project-->
22
<!--Info: https://docs.microsoft.com/en-us/visualstudio/msbuild/customize-your-build?view=vs-2019#directorybuildprops-and-directorybuildtargets-->
33
<Project InitialTargets="SetDefaultPackageVersion">
44
<PropertyGroup Condition="$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Ios'))">

0 commit comments

Comments
 (0)