Merge pull request #2720 from cwensley/curtis/build-updates

Build updates
picoe · Dec 29, 2024 · ad83f72 · ad83f72
2 parents 98835c5 + 49a1470
commit ad83f72
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 27 deletions.
diff --git 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
@@ -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
@@ -179,8 +179,8 @@
     <RemoveDir Directories="$(ArtifactsDir)templates"/>
 
     <!-- install the current version of the templates -->
-    <Exec Command="dotnet new -u Eto.Forms.Templates" />
-    <Exec Command="dotnet new -i $(PackageOutputPath)Eto.Forms.Templates.$(InformationalVersion).nupkg" />
+    <Exec Command="dotnet new uninstall Eto.Forms.Templates" IgnoreExitCode="True" />
+    <Exec Command="dotnet new install $(PackageOutputPath)Eto.Forms.Templates.$(InformationalVersion).nupkg" />
 
     <!-- generate project templates -->
     <ItemGroup>
@@ -196,7 +196,7 @@
       <Combined Include="combined" Value="-c" />
       <Combined Include="separate" Value="" />
 
-      <Framework Include="net60" Value="net6.0" />
+      <Framework Include="net80" Value="net8.0" />
       <Framework Include="net48" Value="net48" />
 
       <OtherOptions Include="none" Value="" />
@@ -231,12 +231,12 @@
       <!-- Build Wpf on Windows -->
       <CombinedProject Update="@(CombinedProject)"
         Condition="%(CombinedId) == 'separate'"
-        BuildCommand="&amp;&amp; cd %(ProjectName).Wpf &amp;&amp; dotnet build &amp;&amp; cd .." />
+        BuildCommand="&amp;&amp; cd %(ProjectName).Wpf &amp;&amp; dotnet build /p:EnableWindowsTargeting=true &amp;&amp; cd .." />
 
       <!-- Build WinForms on Windows -->
       <CombinedProject Update="@(CombinedProject)"
         Condition="%(CombinedId) == 'separate' and ( %(OtherId) == 'wf_macos' or %(OtherId) == 'wf' )"
-        BuildCommand="%(BuildCommand) &amp;&amp; cd %(ProjectName).WinForms &amp;&amp; dotnet build &amp;&amp; cd .." />
+        BuildCommand="%(BuildCommand) &amp;&amp; cd %(ProjectName).WinForms &amp;&amp; dotnet build /p:EnableWindowsTargeting=true &amp;&amp; cd .." />
 
       <!-- Build Mac -->
       <CombinedProject Update="@(CombinedProject)"
@@ -277,8 +277,8 @@
     <RemoveDir Directories="$(ArtifactsDir)mac-publish"/>
 
     <!-- install the current version of the templates -->
-    <Exec Command="dotnet new -u Eto.Forms.Templates" />
-    <Exec Command="dotnet new -i $(PackageOutputPath)Eto.Forms.Templates.$(InformationalVersion).nupkg" />
+    <Exec Command="dotnet new uninstall Eto.Forms.Templates" IgnoreExitCode="True" />
+    <Exec Command="dotnet new install $(PackageOutputPath)Eto.Forms.Templates.$(InformationalVersion).nupkg" />
 
     <!-- generate project templates -->
     <ItemGroup>

diff --git 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
@@ -25,7 +25,7 @@
     <OutputType Condition="$(OutputType) == 'Exe' and ($(BuildPlatform) == 'Wpf' or $(BuildPlatform) == 'Windows')">WinExe</OutputType>
 
     <!-- Need to set this with the macos target if not specified -->
-    <SupportedOSPlatformVersion Condition="$(SupportedOSPlatformVersion) == '' AND ( $(BuildPlatform) == 'macos' )">10.14</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$(SupportedOSPlatformVersion) == '' AND ( $(BuildPlatform) == 'macos' )">10.15</SupportedOSPlatformVersion>
     <RuntimeIdentifiers Condition="$(BuildPlatform) == 'macos' AND $(RuntimeIdentifiers) == '' AND $(RuntimeIdentifier) == ''">osx-x64;osx-arm64</RuntimeIdentifiers>
   </PropertyGroup>