Skip to content

Commit dbd1b64

Browse files
ronaldbarendseronaldbarendse
committed
Use GlobalPackageReference
1 parent 61e856e commit dbd1b64

File tree

6 files changed

+19
-189
lines changed

6 files changed

+19
-189
lines changed

‎Directory.Build.props

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@
1818
<AnalysisMode>All</AnalysisMode>
1919
</PropertyGroup>
2020

21-
<ItemGroup>
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" />
26-
</ItemGroup>
27-
2821
<!-- NuGet packages lock -->
2922
<PropertyGroup>
3023
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
@@ -39,9 +32,6 @@
3932
<IncludeSymbols>true</IncludeSymbols>
4033
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
4134
</PropertyGroup>
42-
<ItemGroup>
43-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
44-
</ItemGroup>
4535

4636
<ItemGroup>
4737
<Content Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="" Visible="false" />

‎Directory.Packages.props

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
5+
<ItemGroup>
6+
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
7+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.113" />
8+
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
9+
<GlobalPackageReference Include="Umbraco.Code" Version="2.0.0" />
10+
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
11+
</ItemGroup>
512
<ItemGroup>
613
<PackageVersion Include="Umbraco.StorageProviders.AzureBlob" Version="[11.0.0-rc1, 12)" />
714
<PackageVersion Include="Umbraco.StorageProviders.AzureBlob.ImageSharp" Version="[11.0.0-rc1, 12)" />
8-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
9-
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.113" />
10-
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
11-
<PackageVersion Include="Umbraco.Code" Version="2.0.0" />
12-
<PackageVersion Include="Umbraco.GitVersioning.Extensions" Version="0.1.1" />
1315
</ItemGroup>
1416
</Project>

‎NuGet.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
</packageSources>
99
<packageSourceMapping>
1010
<packageSource key="nuget.org">
11+
<package pattern="Umbraco.Cms.*" />
12+
<package pattern="Umbraco.StorageProviders" />
13+
<package pattern="Umbraco.StorageProviders.*" />
1114
<package pattern="*" />
1215
</packageSource>
1316
<packageSource key="Umbraco Prereleases">

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

