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.

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

build updates #1

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 6 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ jobs:
runs-on: windows-latest

env:
PlatformBuildParameters: /p:Platform=Windows
PlatformBuildParameters:

steps:
- uses: actions/checkout@v2

- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
dotnet-version: '7.0.105'

- uses: actions/cache@v1
with:
Expand Down Expand Up @@ -56,22 +56,18 @@ jobs:
runs-on: macos-latest

env:
PlatformBuildParameters: /p:Platform=Mac
PlatformBuildParameters:

steps:
- uses: actions/checkout@v2

- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
dotnet-version: '7.0.105'

- name: setup-xamarin
uses: maxim-lobanov/setup-xamarin@v1
with:
mono-version: latest
xamarin-mac-version: latest
xcode-version: latest
- name: Install macos workload
run: sudo dotnet workload install macos --from-rollback-file dotnet-workloads.json

- uses: actions/cache@v1
with:
Expand Down
9 changes: 6 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,15 @@
<PropertyGroup>
<!-- nuget properties -->

<DevVersion>0.1.0</DevVersion>

<!-- set version from tag -->
<Version Condition="$(BuildBranch.StartsWith('refs/tags/'))">$(BuildBranch.Substring(10))</Version>
<!-- set version for CI build -->
<Version Condition="$(Version) == '' AND $(BuildVersion) != ''">$(BuildVersion)</Version>

<Version Condition="$(Version) == ''">0.1.0-dev</Version>
<Version Condition="$(Version) == '' AND $(BuildVersion) != ''">$(DevVersion)-$(BuildVersion)</Version>
<!-- set version for development -->
<Version Condition="$(Version) == ''">$(DevVersion)-dev</Version>

<Authors>Eto.SkiaSharp Authors</Authors>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageTags>Skia;SkiaSharp</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion Eto.SkiaSharp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{31436444-E
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestEtoSkiaSharp", "test\TestEtoSkiaSharp\TestEtoSkiaSharp.csproj", "{0ACDF831-E0D8-4F1A-A3A7-7B5BF943E0FC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestEtoSkiaSharp.Mac", "test\TestEtoSkiaSharp.Mac\TestEtoSkiaSharp.Mac.csproj", "{C7D9211C-DBE6-4E1D-9046-88080A78990D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestEtoSkiaSharp.macOS", "test\TestEtoSkiaSharp.Mac\TestEtoSkiaSharp.macOS.csproj", "{C7D9211C-DBE6-4E1D-9046-88080A78990D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestEtoSkiaSharp.Wpf", "test\TestEtoSkiaSharp.Wpf\TestEtoSkiaSharp.Wpf.csproj", "{E291AA9D-D707-40F3-ADB5-219CCF8E4EC3}"
EndProject
Expand Down
3 changes: 3 additions & 0 deletions dotnet-workloads.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"microsoft.net.sdk.macos": "12.3.2372"
}
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "7.0.100",
"rollForward": "latestPatch"
}
}