Merge branch 'support/12.0.x' into develop

Author: ronaldbarendse

Directory.Build.props

@@ -19,6 +19,13 @@
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
   </PropertyGroup>
 
+  <!-- NuGet packages lock -->
+  <PropertyGroup>
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
+    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <DefaultItemExcludes>$(DefaultItemExcludes);packages.lock.json</DefaultItemExcludes>
+  </PropertyGroup>
+
   <!-- SourceLink -->
   <PropertyGroup>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -29,7 +36,7 @@
   <!-- Package Validation -->
   <PropertyGroup>
     <GenerateCompatibilitySuppressionFile>false</GenerateCompatibilitySuppressionFile>
-    <!--<EnablePackageValidation>true</EnablePackageValidation>-->
+    <EnablePackageValidation>true</EnablePackageValidation>
     <PackageValidationBaselineVersion>13.0.0</PackageValidationBaselineVersion>
     <EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
     <EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>

Directory.Packages.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
-    <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
+    <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <GlobalPackageReference Include="Umbraco.Code" Version="2.1.0" />
     <GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
   </ItemGroup>

Umbraco.Cloud.StorageProviders.AzureBlob.sln

@@ -17,8 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		global.json = global.json
 		icon.png = icon.png
 		LICENSE = LICENSE
-		NuGet.config = NuGet.config
 		README.md = README.md
+		nuget.config = nuget.config
 		version.json = version.json
 	EndProjectSection
 EndProject

NuGet.config renamed to nuget.config

@@ -2,19 +2,20 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
     <add key="Umbraco Prereleases" value="https://www.myget.org/F/umbracoprereleases/api/v3/index.json" />
     <add key="Umbraco Nightly" value="https://www.myget.org/F/umbraconightly/api/v3/index.json" />
   </packageSources>
   <packageSourceMapping>
-    <packageSource key="nuget.org">
+    <packageSource key="nuget">
       <package pattern="*" />
+      <package pattern="Umbraco.*" />
     </packageSource>
     <packageSource key="Umbraco Prereleases">
-      <package pattern="*" />
+      <package pattern="Umbraco.*" />
     </packageSource>
     <packageSource key="Umbraco Nightly">
-      <package pattern="*" />
+      <package pattern="Umbraco.*" />
     </packageSource>
   </packageSourceMapping>
 </configuration>