Skip to content

Commit bb81883

Browse files
ronaldbarendseronaldbarendse
committed
Bump version to 4.3.0-rc1 and fix build
1 parent 99cf5b1 commit bb81883

File tree

13 files changed

+38
-178
lines changed

13 files changed

+38
-178
lines changed

‎build/Build.proj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@
4848
It is used to update the nuspec file.
4949
-->
5050
<XmlRead
51-
XPath="/Project/ItemGroup/PackageReference[@Include='UmbracoDeploy.Core']/Version"
51+
XPath="/Project/ItemGroup/PackageReference[@Include='UmbracoDeploy.Core']/@Version"
5252
XmlFileName="..\src\Umbraco.Deploy.Contrib.Connectors\Umbraco.Deploy.Contrib.Connectors.csproj">
53-
<Output TaskParameter="Value" PropertyName="CoreVersion" />
53+
<Output TaskParameter="Value" PropertyName="UmbracoDeployVersion" />
5454
</XmlRead>
55-
<FileUpdate
55+
<FileUpdate
5656
Files="NuSpecs\UmbracoDeploy.Contrib.nuspec"
57-
Regex="dependency id=&quot;UmbracoDeploy.Core&quot; version=&quot;(.*)?,"
58-
ReplacementText="dependency id=&quot;UmbracoDeploy.Core&quot; version=&quot;[$(UmbracoDeployVersion),"/>
57+
Regex="dependency id=&quot;UmbracoDeploy.Core&quot; version=&quot;&quot;"
58+
ReplacementText="dependency id=&quot;UmbracoDeploy.Core&quot; version=&quot;$(UmbracoDeployVersion)&quot;"/>
5959
</Target>
6060

6161
<Target Name="CompileSolution" DependsOnTargets="UpdateReferencedVersions">

‎build/NuSpecs/UmbracoDeploy.Contrib.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<language>en-US</language>
1818
<tags>umbraco</tags>
1919
<dependencies>
20-
<dependency id="UmbracoDeploy.Core" version="4.7.0-rc001" />
20+
<dependency id="UmbracoDeploy.Core" version="4.10.0-alpha11785" />
2121
</dependencies>
2222
</metadata>
2323
<files>

‎build/RunBuild.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@ECHO OFF
2+
13
IF NOT EXIST version.txt (
24
ECHO version.txt missing!
35
GOTO :showerror

‎build/RunContinuousBuild.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@ECHO OFF
2+
13
SET "release="
24
FOR /F "skip=1 delims=" %%i IN (version.txt) DO IF NOT DEFINED release SET "release=%%i"
35

‎build/version.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
2-
4.2.1
2+
4.3.0
3+
rc1

‎src/Umbraco.Deploy.Contrib.Connectors/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[assembly: AssemblyConfiguration("")]
77
[assembly: AssemblyCompany("")]
88
[assembly: AssemblyProduct("Umbraco.Deploy.Contrib")]
9-
[assembly: AssemblyCopyright("Copyright © Umbraco 2023")]
9+
[assembly: AssemblyCopyright("Copyright © Umbraco 2024")]
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

11-
[assembly: System.Reflection.AssemblyInformationalVersion("4.2.1")]
12-
[assembly: System.Reflection.AssemblyVersion("4.2.1")]
11+
[assembly: System.Reflection.AssemblyInformationalVersion("4.3.0-rc1")]
12+
[assembly: System.Reflection.AssemblyVersion("4.3.0")]
1313

1414

‎src/Umbraco.Deploy.Contrib.sln

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,34 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29411.108
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.8.34511.84
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Deploy.Contrib.Connectors", "Umbraco.Deploy.Contrib.Connectors\Umbraco.Deploy.Contrib.Connectors.csproj", "{42FB2213-0815-41CD-94F8-DFB0EC1D8061}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Deploy.Contrib.Connectors", "Umbraco.Deploy.Contrib.Connectors\Umbraco.Deploy.Contrib.Connectors.csproj", "{42FB2213-0815-41CD-94F8-DFB0EC1D8061}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Deploy.Contrib.Tests", "Umbraco.Deploy.Contrib.Tests\Umbraco.Deploy.Contrib.Tests.csproj", "{48B09241-9C44-47EF-B4DF-397B39A631DC}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Deploy.Contrib.Tests", "Umbraco.Deploy.Contrib.Tests\Umbraco.Deploy.Contrib.Tests.csproj", "{48B09241-9C44-47EF-B4DF-397B39A631DC}"
99
EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7AF3C28D-DBD0-4771-9A78-D6E982094DCC}"
1111
ProjectSection(SolutionItems) = preProject
12+
..\.editorconfig = ..\.editorconfig
13+
..\.gitattributes = ..\.gitattributes
14+
..\.gitignore = ..\.gitignore
1215
..\CONTRIBUTING.md = ..\CONTRIBUTING.md
1316
..\LICENSE.md = ..\LICENSE.md
17+
NuGet.config = NuGet.config
1418
..\README.md = ..\README.md
1519
EndProjectSection
1620
EndProject
21+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{14930EA2-75DD-49C3-8E9D-7CDAE35EF8CC}"
22+
ProjectSection(SolutionItems) = preProject
23+
..\build\Build.proj = ..\build\Build.proj
24+
..\build\version.txt = ..\build\version.txt
25+
EndProjectSection
26+
EndProject
27+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuSpecs", "NuSpecs", "{033BA82A-DE58-4674-AB52-5EA94961BC94}"
28+
ProjectSection(SolutionItems) = preProject
29+
..\build\NuSpecs\UmbracoDeploy.Contrib.nuspec = ..\build\NuSpecs\UmbracoDeploy.Contrib.nuspec
30+
EndProjectSection
31+
EndProject
1732
Global
1833
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1934
Debug|Any CPU = Debug|Any CPU
@@ -32,6 +47,10 @@ Global
3247
GlobalSection(SolutionProperties) = preSolution
3348
HideSolutionNode = FALSE
3449
EndGlobalSection
50+
GlobalSection(NestedProjects) = preSolution
51+
{14930EA2-75DD-49C3-8E9D-7CDAE35EF8CC} = {7AF3C28D-DBD0-4771-9A78-D6E982094DCC}
52+
{033BA82A-DE58-4674-AB52-5EA94961BC94} = {14930EA2-75DD-49C3-8E9D-7CDAE35EF8CC}
53+
EndGlobalSection
3554
GlobalSection(ExtensibilityGlobals) = postSolution
3655
SolutionGuid = {20357E31-FA18-4D77-B38B-6C878A179849}
3756
EndGlobalSection

‎src/gulp/conf.js

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎src/gulp/dev.js

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)