Merge branch 'v9/9.1' into v10/10.1

# Conflicts: # src/Directory.Build.props # src/Umbraco.Deploy.Contrib/Properties/VersionInfo.cs
umbraco · Sep 21, 2022 · d579d79 · d579d79
2 parents cd8b5b8 + 3e19c08
commit d579d79
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Version>10.1.0</Version>
     <AssemblyVersion>10.1.0</AssemblyVersion>
-    <InformationalVersion>10.1.0-rc001</InformationalVersion>
+    <InformationalVersion>10.1.0</InformationalVersion>
     <FileVersion>10.1.0</FileVersion>
     <LangVersion Condition="'$(LangVersion)' == ''">10.0</LangVersion>
     <NeutralLanguage>en-US</NeutralLanguage>

diff --git a/src/Umbraco.Deploy.Contrib.Tests/Umbraco.Deploy.Contrib.Tests.csproj b/src/Umbraco.Deploy.Contrib.Tests/Umbraco.Deploy.Contrib.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <AssemblyName>Umbraco.Deploy.Contrib.Connectors.Tests</AssemblyName>
+        <AssemblyName>Umbraco.Deploy.Contrib.Tests</AssemblyName>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-        <RootNamespace>Umbraco.Deploy.Contrib.Connectors.Tests</RootNamespace>
+        <RootNamespace>Umbraco.Deploy.Contrib.Tests</RootNamespace>
         <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 

diff --git a/src/Umbraco.Deploy.Contrib/Properties/VersionInfo.cs b/src/Umbraco.Deploy.Contrib/Properties/VersionInfo.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyInformationalVersion("10.1.0-rc001")]
+[assembly: System.Reflection.AssemblyInformationalVersion("10.1.0")]
 [assembly: System.Reflection.AssemblyVersion("10.1.0")]
 
 
diff --git a/src/Umbraco.Deploy.Contrib/Umbraco.Deploy.Contrib.csproj b/src/Umbraco.Deploy.Contrib/Umbraco.Deploy.Contrib.csproj
@@ -8,6 +8,6 @@
 
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="Umbraco.Deploy.Core" Version="10.1.0-rc001" />
+        <PackageReference Include="Umbraco.Deploy.Core" Version="10.1.0" />
     </ItemGroup>
 </Project>