Skip to content

Commit a64c58d

Browse files
committed
Merge branch 'v9/9.1' into v9/dev
2 parents fca1685 + 7ffa46d commit a64c58d

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

build/azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ stages:
541541
inputs:
542542
targetType: inline
543543
script: |
544-
choco install docfx -y
544+
choco install docfx --version=2.58.5 -y
545545
if ($lastexitcode -ne 0){
546546
throw ("Error installing DocFX")
547547
}

build/templates/UmbracoPackage/.template.config/template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"version": {
2525
"type": "parameter",
2626
"datatype": "string",
27-
"defaultValue": "9.1.0",
27+
"defaultValue": "9.1.0-rc",
2828
"description": "The version of Umbraco to load using NuGet",
2929
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
3030
},

build/templates/UmbracoProject/.template.config/template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"version": {
5858
"type": "parameter",
5959
"datatype": "string",
60-
"defaultValue": "9.1.0",
60+
"defaultValue": "9.1.0-rc",
6161
"description": "The version of Umbraco to load using NuGet",
6262
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
6363
},

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<Version>9.1.0</Version>
77
<AssemblyVersion>9.1.0</AssemblyVersion>
8-
<InformationalVersion>9.1.0</InformationalVersion>
8+
<InformationalVersion>9.1.0-rc</InformationalVersion>
99
<FileVersion>9.1.0</FileVersion>
1010
<LangVersion Condition="'$(LangVersion)' == ''">9.0</LangVersion>
1111
<NeutralLanguage>en-US</NeutralLanguage>

0 commit comments

Comments
 (0)