yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v11/dev' into v12/dev

Browse Source
This commit is contained in:
Bjarke Berg
2023-08-21 08:02:15 +02:00
parent 5f28f6d293 d676850f6c
commit 29d0c6770c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/azure-pipelines.yml
View File

@@ -356,7 +356,7 @@ stages:
Umbraco__CMS__Unattended__InstallUnattended: true Umbraco__CMS__Unattended__InstallUnattended: true
Umbraco__CMS__Global__InstallMissingDatabase: true Umbraco__CMS__Global__InstallMissingDatabase: true
UmbracoDatabaseServer: (LocalDB)\MSSQLLocalDB UmbracoDatabaseServer: (LocalDB)\MSSQLLocalDB
UmbracoDatabaseName: Playwright UmbracoDatabaseName: AcceptanceTestDB
ConnectionStrings__umbracoDbDSN: Server=$(UmbracoDatabaseServer);Database=$(UmbracoDatabaseName);Integrated Security=true; ConnectionStrings__umbracoDbDSN: Server=$(UmbracoDatabaseServer);Database=$(UmbracoDatabaseName);Integrated Security=true;
# Custom Umbraco settings # Custom Umbraco settings
Umbraco__CMS__Global__VersionCheckPeriod: 0 Umbraco__CMS__Global__VersionCheckPeriod: 0
@@ -416,7 +416,7 @@ stages:
workingDirectory: tests/Umbraco.Tests.AcceptanceTest/misc workingDirectory: tests/Umbraco.Tests.AcceptanceTest/misc
- pwsh: | - pwsh: |
dotnet new --install ./nupkg/Umbraco.Templates.*.nupkg 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 restore --configfile ./nuget.config
dotnet build --configuration $(buildConfiguration) --no-restore dotnet build --configuration $(buildConfiguration) --no-restore
dotnet dev-certs https dotnet dev-certs https

4
tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker
View File

@@ -13,7 +13,7 @@ COPY nupkg .
WORKDIR /build WORKDIR /build
RUN dotnet new --install /nupkg/Umbraco.Templates.*.nupkg 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 restore --configfile /nuget.config
RUN dotnet build --configuration Release --no-restore RUN dotnet build --configuration Release --no-restore
RUN dotnet publish --configuration Release --no-build --output /dist RUN dotnet publish --configuration Release --no-build --output /dist
@@ -48,4 +48,4 @@ ENV Umbraco__CMS__KeepAlive__DisableKeepAliveTask="true"
# Set application URL # Set application URL
ENV ASPNETCORE_URLS="http://0.0.0.0:5000;https://0.0.0.0:5001" ENV ASPNETCORE_URLS="http://0.0.0.0:5000;https://0.0.0.0:5001"
CMD dotnet Playwright.dll CMD dotnet AcceptanceTestProject.dll