Skip to content

Commit d114ae4

Browse files
authored
Merge pull request #6142 from oqtane/dev
10.1.2 Release
2 parents 12809df + 2d6b056 commit d114ae4

File tree

28 files changed

+104
-116
lines changed

28 files changed

+104
-116
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<PropertyGroup>
33
<TargetFramework>net10.0</TargetFramework>
44
<Configurations>Debug;Release</Configurations>
5-
<Version>10.1.1</Version>
5+
<Version>10.1.2</Version>
66
<Product>Oqtane</Product>
77
<Authors>Shaun Walker</Authors>
88
<Company>.NET Foundation</Company>
99
<Description>CMS and Application Framework for Blazor and .NET MAUI</Description>
1010
<Copyright>.NET Foundation</Copyright>
1111
<PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
1212
<PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
13-
<PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v10.1.1</PackageReleaseNotes>
13+
<PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v10.1.2</PackageReleaseNotes>
1414
<RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
1515
<RepositoryType>Git</RepositoryType>
1616
</PropertyGroup>

Oqtane.Application/Client/Oqtane.Application.Client.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.3" />
16-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.3" />
17-
<PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.3" />
18-
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.3" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.5" />
16+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.5" />
17+
<PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.5" />
18+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.5" />
1919
</ItemGroup>
2020

2121
<ItemGroup>
2222
<ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Oqtane.Client" Version="10.1.1" />
26+
<PackageReference Include="Oqtane.Client" Version="10.1.2" />
2727
</ItemGroup>
2828

2929
</Project>

Oqtane.Application/Oqtane.Application.Template.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>Oqtane.Application.Template</id>
5-
<version>10.1.1</version>
5+
<version>10.1.2</version>
66
<title>Oqtane Application Template For Blazor</title>
77
<authors>Shaun Walker</authors>
88
<requireLicenseAcceptance>false</requireLicenseAcceptance>

Oqtane.Application/Server/Oqtane.Application.Server.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.3" />
26-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.3" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
25+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.5" />
26+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.5" />
27+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.5" />
2828
</ItemGroup>
2929

3030
<ItemGroup>
@@ -33,7 +33,7 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="Oqtane.Server" Version="10.1.1" />
36+
<PackageReference Include="Oqtane.Server" Version="10.1.2" />
3737
</ItemGroup>
3838

3939
</Project>

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Settings.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@namespace [Owner].Module.[Module]
22
@inherits ModuleBase
3+
@implements Oqtane.Interfaces.ISettingsControl
34
@inject ISettingService SettingService
45
@inject IStringLocalizer<Settings> Localizer
56

Oqtane.Application/Shared/Oqtane.Application.Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Oqtane.Shared" Version="10.1.1" />
14+
<PackageReference Include="Oqtane.Shared" Version="10.1.2" />
1515
</ItemGroup>
1616

1717
</Project>

Oqtane.Client/Modules/Admin/Modules/Settings.razor

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,8 @@
298298
}
299299
else
300300
{
301-
// legacy support - module settings updated by convention ( ie. by calling a public method named "UpdateSettings" in settings component )
301+
// legacy approach - module settings updated by convention (ie. by calling a public method named "UpdateSettings" in settings component)
302+
// this method should be removed however the ISettingsControl declaration was not added to the default module template until version 10.1.2
302303
_moduleSettings?.GetType().GetMethod("UpdateSettings")?.Invoke(_moduleSettings, null);
303304
}
304305
}

Oqtane.Client/Modules/Admin/Site/Index.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@
11941194

11951195
if (unique)
11961196
{
1197-
if (_aliasid == 0)
1197+
if (_aliasid == -1)
11981198
{
11991199
alias = new Alias { SiteId = PageState.Site.SiteId, TenantId = PageState.Alias.TenantId, Name = _aliasname, IsDefault = bool.Parse(_defaultalias) };
12001200
await AliasService.AddAliasAsync(alias);

Oqtane.Client/Modules/Admin/Upgrade/Index.razor

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,11 @@
1111
{
1212
<TabStrip>
1313
<TabPanel Name="Download" ResourceKey="Download">
14-
@if (_versions.Count > 0 && _upgradeable)
14+
@if (_package != null && _upgradeavailable)
1515
{
1616
<div class="container">
1717
<div class="row mb-1 align-items-center">
18-
<Label Class="col-sm-3" For="version" HelpText="Select the framework upgrade version" ResourceKey="Version">Version: </Label>
19-
<div class="col-sm-9">
20-
<select id="backup" class="form-select" @bind="@_version">
21-
@foreach (var version in _versions)
22-
{
23-
<option value="@version">@version</option>
24-
}
25-
</select>
26-
</div>
27-
</div>
28-
<div class="row mb-1 align-items-center">
29-
<Label Class="col-sm-3" For="backup" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will reduce the time required for the upgrade." ResourceKey="Backup">Backup Files? </Label>
18+
<Label Class="col-sm-3" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will reduce the time required for the upgrade." ResourceKey="Backup">Backup Files? </Label>
3019
<div class="col-sm-9">
3120
<select id="backup" class="form-select" @bind="@_backup">
3221
<option value="True">@SharedLocalizer["Yes"]</option>
@@ -38,7 +27,7 @@
3827
<br />
3928
@if (!_downloaded)
4029
{
41-
<button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, _version))>@SharedLocalizer["Download"] @_version</button>
30+
<button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@SharedLocalizer["Download"] @_package.Version</button>
4231
}
4332
else
4433
{
@@ -77,9 +66,8 @@
7766
@code {
7867
private bool _initialized = false;
7968
private bool _downloaded = false;
80-
private List<string> _versions = new List<string>();
81-
private string _version;
82-
private bool _upgradeable = false;
69+
private Package _package;
70+
private bool _upgradeavailable = false;
8371
private string _backup = "True";
8472

8573
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
@@ -96,18 +84,18 @@
9684
{
9785
AddModuleMessage(Localizer["Disclaimer.Text"], MessageType.Warning);
9886

99-
var packages = await PackageService.GetPackagesAsync("framework", "", "", "");
87+
List<Package> packages = await PackageService.GetPackagesAsync("framework", "", "", "");
10088
if (packages != null)
10189
{
102-
_version = packages.First(item => item.PackageId.StartsWith(Constants.PackageId)).Version;
103-
foreach (var version in Constants.ReleaseVersions.Split(','))
90+
_package = packages.Where(item => item.PackageId.StartsWith(Constants.PackageId)).FirstOrDefault();
91+
if (_package != null)
92+
{
93+
_upgradeavailable = (Version.Parse(_package.Version).CompareTo(Version.Parse(Constants.Version)) > 0);
94+
}
95+
else
10496
{
105-
if (Version.Parse(version).CompareTo(Version.Parse(Constants.Version)) > 0)
106-
{
107-
_versions.Add(version);
108-
}
97+
_package = new Package { Name = Constants.PackageId, Version = Constants.Version };
10998
}
110-
_upgradeable = (Version.Parse(_version).CompareTo(Version.Parse(Constants.Version)) > 0);
11199
}
112100
_initialized = true;
113101
}

Oqtane.Client/Oqtane.Client.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.3" />
12-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.3" />
13-
<PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.3" />
14-
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.3" />
15-
<PackageReference Include="Radzen.Blazor" Version="9.0.8" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.5" />
12+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.5" />
13+
<PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.5" />
14+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.5" />
15+
<PackageReference Include="Radzen.Blazor" Version="10.0.6" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

0 commit comments

Comments
 (0)