diff --git a/.gitattributes b/.gitattributes index 8ac58cf5fe..6e707b7796 100644 --- a/.gitattributes +++ b/.gitattributes @@ -46,6 +46,7 @@ *.xml text=auto *.resx text=auto *.yml text eol=lf core.whitespace whitespace=tab-in-indent,trailing-space,tabwidth=2 +*.sh eol=lf *.csproj text=auto merge=union *.vbproj text=auto merge=union diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 9d53b2e710..865d97081d 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -117,8 +117,7 @@ stages: - checkout: self submodules: false lfs: false, - fetchDepth: 1 - fetchFilter: tree:0 + fetchDepth: 500 - template: templates/backoffice-install.yml - script: npm run build:for:npm displayName: Run build:for:npm @@ -936,6 +935,7 @@ stages: inputs: archiveFilePatterns: $(Build.SourcesDirectory)/csharp-docs.zip destinationFolder: $(Build.ArtifactStagingDirectory)/csharp-docs + overwriteExistingFiles: true - task: AzureFileCopy@4 displayName: "Copy C# Docs to blob storage" inputs: @@ -959,6 +959,7 @@ stages: inputs: archiveFilePatterns: $(Build.SourcesDirectory)/ui-docs.zip destinationFolder: $(Build.ArtifactStagingDirectory)/ui-docs + overwriteExistingFiles: true - task: AzureFileCopy@4 displayName: "Copy Storybook to blob storage" inputs: @@ -982,6 +983,7 @@ stages: inputs: archiveFilePatterns: $(Build.SourcesDirectory)/ui-api-docs.zip destinationFolder: $(Build.ArtifactStagingDirectory)/ui-api-docs + overwriteExistingFiles: true - task: AzureFileCopy@4 displayName: "Copy UI API Docs to blob storage" inputs: diff --git a/templates/UmbracoProject/Dockerfile b/templates/UmbracoProject/Dockerfile index e3eda648dd..0e1b379b20 100644 --- a/templates/UmbracoProject/Dockerfile +++ b/templates/UmbracoProject/Dockerfile @@ -1,10 +1,10 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base USER $APP_UID WORKDIR /app EXPOSE 8080 EXPOSE 8081 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["UmbracoProject/UmbracoProject.csproj", "UmbracoProject/"]