Skip to content

Commit 1182f94

Browse files
authored
Merge pull request #29 from timunie/main
Update to 11.3.3
2 parents afaaa89 + 38e3a26 commit 1182f94

File tree

5 files changed

+24
-16
lines changed

5 files changed

+24
-16
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "Avalonia"]
22
path = ext/Avalonia
33
url = https://github.com/AvaloniaUI/Avalonia.git
4-
branch = release/11.3.2
4+
branch = release/latest

AvaloniaVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
11.3.2
1+
11.3.3

ext/Avalonia

Submodule Avalonia updated 56 files

set-avalonia-branch.ps1

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
param (
2+
[Parameter(HelpMessage="Enter the Avalonia branch to use as input. The default is 'release/latest'")]
3+
[string]$branchName
4+
)
5+
6+
if (-Not $branchName){
7+
$branchName = "release/latest"
8+
}
9+
10+
# Update git submodules
11+
git submodule set-branch --branch $branchName ext/Avalonia
12+
git submodule sync --recursive
13+
git submodule update --init --recursive --remote
14+
git submodule foreach -q --recursive 'branch="$(git config -f $toplevel.gitmodules submodule.$name.branch)"; git checkout $branch'
15+
16+
git add .\.gitmodules
17+
git add .\ext\*

set-version.ps1

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
11
param (
2-
[Parameter(HelpMessage="Enter the Avalonia version to document")]
2+
[Parameter(HelpMessage="Enter the Avalonia version to document", mandatory=$true)]
33
[string]$version
44
)
55

6-
if ($PSBoundParameters.ContainsKey("version")){
7-
New-item ./AvaloniaVersion.txt -ItemType File -Value $version -Force
8-
}
9-
else{
10-
$version = Get-Content ./AvaloniaVersion.txt
11-
}
6+
New-item ./AvaloniaVersion.txt -ItemType File -Value $version -Force
127

13-
# Update git submodules
14-
git submodule set-branch --branch release/$version ext/Avalonia
15-
git submodule sync --recursive
16-
git submodule update --init --recursive --remote
17-
18-
git submodule foreach -q --recursive 'branch="$(git config -f $toplevel.gitmodules submodule.$name.branch)"; git checkout $branch'
8+
git add ./AvaloniaVersion.txt
9+
git commit -m "Updated to Avalonia version $($version)"

0 commit comments

Comments
 (0)