From ba4e8cf4c0bcf98ed1a1ce21b61459bbc699e182 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Mon, 13 Apr 2020 16:37:22 -0400
Subject: [PATCH 1/2] fix: Fail the build when a project uses the deprecated
 CLI package

---
 .../build/Uno.Wasm.Bootstrap.targets                   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets b/src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets
index e530a83e0..6245933ca 100644
--- a/src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets
+++ b/src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets
@@ -165,8 +165,14 @@
     <Delete Files="@(_DistFilesToDelete)" />
   </Target>
 
+  <Target Name="_ValidateLegacyCLIPackage" BeforeTargets="CoreCompile">
+	<PropertyGroup>
+	  <_CliToolRefs>@(DotNetCliToolReference)</_CliToolRefs>
+	</PropertyGroup>
 
-  <Import Project="Uno.Wasm.Bootstrap.Publish.targets"/>
-
+	<Error Text="The current project is referencing the deprecated Uno.Wasm.Bootstrap.Cli package. Remove it manually in the project file and add a reference to Uno.Wasm.Bootstrap.DevServer instead. For more information visit: https://github.com/unoplatform/Uno.Wasm.Bootstrap#upgrading-from-previous-versions-of-the-unowasmbootstrap-package"
+		 Condition="$(_CliToolRefs.Contains('Uno.Wasm.Bootstrap.Cli'))"/>
+  </Target>
 
+  <Import Project="Uno.Wasm.Bootstrap.Publish.targets"/>
 </Project>

From 3f1ffe8460de9e6b19669560a8a2cf2f1cf7298a Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Mon, 13 Apr 2020 17:04:15 -0400
Subject: [PATCH 2/2] ci: Adjust ubuntu agent

---
 .vsts-ci-linux.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.vsts-ci-linux.yml b/.vsts-ci-linux.yml
index ef74c6556..9f488e550 100644
--- a/.vsts-ci-linux.yml
+++ b/.vsts-ci-linux.yml
@@ -1,7 +1,7 @@
 parameters:
   jobName: ''
   linux_container: ''
-  linux_vmImage: 'ubuntu-18.04'
+  linux_vmImage: 'ubuntu-latest'
   netcore_version: ''
 
 jobs:
@@ -86,6 +86,9 @@ jobs:
       OverWrite: false
       flattenFolders: false
 
+  - bash: rm -fr ~/emsdk
+    displayName: Cleanup Emscripten folder to run tests
+
   - bash: |
       cd $(build.sourcesdirectory)/src/Uno.Wasm.AotTests/bin/Release/netstandard2.0/dist
       python server.py &