Merge branch 'v13/13.0' into v13/dev

Author: ronaldbarendse

.artifactignore

@@ -1,5 +1,2 @@
 **/*
-!src/*/bin/**
-!src/*/obj/**
 !tests/*/bin/**
-!tests/*/obj/**

Directory.Build.props

@@ -19,12 +19,6 @@
     <Content Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="" Visible="false" />
   </ItemGroup>
 
-  <!-- NuGet packages lock -->
-  <PropertyGroup>
-    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-    <DefaultItemExcludes>$(DefaultItemExcludes);packages.lock.json</DefaultItemExcludes>
-  </PropertyGroup>
-
   <!-- SourceLink -->
   <PropertyGroup>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

Directory.Packages.props

@@ -3,16 +3,15 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
     <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
-    <GlobalPackageReference Include="Umbraco.Code" Version="2.0.0" />
+    <GlobalPackageReference Include="Umbraco.Code" Version="2.1.0" />
     <GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
-    <PackageVersion Include="Umbraco.Cms.Tests" Version="[13.0.0-rc3, 14)" />
-    <PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[13.0.0-rc3, 14)" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Umbraco.Cms.Tests" Version="[13.0.0, 14)" />
+    <PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[13.0.0, 14)" />
   </ItemGroup>
 </Project>

azure-pipelines.yml

@@ -10,7 +10,7 @@ parameters:
   - name: cache_nuget
     displayName: Cache NuGet packages
     type: boolean
-    default: true
+    default: false # As long as we're overwriting versions on MyGet, we can't cache NuGet packages
 
 variables:
   solution: Umbraco.Deploy.Contrib.sln

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

@@ -2,6 +2,9 @@
   <PropertyGroup>
     <Title>Umbraco Deploy - Contrib</Title>
     <Description>Umbraco Deploy Contrib provides community contributions for Umbraco Deploy. This package can be used with Umbraco CMS version 9 and higher, for version 8 or below, use https://www.nuget.org/packages/UmbracoDeploy.Contrib/ instead.</Description>
+    <!-- Deploy Contrib currently doesn't contain any code, skip including empty assembly -->
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IncludeSymbols>false</IncludeSymbols>
   </PropertyGroup>
 
   <ItemGroup>