Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ci build #187

Merged
merged 8 commits into from
Jan 31, 2021
Merged

Fix ci build #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
af8c2c0
again
FoggyFinder Dec 26, 2020
22c232a
maybe explicit restore ?
FoggyFinder Dec 31, 2020
5fecc99
attempt to remove .bin/.obj folders
FoggyFinder Jan 1, 2021
93efbff
update Avalonia version here as well (temporary)
FoggyFinder Jan 1, 2021
f1cff85
fix conflict
FoggyFinder Jan 30, 2021
2048076
Revert "attempt to remove .bin/.obj folders"
FoggyFinder Jan 30, 2021
451ae97
Revert "maybe explicit restore ?"
FoggyFinder Jan 30, 2021
9386557
change version manually & temporarily avoid upgrading of Avalonia.Ski…
FoggyFinder Jan 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/Build.yml
View file
Open in desktop
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/setup-nuget@v1.0.2
uses: NuGet/setup-nuget@v1.0.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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion CSharpMath.Xaml.Tests.NuGet/CSharpMath.Xaml.Tests.NuGet.csproj
View file
Open in desktop
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
View file
Open in desktop
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