Skip to content

Commit d579d79

Browse files
committed
Merge branch 'v9/9.1' into v10/10.1
# Conflicts: # src/Directory.Build.props # src/Umbraco.Deploy.Contrib/Properties/VersionInfo.cs
2 parents cd8b5b8 + 3e19c08 commit d579d79

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<Version>10.1.0</Version>
44
<AssemblyVersion>10.1.0</AssemblyVersion>
5-
<InformationalVersion>10.1.0-rc001</InformationalVersion>
5+
<InformationalVersion>10.1.0</InformationalVersion>
66
<FileVersion>10.1.0</FileVersion>
77
<LangVersion Condition="'$(LangVersion)' == ''">10.0</LangVersion>
88
<NeutralLanguage>en-US</NeutralLanguage>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<AssemblyName>Umbraco.Deploy.Contrib.Connectors.Tests</AssemblyName>
3+
<AssemblyName>Umbraco.Deploy.Contrib.Tests</AssemblyName>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
5-
<RootNamespace>Umbraco.Deploy.Contrib.Connectors.Tests</RootNamespace>
5+
<RootNamespace>Umbraco.Deploy.Contrib.Tests</RootNamespace>
66
<TargetFramework>net6.0</TargetFramework>
77
</PropertyGroup>
88

src/Umbraco.Deploy.Contrib/Properties/VersionInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

11-
[assembly: System.Reflection.AssemblyInformationalVersion("10.1.0-rc001")]
11+
[assembly: System.Reflection.AssemblyInformationalVersion("10.1.0")]
1212
[assembly: System.Reflection.AssemblyVersion("10.1.0")]
1313

1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
11-
<PackageReference Include="Umbraco.Deploy.Core" Version="10.1.0-rc001" />
11+
<PackageReference Include="Umbraco.Deploy.Core" Version="10.1.0" />
1212
</ItemGroup>
1313
</Project>

0 commit comments

Comments
 (0)