From 33e6dec585e2ff6d169b76dbe59391166d7b498c Mon Sep 17 00:00:00 2001
From: Curtis Wensley <curtis.wensley@gmail.com>
Date: Tue, 13 Jun 2023 01:40:57 -0700
Subject: [PATCH] build updates

---
 .github/workflows/build.yml | 16 ++++++----------
 Directory.Build.props       |  9 ++++++---
 Eto.SkiaSharp.sln           |  2 +-
 dotnet-workloads.json       |  3 +++
 global.json                 |  6 ++++++
 5 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 dotnet-workloads.json
 create mode 100644 global.json

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c84433..489763e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: windows-latest
 
     env:
-      PlatformBuildParameters: /p:Platform=Windows
+      PlatformBuildParameters: 
 
     steps:
     - uses: actions/checkout@v2
@@ -27,7 +27,7 @@ jobs:
     - 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:
@@ -56,7 +56,7 @@ jobs:
     runs-on: macos-latest
 
     env:
-      PlatformBuildParameters: /p:Platform=Mac
+      PlatformBuildParameters: 
 
     steps:
     - uses: actions/checkout@v2
@@ -64,14 +64,10 @@ jobs:
     - 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:
diff --git a/Directory.Build.props b/Directory.Build.props
index fcd5bdf..9d19f3d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -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>
diff --git a/Eto.SkiaSharp.sln b/Eto.SkiaSharp.sln
index 4b66a55..d0e876e 100644
--- a/Eto.SkiaSharp.sln
+++ b/Eto.SkiaSharp.sln
@@ -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
diff --git a/dotnet-workloads.json b/dotnet-workloads.json
new file mode 100644
index 0000000..939b3bc
--- /dev/null
+++ b/dotnet-workloads.json
@@ -0,0 +1,3 @@
+{
+    "microsoft.net.sdk.macos": "12.3.2372"
+}
\ No newline at end of file
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..a9e6e8b
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "7.0.100",
+    "rollForward": "latestPatch"
+  }
+}
\ No newline at end of file