Fixed file write

Better LauncherEx gzipping
BUTR · Apr 9, 2024 · 2903577 · 2903577
1 parent 88603db
commit 2903577
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/build/common.props b/build/common.props
@@ -11,7 +11,7 @@
 
   <!--Development Variables-->
   <PropertyGroup>
-    <Version>1.4.13</Version>
+    <Version>1.5.0</Version>
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <BUTRSharedVersion>3.0.0.138</BUTRSharedVersion>
     <BUTRModuleManagerVersion>5.0.221</BUTRModuleManagerVersion>

diff --git 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
@@ -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
@@ -77,8 +77,10 @@
       <LauncherExProject>$(MSBuildThisFileDirectory)..\Bannerlord.LauncherEx\Bannerlord.LauncherEx.csproj</LauncherExProject>
       <LauncherExProjectFull>"$([System.IO.Path]::GetFullPath('$(LauncherExProject)'))"</LauncherExProjectFull>
     </PropertyGroup>
-    <Message Text="dotnet build $(LauncherExProjectFull) --target:BuildExtended -p:GameVersion=%(GameAPIVersion.GameVersion) -p:Configuration=$(Configuration)_%(GameAPIVersion.Flat) -p:ILRepackBuildEnable=true" Importance="High" />
-    <Exec Command="dotnet build $(LauncherExProjectFull) --target:BuildExtended -p:GameVersion=%(GameAPIVersion.GameVersion) -p:Configuration=$(Configuration)_%(GameAPIVersion.Flat) -p:ILRepackBuildEnable=true" />
+    <Message Text="dotnet clean $(LauncherExProjectFull) -p:Configuration=$(Configuration)_%(GameAPIVersion.Flat)" Importance="High" />
+    <Exec Command="dotnet clean $(LauncherExProjectFull) -p:Configuration=$(Configuration)_%(GameAPIVersion.Flat)" />
+    <Message Text="dotnet build $(LauncherExProjectFull) --force -p:GameVersion=%(GameAPIVersion.GameVersion) -p:Configuration=$(Configuration)_%(GameAPIVersion.Flat)" Importance="High" />
+    <Exec Command="dotnet build $(LauncherExProjectFull) --force -p:GameVersion=%(GameAPIVersion.GameVersion) -p:Configuration=$(Configuration)_%(GameAPIVersion.Flat)" />
   </Target>
   <Target Condition="$(Configuration) == 'Release'" Name="BeforeBuildCompress" AfterTargets="BeforeBuildLauncherEx">
     <GZip Files="@(EmbeddedResource)">

diff --git 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<string>) x.Extensions)}|{string.Join((string) ", ", (IEnumerable<string>) 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
@@ -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
@@ -5,7 +5,7 @@
     <LangVersion>11.0</LangVersion>
     <Nullable>enable</Nullable>
     <PlatformTarget>x64</PlatformTarget>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <Version>1.25.0</Version>
     <PolySharpExcludeGeneratedTypes>System.Diagnostics.CodeAnalysis.UnscopedRefAttribute</PolySharpExcludeGeneratedTypes>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
@@ -18,16 +18,15 @@
     <ILRepackMergeDebugSymbols>true</ILRepackMergeDebugSymbols>
     <ILRepackPerformInternalize>true</ILRepackPerformInternalize>
     <ILRepackCopyAttributes>false</ILRepackCopyAttributes>
-    <ILRepackBuildToolingPath Condition="$(Configuration) != 'Debug'">$(PkgBUTR_ILRepack)\tools\net461\ILRepack.exe</ILRepackBuildToolingPath>
-    <!--
-    <GameVersion>1.1.0</GameVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$(Configuration) == 'Debug'">
+    <GameVersion>1.2.0</GameVersion>
     <GameVersionFlat>$([System.String]::Copy('$(GameVersion)').Replace('.',''))</GameVersionFlat>
     <GameVersionConstant>v$(GameVersionFlat)</GameVersionConstant>
-    -->
-
     <DefineConstants>$(DefineConstants);$(GameVersionConstant)</DefineConstants>
   </PropertyGroup>
-
+  
   <PropertyGroup>
     <PackageId>Bannerlord.LauncherEx</PackageId>
     <Title>Bannerlord.LauncherEx</Title>
@@ -78,12 +77,8 @@
       </AssemblyAttribute>
     </ItemGroup>
   </Target>
-
-  <Target Name="BuildExtended">
-    <CallTarget Targets="Build" />
-  </Target>
-
-  <Target Name="ExcludeAssembliesFromILRepack" BeforeTargets="ILRepackPrepare">
+
+  <Target Name="ExcludeAssembliesFromILRepack" BeforeTargets="ILRepackPrepareBuild">
     <PropertyGroup>
       <ILRepackExcludeAssemblies>$(ILRepackExcludeAssemblies);$(ProjectDir)$(OutputPath)System.Drawing.dll;</ILRepackExcludeAssemblies>
       <ILRepackExcludeAssemblies>$(ILRepackExcludeAssemblies);$(ProjectDir)$(OutputPath)System.Drawing.Common.dll;</ILRepackExcludeAssemblies>