Skip to content

Commit

Permalink
More updates for latest .NET 6 sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
@cwensley
cwensley committed Apr 30, 2022
1 parent c05e3d0 commit 2187a82
Show file tree
Hide file tree
Showing 30 changed files with 106 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
types: [ published ]

env:
DotNetVersion: "6.0.100"
DotNetVersion: "6.0.201"
BuildConfiguration: "Release"
BuildParameters: "build/Build.proj /v:Minimal /consoleLoggerParameters:NoSummary /p:Configuration=Release /p:BuildVersion=${{ github.run_id }} /p:BuildBranch=${{ github.ref }}"

Expand Down
8 changes: 4 additions & 4 deletions build/Build.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,10 @@
<Config Include="debug" Value="-c Debug" />

<Build Include="build-net4" Create="-f net48" Build="build" />
<Build Include="build-net5" Create="-f net5.0" Build="build" />
<Build Include="build-rid-net5" Create="-f net5.0" Build="build -r osx-x64" />
<Build Include="publish-net5" Create="-f net5.0" Build="publish" />
<Build Include="publish-rid-net5" Create="-f net5.0" Build="publish -r osx-x64" />
<Build Include="build-net5" Create="-f net6.0" Build="build" />
<Build Include="build-rid-net5" Create="-f net6.0" Build="build -r osx-x64" />
<Build Include="publish-net5" Create="-f net6.0" Build="publish" />
<Build Include="publish-rid-net5" Create="-f net6.0" Build="publish -r osx-x64" />

<Combined Include="combined" Value="-c" />
<Combined Include="separate" Value="" Build="**/*.Mac.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion lib/monomac
Submodule monomac updated 4 files
+1 −1 src/MonoMac.csproj
+1 −1 src/bmac.csproj
+1 −1 src/btouch.cs
+1 −1 src/generator.csproj
3 changes: 2 additions & 1 deletion samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
<PropertyGroup>
<UseXamarinMac>True</UseXamarinMac>
<OutputType>Exe</OutputType>
<TargetFrameworks>net48</TargetFrameworks>
<TargetFrameworks>xamarinmac20</TargetFrameworks>
<EnableDefaultNoneItems>False</EnableDefaultNoneItems>
<EnableDefaultContentItems>False</EnableDefaultContentItems>
<CodeSigningKey>Mac Developer</CodeSigningKey>
<PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
<MonoBundlingExtraArgs>--nowarn:2006 --nowarn:5220</MonoBundlingExtraArgs>
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
<EnableDefaultImageAssets>False</EnableDefaultImageAssets>
<LinkMode Condition="$(Configuration) == 'Release'">SdkOnly</LinkMode>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
<PropertyGroup>
<UseXamarinMac>True</UseXamarinMac>
<OutputType>Exe</OutputType>
<TargetFrameworks>net48</TargetFrameworks>
<TargetFrameworks>xamarinmac20</TargetFrameworks>
<EnableDefaultNoneItems>False</EnableDefaultNoneItems>
<EnableDefaultContentItems>False</EnableDefaultContentItems>
<CodeSigningKey>Mac Developer</CodeSigningKey>
<PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
<MonoBundlingExtraArgs>--nowarn:2006 --nowarn:5220</MonoBundlingExtraArgs>
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
<EnableDefaultImageAssets>False</EnableDefaultImageAssets>
<LinkMode Condition="$(Configuration) == 'Release'">SdkOnly</LinkMode>
</PropertyGroup>

