Skip to content

Commit 1b3142e

Browse files
committed
2 parents 84205af + 248594e commit 1b3142e

File tree

4 files changed

+43
-3
lines changed

4 files changed

+43
-3
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3+
"version": "5.0-beta",
4+
"nugetPackageVersion": {
5+
"semVer": 2
6+
},
7+
"publicReleaseRefSpec": [
8+
"^refs/heads/master$"
9+
],
10+
"cloudBuild": {
11+
"buildNumber": {
12+
"enabled": true,
13+
"includeCommitId": {
14+
"when": "nonPublicReleaseOnly",
15+
"where": "buildMetadata"
16+
}
17+
},
18+
"setVersionVariables": true
19+
}
20+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3+
"version": "5.0-beta",
4+
"nugetPackageVersion": {
5+
"semVer": 2
6+
},
7+
"publicReleaseRefSpec": [
8+
"^refs/heads/master$"
9+
],
10+
"cloudBuild": {
11+
"buildNumber": {
12+
"enabled": true,
13+
"includeCommitId": {
14+
"when": "nonPublicReleaseOnly",
15+
"where": "buildMetadata"
16+
}
17+
},
18+
"setVersionVariables": true
19+
}
20+
}

src/Caliburn.Micro.Platform/Platforms/netcore-avalonia/WindowManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ public virtual async Task<Window> CreateWindowAsync(object rootModel, object con
137137
var view = EnsureWindow(rootModel, view1);
138138

139139
var haveDisplayName = rootModel as IHaveDisplayName;
140-
if (string.IsNullOrEmpty(view.Title) && haveDisplayName != null && !ConventionManager.HasBinding(view, Window.TitleProperty))
140+
if ((string.IsNullOrEmpty(view.Title) || view.Title == "Window") && haveDisplayName != null && !ConventionManager.HasBinding(view, Window.TitleProperty))
141141
{
142142
var binding = new Binding("DisplayName") { Mode = BindingMode.TwoWay };
143143
view.Bind(Window.TitleProperty, binding);
144-
}
144+
}
145145

146146
ApplySettings(view, settings);
147147
var conductor = new WindowConductor(rootModel, view);

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "5.0-beta",
3+
"version": "5.0",
44
"nugetPackageVersion": {
55
"semVer": 2
66
},

0 commit comments

Comments
 (0)