Merge remote-tracking branch 'origin/v13/dev' into v14/dev

# Conflicts: # build/azure-pipelines.yml
umbraco · Aug 21, 2023 · 6f10517 · 6f10517
2 parents 0096add + 84cd7a1
commit 6f10517
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
@@ -39,7 +39,6 @@ stages:
   ## Build
   ###############################################
   - stage: Build
-
     variables:
       npm_config_cache: $(Pipeline.Workspace)/.npm_client
       NODE_OPTIONS: --max_old_space_size=16384
@@ -381,7 +380,7 @@ stages:
 #              Umbraco__CMS__Unattended__InstallUnattended: true
 #              Umbraco__CMS__Global__InstallMissingDatabase: true
 #              UmbracoDatabaseServer: (LocalDB)\MSSQLLocalDB
-#              UmbracoDatabaseName: Playwright
+#              UmbracoDatabaseName: AcceptanceTestDB
 #              ConnectionStrings__umbracoDbDSN: Server=$(UmbracoDatabaseServer);Database=$(UmbracoDatabaseName);Integrated Security=true;
 #              # Custom Umbraco settings
 #              Umbraco__CMS__Global__VersionCheckPeriod: 0
@@ -441,7 +440,7 @@ stages:
 #            workingDirectory: tests/Umbraco.Tests.AcceptanceTest/misc
 #          - pwsh: |
 #              dotnet new --install ./nupkg/Umbraco.Templates.*.nupkg
-#              dotnet new umbraco --name Playwright --no-restore --output .
+#              dotnet new umbraco --name AcceptanceTestProject --no-restore --output .
 #              dotnet restore --configfile ./nuget.config
 #              dotnet build --configuration $(buildConfiguration) --no-restore
 #              dotnet dev-certs https

diff --git a/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker b/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker
@@ -13,7 +13,7 @@ COPY nupkg .
 
 WORKDIR /build
 RUN dotnet new --install /nupkg/Umbraco.Templates.*.nupkg
-RUN dotnet new umbraco --name Playwright --no-restore --output .
+RUN dotnet new umbraco --name AcceptanceTestProject --no-restore --output .
 RUN dotnet restore --configfile /nuget.config
 RUN dotnet build --configuration Release --no-restore
 RUN dotnet publish --configuration Release --no-build --output /dist
@@ -48,4 +48,4 @@ ENV Umbraco__CMS__KeepAlive__DisableKeepAliveTask="true"
 # Set application URL
 ENV ASPNETCORE_URLS="http://0.0.0.0:5000;https://0.0.0.0:5001"
 
-CMD dotnet Playwright.dll
+CMD dotnet AcceptanceTestProject.dll