Merge branch 'devel' into main

kekyo · Jul 8, 2023 · fd503f7 · fd503f7
2 parents 8840164 + ce94513
commit fd503f7
Show file tree

Hide file tree

Showing 633 changed files with 12,595 additions and 10,782 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -71,38 +71,45 @@ jobs:
 
     - name: NuGet restore
       run: |
+        msbuild -p:Configuration=Release -maxCpuCount -t:restore src\Epoxy.Build\Epoxy.Build.csproj
         msbuild -p:Configuration=Release -maxCpuCount -t:restore Epoxy.sln
 
     - name: Build
-      run: msbuild -p:Configuration=Release -maxCpuCount Epoxy.sln
+      run: |
+        msbuild -p:Configuration=Release -maxCpuCount src\Epoxy.Build\Epoxy.Build.csproj
+        msbuild -p:Configuration=Release -maxCpuCount Epoxy.sln
 
     - name: Build NuGet packages
       run: |
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Core.Wpf\Epoxy.Core.Wpf.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Core.Xamarin.Forms\Epoxy.Core.Xamarin.Forms.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Core.Avalonia\Epoxy.Core.Avalonia.csproj
+        msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Core.Avalonia11\Epoxy.Core.Avalonia11.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Core.OpenSilver\Epoxy.Core.OpenSilver.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Core.Uwp\Epoxy.Core.Uwp.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Core.WinUI\Epoxy.Core.WinUI.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Build\Epoxy.Build.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Wpf\Epoxy.Wpf.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Xamarin.Forms\Epoxy.Xamarin.Forms.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Avalonia\Epoxy.Avalonia.csproj
+        msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Avalonia11\Epoxy.Avalonia11.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.OpenSilver\Epoxy.OpenSilver.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Uwp\Epoxy.Uwp.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.WinUI\Epoxy.WinUI.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\FSharp.Epoxy.Wpf\FSharp.Epoxy.Wpf.fsproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\FSharp.Epoxy.Avalonia\FSharp.Epoxy.Avalonia.fsproj
+        msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\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
+        msbuild -t:restore -p:Configuration=Release -maxCpuCount templates\Epoxy.Templates.csproj
+        msbuild -p:Configuration=Release -maxCpuCount templates\Epoxy.Templates.csproj
         msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\artifacts templates\Epoxy.Templates.csproj
-    #    msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Core.Uno\Epoxy.Core.Uno.csproj
-    #    msbuild -t:pack -p:Configuration=Release -p:PackageOutputPath=..\..\artifacts src\Epoxy.Uno\Epoxy.Uno.csproj
 
     #-----------------------------------------------------------------------
     # Test
 
     - name: Test
-      run: dotnet test --no-restore --verbosity normal -p:CITest=True Epoxy.sln
+      run: |
+        dotnet test --verbosity normal -p:Configuration=Release -p:CITest=True tests\Epoxy.Build.Tests\Epoxy.Build.Tests.csproj
       timeout-minutes: 10
 
     #-----------------------------------------------------------------------
@@ -114,22 +121,23 @@ jobs:
         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.Uwp.*.nupkg --source ref1
         dotnet nuget push artifacts\Epoxy.Core.WinUI.*.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.Uwp.*.nupkg --source ref1
         dotnet nuget push artifacts\Epoxy.WinUI.*.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
         dotnet nuget push artifacts\FSharp.Epoxy.OpenSilver.*.nupkg --source ref1
         dotnet nuget push artifacts\Epoxy.Templates.*.nupkg --source ref1
-    #    dotnet nuget push artifacts\Epoxy.Core.Uno.*.nupkg --source ref1
-    #    dotnet nuget push artifacts\Epoxy.Uno.*.nupkg --source ref1
 
     #-----------------------------------------------------------------------
     # Deploy packages (main)
@@ -140,19 +148,20 @@ jobs:
     #    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.Uwp.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    dotnet nuget push artifacts\Epoxy.Core.WinUI.*.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.Uwp.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
     #    dotnet nuget push artifacts\Epoxy.WinUI.*.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}}
     #    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}}
-    #    dotnet nuget push artifacts\Epoxy.Core.Uno.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
-    #    dotnet nuget push artifacts\Epoxy.Uno.*.nupkg --source ref2 --api-key ${{secrets.GH_NUGET_APIKEY}}
diff --git a/.gitignore b/.gitignore
@@ -237,3 +237,5 @@ _Pvt_Extensions
 .idea/
 
 test-templates/
+
+msbuild.binlog
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -42,10 +42,6 @@
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="RelaxVersioner" Version="2.14.0" PrivateAssets="All" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
     <SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
Original file line number	Diff line number	Diff line change
Expand Up		@@ -237,3 +237,5 @@ _Pvt_Extensions
		.idea/

		test-templates/

		msbuild.binlog