Merge branch 'devel'

kekyo · Mar 6, 2024 · f834d6d · f834d6d
2 parents 78a3024 + 4dcb7d1
commit f834d6d
Show file tree

Hide file tree

Showing 63 changed files with 2,054 additions and 125 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -17,7 +17,7 @@ jobs:
     - name: Support longpaths
       run: git config --system core.longpaths true
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     #   lfs: true
@@ -28,7 +28,7 @@ jobs:
     # Setup environments
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
           2.2.x
@@ -39,7 +39,7 @@ jobs:
           8.0.x
 
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.3
+      uses: microsoft/setup-msbuild@v2
 
     - name: Setup NuGet package reference
       run: |
@@ -83,12 +83,14 @@ jobs:
         dotnet pack -p:Configuration=Release -o artifacts src\Epoxy.Core.Xamarin.Forms\Epoxy.Core.Xamarin.Forms.csproj
         dotnet pack -p:Configuration=Release -o artifacts src\Epoxy.Core.Avalonia\Epoxy.Core.Avalonia.csproj
         dotnet pack -p:Configuration=Release -o artifacts src\Epoxy.Core.Avalonia11\Epoxy.Core.Avalonia11.csproj
+        dotnet pack -p:Configuration=Release -o artifacts src\Epoxy.Core.Maui\Epoxy.Core.Maui.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Core.OpenSilver\Epoxy.Core.OpenSilver.csproj
         dotnet pack -p:Configuration=Release -o artifacts src\Epoxy.Build\Epoxy.Build.csproj
         dotnet pack -p:Configuration=Release -o artifacts src\Epoxy.Wpf\Epoxy.Wpf.csproj
         dotnet pack -p:Configuration=Release -o artifacts src\Epoxy.Xamarin.Forms\Epoxy.Xamarin.Forms.csproj
         dotnet pack -p:Configuration=Release -o artifacts src\Epoxy.Avalonia\Epoxy.Avalonia.csproj
         dotnet pack -p:Configuration=Release -o artifacts src\Epoxy.Avalonia11\Epoxy.Avalonia11.csproj
+        dotnet pack -p:Configuration=Release -o artifacts src\Epoxy.Maui\Epoxy.Maui.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.OpenSilver\Epoxy.OpenSilver.csproj
         dotnet pack -p:Configuration=Release -o artifacts src\FSharp.Epoxy.Wpf\FSharp.Epoxy.Wpf.fsproj
         dotnet pack -p:Configuration=Release -o artifacts src\FSharp.Epoxy.Avalonia\FSharp.Epoxy.Avalonia.fsproj
@@ -108,12 +110,14 @@ jobs:
         dotnet nuget push artifacts\Epoxy.Core.Avalonia.*.nupkg --source ref1
         dotnet nuget push artifacts\Epoxy.Core.Avalonia11.*.nupkg --source ref1
         dotnet nuget push artifacts\Epoxy.Core.OpenSilver.*.nupkg --source ref1
+        dotnet nuget push artifacts\Epoxy.Core.Maui.*.nupkg --source ref1
         dotnet nuget push artifacts\Epoxy.Build.*.nupkg --source ref1
         dotnet nuget push artifacts\Epoxy.Wpf.*.nupkg --source ref1
         dotnet nuget push artifacts\Epoxy.Xamarin.Forms.*.nupkg --source ref1
         dotnet nuget push artifacts\Epoxy.Avalonia.*.nupkg --source ref1
         dotnet nuget push artifacts\Epoxy.Avalonia11.*.nupkg --source ref1
         dotnet nuget push artifacts\Epoxy.OpenSilver.*.nupkg --source ref1
+        dotnet nuget push artifacts\Epoxy.Maui.*.nupkg --source ref1
         dotnet nuget push artifacts\FSharp.Epoxy.Wpf.*.nupkg --source ref1
         dotnet nuget push artifacts\FSharp.Epoxy.Avalonia.*.nupkg --source ref1
         dotnet nuget push artifacts\FSharp.Epoxy.Avalonia11.*.nupkg --source ref1
@@ -131,12 +135,14 @@ jobs:
     #    dotnet nuget push artifacts\Epoxy.Core.Avalonia.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    dotnet nuget push artifacts\Epoxy.Core.Avalonia11.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    dotnet nuget push artifacts\Epoxy.Core.OpenSilver.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
+    #    dotnet nuget push artifacts\Epoxy.Core.Maui.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    dotnet nuget push artifacts\Epoxy.Build.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    dotnet nuget push artifacts\Epoxy.Wpf.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    dotnet nuget push artifacts\Epoxy.Xamarin.Forms.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    dotnet nuget push artifacts\Epoxy.Avalonia.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    dotnet nuget push artifacts\Epoxy.Avalonia11.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    dotnet nuget push artifacts\Epoxy.OpenSilver.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
+    #    dotnet nuget push artifacts\Epoxy.Maui.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    dotnet nuget push artifacts\FSharp.Epoxy.Wpf.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    dotnet nuget push artifacts\FSharp.Epoxy.Avalonia.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    dotnet nuget push artifacts\FSharp.Epoxy.Avalonia11.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}

diff --git a/Epoxy-build.sln b/Epoxy-build.sln
@@ -40,6 +40,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Avalonia11", "src\Epo
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Epoxy.Avalonia11", "src\FSharp.Epoxy.Avalonia11\FSharp.Epoxy.Avalonia11.fsproj", "{8890BC8D-034C-4347-89DC-CC221018A378}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Core.Maui", "src\Epoxy.Core.Maui\Epoxy.Core.Maui.csproj", "{3C1F576F-7AFD-4004-8A50-550C3F2A95F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Maui", "src\Epoxy.Maui\Epoxy.Maui.csproj", "{60769AB9-21DE-4C7E-90FC-F8ECAA4608B6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -108,6 +112,14 @@ Global
 		{8890BC8D-034C-4347-89DC-CC221018A378}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8890BC8D-034C-4347-89DC-CC221018A378}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8890BC8D-034C-4347-89DC-CC221018A378}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C1F576F-7AFD-4004-8A50-550C3F2A95F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C1F576F-7AFD-4004-8A50-550C3F2A95F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C1F576F-7AFD-4004-8A50-550C3F2A95F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C1F576F-7AFD-4004-8A50-550C3F2A95F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60769AB9-21DE-4C7E-90FC-F8ECAA4608B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60769AB9-21DE-4C7E-90FC-F8ECAA4608B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60769AB9-21DE-4C7E-90FC-F8ECAA4608B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60769AB9-21DE-4C7E-90FC-F8ECAA4608B6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE