diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj index 7dc13303..ab0b55ad 100644 --- a/Oqtane.Client/Oqtane.Client.csproj +++ b/Oqtane.Client/Oqtane.Client.csproj @@ -6,7 +6,7 @@ 7.3 3.0 Debug;Release - 1.0.1 + 1.0.2 Oqtane Shaun Walker .NET Foundation @@ -15,7 +15,7 @@ https://www.oqtane.org https://github.com/oqtane Git - https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.2 Oqtane true diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index e9bea656..74f38f33 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -126,8 +126,10 @@ namespace Oqtane.Infrastructure { Directory.CreateDirectory(Path.GetDirectoryName(filename)); } - if (FileInUse(filename) == false) + if (!FileInUse(filename) == false) + { entry.ExtractToFile(filename, true); + } } private static bool FileInUse(string path) { @@ -139,11 +141,12 @@ namespace Oqtane.Infrastructure } return false; } - catch (IOException ex) + catch { return true; } } + public void UpgradeFramework() { string folder = Path.Combine(_environment.WebRootPath, "Framework"); diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index c9f9be47..0e172b84 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 7.3 Debug;Release - 1.0.1 + 1.0.2 Oqtane Shaun Walker .NET Foundation @@ -13,7 +13,7 @@ https://www.oqtane.org https://github.com/oqtane Git - https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.2 Oqtane true diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].[Module]s.Client.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].[Module]s.Client.csproj index 71a23f9f..49b7d943 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].[Module]s.Client.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].[Module]s.Client.csproj @@ -25,8 +25,8 @@ - - + + diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module]s.Server.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module]s.Server.csproj index 8dc7b8d5..f3bc770d 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module]s.Server.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module]s.Server.csproj @@ -31,7 +31,7 @@ - - + + diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/[Owner].[Module]s.Shared.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/[Owner].[Module]s.Shared.csproj index 4b0860c4..3ba17260 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/[Owner].[Module]s.Shared.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/[Owner].[Module]s.Shared.csproj @@ -17,7 +17,7 @@ - + diff --git a/Oqtane.Shared/Oqtane.Shared.csproj b/Oqtane.Shared/Oqtane.Shared.csproj index 59d6f3d0..2062366d 100644 --- a/Oqtane.Shared/Oqtane.Shared.csproj +++ b/Oqtane.Shared/Oqtane.Shared.csproj @@ -4,7 +4,7 @@ netstandard2.1 7.3 Debug;Release - 1.0.1 + 1.0.2 Oqtane Shaun Walker .NET Foundation @@ -13,7 +13,7 @@ https://www.oqtane.org https://github.com/oqtane Git - https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.2 Oqtane true diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index 77f7dc68..c04e765c 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/Oqtane.Shared/Shared/Constants.cs @@ -5,8 +5,8 @@ namespace Oqtane.Shared public class Constants { public const string PackageId = "Oqtane.Framework"; - public const string Version = "1.0.1"; - public const string ReleaseVersions = "0.9.0,0.9.1,0.9.2,1.0.0,1.0.1"; + public const string Version = "1.0.2"; + public const string ReleaseVersions = "0.9.0,0.9.1,0.9.2,1.0.0,1.0.1,1.0.2"; public const string PageComponent = "Oqtane.UI.ThemeBuilder, Oqtane.Client"; public const string ContainerComponent = "Oqtane.UI.ContainerBuilder, Oqtane.Client"; diff --git a/Oqtane.Test/Oqtane.Test.csproj b/Oqtane.Test/Oqtane.Test.csproj index 4e4d12fa..99fda27a 100644 --- a/Oqtane.Test/Oqtane.Test.csproj +++ b/Oqtane.Test/Oqtane.Test.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 7.3 Debug;Release - 1.0.1 + 1.0.2 Oqtane Shaun Walker .NET Foundation @@ -13,7 +13,7 @@ https://www.oqtane.org https://github.com/oqtane Git - https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.2 Oqtane false diff --git a/Oqtane.Upgrade/Oqtane.Upgrade.csproj b/Oqtane.Upgrade/Oqtane.Upgrade.csproj index 4d352a6f..47052a35 100644 --- a/Oqtane.Upgrade/Oqtane.Upgrade.csproj +++ b/Oqtane.Upgrade/Oqtane.Upgrade.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 7.3 Exe - 1.0.1 + 1.0.2 Oqtane Shaun Walker .NET Foundation @@ -13,7 +13,7 @@ https://www.oqtane.org https://github.com/oqtane Git - https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.2 Oqtane false