Skip to content

Commit bc8133b

Browse files
ronaldbarendseronaldbarendse
committed
Merge branch 'feature/central-package-management' into develop
2 parents aa5623b + bf7403c commit bc8133b

File tree

10 files changed

+67
-37
lines changed

10 files changed

+67
-37
lines changed

‎Directory.Build.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.113" PrivateAssets="all" IsImplicitlyDefined="true" />
23-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="all" IsImplicitlyDefined="true" />
24-
<PackageReference Include="Umbraco.Code" Version="2.0.0" PrivateAssets="all" IsImplicitlyDefined="true" />
25-
<PackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.1.1" PrivateAssets="all" IsImplicitlyDefined="true" />
22+
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
23+
<PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" />
24+
<PackageReference Include="Umbraco.Code" PrivateAssets="all" />
25+
<PackageReference Include="Umbraco.GitVersioning.Extensions" PrivateAssets="all" />
2626
</ItemGroup>
2727

2828
<!-- NuGet packages lock -->
@@ -40,7 +40,7 @@
4040
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
4141
</PropertyGroup>
4242
<ItemGroup>
43-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
43+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
4444
</ItemGroup>
4545

4646
<ItemGroup>

‎Directory.Packages.props

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="Azure.Storage.Blobs" Version="12.14.0" />
7+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
8+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.113" />
9+
<PackageVersion Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="2.0.2" />
10+
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
11+
<PackageVersion Include="Umbraco.Cms.Imaging.ImageSharp" Version="[11.0.0--rc1.preview.31.ged9a26b, 12)" />
12+
<PackageVersion Include="Umbraco.Cms.Web.Common" Version="[11.0.0--rc1.preview.31.ged9a26b, 12)" />
13+
<PackageVersion Include="Umbraco.Code" Version="2.0.0" />
14+
<PackageVersion Include="Umbraco.GitVersioning.Extensions" Version="0.1.1" />
15+
</ItemGroup>
16+
</Project>

‎NuGet.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,15 @@
66
<add key="Umbraco Prereleases" value="https://www.myget.org/F/umbracoprereleases/api/v3/index.json" />
77
<add key="Umbraco Nightly" value="https://www.myget.org/F/umbraconightly/api/v3/index.json" />
88
</packageSources>
9+
<packageSourceMapping>
10+
<packageSource key="nuget.org">
11+
<package pattern="*" />
12+
</packageSource>
13+
<packageSource key="Umbraco Prereleases">
14+
<package pattern="Umbraco.Cms.*" />
15+
</packageSource>
16+
<packageSource key="Umbraco Nightly">
17+
<package pattern="Umbraco.Cms.*" />
18+
</packageSource>
19+
</packageSourceMapping>
920
</configuration>

‎Umbraco.StorageProviders.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
.globalconfig = .globalconfig
1414
azure-pipelines.yml = azure-pipelines.yml
1515
Directory.Build.props = Directory.Build.props
16+
Directory.Packages.props = Directory.Packages.props
1617
global.json = global.json
1718
icon.png = icon.png
1819
LICENSE = LICENSE

‎src/Umbraco.StorageProviders.AzureBlob.ImageSharp/Umbraco.StorageProviders.AzureBlob.ImageSharp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<PackageTags>umbraco storage azure blob imagesharp</PackageTags>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="2.0.2" />
9-
<PackageReference Include="Umbraco.Cms.Imaging.ImageSharp" Version="[11.0.0--rc1.preview.31.ged9a26b, 12)" />
8+
<PackageReference Include="SixLabors.ImageSharp.Web.Providers.Azure" />
9+
<PackageReference Include="Umbraco.Cms.Imaging.ImageSharp" />
1010
<ProjectReference Include="..\Umbraco.StorageProviders.AzureBlob\Umbraco.StorageProviders.AzureBlob.csproj" />
1111
</ItemGroup>
1212
</Project>

