diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a0c496ac6..30e4852cf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -88,7 +88,7 @@ jobs:
- name: Import code signing certificate
if: github.event_name != 'pull_request'
- uses: apple-actions/import-codesign-certs@v1
+ uses: apple-actions/import-codesign-certs@v3
with:
p12-file-base64: ${{ secrets.DEVID_CERTIFICATE_P12 }}
p12-password: ${{ secrets.DEVID_CERTIFICATE_P12_PASSWORD }}
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 3893d178b..b9f8f77c0 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -7,29 +7,22 @@ jobs:
create-release:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
with:
submodules: true
- - name: Create Release Notes
- uses: docker://decathlon/release-notes-generator-action:2.0.1
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- name: Add Milestone Description
run: |
- echo "${{ github.event.milestone.description }}" > release_file_combined.md
- echo -e "\n\n" >> release_file_combined.md
- cat release_file.md >> release_file_combined.md
-
+ echo "${{ github.event.milestone.description }}" > milestone_description.md
+ echo -e "\n\n" >> milestone_description.md
+
- name: Create Release
- id: create_release
- uses: actions/create-release@v1
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ uses: softprops/action-gh-release@v2
with:
+ token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ github.event.milestone.title }}
- release_name: ${{ github.event.milestone.title }}
- body_path: release_file_combined.md
+ name: ${{ github.event.milestone.title }}
+ body_path: milestone_description.md
+ generate_release_notes: true
draft: true
- prerelease: false
+
diff --git a/build/Build.proj b/build/Build.proj
index b38cee9f1..63a18ef0d 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -179,8 +179,8 @@
-
-
+
+
@@ -196,7 +196,7 @@
-
+
@@ -231,12 +231,12 @@
+ BuildCommand="&& cd %(ProjectName).Wpf && dotnet build /p:EnableWindowsTargeting=true && cd .." />
+ BuildCommand="%(BuildCommand) && cd %(ProjectName).WinForms && dotnet build /p:EnableWindowsTargeting=true && cd .." />
-
-
+
+
diff --git a/src/Eto.Mac/build/Mac.targets b/src/Eto.Mac/build/Mac.targets
index ea5faf504..7d30db554 100644
--- a/src/Eto.Mac/build/Mac.targets
+++ b/src/Eto.Mac/build/Mac.targets
@@ -182,7 +182,7 @@
AddStringProperty("NSPrincipalClass", "NSApplication");
AddStringProperty("CFBundleName", MacBundleName);
AddStringProperty("CFBundleExecutable", LauncherFile, true);
- AddStringProperty("LSMinimumSystemVersion", "10.14");
+ AddStringProperty("LSMinimumSystemVersion", "10.15");
if (!string.IsNullOrEmpty(MonoMinimumVersion)) {
AddStringProperty("MonoMinimumVersion", MonoMinimumVersion);
}
diff --git a/src/Eto/sdk/Sdk.targets b/src/Eto/sdk/Sdk.targets
index 9a2b8a808..2ace71322 100755
--- a/src/Eto/sdk/Sdk.targets
+++ b/src/Eto/sdk/Sdk.targets
@@ -25,7 +25,7 @@
WinExe
- 10.14
+ 10.15
osx-x64;osx-arm64