diff --git a/build/common.props b/build/common.props index 20dc669..ff68694 100644 --- a/build/common.props +++ b/build/common.props @@ -11,7 +11,7 @@ - 1.4.13 + 1.5.0 2.2.2 3.0.0.138 5.0.221 diff --git a/build/common.targets b/build/common.targets index 47a6443..5564de0 100644 --- a/build/common.targets +++ b/build/common.targets @@ -37,7 +37,7 @@ if (Files.Length > 0) Log.LogMessage(MessageImportance.Normal, $"EmbeddedResource Src: {sourceItemSpec}"); using (var sourceStream = File.OpenRead(sourcePath)) - using (var destinationStream = File.OpenWrite(destinationPath)) + using (var destinationStream = new FileStream(destinationPath, FileMode.Truncate, FileAccess.Write)) using (var destinationGZip = new GZipStream(destinationStream, CompressionLevel.Optimal)) { sourceStream.CopyTo(destinationGZip); diff --git a/changelog.txt b/changelog.txt index b7151d0..766b8a3 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.5.0 +Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.x +* BETA Release! +* Switched to new launcher manager backend +--------------------------------------------------------------------------------------------------- Version: 1.4.12 Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.9 * Adapted to v1.2.9. Thanks to jzebedee! diff --git a/src/Bannerlord.BLSE.Shared/Bannerlord.BLSE.Shared.csproj b/src/Bannerlord.BLSE.Shared/Bannerlord.BLSE.Shared.csproj index 2eec9ad..1026937 100644 --- a/src/Bannerlord.BLSE.Shared/Bannerlord.BLSE.Shared.csproj +++ b/src/Bannerlord.BLSE.Shared/Bannerlord.BLSE.Shared.csproj @@ -77,8 +77,10 @@ $(MSBuildThisFileDirectory)..\Bannerlord.LauncherEx\Bannerlord.LauncherEx.csproj "$([System.IO.Path]::GetFullPath('$(LauncherExProject)'))" - - + + + + diff --git a/src/Bannerlord.LauncherEx/Adapters/DialogProviderImpl.cs b/src/Bannerlord.LauncherEx/Adapters/DialogProviderImpl.cs index 130f5ba..4cee407 100644 --- a/src/Bannerlord.LauncherEx/Adapters/DialogProviderImpl.cs +++ b/src/Bannerlord.LauncherEx/Adapters/DialogProviderImpl.cs @@ -33,7 +33,7 @@ public void SendDialog(DialogType type, string title, string message, IReadOnlyL } case DialogType.FileOpen: { - var filter = string.Join("|", filters.Select(x => $"{x.Name} ({string.Join((string) ", ", (IEnumerable) x.Extensions)}|{string.Join((string) ", ", (IEnumerable) x.Extensions)}")); + var filter = string.Join("|", filters.Select(x => $"{x.Name} {string.Join((string) ", ", x.Extensions)}|{string.Join((string) ", ", x.Extensions)}")); var dialog = new OpenFileDialog { Title = title, @@ -51,7 +51,7 @@ public void SendDialog(DialogType type, string title, string message, IReadOnlyL case DialogType.FileSave: { var fileName = message; - var filter = string.Join("|", filters.Select(x => $"{x.Name} ({string.Join(", ", x.Extensions)}|{string.Join(", ", x.Extensions)}")); + var filter = string.Join("|", filters.Select(x => $"{x.Name} {string.Join(", ", x.Extensions)}|{string.Join(", ", x.Extensions)}")); var dialog = new SaveFileDialog { Title = title, diff --git a/src/Bannerlord.LauncherEx/Adapters/FileSystemProviderImpl.cs b/src/Bannerlord.LauncherEx/Adapters/FileSystemProviderImpl.cs index d184ce8..43317e0 100644 --- a/src/Bannerlord.LauncherEx/Adapters/FileSystemProviderImpl.cs +++ b/src/Bannerlord.LauncherEx/Adapters/FileSystemProviderImpl.cs @@ -24,7 +24,7 @@ internal sealed class FileSystemProviderImpl : IFileSystemProvider using var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read); var data = new byte[length]; fs.Seek(offset, SeekOrigin.Begin); - fs.Read(data, 0, length); + _ = fs.Read(data, 0, length); return data; } else @@ -41,8 +41,6 @@ internal sealed class FileSystemProviderImpl : IFileSystemProvider public void WriteFileContent(string filePath, byte[]? data) { - if (!File.Exists(filePath)) return; - try { if (data is null) diff --git a/src/Bannerlord.LauncherEx/Bannerlord.LauncherEx.csproj b/src/Bannerlord.LauncherEx/Bannerlord.LauncherEx.csproj index 695d862..7a65d16 100644 --- a/src/Bannerlord.LauncherEx/Bannerlord.LauncherEx.csproj +++ b/src/Bannerlord.LauncherEx/Bannerlord.LauncherEx.csproj @@ -5,7 +5,7 @@ 11.0 enable x64 - full + portable 1.25.0 System.Diagnostics.CodeAnalysis.UnscopedRefAttribute true @@ -18,16 +18,15 @@ true true false - $(PkgBUTR_ILRepack)\tools\net461\ILRepack.exe - - $(DefineConstants);$(GameVersionConstant) - + Bannerlord.LauncherEx Bannerlord.LauncherEx @@ -78,12 +77,8 @@ - - - - - - + + $(ILRepackExcludeAssemblies);$(ProjectDir)$(OutputPath)System.Drawing.dll; $(ILRepackExcludeAssemblies);$(ProjectDir)$(OutputPath)System.Drawing.Common.dll;