feat: Build for wasm/skia net7

unoplatform · Sep 29, 2022 · 4a946ad · 4a946ad
1 parent 035df68
commit 4a946ad
Show file tree

Hide file tree

Showing 47 changed files with 489 additions and 153 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -77,6 +77,13 @@ jobs:
   parameters:
     poolName: '$(windowsScaledPool)'
 
+- template: build/ci/.azure-devops-package-wasm.yml
+  parameters:
+    vmImage: '$(linuxVMImage)'
+
+- template: build/ci/.azure-devops-package-skia.yml
+  parameters:
+    poolName: '$(windowsScaledPool)'
 - template: build/ci/.azure-devops-package.yml
   parameters:
     poolName: '$(windowsScaledPool)'

diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj
@@ -43,29 +43,21 @@
 		<Warning Text="Building this project under Visual Studio has no effect." />
 	</Target>
 
-	<Target Name="BuildGeneric" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''">
-
+	<Target Name="PrepareBuildAssets" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''">
 		<Message Text="Building for $(Configuration) and $(Platform) BuildReason:$(BUILD_REASON) Version:$(GitVersion_SemVer) UNO_UWP_BUILD:$(UNO_UWP_BUILD)" />
 
 		<CallTarget Targets="UpdateFileVersions;UpdateTasksSHA;PrepareNuGetPackage" Condition="$(_isWindows)" />
+	</Target>
+
+	<Target Name="BuildGeneric" AfterTargets="Build" DependsOnTargets="PrepareBuildAssets" Condition="'$(BuildingInsideVisualStudio)'==''">
 
 		<CallTarget Targets="BuildCI" Condition="'$(Configuration)'=='Release' and $(_isWindows)" />
 
 		<CallTarget Targets="PublishVSIX2019" Condition="'$(Configuration)'=='Release' and $(_isWindows)" />
 	</Target>
 
-	<Target Name="BuildNet6" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''">
-		<Message Text="Building for $(Configuration) and $(Platform) BuildReason:$(BUILD_REASON) Version:$(GitVersion_SemVer) UNO_UWP_BUILD:$(UNO_UWP_BUILD)" />
-
-		<CallTarget Targets="UpdateFileVersions;UpdateTasksSHA;PrepareNuGetPackage" Condition="$(_isWindows)" />
-	</Target>
-
-	<Target Name="GeneratePackages" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''">
-
-		<Message Text="Building for $(Configuration) and $(Platform) BuildReason:$(BUILD_REASON) Version:$(GitVersion_SemVer) UNO_UWP_BUILD:$(UNO_UWP_BUILD)" />
-
-		<CallTarget Targets="UpdateFileVersions;UpdateTasksSHA;PrepareNuGetPackage" Condition="$(_isWindows)" />
 
+	<Target Name="GeneratePackages" AfterTargets="Build" DependsOnTargets="PrepareBuildAssets" Condition="'$(BuildingInsideVisualStudio)'==''">
 		<CallTarget Targets="BuildNuGetPackage" Condition="'$(Configuration)'=='Release'" />
 	</Target>
 
@@ -221,14 +213,13 @@
 
 	<Target Name="BuildCI">
 		<MSBuild Properties="Configuration=Release_NoSamples;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-generic;PackageVersion=$(GITVERSION_SemVer)"
-             Projects="..\src\Uno.UI-packages-no-net6.slnf"
+             Projects="filters\Uno.UI-packages-no-net6.slnf"
              Targets="Restore;Build"
              RebaseOutputs="false"
              BuildInParallel="true" />
-
 	</Target>
 
-	<Target Name="BuildCINet6">
+	<Target Name="BuildCINet6" DependsOnTargets="PrepareBuildAssets">
 
 		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET6_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-net6;PackageVersion=$(GITVERSION_SemVer)"
              Projects="..\src\Uno.UI-net6-only.slnf"
@@ -238,6 +229,26 @@
 
 	</Target>
 
+	<Target Name="BuildCIWasm" DependsOnTargets="PrepareBuildAssets">
+
+		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET6_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-wasm;PackageVersion=$(GITVERSION_SemVer)"
+             Projects="filters\Uno.UI-packages-wasm.slnf"
+             Targets="Restore;Build"
+             RebaseOutputs="false"
+             BuildInParallel="true" />
+
+	</Target>
+
+	<Target Name="BuildCISkia" DependsOnTargets="PrepareBuildAssets">
+
+		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET6_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-skia;PackageVersion=$(GITVERSION_SemVer)"
+             Projects="filters\Uno.UI-packages-skia.slnf"
+             Targets="Restore;Build"
+             RebaseOutputs="false"
+             BuildInParallel="true" />
+
+	</Target>
+
 	<Target Name="BuildSyncGenerator">
 		<!-- Restore the nuget packages for the whole solution -->
 		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true" Projects="..\src\Uno.UI-packages-no-net6.slnf" Targets="Restore" RebaseOutputs="false" BuildInParallel="true" />