Skip to content

Commit 219fa45

Browse files
Merge branch 'support/10.0.x' into support/12.0.x
2 parents cdfeb39 + bdcda83 commit 219fa45

File tree

7 files changed

+266
-407
lines changed

7 files changed

+266
-407
lines changed

Directory.Packages.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
6+
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
77
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
8-
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
9-
<GlobalPackageReference Include="Umbraco.Code" Version="2.0.0" />
8+
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
9+
<GlobalPackageReference Include="Umbraco.Code" Version="2.1.0" />
1010
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
1111
</ItemGroup>
1212
<PropertyGroup>

Umbraco.Cloud.StorageProviders.AzureBlob.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1717
global.json = global.json
1818
icon.png = icon.png
1919
LICENSE = LICENSE
20-
NuGet.config = NuGet.config
2120
README.md = README.md
21+
nuget.config = nuget.config
2222
version.json = version.json
2323
EndProjectSection
2424
EndProject

NuGet.config renamed to nuget.config

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,20 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
5+
<add key="nuget" 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>
99
<packageSourceMapping>
10-
<packageSource key="nuget.org">
11-
<package pattern="Umbraco.Cms.*" />
12-
<package pattern="Umbraco.StorageProviders" />
13-
<package pattern="Umbraco.StorageProviders.*" />
10+
<packageSource key="nuget">
1411
<package pattern="*" />
12+
<package pattern="Umbraco.*" />
1513
</packageSource>
1614
<packageSource key="Umbraco Prereleases">
17-
<package pattern="Umbraco.Cms.*" />
18-
<package pattern="Umbraco.StorageProviders" />
19-
<package pattern="Umbraco.StorageProviders.*" />
15+
<package pattern="Umbraco.*" />
2016
</packageSource>
2117
<packageSource key="Umbraco Nightly">
22-
<package pattern="Umbraco.Cms.*" />
23-
<package pattern="Umbraco.StorageProviders" />
24-
<package pattern="Umbraco.StorageProviders.*" />
18+
<package pattern="Umbraco.*" />
2519
</packageSource>
2620
</packageSourceMapping>
2721
</configuration>

0 commit comments

Comments
 (0)