Skip to content

Commit 44618a5

Browse files
ronaldbarendseronaldbarendse
committed
Use Central Package Management
1 parent f61bd47 commit 44618a5

File tree

10 files changed

+60
-30
lines changed

10 files changed

+60
-30
lines changed

‎Directory.Build.props

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919
<Content Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="" Visible="false" />
2020
</ItemGroup>
2121

22-
<ItemGroup>
23-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" IsImplicitlyDefined="true" />
24-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.113" PrivateAssets="all" IsImplicitlyDefined="true" />
25-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="all" IsImplicitlyDefined="true" />
26-
<PackageReference Include="Umbraco.Code" Version="2.0.0" PrivateAssets="all" IsImplicitlyDefined="true" />
27-
<PackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.1.1" PrivateAssets="all" IsImplicitlyDefined="true" />
28-
</ItemGroup>
29-
3022
<!-- NuGet packages lock -->
3123
<PropertyGroup>
3224
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>

‎Directory.Packages.props

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</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.1.1" />
11+
</ItemGroup>
12+
<ItemGroup>
13+
<PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
14+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
15+
<PackageVersion Include="Umbraco.Cms.Tests" Version="[10.1.0, 11)" />
16+
<PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[10.1.0, 11)" />
17+
</ItemGroup>
18+
</Project>

‎NuGet.config

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
44
<clear />
55
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
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.Deploy.Contrib.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1717
azure-pipelines.yml = azure-pipelines.yml
1818
CONTRIBUTING.md = CONTRIBUTING.md
1919
Directory.Build.props = Directory.Build.props
20+
Directory.Packages.props = Directory.Packages.props
2021
global.json = global.json
2122
icon.png = icon.png
2223
LICENSE.md = LICENSE.md

‎src/Umbraco.Deploy.Contrib/CompatibilitySuppressions.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Suppressions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
33
<Suppression>
44
<DiagnosticId>CP0007</DiagnosticId>
55
<Target>T:Umbraco.Deploy.Contrib.ValueConnectors.BlockEditorValueConnector</Target>
@@ -91,4 +91,11 @@
9191
<Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
9292
<IsBaselineSuppression>true</IsBaselineSuppression>
9393
</Suppression>
94+
<Suppression>
95+
<DiagnosticId>CP0003</DiagnosticId>
96+
<Target>Umbraco.Deploy.Contrib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Target>
97+
<Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
98+
<Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
99+
<IsBaselineSuppression>true</IsBaselineSuppression>
100+
</Suppression>
94101
</Suppressions>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Umbraco.Deploy.Infrastructure" Version="10.1.0" />
8+
<PackageReference Include="Umbraco.Deploy.Infrastructure" />
99
</ItemGroup>
1010
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": 1,
2+
"version": 2,
33
"dependencies": {
44
"net6.0": {
55
"Microsoft.SourceLink.GitHub": {
@@ -38,7 +38,7 @@
3838
},
3939
"Umbraco.Deploy.Infrastructure": {
4040
"type": "Direct",
41-
"requested": "[10.1.0, )",
41+
"requested": "[10.1.0, 11.0.0)",
4242
"resolved": "10.1.0",
4343
"contentHash": "xX3//I/oqzhsaQYNrI0tIfxJT6fc17UU3oX2BZh1JFH6Oa3XmG1mWHVjxIlaSgLzbquIVCMdmyinPBCI5uiQJw==",
4444
"dependencies": {

‎tests/Umbraco.Deploy.Contrib.Tests/Umbraco.Deploy.Contrib.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
11-
<PackageReference Include="Umbraco.Cms.Tests" Version="10.1.0" />
9+
<PackageReference Include="NUnit3TestAdapter" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
11+
<PackageReference Include="Umbraco.Cms.Tests" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

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

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": 1,
2+
"version": 2,
33
"dependencies": {
44
"net6.0": {
55
"Microsoft.NET.Test.Sdk": {
@@ -45,7 +45,7 @@
4545
},
4646
"Umbraco.Cms.Tests": {
4747
"type": "Direct",
48-
"requested": "[10.1.0, )",
48+
"requested": "[10.1.0, 11.0.0)",
4949
"resolved": "10.1.0",
5050
"contentHash": "Ov0vvPS+40Jxj1nli/nM6fpjaYcUglcZEhM3/3OYEf1D3Mq1YBb81BqfU2FBcQVNqCM0EJl3veKeQ9RwKPCtRw==",
5151
"dependencies": {
@@ -2152,16 +2152,6 @@
21522152
"Umbraco.Cms.Core": "[10.0.0, 11.0.0)"
21532153
}
21542154
},
2155-
"Umbraco.Deploy.Infrastructure": {
2156-
"type": "Transitive",
2157-
"resolved": "10.1.0",
2158-
"contentHash": "xX3//I/oqzhsaQYNrI0tIfxJT6fc17UU3oX2BZh1JFH6Oa3XmG1mWHVjxIlaSgLzbquIVCMdmyinPBCI5uiQJw==",
2159-
"dependencies": {
2160-
"Umbraco.Cms.Web.BackOffice": "[10.0.0, 11.0.0)",
2161-
"Umbraco.Deploy.Core": "10.1.0",
2162-
"Umbraco.Licensing": "4.0.0"
2163-
}
2164-
},
21652155
"Umbraco.Licensing": {
21662156
"type": "Transitive",
21672157
"resolved": "4.0.0",
@@ -2176,7 +2166,18 @@
21762166
"umbraco.deploy.contrib": {
21772167
"type": "Project",
21782168
"dependencies": {
2179-
"Umbraco.Deploy.Infrastructure": "[10.1.0, )"
2169+
"Umbraco.Deploy.Infrastructure": "[10.1.0, 11.0.0)"
2170+
}
2171+
},
2172+
"Umbraco.Deploy.Infrastructure": {
2173+
"type": "CentralTransitive",
2174+
"requested": "[10.1.0, 11.0.0)",
2175+
"resolved": "10.1.0",
2176+
"contentHash": "xX3//I/oqzhsaQYNrI0tIfxJT6fc17UU3oX2BZh1JFH6Oa3XmG1mWHVjxIlaSgLzbquIVCMdmyinPBCI5uiQJw==",
2177+
"dependencies": {
2178+
"Umbraco.Cms.Web.BackOffice": "[10.0.0, 11.0.0)",
2179+
"Umbraco.Deploy.Core": "10.1.0",
2180+
"Umbraco.Licensing": "4.0.0"
21802181
}
21812182
}
21822183
}

‎version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
"release": {
2121
"branchName": "release/{version}"
2222
}
23-
}
23+
}

0 commit comments

Comments
 (0)