Skip to content

Commit da89b42

Browse files
AndyButlandAndyButland
committed
Added explicit reference to avoid version conflict (5).
1 parent 0f517c2 commit da89b42

File tree

3 files changed

+79
-64
lines changed

3 files changed

+79
-64
lines changed

‎Directory.Packages.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,10 @@
2020
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
2121
<PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="7.0.0" />
2222
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
23+
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="7.0.0" />
24+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
25+
<PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.0" />
26+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
27+
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0" />
2328
</ItemGroup>
2429
</Project>

‎src/Umbraco.Deploy.Contrib/Umbraco.Deploy.Contrib.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,10 @@
1212
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" />
1313
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
1414
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
15+
<PackageReference Include="Microsoft.Extensions.Identity.Core" />
16+
<PackageReference Include="Microsoft.Extensions.Logging" />
17+
<PackageReference Include="Microsoft.Extensions.Options" />
18+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
19+
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" />
1520
</ItemGroup>
1621
</Project>

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

Lines changed: 69 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,62 @@
4242
"Microsoft.Extensions.FileProviders.Abstractions": "7.0.0"
4343
}
4444
},
45+
"Microsoft.Extensions.Identity.Core": {
46+
"type": "Direct",
47+
"requested": "[7.0.0, )",
48+
"resolved": "7.0.0",
49+
"contentHash": "cq11jroq2szFcXLJ0IW5BlI7oqq3ZGCu1mXCnpJ8VIvhvpIzf30AOoWR/w3YRVdAgkYzxbUQpKGZd+oxAKQhLA==",
50+
"dependencies": {
51+
"Microsoft.AspNetCore.Cryptography.KeyDerivation": "7.0.0",
52+
"Microsoft.Extensions.Logging": "7.0.0",
53+
"Microsoft.Extensions.Options": "7.0.0"
54+
}
55+
},
56+
"Microsoft.Extensions.Logging": {
57+
"type": "Direct",
58+
"requested": "[7.0.0, )",
59+
"resolved": "7.0.0",
60+
"contentHash": "Nw2muoNrOG5U5qa2ZekXwudUn2BJcD41e65zwmDHb1fQegTX66UokLWZkJRpqSSHXDOWZ5V0iqhbxOEky91atA==",
61+
"dependencies": {
62+
"Microsoft.Extensions.DependencyInjection": "7.0.0",
63+
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
64+
"Microsoft.Extensions.Logging.Abstractions": "7.0.0",
65+
"Microsoft.Extensions.Options": "7.0.0"
66+
}
67+
},
68+
"Microsoft.Extensions.Options": {
69+
"type": "Direct",
70+
"requested": "[7.0.0, )",
71+
"resolved": "7.0.0",
72+
"contentHash": "lP1yBnTTU42cKpMozuafbvNtQ7QcBjr/CcK3bYOGEMH55Fjt+iecXjT6chR7vbgCMqy3PG3aNQSZgo/EuY/9qQ==",
73+
"dependencies": {
74+
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
75+
"Microsoft.Extensions.Primitives": "7.0.0"
76+
}
77+
},
78+
"Microsoft.Extensions.Options.ConfigurationExtensions": {
79+
"type": "Direct",
80+
"requested": "[7.0.0, )",
81+
"resolved": "7.0.0",
82+
"contentHash": "95UnxZkkFdXxF6vSrtJsMHCzkDeSMuUWGs2hDT54cX+U5eVajrCJ3qLyQRW+CtpTt5OJ8bmTvpQVHu1DLhH+cA==",
83+
"dependencies": {
84+
"Microsoft.Extensions.Configuration.Abstractions": "7.0.0",
85+
"Microsoft.Extensions.Configuration.Binder": "7.0.0",
86+
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
87+
"Microsoft.Extensions.Options": "7.0.0",
88+
"Microsoft.Extensions.Primitives": "7.0.0"
89+
}
90+
},
91+
"Microsoft.Extensions.Options.DataAnnotations": {
92+
"type": "Direct",
93+
"requested": "[7.0.0, )",
94+
"resolved": "7.0.0",
95+
"contentHash": "57cONN+EcyypxCmDlaJOL7tdeYMiRNVZmv2m7hi41zAu03p+r6jbGTx7bykg3o4GYPRQjsi0FGhjLn5XuVHM1Q==",
96+
"dependencies": {
97+
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
98+
"Microsoft.Extensions.Options": "7.0.0"
99+
}
100+
},
45101
"Microsoft.SourceLink.GitHub": {
46102
"type": "Direct",
47103
"requested": "[1.1.1, )",
@@ -289,15 +345,15 @@
289345
},
290346
"Microsoft.AspNetCore.Cryptography.Internal": {
291347
"type": "Transitive",
292-
"resolved": "7.0.0-rc.2.22476.2",
293-
"contentHash": "s2uBHODsYV1euNveHJNwEf0O9nNXsbgb/6rbdOQZUXy6lCDJPC0mxjgUxeT3g/UczVPpQNbch5uO5WUzKirekg=="
348+
"resolved": "7.0.0",
349+
"contentHash": "hFF+HOqtiNrGtO5ZxLVAFo1ksDLQWf8IHEmGRmcF9azlUWvDLZp8+W8gDyLBcGcY5m3ugEvKy/ncElxO4d0NtQ=="
294350
},
295351
"Microsoft.AspNetCore.Cryptography.KeyDerivation": {
296352
"type": "Transitive",
297-
"resolved": "7.0.0-rc.2.22476.2",
298-
"contentHash": "Ove59FmdBXRvDNnk/2UFBFJ7BswKA5Qoqj+Ux4RG27Ykc8Vvfz1j1i3ME09syV4FP5SHQsQMhOG6scOry05QJw==",
353+
"resolved": "7.0.0",
354+
"contentHash": "rCQddWkUxGmObeftM0YVyFOPcXkXDEWKGCc4F1viRLEL4ojIbdKwbOYBSf5hfWDR+NO0aGq8r3a8COvNYN/bZA==",
299355
"dependencies": {
300-
"Microsoft.AspNetCore.Cryptography.Internal": "7.0.0-rc.2.22476.2"
356+
"Microsoft.AspNetCore.Cryptography.Internal": "7.0.0"
301357
}
302358
},
303359
"Microsoft.AspNetCore.DataProtection": {
@@ -501,10 +557,10 @@
501557
},
502558
"Microsoft.Extensions.Configuration.Binder": {
503559
"type": "Transitive",
504-
"resolved": "7.0.0-rc.2.22472.3",
505-
"contentHash": "Wv5mIUllalppHmP/K+gvzNFUmohtjvnOTVC16es01N57Ll0d89OZl0VG8sVmB6NB3wd8W7Twm7EuBgJ/WnhNWw==",
560+
"resolved": "7.0.0",
561+
"contentHash": "tgU4u7bZsoS9MKVRiotVMAwHtbREHr5/5zSEV+JPhg46+ox47Au84E3D2IacAaB0bk5ePNaNieTlPrfjbbRJkg==",
506562
"dependencies": {
507-
"Microsoft.Extensions.Configuration.Abstractions": "7.0.0-rc.2.22472.3"
563+
"Microsoft.Extensions.Configuration.Abstractions": "7.0.0"
508564
}
509565
},
510566
"Microsoft.Extensions.Configuration.FileExtensions": {
@@ -533,10 +589,10 @@
533589
},
534590
"Microsoft.Extensions.DependencyInjection": {
535591
"type": "Transitive",
536-
"resolved": "7.0.0-rc.2.22472.3",
537-
"contentHash": "z9XJWJ9JUUkSdN45DX7rD4+jhkoGl/YNYCpyPxk0atlY8SzaeHGRpZnQ6cVGjn2M2CaJUZNzLmzxvt7ZOXd2Cg==",
592+
"resolved": "7.0.0",
593+
"contentHash": "elNeOmkeX3eDVG6pYVeV82p29hr+UKDaBhrZyWvWLw/EVZSYEkZlQdkp0V39k/Xehs2Qa0mvoCvkVj3eQxNQ1Q==",
538594
"dependencies": {
539-
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0-rc.2.22472.3"
595+
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0"
540596
}
541597
},
542598
"Microsoft.Extensions.DependencyInjection.Abstractions": {
@@ -586,16 +642,6 @@
586642
"Microsoft.Extensions.Options": "7.0.0-rc.2.22472.3"
587643
}
588644
},
589-
"Microsoft.Extensions.Identity.Core": {
590-
"type": "Transitive",
591-
"resolved": "7.0.0-rc.2.22476.2",
592-
"contentHash": "gz9WmtG9slSaPWa/0xe/QbbI1BJ5cer1RSlT3llm9e2lPggD+ChxbkQgxTzp2Iak/x0nhXNk0EWXyZ9ozrjQPQ==",
593-
"dependencies": {
594-
"Microsoft.AspNetCore.Cryptography.KeyDerivation": "7.0.0-rc.2.22476.2",
595-
"Microsoft.Extensions.Logging": "7.0.0-rc.2.22472.3",
596-
"Microsoft.Extensions.Options": "7.0.0-rc.2.22472.3"
597-
}
598-
},
599645
"Microsoft.Extensions.Identity.Stores": {
600646
"type": "Transitive",
601647
"resolved": "7.0.0-rc.2.22476.2",
@@ -606,51 +652,10 @@
606652
"Microsoft.Extensions.Logging": "7.0.0-rc.2.22472.3"
607653
}
608654
},
609-
"Microsoft.Extensions.Logging": {
610-
"type": "Transitive",
611-
"resolved": "7.0.0-rc.2.22472.3",
612-
"contentHash": "kEz03ifmDrjZ/vB0gjHSAu08sYjSPqxTAQH1snCGnrrd/4BjwJYAMKMWXVmI5qjz/Hn6OW3lcGiJOyHFYMPKkg==",
613-
"dependencies": {
614-
"Microsoft.Extensions.DependencyInjection": "7.0.0-rc.2.22472.3",
615-
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0-rc.2.22472.3",
616-
"Microsoft.Extensions.Logging.Abstractions": "7.0.0-rc.2.22472.3",
617-
"Microsoft.Extensions.Options": "7.0.0-rc.2.22472.3"
618-
}
619-
},
620655
"Microsoft.Extensions.Logging.Abstractions": {
621656
"type": "Transitive",
622-
"resolved": "7.0.0-rc.2.22472.3",
623-
"contentHash": "2BjU2gAupioo+bEYIeRvqND+JGs/3jtuw9/uba35StZcqGekq5ew0omakVEuP0j+P39YdzUnHEzVPAiKlW/lXw=="
624-
},
625-
"Microsoft.Extensions.Options": {
626-
"type": "Transitive",
627-
"resolved": "7.0.0-rc.2.22472.3",
628-
"contentHash": "wDIbcTUTUI/yjaCQNtO2Kv/DbWwWiJ1ISj//XXjyUhoIXRf/mbxmOBO9cEEe3BlMEAIEAipf4TpSLy2ax+1OBw==",
629-
"dependencies": {
630-
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0-rc.2.22472.3",
631-
"Microsoft.Extensions.Primitives": "7.0.0-rc.2.22472.3"
632-
}
633-
},
634-
"Microsoft.Extensions.Options.ConfigurationExtensions": {
635-
"type": "Transitive",
636-
"resolved": "7.0.0-rc.2.22472.3",
637-
"contentHash": "O5kDpXwjHh5+PFa6oidbw0TwP4mkiPTS/K1yld6bAVs8WXW5VD2wFwyrvrMQp383G9yUmD+OvkBOTLGiW1mDeA==",
638-
"dependencies": {
639-
"Microsoft.Extensions.Configuration.Abstractions": "7.0.0-rc.2.22472.3",
640-
"Microsoft.Extensions.Configuration.Binder": "7.0.0-rc.2.22472.3",
641-
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0-rc.2.22472.3",
642-
"Microsoft.Extensions.Options": "7.0.0-rc.2.22472.3",
643-
"Microsoft.Extensions.Primitives": "7.0.0-rc.2.22472.3"
644-
}
645-
},
646-
"Microsoft.Extensions.Options.DataAnnotations": {
647-
"type": "Transitive",
648-
"resolved": "7.0.0-rc.2.22472.3",
649-
"contentHash": "GPoxxWp2lORVPAw4grwVgecxv15R4DE9V6uyisGKXSdlvhV0gXg8z6I6vEiMKoFsrT3jZCCIPpJboUsDjTO1jQ==",
650-
"dependencies": {
651-
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0-rc.2.22472.3",
652-
"Microsoft.Extensions.Options": "7.0.0-rc.2.22472.3"
653-
}
657+
"resolved": "7.0.0",
658+
"contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw=="
654659
},
655660
"Microsoft.Extensions.Primitives": {
656661
"type": "Transitive",

0 commit comments

Comments
 (0)