Update to latest uno, bootstrapper

2020-02-28 13:42:57 -05:00 · 2020-02-28 13:42:57 -05:00 · 3fc19187fa
--- a/.vsts-ci.Linux.yml
+++ b/.vsts-ci.Linux.yml
@ -1,9 +1,9 @@
 jobs:
 - job: linux
-  container: nv-bionic-wasm
+  container: unoplatform/wasm-build:2.0

  pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-18.04'

  variables:
    NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
@ -17,11 +17,35 @@ jobs:
      cd ~
      git clone https://github.com/emscripten-core/emsdk
      cd emsdk
-      ./emsdk install sdk-1.38.31-64bit
-      ./emsdk activate sdk-1.38.31-64bit
+      ./emsdk install sdk-1.39.7
+      ./emsdk activate sdk-1.39.7

    displayName: 'Setup Emscripten'

+  - bash: |
+      cd ~/emsdk
+      wget https://raw.githubusercontent.com/mono/mono/27247739c68faee7b2a63ae805222d4b375d2161/sdks/builds/emscripten-pr-8457.diff
+      wget https://raw.githubusercontent.com/mono/mono/27247739c68faee7b2a63ae805222d4b375d2161/sdks/builds/fix-emscripten-8511.diff
+      cd ~/emsdk/upstream/emscripten
+      patch -N -p1 < ~/emsdk/emscripten-pr-8457.diff
+      patch -N -p1 < ~/emsdk/fix-emscripten-8511.diff
+
+    displayName: 'Apply Emscripten Mono patches'
+
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      packageType: sdk
+      version: 2.2.x
+      installationPath: $(Agent.ToolsDirectory)/dotnet
+
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      packageType: sdk
+      version: 3.0.x
+      installationPath: $(Agent.ToolsDirectory)/dotnet
+
  - task: GitVersion@5
    inputs:
      useConfigFile: true
--- a/.vsts-ci.Windows.yml
+++ b/.vsts-ci.Windows.yml
@ -99,7 +99,7 @@ jobs:
      msbuildLocationMethod: version
      msbuildVersion: latest
      msbuildArchitecture: x86
-      msbuildArguments: /r /p:Configuration=Release /detailedsummary /p:AndroidSigningKeyPass=$(KeystorePassword) /p:AndroidSigningStorePass=$(KeystorePassword)  "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION"
+      msbuildArguments: /r /p:Configuration=Release /detailedsummary /p:SkipWasmBuild=true /p:AndroidSigningKeyPass=$(KeystorePassword) /p:AndroidSigningStorePass=$(KeystorePassword)  "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION"
      clean: false
      maximumCpuCount: true
      restoreNugetPackages: false
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@ -1,8 +1,3 @@
-resources:
-  containers:
-  - container: nv-bionic-wasm
-    image: nventive/wasm-build:1.3
-
 jobs:
 - template: .vsts-ci.Windows.yml
 - template: .vsts-ci.Linux.yml
--- a/src/CalcManager/bin/wasm/CalcManager.bc
+++ b/src/CalcManager/bin/wasm/CalcManager.bc
--- a/src/CalcManager/bin/wasm/CalcManager.wasm
+++ b/src/CalcManager/bin/wasm/CalcManager.wasm
--- a/src/CalcManager/build.sh
+++ b/src/CalcManager/build.sh
@ -1,17 +1,4 @@
 mkdir -p bin/wasm
-echo Generating WASM File
-emcc \
-	-std=c++17 \
-	-s WASM=1 \
-	-s LEGALIZE_JS_FFI=0 \
-	-s RESERVED_FUNCTION_POINTERS=64 \
-    -s ALLOW_MEMORY_GROWTH=1 \
-	-s BINARYEN=1 \
-	-s SIDE_MODULE=1 \
-	-s DISABLE_EXCEPTION_CATCHING=0 \
-	-o bin/wasm/CalcManager.wasm \
-	-s EXPORT_ALL=1 \
-	CEngine/*.cpp Ratpack/*.cpp *.cpp -I.

 echo Generating LLVM Bitcode files
 emcc \
@ -23,4 +10,5 @@ emcc \
 	-s BINARYEN=1 \
 	-s DISABLE_EXCEPTION_CATCHING=0 \
 	-o bin/wasm/CalcManager.bc \
+	-r \
 	CEngine/*.cpp Ratpack/*.cpp *.cpp -I.
--- a/src/Calculator.Droid/Calculator.Droid.csproj
+++ b/src/Calculator.Droid/Calculator.Droid.csproj
@ -85,7 +85,7 @@
    <PackageReference Include="Newtonsoft.Json">
      <Version>12.0.2</Version>
    </PackageReference>
-    <PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
+    <PackageReference Include="Uno.UI" Version="2.1.0-dev.1371" />
    <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
    <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
@ -216,4 +216,4 @@
 		<Target Name="AfterBuild">
 		</Target>
 -->
-</Project>
+</Project>
--- a/src/Calculator.UWP/Calculator.UWP.csproj
+++ b/src/Calculator.UWP/Calculator.UWP.csproj
@ -15,7 +15,7 @@
      <Version>4.3.1</Version>
    </PackageReference>
    <PackageReference Include="Uno.UI">
-      <Version>2.0.512-dev.4178</Version>
+      <Version>2.1.0-dev.1371</Version>
    </PackageReference>
  </ItemGroup>
  <PropertyGroup>
--- a/src/Calculator.Wasm/Calculator.Wasm.csproj
+++ b/src/Calculator.Wasm/Calculator.Wasm.csproj
@ -11,9 +11,6 @@
 		<MonoRuntimeDebuggerEnabled Condition="'$(Configuration)'=='Debug'">true</MonoRuntimeDebuggerEnabled>
 		<WasmShellMonoRuntimeExecutionMode Condition="$([MSBuild]::IsOsPlatform('Linux'))">InterpreterAndAOT</WasmShellMonoRuntimeExecutionMode>
 		<WasmPWAManifestFile>manifest.json</WasmPWAManifestFile>
-
-		<!-- Release dynamic is required as of Wasm.Bootstapper 1.0.8 because of the dependency on emscripten's addFunction export -->
-		<MonoWasmRuntimeConfiguration>release-dynamic</MonoWasmRuntimeConfiguration>
 		<WasmShellIndexHtmlPath>$(MSBuildThisFileDirectory)index.html</WasmShellIndexHtmlPath>
 	</PropertyGroup>
 	<ItemGroup>
@ -46,17 +43,16 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-		<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
+		<PackageReference Include="Uno.UI" Version="2.1.0-dev.1371" />
 		<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.23" />
-		<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.8" />
+		<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.1.0-dev.420" />
 		<DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.8" />
 	</ItemGroup>
 	<ItemGroup>
 		<MonoRuntimeMixedModeExcludedAssembly Include="Newtonsoft.Json" />
 		<MonoRuntimeMixedModeExcludedAssembly Include="System.Data" />
 	</ItemGroup>
-	<ItemGroup>
-		<Content Include="..\CalcManager\bin\wasm\CalcManager.wasm" Link="CalcManager.wasm" />
+	<ItemGroup Condition="$([MSBuild]::IsOsPlatform('Linux')) or ( $([MSBuild]::IsOsPlatform('Windows')) and '$(SkipWasmBuild)'=='' )">
 		<Content Include="..\CalcManager\bin\wasm\CalcManager.bc" Link="CalcManager.bc" />
 	</ItemGroup>
 	<ItemGroup>
--- a/src/Calculator.Wasm/index.html
+++ b/src/Calculator.Wasm/index.html
@ -14,7 +14,7 @@
    <script type="text/javascript" src="uno-config.js"></script>
    <script type="text/javascript" src="uno-bootstrap.js"></script>
    <script type="text/javascript" src="ios-redirect.js"></script>
-    <script async type="text/javascript" src="mono.js"></script>
+    <script async type="text/javascript" src="dotnet.js"></script>
    $(ADDITIONAL_CSS)
    $(ADDITIONAL_HEAD)
 </head>
--- a/src/Calculator.iOS/Calculator.iOS.csproj
+++ b/src/Calculator.iOS/Calculator.iOS.csproj
@ -214,7 +214,7 @@
    <PackageReference Include="Newtonsoft.Json">
      <Version>12.0.2</Version>
    </PackageReference>
-    <PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
+    <PackageReference Include="Uno.UI" Version="2.1.0-dev.1371" />
    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
    <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
  </ItemGroup>
--- a/src/Calculator.sln
+++ b/src/Calculator.sln
@ -32,6 +32,7 @@ EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Calculator.Shared\Calculator.Shared.projitems*{093428d1-ab83-4f1a-93e9-304b44a24d1f}*SharedItemsImports = 4
+		Calculator.Shared\Calculator.Shared.projitems*{53337466-6e79-45f3-a650-1bfb93cc19b0}*SharedItemsImports = 5
 		Calculator.Shared\Calculator.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13
 		Calculator.Shared\Calculator.Shared.projitems*{6aa5ec60-6865-4ba8-9f09-ee02add025e2}*SharedItemsImports = 4
 		Calculator.Shared\Calculator.Shared.projitems*{a8517645-fa26-4bbe-a931-52fcf16db2c6}*SharedItemsImports = 4