Skip to content

Commit 6458a55

Browse files
committed
Merge branch 'release/15.1' into v15/dev
# Conflicts: # build/azure-pipelines.yml
2 parents de92f1c + 2cfd52a commit 6458a55

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
*.xml text=auto
4747
*.resx text=auto
4848
*.yml text eol=lf core.whitespace whitespace=tab-in-indent,trailing-space,tabwidth=2
49+
*.sh eol=lf
4950

5051
*.csproj text=auto merge=union
5152
*.vbproj text=auto merge=union

build/azure-pipelines.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ stages:
117117
- checkout: self
118118
submodules: false
119119
lfs: false,
120-
fetchDepth: 1
121-
fetchFilter: tree:0
120+
fetchDepth: 500
122121
- template: templates/backoffice-install.yml
123122
- script: npm run build:for:npm
124123
displayName: Run build:for:npm
@@ -936,6 +935,7 @@ stages:
936935
inputs:
937936
archiveFilePatterns: $(Build.SourcesDirectory)/csharp-docs.zip
938937
destinationFolder: $(Build.ArtifactStagingDirectory)/csharp-docs
938+
overwriteExistingFiles: true
939939
- task: AzureFileCopy@4
940940
displayName: "Copy C# Docs to blob storage"
941941
inputs:
@@ -959,6 +959,7 @@ stages:
959959
inputs:
960960
archiveFilePatterns: $(Build.SourcesDirectory)/ui-docs.zip
961961
destinationFolder: $(Build.ArtifactStagingDirectory)/ui-docs
962+
overwriteExistingFiles: true
962963
- task: AzureFileCopy@4
963964
displayName: "Copy Storybook to blob storage"
964965
inputs:
@@ -982,6 +983,7 @@ stages:
982983
inputs:
983984
archiveFilePatterns: $(Build.SourcesDirectory)/ui-api-docs.zip
984985
destinationFolder: $(Build.ArtifactStagingDirectory)/ui-api-docs
986+
overwriteExistingFiles: true
985987
- task: AzureFileCopy@4
986988
displayName: "Copy UI API Docs to blob storage"
987989
inputs:

templates/UmbracoProject/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
22
USER $APP_UID
33
WORKDIR /app
44
EXPOSE 8080
55
EXPOSE 8081
66

7-
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
7+
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
88
ARG BUILD_CONFIGURATION=Release
99
WORKDIR /src
1010
COPY ["UmbracoProject/UmbracoProject.csproj", "UmbracoProject/"]

0 commit comments

Comments
 (0)