‎src/Umbraco.StorageProviders.AzureBlob.ImageSharp/packages.lock.json

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": 1,
2+
"version": 2,
33
"dependencies": {
44
"net7.0": {
55
"Microsoft.SourceLink.GitHub": {
@@ -80,15 +80,6 @@
8080
"System.Threading.Tasks.Extensions": "4.5.4"
8181
}
8282
},
83-
"Azure.Storage.Blobs": {
84-
"type": "Transitive",
85-
"resolved": "12.14.0",
86-
"contentHash": "+/aubv2pWQuGw2cDh4TBXOuDYF1IpzI2gttcXYS+g4QJZhzG7TKuN50NuSr0Rlz5AaXVUIoQ+ET2i5ajt3xDPg==",
87-
"dependencies": {
88-
"Azure.Storage.Common": "12.13.0",
89-
"System.Text.Json": "4.7.2"
90-
}
91-
},
9283
"Azure.Storage.Common": {
9384
"type": "Transitive",
9485
"resolved": "12.13.0",
@@ -2358,8 +2349,33 @@
23582349
"Umbraco.Cms.Infrastructure": "11.0.0--rc1.preview.31.ged9a26b"
23592350
}
23602351
},
2352+
"umbraco.storageproviders": {
2353+
"type": "Project",
2354+
"dependencies": {
2355+
"Umbraco.Cms.Web.Common": "[11.0.0--rc1.preview.31.ged9a26b, 12.0.0)"
2356+
}
2357+
},
2358+
"umbraco.storageproviders.azureblob": {
2359+
"type": "Project",
2360+
"dependencies": {
2361+
"Azure.Storage.Blobs": "[12.14.0, )",
2362+
"Umbraco.Cms.Web.Common": "[11.0.0--rc1.preview.31.ged9a26b, 12.0.0)",
2363+
"Umbraco.StorageProviders": "[1.0.0, )"
2364+
}
2365+
},
2366+
"Azure.Storage.Blobs": {
2367+
"type": "CentralTransitive",
2368+
"requested": "[12.14.0, )",
2369+
"resolved": "12.14.0",
2370+
"contentHash": "+/aubv2pWQuGw2cDh4TBXOuDYF1IpzI2gttcXYS+g4QJZhzG7TKuN50NuSr0Rlz5AaXVUIoQ+ET2i5ajt3xDPg==",
2371+
"dependencies": {
2372+
"Azure.Storage.Common": "12.13.0",
2373+
"System.Text.Json": "4.7.2"
2374+
}
2375+
},
23612376
"Umbraco.Cms.Web.Common": {
2362-
"type": "Transitive",
2377+
"type": "CentralTransitive",
2378+
"requested": "[11.0.0--rc1.preview.31.ged9a26b, 12.0.0)",
23632379
"resolved": "11.0.0--rc1.preview.31.ged9a26b",
23642380
"contentHash": "158wyPjhfksibcgTrKHiVq6eFmLDEpQlsF5uqFLRkN7sbke9QgDEAUpVTzgekBi+33yg2GD6Ga9/r8/SJ2tVbg==",
23652381
"dependencies": {
@@ -2374,20 +2390,6 @@
23742390
"Umbraco.Cms.Infrastructure": "11.0.0--rc1.preview.31.ged9a26b",
23752391
"Umbraco.Cms.PublishedCache.NuCache": "11.0.0--rc1.preview.31.ged9a26b"
23762392
}
2377-
},
2378-
"umbraco.storageproviders": {
2379-
"type": "Project",
2380-
"dependencies": {
2381-
"Umbraco.Cms.Web.Common": "[11.0.0--rc1.preview.31.ged9a26b, 12.0.0)"
2382-
}
2383-
},
2384-
"umbraco.storageproviders.azureblob": {
2385-
"type": "Project",
2386-
"dependencies": {
2387-
"Azure.Storage.Blobs": "[12.14.0, )",
2388-
"Umbraco.Cms.Web.Common": "[11.0.0--rc1.preview.31.ged9a26b, 12.0.0)",
2389-
"Umbraco.StorageProviders": "[1.0.0, )"
2390-
}
23912393
}
23922394
}
23932395
}

‎src/Umbraco.StorageProviders.AzureBlob/Umbraco.StorageProviders.AzureBlob.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<PackageTags>umbraco storage azure blob</PackageTags>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Umbraco.Cms.Web.Common" Version="[11.0.0--rc1.preview.31.ged9a26b, 12)" />
9-
<PackageReference Include="Azure.Storage.Blobs" Version="12.14.0" />
8+
<PackageReference Include="Umbraco.Cms.Web.Common" />
9+
<PackageReference Include="Azure.Storage.Blobs" />
1010
<ProjectReference Include="..\Umbraco.StorageProviders\Umbraco.StorageProviders.csproj" />
1111
</ItemGroup>
1212
</Project>

‎src/Umbraco.StorageProviders.AzureBlob/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": 1,
2+
"version": 2,
33
"dependencies": {
44
"net7.0": {
55
"Azure.Storage.Blobs": {

‎src/Umbraco.StorageProviders/Umbraco.StorageProviders.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<Description>Shared storage providers infrastructure for Umbraco CMS</Description>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Umbraco.Cms.Web.Common" Version="[11.0.0--rc1.preview.31.ged9a26b, 12)" />
7+
<PackageReference Include="Umbraco.Cms.Web.Common" />
88
</ItemGroup>
99
</Project>

‎src/Umbraco.StorageProviders/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": 1,
2+
"version": 2,
33
"dependencies": {
44
"net7.0": {
55
"Microsoft.SourceLink.GitHub": {

0 commit comments

Comments
 (0)