Merge pull request #192 from unoplatform/dev/jela/devserver-error

fix: Fail the build when a project uses the deprecated CLI package
unoplatform · Apr 14, 2020 · 1e4fc8b · 1e4fc8b
2 parents 2eb4131 + 3f1ffe8
commit 1e4fc8b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git 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 &

diff --git 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>