<ItemGroup>
Expand Down
28 changes: 28 additions & 0 deletions src/Eto.Core.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "monomac", "monomac", "{E77D
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator", "..\lib\monomac\src\generator.csproj", "{EE5D4296-DFD7-4D1B-B9F9-C43AD9ED4F6F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.macOS", "Eto.Mac\Eto.macOS.csproj", "{B3AB773A-BCF6-4679-AC13-E2879F61DF33}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.macOS", "..\test\Eto.Test.Mac\Eto.Test.macOS.csproj", "{8A002565-996A-45F9-8D74-89E8D272717F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -228,6 +232,30 @@ Global
{EE5D4296-DFD7-4D1B-B9F9-C43AD9ED4F6F}.Release|x64.Build.0 = Release|Any CPU
{EE5D4296-DFD7-4D1B-B9F9-C43AD9ED4F6F}.Release|x86.ActiveCfg = Release|Any CPU
{EE5D4296-DFD7-4D1B-B9F9-C43AD9ED4F6F}.Release|x86.Build.0 = Release|Any CPU
{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Debug|x64.ActiveCfg = Debug|Any CPU
{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Debug|x64.Build.0 = Debug|Any CPU
{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Debug|x86.ActiveCfg = Debug|Any CPU
{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Debug|x86.Build.0 = Debug|Any CPU
{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Release|Any CPU.Build.0 = Release|Any CPU
{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Release|x64.ActiveCfg = Release|Any CPU
{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Release|x64.Build.0 = Release|Any CPU
{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Release|x86.ActiveCfg = Release|Any CPU
{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Release|x86.Build.0 = Release|Any CPU
{8A002565-996A-45F9-8D74-89E8D272717F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8A002565-996A-45F9-8D74-89E8D272717F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A002565-996A-45F9-8D74-89E8D272717F}.Debug|x64.ActiveCfg = Debug|Any CPU
{8A002565-996A-45F9-8D74-89E8D272717F}.Debug|x64.Build.0 = Debug|Any CPU
{8A002565-996A-45F9-8D74-89E8D272717F}.Debug|x86.ActiveCfg = Debug|Any CPU
{8A002565-996A-45F9-8D74-89E8D272717F}.Debug|x86.Build.0 = Debug|Any CPU
{8A002565-996A-45F9-8D74-89E8D272717F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8A002565-996A-45F9-8D74-89E8D272717F}.Release|Any CPU.Build.0 = Release|Any CPU
{8A002565-996A-45F9-8D74-89E8D272717F}.Release|x64.ActiveCfg = Release|Any CPU
{8A002565-996A-45F9-8D74-89E8D272717F}.Release|x64.Build.0 = Release|Any CPU
{8A002565-996A-45F9-8D74-89E8D272717F}.Release|x86.ActiveCfg = Release|Any CPU
{8A002565-996A-45F9-8D74-89E8D272717F}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{EE5D4296-DFD7-4D1B-B9F9-C43AD9ED4F6F} = {E77D6350-0CCF-11EB-A5F5-69BE9D4F31C9}
Expand Down
4 changes: 2 additions & 2 deletions src/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
"type": "parameter",
"description": "Specify the framework(s) to support",
"dataType": "choice",
"defaultValue": "net5.0",
"replaces": "net5.0",
"defaultValue": "net6.0",
"replaces": "net6.0",
"choices": [
{
"choice": "net6.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->

<PropertyGroup>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>

Expand Down
2 changes: 1 addition & 1 deletion src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.Gtk</RootNamespace>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.Mac</RootNamespace>

<RuntimeIdentifiers>osx-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...to.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net5.0-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net6.0-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'True'">TargetFrameworkOverride-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'False'">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.WinForms</RootNamespace>
Expand Down
4 changes: 2 additions & 2 deletions src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net5.0-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net6.0-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'True'">TargetFrameworkOverride-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'False'">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.Wpf</RootNamespace>
Expand Down
4 changes: 2 additions & 2 deletions src/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
"type": "parameter",
"description": "Specify the framework(s) to support",
"dataType": "choice",
"defaultValue": "net5.0",
"replaces": "net5.0",
"defaultValue": "net6.0",
"replaces": "net6.0",
"choices": [
{
"choice": "net6.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->

<PropertyGroup>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>

Expand Down
2 changes: 1 addition & 1 deletion src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.Gtk</RootNamespace>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.Mac</RootNamespace>

<RuntimeIdentifiers>osx-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...to.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net5.0-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net6.0-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'True'">TargetFrameworkOverride-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'False'">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.WinForms</RootNamespace>
Expand Down
4 changes: 2 additions & 2 deletions src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net5.0-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net6.0-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'True'">TargetFrameworkOverride-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'False'">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.Wpf</RootNamespace>
Expand Down
4 changes: 2 additions & 2 deletions src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
"type": "parameter",
"description": "Specify the framework(s) to support",
"dataType": "choice",
"defaultValue": "net5.0",
"replaces": "net5.0",
"defaultValue": "net6.0",
"replaces": "net6.0",
"choices": [
{
"choice": "net6.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->

<PropertyGroup>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>

Expand Down
2 changes: 1 addition & 1 deletion src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Mac/EtoApp.1.Mac.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>

<RuntimeIdentifiers>osx-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...rms.Templates/content/App-VisualBasic/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net5.0-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net6.0-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'True'">TargetFrameworkOverride-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'False'">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>
Expand Down
4 changes: 2 additions & 2 deletions src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net5.0-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net5.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net6.0-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net6.0</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'True'">TargetFrameworkOverride-windows</TargetFramework>
<TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'False'">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>
Expand Down
5 changes: 4 additions & 1 deletion src/Eto.Mac/build/BundleDotNetCore.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,12 @@

<Target Name="_MacBuildUnifiedAppBundle" Condition="@(MacBundleRuntimeIdentifiers->Count()) > 1">
<!-- Copy both bundles together, using lipo to generate unified binaries -->
<PropertyGroup>
<_FullBaseOutputAppPath>$([System.IO.Path]::GetFullPath('$(BaseOutputAppPath)'))</_FullBaseOutputAppPath>
</PropertyGroup>

<ItemGroup>
<UnifiedFiles Include="$(BaseOutputAppPath)%(MacBundleRuntimeIdentifiers.Identity)\$(MacBundleName).app\**" RuntimeIdentifier="%(MacBundleRuntimeIdentifiers.Identity)" BasePath="$(BaseOutputAppPath)%(MacBundleRuntimeIdentifiers.Identity)\$(MacBundleName).app\" />
<UnifiedFiles Include="$(_FullBaseOutputAppPath)%(MacBundleRuntimeIdentifiers.Identity)\$(MacBundleName).app\**" RuntimeIdentifier="%(MacBundleRuntimeIdentifiers.Identity)" BasePath="$(_FullBaseOutputAppPath)%(MacBundleRuntimeIdentifiers.Identity)/$(MacBundleName).app/" />
<UnifiedFiles TargetPath="$([System.String]::Copy('%(FullPath)').TrimStart('%(BasePath)'))" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion src/Eto.Mac/build/Dmg.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@

<Exec Command="sleep 2" />

<Exec Command="bless '$(_DmgVolume)/' --openfolder '$(_DmgVolume)'" />
<Exec Command="bless --folder '$(_DmgVolume)/'" />
<!-- <Exec Command="bless '$(_DmgVolume)/' -openfolder '$(_DmgVolume)'" /> -->

<PropertyGroup>
<DmgBackgroundImage Condition="$(DmgBackgroundImage) != '' AND !Exists($(DmgBackgroundImage)) AND Exists('$(MSBuildProjectDirectory)\$(DmgBackgroundImage)')">$(MSBuildProjectDirectory)\$(DmgBackgroundImage)</DmgBackgroundImage>
Expand Down
Loading

0 comments on commit 2187a82

Please sign in to comment.