Skip to content

Commit 4c320ba

Browse files
ronaldbarendseronaldbarendse
committed
Merge branch 'v10/dev' into v11/dev
2 parents ab57fdb + 3b9eb68 commit 4c320ba

File tree

3 files changed

+14
-124
lines changed

3 files changed

+14
-124
lines changed

‎Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
</PropertyGroup>
55
<ItemGroup>
66
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
7-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.113" />
7+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" />
88
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
99
<GlobalPackageReference Include="Umbraco.Code" Version="2.0.0" />
10-
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.1.1" />
10+
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
1111
</ItemGroup>
1212
<ItemGroup>
1313
<PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />

‎src/Umbraco.Deploy.Contrib/packages.lock.json

Lines changed: 6 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
},
1515
"Nerdbank.GitVersioning": {
1616
"type": "Direct",
17-
"requested": "[3.5.113, )",
18-
"resolved": "3.5.113",
19-
"contentHash": "4fBSMkqhi410qlkjPm+Mxfk8iO3C7dmgdVS7ljsfVO21WEzZCHP1VCOqB6rlOPfPidR/oxX+/Do/I7meCAz+Jg=="
17+
"requested": "[3.5.119, )",
18+
"resolved": "3.5.119",
19+
"contentHash": "x8k4zV6YKZA5Rr810439lG9NngdbyPtFv0QpIYz32m1Im59kvSbEHO8gKGZoNvsfZSquayjEDUCa8acbut372g=="
2020
},
2121
"StyleCop.Analyzers": {
2222
"type": "Direct",
@@ -49,12 +49,9 @@
4949
},
5050
"Umbraco.GitVersioning.Extensions": {
5151
"type": "Direct",
52-
"requested": "[0.1.1, )",
53-
"resolved": "0.1.1",
54-
"contentHash": "HX3t4/YgcqIMlaOQuvr83rGCBSDoPaGBZ6NZ95CFO70WxSuddvbW80bL9ND/sf4P0zeiR8drldqWc5BSYXN56g==",
55-
"dependencies": {
56-
"Microsoft.Build.Tasks.Core": "17.1.0"
57-
}
52+
"requested": "[0.2.0, )",
53+
"resolved": "0.2.0",
54+
"contentHash": "m85a1RWGllvZxhw4SfnNyHszN9WDqQk6WGpR0Fzu2ZwEHCPesQPc+7NDl/PgUrVLyLDA9HqAasb2NEHqPffaCQ=="
5855
},
5956
"CSharpTest.Net.Collections-NetStd2": {
6057
"type": "Transitive",
@@ -375,53 +372,11 @@
375372
"resolved": "5.0.0",
376373
"contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ=="
377374
},
378-
"Microsoft.Build.Framework": {
379-
"type": "Transitive",
380-
"resolved": "17.1.0",
381-
"contentHash": "7PPEbjuL/lKQ8ftblxwBZKf5alZCA4GDvBTiO3UAVxtRe52a2jL3mc8TpKNiJZzytGz7fKdR5ClDCs7+Uw4hMg==",
382-
"dependencies": {
383-
"Microsoft.Win32.Registry": "4.3.0",
384-
"System.Security.Permissions": "4.7.0"
385-
}
386-
},
387-
"Microsoft.Build.Tasks.Core": {
388-
"type": "Transitive",
389-
"resolved": "17.1.0",
390-
"contentHash": "obCL4Tb2wpc684sCTlS4hriNhI+6MBqlVWOQoajo9zYv/aqAN53YdIZ3Lnw5XszoYCCQexy2sT/MNElMgoSN9g==",
391-
"dependencies": {
392-
"Microsoft.Build.Framework": "17.1.0",
393-
"Microsoft.Build.Utilities.Core": "17.1.0",
394-
"Microsoft.NET.StringTools": "1.0.0",
395-
"Microsoft.Win32.Registry": "4.3.0",
396-
"System.CodeDom": "4.4.0",
397-
"System.Collections.Immutable": "5.0.0",
398-
"System.Reflection.Metadata": "1.6.0",
399-
"System.Resources.Extensions": "4.6.0",
400-
"System.Security.Cryptography.Pkcs": "4.7.0",
401-
"System.Security.Cryptography.Xml": "4.7.0",
402-
"System.Security.Permissions": "4.7.0",
403-
"System.Threading.Tasks.Dataflow": "6.0.0"
404-
}
405-
},
406375
"Microsoft.Build.Tasks.Git": {
407376
"type": "Transitive",
408377
"resolved": "1.1.1",
409378
"contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
410379
},
411-
"Microsoft.Build.Utilities.Core": {
412-
"type": "Transitive",
413-
"resolved": "17.1.0",
414-
"contentHash": "JqhQ4q6L4IyA0Wh3PrDrxHHYMVHyOLIusyC4imAnhcnZiOC4+CwgVRSdo8fLsQmvz0Jab8FFrU1NPZFbDoxRng==",
415-
"dependencies": {
416-
"Microsoft.Build.Framework": "17.1.0",
417-
"Microsoft.NET.StringTools": "1.0.0",
418-
"Microsoft.Win32.Registry": "4.3.0",
419-
"System.Collections.Immutable": "5.0.0",
420-
"System.Configuration.ConfigurationManager": "4.7.0",
421-
"System.Security.Permissions": "4.7.0",
422-
"System.Text.Encoding.CodePages": "4.0.1"
423-
}
424-
},
425380
"Microsoft.CodeAnalysis.Analyzers": {
426381
"type": "Transitive",
427382
"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",
@@ -1793,11 +1743,6 @@
17931743
"System.Runtime": "4.3.0"
17941744
}
17951745
},
1796-
"System.Resources.Extensions": {
1797-
"type": "Transitive",
1798-
"resolved": "4.6.0",
1799-
"contentHash": "6aVCk8oTFZNT3Tx1jjiPi6+aipiJ3qMZYttAREKTRJidP50YvNeOn4PXrqzfA5qC23fLReq2JYp+nJwzj62HGw=="
1800-
},
18011746
"System.Resources.ResourceManager": {
18021747
"type": "Transitive",
18031748
"resolved": "4.3.0",

‎tests/Umbraco.Deploy.Contrib.Tests/packages.lock.json

Lines changed: 6 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
},
2525
"Nerdbank.GitVersioning": {
2626
"type": "Direct",
27-
"requested": "[3.5.113, )",
28-
"resolved": "3.5.113",
29-
"contentHash": "4fBSMkqhi410qlkjPm+Mxfk8iO3C7dmgdVS7ljsfVO21WEzZCHP1VCOqB6rlOPfPidR/oxX+/Do/I7meCAz+Jg=="
27+
"requested": "[3.5.119, )",
28+
"resolved": "3.5.119",
29+
"contentHash": "x8k4zV6YKZA5Rr810439lG9NngdbyPtFv0QpIYz32m1Im59kvSbEHO8gKGZoNvsfZSquayjEDUCa8acbut372g=="
3030
},
3131
"NUnit3TestAdapter": {
3232
"type": "Direct",
@@ -71,12 +71,9 @@
7171
},
7272
"Umbraco.GitVersioning.Extensions": {
7373
"type": "Direct",
74-
"requested": "[0.1.1, )",
75-
"resolved": "0.1.1",
76-
"contentHash": "HX3t4/YgcqIMlaOQuvr83rGCBSDoPaGBZ6NZ95CFO70WxSuddvbW80bL9ND/sf4P0zeiR8drldqWc5BSYXN56g==",
77-
"dependencies": {
78-
"Microsoft.Build.Tasks.Core": "17.1.0"
79-
}
74+
"requested": "[0.2.0, )",
75+
"resolved": "0.2.0",
76+
"contentHash": "m85a1RWGllvZxhw4SfnNyHszN9WDqQk6WGpR0Fzu2ZwEHCPesQPc+7NDl/PgUrVLyLDA9HqAasb2NEHqPffaCQ=="
8077
},
8178
"AutoFixture": {
8279
"type": "Transitive",
@@ -468,53 +465,11 @@
468465
"resolved": "5.0.0",
469466
"contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ=="
470467
},
471-
"Microsoft.Build.Framework": {
472-
"type": "Transitive",
473-
"resolved": "17.1.0",
474-
"contentHash": "7PPEbjuL/lKQ8ftblxwBZKf5alZCA4GDvBTiO3UAVxtRe52a2jL3mc8TpKNiJZzytGz7fKdR5ClDCs7+Uw4hMg==",
475-
"dependencies": {
476-
"Microsoft.Win32.Registry": "4.3.0",
477-
"System.Security.Permissions": "4.7.0"
478-
}
479-
},
480-
"Microsoft.Build.Tasks.Core": {
481-
"type": "Transitive",
482-
"resolved": "17.1.0",
483-
"contentHash": "obCL4Tb2wpc684sCTlS4hriNhI+6MBqlVWOQoajo9zYv/aqAN53YdIZ3Lnw5XszoYCCQexy2sT/MNElMgoSN9g==",
484-
"dependencies": {
485-
"Microsoft.Build.Framework": "17.1.0",
486-
"Microsoft.Build.Utilities.Core": "17.1.0",
487-
"Microsoft.NET.StringTools": "1.0.0",
488-
"Microsoft.Win32.Registry": "4.3.0",
489-
"System.CodeDom": "4.4.0",
490-
"System.Collections.Immutable": "5.0.0",
491-
"System.Reflection.Metadata": "1.6.0",
492-
"System.Resources.Extensions": "4.6.0",
493-
"System.Security.Cryptography.Pkcs": "4.7.0",
494-
"System.Security.Cryptography.Xml": "4.7.0",
495-
"System.Security.Permissions": "4.7.0",
496-
"System.Threading.Tasks.Dataflow": "6.0.0"
497-
}
498-
},
499468
"Microsoft.Build.Tasks.Git": {
500469
"type": "Transitive",
501470
"resolved": "1.1.1",
502471
"contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
503472
},
504-
"Microsoft.Build.Utilities.Core": {
505-
"type": "Transitive",
506-
"resolved": "17.1.0",
507-
"contentHash": "JqhQ4q6L4IyA0Wh3PrDrxHHYMVHyOLIusyC4imAnhcnZiOC4+CwgVRSdo8fLsQmvz0Jab8FFrU1NPZFbDoxRng==",
508-
"dependencies": {
509-
"Microsoft.Build.Framework": "17.1.0",
510-
"Microsoft.NET.StringTools": "1.0.0",
511-
"Microsoft.Win32.Registry": "4.3.0",
512-
"System.Collections.Immutable": "5.0.0",
513-
"System.Configuration.ConfigurationManager": "4.7.0",
514-
"System.Security.Permissions": "4.7.0",
515-
"System.Text.Encoding.CodePages": "4.0.1"
516-
}
517-
},
518473
"Microsoft.CodeAnalysis.Analyzers": {
519474
"type": "Transitive",
520475
"resolved": "3.3.2",
@@ -1338,11 +1293,6 @@
13381293
"resolved": "4.5.0",
13391294
"contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A=="
13401295
},
1341-
"System.CodeDom": {
1342-
"type": "Transitive",
1343-
"resolved": "4.4.0",
1344-
"contentHash": "2sCCb7doXEwtYAbqzbF/8UAeDRMNmPaQbU2q50Psg1J9KzumyVVCgKQY8s53WIPTufNT0DpSe9QRvVjOzfDWBA=="
1345-
},
13461296
"System.Collections": {
13471297
"type": "Transitive",
13481298
"resolved": "4.3.0",
@@ -1893,11 +1843,6 @@
18931843
"System.Runtime": "4.3.0"
18941844
}
18951845
},
1896-
"System.Resources.Extensions": {
1897-
"type": "Transitive",
1898-
"resolved": "4.6.0",
1899-
"contentHash": "6aVCk8oTFZNT3Tx1jjiPi6+aipiJ3qMZYttAREKTRJidP50YvNeOn4PXrqzfA5qC23fLReq2JYp+nJwzj62HGw=="
1900-
},
19011846
"System.Resources.ResourceManager": {
19021847
"type": "Transitive",
19031848
"resolved": "4.3.0",

0 commit comments

Comments
 (0)