No fancy things needed

Add a workaround for unoplatform/Uno.Wasm.Bootstrap#253
mono · Jul 20, 2020 · bc0a6a7 · bc0a6a7
1 parent 692c54a
commit bc0a6a7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/externals/skia b/externals/skia
diff --git a/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj
@@ -24,6 +24,9 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
     <PackageReference Include="Uno.UI" Version="2.4.4" />
+  </ItemGroup>
+  <!-- workaround for https://github.com/unoplatform/Uno.Wasm.Bootstrap/issues/253 -->
+  <ItemGroup Condition=" '$(WasmShellForceDisableWSL)' != 'true' ">
     <PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.7" />
     <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.4.0-dev.7" />
   </ItemGroup>

diff --git a/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj
@@ -24,6 +24,9 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
     <PackageReference Include="Uno.UI" Version="2.4.4" />
+  </ItemGroup>
+  <!-- workaround for https://github.com/unoplatform/Uno.Wasm.Bootstrap/issues/253 -->
+  <ItemGroup Condition=" '$(WasmShellForceDisableWSL)' != 'true' ">
     <PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.7" />
     <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.4.0-dev.7" />
   </ItemGroup>
+0 −7		include/c/gr_context.h
+0 −3		include/c/sk_types.h
+28 −20		src/c/gr_context.cpp
+3 −44		src/c/sk_types_priv.h
+0 −8		src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp