Merge pull request #653 from unoplatform/dev/jela/standalone-server-p…

…ublish fix: Publish dist folder in wwwroot to align with default UseStaticFiles behavior
unoplatform · Dec 19, 2022 · cd9f8f9 · cd9f8f9
2 parents 826818f + 9d2fbfa
commit cd9f8f9
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 3 deletions.
diff --git a/.vsts-ci-windows-tests.yml b/.vsts-ci-windows-tests.yml
@@ -42,6 +42,26 @@ jobs:
  dotnet publish /p:Configuration=Release /m:1 "/p:WasmShellMonoTempFolder=$customMonoTempPath" /p:DISABLE_CLIHOST_NET6=true /p:WasmShellEmccLinkOptimization=false /bl:$(build.artifactstagingdirectory)/SampleNet5-win-temp-with-space.binlog
  displayName: Build Raytracer Sample with Spaces
 
+ # Standalone Server publish
+ - pwsh: |
+ cd $(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Server.net7
+ dotnet clean -c Release /p:DISABLE_CLIHOST_NET6=true
+ dotnet publish -c Release /m:1 /p:DISABLE_CLIHOST_NET6=true /p:WasmShellEmccLinkOptimization=false /bl:$(build.artifactstagingdirectory)/SampleServerNet7-win.binlog
+ displayName: Build Standalone Server publish (net5)
+
+ - pwsh: |
+ $(build.sourcesdirectory)\build\scripts\run-tests-windows-server.ps1 `
+ "$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Server.net7\bin\Release\net7.0\publish" `
+ "Uno.Wasm.StaticLinking.Server.net7.exe" `
+ "$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.UITests" `
+ "http://localhost:8000/"
+
+ displayName: Standalone Server publish tests (net7)
+ env:
+ BUILD_SOURCESDIRECTORY: "$(build.sourcesdirectory)"
+
+ # Ray tracer
+
  - pwsh: |
  cd $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer
  $customMonoTempPath="$env:temp\with a space\test2"
@@ -58,7 +78,7 @@ jobs:
 
  - pwsh: |
  $(build.sourcesdirectory)\build\scripts\run-tests-windows.ps1 `
- "$(build.sourcesdirectory)\src\Uno.Wasm.Sample.RayTracer\bin\Release\net6.0\publish" `
+ "$(build.sourcesdirectory)\src\Uno.Wasm.Sample.RayTracer\bin\Release\net6.0\publish\wwwroot" `
  "$(build.sourcesdirectory)\src\WasmAot.UITests" `
  "http://localhost:8000/"
 
@@ -107,7 +127,7 @@ jobs:
  env:
  BUILD_SOURCESDIRECTORY: "$(build.sourcesdirectory)"
  
- # Static linking test (net4)
+ # Static linking test (net7)
  - pwsh: |
  cd $(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7
  dotnet clean -c Release /p:DISABLE_CLIHOST_NET6=true

diff --git a/build/scripts/run-tests-windows-server.ps1 b/build/scripts/run-tests-windows-server.ps1
@@ -0,0 +1,20 @@
+Set-PSDebug -Trace 1
+
+$BOOTSTRAP_APP_PATH=$args[0]
+$BOOTSTRAP_APP_EXE=$args[1]
+$BOOTSTRAP_TEST_RUNNER_PATH=$args[2]
+$env:BOOTSTRAP_TEST_RUNNER_URL=$args[3]
+
+cd $BOOTSTRAP_APP_PATH
+$serverProcess = Start-Process .\$BOOTSTRAP_APP_EXE -NoNewWindow -PassThru --urls=$env:BOOTSTRAP_TEST_RUNNER_URL
+
+Try 
+{
+ cd $BOOTSTRAP_TEST_RUNNER_PATH
+ npm install
+ node app
+}
+Finally
+{
+ $serverProcess.Kill()
+}
diff --git a/src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.Publish.targets b/src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.Publish.targets
@@ -20,7 +20,7 @@
  <ItemGroup>
  <_UnoWasmDistFiles Include="$(OutputPath)dist/**"/>
  <_UnoWasmDist Include="@(_UnoWasmDistFiles)">
- <TargetPath>$([System.String]::Copy('%(Identity)').Replace('$(OutputPath)dist$([System.IO.Path]::DirectorySeparatorChar)', ''))</TargetPath>
+ <TargetPath>$([System.String]::Copy('%(Identity)').Replace('$(OutputPath)dist$([System.IO.Path]::DirectorySeparatorChar)', 'wwwroot/'))</TargetPath>
  </_UnoWasmDist>
 
  <ContentWithTargetPath Include="@(_UnoWasmDist)">