Aligned project name with nuget package id.

Author: AndyButland

build/build.ps1

@@ -52,23 +52,23 @@
     Write-Host "Compile Umbraco Deploy Contrib"
     Write-Host "Logging to $log"
 
-    # Umbraco.Deploy.Contrib.Connectors compile
-    &dotnet build "$src\Umbraco.Deploy.Contrib.Connectors\Umbraco.Deploy.Contrib.Connectors.csproj" `
+    # Umbraco.Deploy.Contrib compile
+    &dotnet build "$src\Umbraco.Deploy.Contrib\Umbraco.Deploy.Contrib.csproj" `
       --configuration $buildConfiguration `
       --output "$($this.BuildTemp)\bin\\" `
       > $log
 
-    &dotnet publish "$src\Umbraco.Deploy.Contrib.Connectors\Umbraco.Deploy.Contrib.Connectors.csproj" `
-      --configuration Release --output "$($this.BuildTemp)\Connectors\bin\\" `
+    &dotnet publish "$src\Umbraco.Deploy.Contrib\Umbraco.Deploy.Contrib.csproj" `
+      --configuration Release --output "$($this.BuildTemp)\bin\\" `
       > $log
 
-    $webAppBin = "$($this.BuildTemp)\Connectors\bin"
+    $webAppBin = "$($this.BuildTemp)\bin"
     $excludeDirs = @("$($webAppBin)\refs","$($webAppBin)\runtimes","$($webAppBin)\Umbraco","$($webAppBin)\wwwroot")
     $excludeFiles = @("$($webAppBin)\appsettings.*","$($webAppBin)\*.deps.json","$($webAppBin)\*.exe","$($webAppBin)\*.config","$($webAppBin)\*.runtimeconfig.json")
     $this.RemoveDirectory($excludeDirs)
     $this.RemoveFile($excludeFiles)
 
-    if (-not $?) { throw "Failed to compile Umbraco.Deploy.Contrib.Connectors." }
+    if (-not $?) { throw "Failed to compile Umbraco.Deploy.Contrib." }
 
     # /p:UmbracoBuild tells the csproj that we are building from PS, not VS
   })

src/Umbraco.Deploy.Contrib.Pack.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29411.108
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Deploy.Contrib.Connectors", "Umbraco.Deploy.Contrib.Connectors\Umbraco.Deploy.Contrib.Connectors.csproj", "{42FB2213-0815-41CD-94F8-DFB0EC1D8061}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Deploy.Contrib", "Umbraco.Deploy.Contrib\Umbraco.Deploy.Contrib.csproj", "{42FB2213-0815-41CD-94F8-DFB0EC1D8061}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

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

@@ -7,6 +7,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Umbraco.Deploy.Contrib.Connectors\Umbraco.Deploy.Contrib.Connectors.csproj" />
+        <ProjectReference Include="..\Umbraco.Deploy.Contrib.Connectors\Umbraco.Deploy.Contrib.csproj" />
     </ItemGroup>
 </Project>

src/Umbraco.Deploy.Contrib.sln

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29411.108
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Deploy.Contrib.Connectors", "Umbraco.Deploy.Contrib.Connectors\Umbraco.Deploy.Contrib.Connectors.csproj", "{42FB2213-0815-41CD-94F8-DFB0EC1D8061}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Deploy.Contrib", "Umbraco.Deploy.Contrib\Umbraco.Deploy.Contrib.csproj", "{42FB2213-0815-41CD-94F8-DFB0EC1D8061}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Deploy.Contrib.Tests", "Umbraco.Deploy.Contrib.Tests\Umbraco.Deploy.Contrib.Tests.csproj", "{48B09241-9C44-47EF-B4DF-397B39A631DC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Deploy.Contrib.Tests", "Umbraco.Deploy.Contrib.Tests\Umbraco.Deploy.Contrib.Tests.csproj", "{48B09241-9C44-47EF-B4DF-397B39A631DC}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7AF3C28D-DBD0-4771-9A78-D6E982094DCC}"
 	ProjectSection(SolutionItems) = preProject

src/Umbraco.Deploy.Contrib.Connectors/GridCellValueConnectors/dummy.txt renamed to src/Umbraco.Deploy.Contrib/GridCellValueConnectors/dummy.txt

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <AssemblyName>Umbraco.Deploy.Contrib.Connectors</AssemblyName>
+        <AssemblyName>Umbraco.Deploy.Contrib</AssemblyName>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-        <RootNamespace>Umbraco.Deploy.Contrib.Connectors</RootNamespace>
+        <RootNamespace>Umbraco.Deploy.Contrib</RootNamespace>
         <TargetFramework>net5.0</TargetFramework>
     </PropertyGroup>
 

src/Umbraco.Deploy.Contrib.Connectors/Properties/AssemblyInfo.cs renamed to src/Umbraco.Deploy.Contrib/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 using Umbraco.Deploy.Core.Connectors.ValueConnectors.Services;
 using Umbraco.Extensions;
 
-namespace Umbraco.Deploy.Contrib.Connectors.ValueConnectors
+namespace Umbraco.Deploy.Contrib.ValueConnectors
 {
     /// <summary>
     /// A Deploy connector for BlockEditor based property editors (ie. BlockList)

src/Umbraco.Deploy.Contrib.Connectors/Properties/VersionInfo.cs renamed to src/Umbraco.Deploy.Contrib/Properties/VersionInfo.cs

@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Services;
 using Umbraco.Deploy.Core.Connectors.ValueConnectors.Services;
 
-namespace Umbraco.Deploy.Contrib.Connectors.ValueConnectors
+namespace Umbraco.Deploy.Contrib.ValueConnectors
 {
     /// <summary>
     /// A Deploy connector for the BlockList property editor