Merge branch 'devel'

kekyo · May 28, 2024 · de74ab8 · de74ab8
2 parents a050c8f + 7fc1754
commit de74ab8
Show file tree

Hide file tree

Showing 369 changed files with 1,462 additions and 67,866 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -80,14 +80,12 @@ jobs:
     - name: Build NuGet packages
       run: |
         dotnet pack -p:Configuration=Release -o artifacts src\Epoxy.Core.Wpf\Epoxy.Core.Wpf.csproj
-        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
@@ -96,8 +94,6 @@ jobs:
         dotnet pack -p:Configuration=Release -o artifacts src\FSharp.Epoxy.Avalonia\FSharp.Epoxy.Avalonia.fsproj
         dotnet pack -p:Configuration=Release -o artifacts src\FSharp.Epoxy.Avalonia11\FSharp.Epoxy.Avalonia11.fsproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\FSharp.Epoxy.OpenSilver\FSharp.Epoxy.OpenSilver.fsproj
-        dotnet build -p:Configuration=Release templates\Epoxy.Templates.csproj
-        dotnet pack -p:Configuration=Release -o artifacts templates\Epoxy.Templates.csproj
 
     #-----------------------------------------------------------------------
     # Deploy packages (develop)
@@ -106,14 +102,12 @@ jobs:
       if: startsWith( github.ref, 'refs/tags/' )
       run: |
         dotnet nuget push artifacts\Epoxy.Core.Wpf.*.nupkg --source ref1
-        dotnet nuget push artifacts\Epoxy.Core.Xamarin.Forms.*.nupkg --source ref1
         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
@@ -122,7 +116,6 @@ jobs:
         dotnet nuget push artifacts\FSharp.Epoxy.Avalonia.*.nupkg --source ref1
         dotnet nuget push artifacts\FSharp.Epoxy.Avalonia11.*.nupkg --source ref1
         dotnet nuget push artifacts\FSharp.Epoxy.OpenSilver.*.nupkg --source ref1
-        dotnet nuget push artifacts\Epoxy.Templates.*.nupkg --source ref1
 
     #-----------------------------------------------------------------------
     # Deploy packages (main)
@@ -131,14 +124,12 @@ jobs:
     #  if: (startsWith( github.ref, 'refs/tags/' )) && (endsWith(steps.extract_branch_name.outputs.branch_name, 'main'))
     #  run: |
     #    dotnet nuget push artifacts\Epoxy.Core.Wpf.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
-    #    dotnet nuget push artifacts\Epoxy.Core.Xamarin.Forms.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    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}}
@@ -147,4 +138,3 @@ jobs:
     #    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}}
     #    dotnet nuget push artifacts\FSharp.Epoxy.OpenSilver.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
-    #    dotnet nuget push artifacts\Epoxy.Templates.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
diff --git a/Epoxy-build.sln b/Epoxy-build.sln
@@ -4,22 +4,16 @@ VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Wpf", "src\Epoxy.Wpf\Epoxy.Wpf.csproj", "{1B625B4E-7DBB-45F3-B095-B8016CC592CE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Xamarin.Forms", "src\Epoxy.Xamarin.Forms\Epoxy.Xamarin.Forms.csproj", "{15B90169-2BDF-45FA-ACDB-A45AAD6F3CCA}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Avalonia", "src\Epoxy.Avalonia\Epoxy.Avalonia.csproj", "{32ABAA5B-2465-4FE8-8446-7BC7CEC16123}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Core.Wpf", "src\Epoxy.Core.Wpf\Epoxy.Core.Wpf.csproj", "{C0A15D5B-C338-4306-9C2B-CE7E6AB50DE1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Core.Xamarin.Forms", "src\Epoxy.Core.Xamarin.Forms\Epoxy.Core.Xamarin.Forms.csproj", "{494DDC01-9BCD-4CE6-B5B6-58F97BD1346C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Core.Avalonia", "src\Epoxy.Core.Avalonia\Epoxy.Core.Avalonia.csproj", "{037C4C66-0ED1-46EF-8AFA-9FF81205E318}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Epoxy.Wpf", "src\FSharp.Epoxy.Wpf\FSharp.Epoxy.Wpf.fsproj", "{C4EE5059-5F8D-40CD-97EA-F450A3CEDF6D}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Epoxy.Avalonia", "src\FSharp.Epoxy.Avalonia\FSharp.Epoxy.Avalonia.fsproj", "{E0E32D7E-E274-418B-9DB2-D4E03AE46E1A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Templates", "templates\Epoxy.Templates.csproj", "{31223F7E-506F-4FD2-905B-9C9D75DBDFB6}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Build", "src\Epoxy.Build\Epoxy.Build.csproj", "{BF5976C8-2143-4769-A029-0B1C64B18F81}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0B980574-EA76-4524-A6A0-37E36163823A}"
@@ -54,10 +48,6 @@ Global
 		{1B625B4E-7DBB-45F3-B095-B8016CC592CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1B625B4E-7DBB-45F3-B095-B8016CC592CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B625B4E-7DBB-45F3-B095-B8016CC592CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15B90169-2BDF-45FA-ACDB-A45AAD6F3CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15B90169-2BDF-45FA-ACDB-A45AAD6F3CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15B90169-2BDF-45FA-ACDB-A45AAD6F3CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15B90169-2BDF-45FA-ACDB-A45AAD6F3CCA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{32ABAA5B-2465-4FE8-8446-7BC7CEC16123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{32ABAA5B-2465-4FE8-8446-7BC7CEC16123}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{32ABAA5B-2465-4FE8-8446-7BC7CEC16123}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -66,10 +56,6 @@ Global
 		{C0A15D5B-C338-4306-9C2B-CE7E6AB50DE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C0A15D5B-C338-4306-9C2B-CE7E6AB50DE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C0A15D5B-C338-4306-9C2B-CE7E6AB50DE1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{494DDC01-9BCD-4CE6-B5B6-58F97BD1346C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{494DDC01-9BCD-4CE6-B5B6-58F97BD1346C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{494DDC01-9BCD-4CE6-B5B6-58F97BD1346C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{494DDC01-9BCD-4CE6-B5B6-58F97BD1346C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{037C4C66-0ED1-46EF-8AFA-9FF81205E318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{037C4C66-0ED1-46EF-8AFA-9FF81205E318}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{037C4C66-0ED1-46EF-8AFA-9FF81205E318}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -82,8 +68,6 @@ Global
 		{E0E32D7E-E274-418B-9DB2-D4E03AE46E1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E0E32D7E-E274-418B-9DB2-D4E03AE46E1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E0E32D7E-E274-418B-9DB2-D4E03AE46E1A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31223F7E-506F-4FD2-905B-9C9D75DBDFB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31223F7E-506F-4FD2-905B-9C9D75DBDFB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF5976C8-2143-4769-A029-0B1C64B18F81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF5976C8-2143-4769-A029-0B1C64B18F81}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BF5976C8-2143-4769-A029-0B1C64B18F81}.Release|Any CPU.ActiveCfg = Release|Any CPU