Lines changed: 3 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,9 @@
3838
},
3939
"Umbraco.GitVersioning.Extensions": {
4040
"type": "Direct",
41-
"requested": "[0.1.1, )",
42-
"resolved": "0.1.1",
43-
"contentHash": "HX3t4/YgcqIMlaOQuvr83rGCBSDoPaGBZ6NZ95CFO70WxSuddvbW80bL9ND/sf4P0zeiR8drldqWc5BSYXN56g==",
44-
"dependencies": {
45-
"Microsoft.Build.Tasks.Core": "17.1.0"
46-
}
41+
"requested": "[0.2.0, )",
42+
"resolved": "0.2.0",
43+
"contentHash": "m85a1RWGllvZxhw4SfnNyHszN9WDqQk6WGpR0Fzu2ZwEHCPesQPc+7NDl/PgUrVLyLDA9HqAasb2NEHqPffaCQ=="
4744
},
4845
"Umbraco.StorageProviders.AzureBlob": {
4946
"type": "Direct",
@@ -407,53 +404,11 @@
407404
"resolved": "5.0.0",
408405
"contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ=="
409406
},
410-
"Microsoft.Build.Framework": {
411-
"type": "Transitive",
412-
"resolved": "17.1.0",
413-
"contentHash": "7PPEbjuL/lKQ8ftblxwBZKf5alZCA4GDvBTiO3UAVxtRe52a2jL3mc8TpKNiJZzytGz7fKdR5ClDCs7+Uw4hMg==",
414-
"dependencies": {
415-
"Microsoft.Win32.Registry": "4.3.0",
416-
"System.Security.Permissions": "4.7.0"
417-
}
418-
},
419-
"Microsoft.Build.Tasks.Core": {
420-
"type": "Transitive",
421-
"resolved": "17.1.0",
422-
"contentHash": "obCL4Tb2wpc684sCTlS4hriNhI+6MBqlVWOQoajo9zYv/aqAN53YdIZ3Lnw5XszoYCCQexy2sT/MNElMgoSN9g==",
423-
"dependencies": {
424-
"Microsoft.Build.Framework": "17.1.0",
425-
"Microsoft.Build.Utilities.Core": "17.1.0",
426-
"Microsoft.NET.StringTools": "1.0.0",
427-
"Microsoft.Win32.Registry": "4.3.0",
428-
"System.CodeDom": "4.4.0",
429-
"System.Collections.Immutable": "5.0.0",
430-
"System.Reflection.Metadata": "1.6.0",
431-
"System.Resources.Extensions": "4.6.0",
432-
"System.Security.Cryptography.Pkcs": "4.7.0",
433-
"System.Security.Cryptography.Xml": "4.7.0",
434-
"System.Security.Permissions": "4.7.0",
435-
"System.Threading.Tasks.Dataflow": "6.0.0"
436-
}
437-
},
438407
"Microsoft.Build.Tasks.Git": {
439408
"type": "Transitive",
440409
"resolved": "1.1.1",
441410
"contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
442411
},
443-
"Microsoft.Build.Utilities.Core": {
444-
"type": "Transitive",
445-
"resolved": "17.1.0",
446-
"contentHash": "JqhQ4q6L4IyA0Wh3PrDrxHHYMVHyOLIusyC4imAnhcnZiOC4+CwgVRSdo8fLsQmvz0Jab8FFrU1NPZFbDoxRng==",
447-
"dependencies": {
448-
"Microsoft.Build.Framework": "17.1.0",
449-
"Microsoft.NET.StringTools": "1.0.0",
450-
"Microsoft.Win32.Registry": "4.3.0",
451-
"System.Collections.Immutable": "5.0.0",
452-
"System.Configuration.ConfigurationManager": "4.7.0",
453-
"System.Security.Permissions": "4.7.0",
454-
"System.Text.Encoding.CodePages": "4.0.1"
455-
}
456-
},
457412
"Microsoft.CodeAnalysis.Analyzers": {
458413
"type": "Transitive",
459414
"resolved": "3.3.2",
@@ -1184,11 +1139,6 @@
11841139
"System.Threading": "4.3.0"
11851140
}
11861141
},
1187-
"System.CodeDom": {
1188-
"type": "Transitive",
1189-
"resolved": "4.4.0",
1190-
"contentHash": "2sCCb7doXEwtYAbqzbF/8UAeDRMNmPaQbU2q50Psg1J9KzumyVVCgKQY8s53WIPTufNT0DpSe9QRvVjOzfDWBA=="
1191-
},
11921142
"System.Collections": {
11931143
"type": "Transitive",
11941144
"resolved": "4.3.0",
@@ -1791,11 +1741,6 @@
17911741
"System.Runtime": "4.3.0"
17921742
}
17931743
},
1794-
"System.Resources.Extensions": {
1795-
"type": "Transitive",
1796-
"resolved": "4.6.0",
1797-
"contentHash": "6aVCk8oTFZNT3Tx1jjiPi6+aipiJ3qMZYttAREKTRJidP50YvNeOn4PXrqzfA5qC23fLReq2JYp+nJwzj62HGw=="
1798-
},
17991744
"System.Resources.ResourceManager": {
18001745
"type": "Transitive",
18011746
"resolved": "4.3.0",

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

Lines changed: 3 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,9 @@
3838
},
3939
"Umbraco.GitVersioning.Extensions": {
4040
"type": "Direct",
41-
"requested": "[0.1.1, )",
42-
"resolved": "0.1.1",
43-
"contentHash": "HX3t4/YgcqIMlaOQuvr83rGCBSDoPaGBZ6NZ95CFO70WxSuddvbW80bL9ND/sf4P0zeiR8drldqWc5BSYXN56g==",
44-
"dependencies": {
45-
"Microsoft.Build.Tasks.Core": "17.1.0"
46-
}
41+
"requested": "[0.2.0, )",
42+
"resolved": "0.2.0",
43+
"contentHash": "m85a1RWGllvZxhw4SfnNyHszN9WDqQk6WGpR0Fzu2ZwEHCPesQPc+7NDl/PgUrVLyLDA9HqAasb2NEHqPffaCQ=="
4744
},
4845
"Umbraco.StorageProviders.AzureBlob.ImageSharp": {
4946
"type": "Direct",
@@ -407,53 +404,11 @@
407404
"resolved": "5.0.0",
408405
"contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ=="
409406
},
410-
"Microsoft.Build.Framework": {
411-
"type": "Transitive",
412-
"resolved": "17.1.0",
413-
"contentHash": "7PPEbjuL/lKQ8ftblxwBZKf5alZCA4GDvBTiO3UAVxtRe52a2jL3mc8TpKNiJZzytGz7fKdR5ClDCs7+Uw4hMg==",
414-
"dependencies": {
415-
"Microsoft.Win32.Registry": "4.3.0",
416-
"System.Security.Permissions": "4.7.0"
417-
}
418-
},
419-
"Microsoft.Build.Tasks.Core": {
420-
"type": "Transitive",
421-
"resolved": "17.1.0",
422-
"contentHash": "obCL4Tb2wpc684sCTlS4hriNhI+6MBqlVWOQoajo9zYv/aqAN53YdIZ3Lnw5XszoYCCQexy2sT/MNElMgoSN9g==",
423-
"dependencies": {
424-
"Microsoft.Build.Framework": "17.1.0",
425-
"Microsoft.Build.Utilities.Core": "17.1.0",
426-
"Microsoft.NET.StringTools": "1.0.0",
427-
"Microsoft.Win32.Registry": "4.3.0",
428-
"System.CodeDom": "4.4.0",
429-
"System.Collections.Immutable": "5.0.0",
430-
"System.Reflection.Metadata": "1.6.0",
431-
"System.Resources.Extensions": "4.6.0",
432-
"System.Security.Cryptography.Pkcs": "4.7.0",
433-
"System.Security.Cryptography.Xml": "4.7.0",
434-
"System.Security.Permissions": "4.7.0",
435-
"System.Threading.Tasks.Dataflow": "6.0.0"
436-
}
437-
},
438407
"Microsoft.Build.Tasks.Git": {
439408
"type": "Transitive",
440409
"resolved": "1.1.1",
441410
"contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
442411
},
443-
"Microsoft.Build.Utilities.Core": {
444-
"type": "Transitive",
445-
"resolved": "17.1.0",
446-
"contentHash": "JqhQ4q6L4IyA0Wh3PrDrxHHYMVHyOLIusyC4imAnhcnZiOC4+CwgVRSdo8fLsQmvz0Jab8FFrU1NPZFbDoxRng==",
447-
"dependencies": {
448-
"Microsoft.Build.Framework": "17.1.0",
449-
"Microsoft.NET.StringTools": "1.0.0",
450-
"Microsoft.Win32.Registry": "4.3.0",
451-
"System.Collections.Immutable": "5.0.0",
452-
"System.Configuration.ConfigurationManager": "4.7.0",
453-
"System.Security.Permissions": "4.7.0",
454-
"System.Text.Encoding.CodePages": "4.0.1"
455-
}
456-
},
457412
"Microsoft.CodeAnalysis.Analyzers": {
458413
"type": "Transitive",
459414
"resolved": "3.3.2",
@@ -1216,11 +1171,6 @@
12161171
"System.Threading": "4.3.0"
12171172
}
12181173
},
1219-
"System.CodeDom": {
1220-
"type": "Transitive",
1221-
"resolved": "4.4.0",
1222-
"contentHash": "2sCCb7doXEwtYAbqzbF/8UAeDRMNmPaQbU2q50Psg1J9KzumyVVCgKQY8s53WIPTufNT0DpSe9QRvVjOzfDWBA=="
1223-
},
12241174
"System.Collections": {
12251175
"type": "Transitive",
12261176
"resolved": "4.3.0",
@@ -1823,11 +1773,6 @@
18231773
"System.Runtime": "4.3.0"
18241774
}
18251775
},
1826-
"System.Resources.Extensions": {
1827-
"type": "Transitive",
1828-
"resolved": "4.6.0",
1829-
"contentHash": "6aVCk8oTFZNT3Tx1jjiPi6+aipiJ3qMZYttAREKTRJidP50YvNeOn4PXrqzfA5qC23fLReq2JYp+nJwzj62HGw=="
1830-
},
18311776
"System.Resources.ResourceManager": {
18321777
"type": "Transitive",
18331778
"resolved": "4.3.0",

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

Lines changed: 3 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,9 @@
3838
},
3939
"Umbraco.GitVersioning.Extensions": {
4040
"type": "Direct",
41-
"requested": "[0.1.1, )",
42-
"resolved": "0.1.1",
43-
"contentHash": "HX3t4/YgcqIMlaOQuvr83rGCBSDoPaGBZ6NZ95CFO70WxSuddvbW80bL9ND/sf4P0zeiR8drldqWc5BSYXN56g==",
44-
"dependencies": {
45-
"Microsoft.Build.Tasks.Core": "17.1.0"
46-
}
41+
"requested": "[0.2.0, )",
42+
"resolved": "0.2.0",
43+
"contentHash": "m85a1RWGllvZxhw4SfnNyHszN9WDqQk6WGpR0Fzu2ZwEHCPesQPc+7NDl/PgUrVLyLDA9HqAasb2NEHqPffaCQ=="
4744
},
4845
"Azure.Core": {
4946
"type": "Transitive",
@@ -396,53 +393,11 @@
396393
"resolved": "5.0.0",
397394
"contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ=="
398395
},
399-
"Microsoft.Build.Framework": {
400-
"type": "Transitive",
401-
"resolved": "17.1.0",
402-
"contentHash": "7PPEbjuL/lKQ8ftblxwBZKf5alZCA4GDvBTiO3UAVxtRe52a2jL3mc8TpKNiJZzytGz7fKdR5ClDCs7+Uw4hMg==",
403-
"dependencies": {
404-
"Microsoft.Win32.Registry": "4.3.0",
405-
"System.Security.Permissions": "4.7.0"
406-
}
407-
},
408-
"Microsoft.Build.Tasks.Core": {
409-
"type": "Transitive",
410-
"resolved": "17.1.0",
411-
"contentHash": "obCL4Tb2wpc684sCTlS4hriNhI+6MBqlVWOQoajo9zYv/aqAN53YdIZ3Lnw5XszoYCCQexy2sT/MNElMgoSN9g==",
412-
"dependencies": {
413-
"Microsoft.Build.Framework": "17.1.0",
414-
"Microsoft.Build.Utilities.Core": "17.1.0",
415-
"Microsoft.NET.StringTools": "1.0.0",
416-
"Microsoft.Win32.Registry": "4.3.0",
417-
"System.CodeDom": "4.4.0",
418-
"System.Collections.Immutable": "5.0.0",
419-
"System.Reflection.Metadata": "1.6.0",
420-
"System.Resources.Extensions": "4.6.0",
421-
"System.Security.Cryptography.Pkcs": "4.7.0",
422-
"System.Security.Cryptography.Xml": "4.7.0",
423-
"System.Security.Permissions": "4.7.0",
424-
"System.Threading.Tasks.Dataflow": "6.0.0"
425-
}
426-
},
427396
"Microsoft.Build.Tasks.Git": {
428397
"type": "Transitive",
429398
"resolved": "1.1.1",
430399
"contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
431400
},
432-
"Microsoft.Build.Utilities.Core": {
433-
"type": "Transitive",
434-
"resolved": "17.1.0",
435-
"contentHash": "JqhQ4q6L4IyA0Wh3PrDrxHHYMVHyOLIusyC4imAnhcnZiOC4+CwgVRSdo8fLsQmvz0Jab8FFrU1NPZFbDoxRng==",
436-
"dependencies": {
437-
"Microsoft.Build.Framework": "17.1.0",
438-
"Microsoft.NET.StringTools": "1.0.0",
439-
"Microsoft.Win32.Registry": "4.3.0",
440-
"System.Collections.Immutable": "5.0.0",
441-
"System.Configuration.ConfigurationManager": "4.7.0",
442-
"System.Security.Permissions": "4.7.0",
443-
"System.Text.Encoding.CodePages": "4.0.1"
444-
}
445-
},
446401
"Microsoft.CodeAnalysis.Analyzers": {
447402
"type": "Transitive",
448403
"resolved": "3.3.2",
@@ -1205,11 +1160,6 @@
12051160
"System.Threading": "4.3.0"
12061161
}
12071162
},
1208-
"System.CodeDom": {
1209-
"type": "Transitive",
1210-
"resolved": "4.4.0",
1211-
"contentHash": "2sCCb7doXEwtYAbqzbF/8UAeDRMNmPaQbU2q50Psg1J9KzumyVVCgKQY8s53WIPTufNT0DpSe9QRvVjOzfDWBA=="
1212-
},
12131163
"System.Collections": {
12141164
"type": "Transitive",
12151165
"resolved": "4.3.0",
@@ -1812,11 +1762,6 @@
18121762
"System.Runtime": "4.3.0"
18131763
}
18141764
},
1815-
"System.Resources.Extensions": {
1816-
"type": "Transitive",
1817-
"resolved": "4.6.0",
1818-
"contentHash": "6aVCk8oTFZNT3Tx1jjiPi6+aipiJ3qMZYttAREKTRJidP50YvNeOn4PXrqzfA5qC23fLReq2JYp+nJwzj62HGw=="
1819-
},
18201765
"System.Resources.ResourceManager": {
18211766
"type": "Transitive",
18221767
"resolved": "4.3.0",

0 commit comments

Comments
 (0)