Skip to content

Commit 5fb8290

Browse files
Merge branch 'release/15.0.0' into develop
2 parents 2617bc8 + 313938d commit 5fb8290

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.143" />
6+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" />
77
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
88
<GlobalPackageReference Include="Umbraco.Code" Version="2.2.0" />
99
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
1010
</ItemGroup>
1111
<PropertyGroup>
12-
<UmbracoStorageProvidersPackageVersion>[15.0.0-rc1, 16)</UmbracoStorageProvidersPackageVersion>
12+
<UmbracoStorageProvidersPackageVersion>[15.0.0, 16)</UmbracoStorageProvidersPackageVersion>
1313
</PropertyGroup>
1414
<ItemGroup>
1515
<PackageVersion Include="Umbraco.StorageProviders.AzureBlob" Version="$(UmbracoStorageProvidersPackageVersion)" />

global.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-rc.1.24452.12",
4-
"rollForward": "latestFeature",
5-
"allowPrerelease": true
3+
"version": "9.0.100",
4+
"rollForward": "latestFeature"
65
}
76
}

0 commit comments

Comments
 (0)