Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert game finder upgrade

Browse Source
This commit is contained in:
Timothy Baldridge 2022-06-01 18:11:38 -06:00
parent 838e8ce274
commit 971a3ca252
9 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,5 +1,12 @@
### Changelog ### Changelog
#### Version - 2.5.3.18 - 6/1/2022
* Downgrade to a working copy of Game Finder
#### Version - 2.5.3.17 - 6/1/2022
* Switch the launcher to 3.0 code
* Download new releases from the Nexus when possible
#### Version - 2.5.3.16 - 5/22/2022 #### Version - 2.5.3.16 - 5/22/2022
* Update to the latest Game Finder library * Update to the latest Game Finder library

4
Wabbajack.CLI/Wabbajack.CLI.csproj
View File

@ -6,8 +6,8 @@
<AssemblyName>wabbajack-cli</AssemblyName> <AssemblyName>wabbajack-cli</AssemblyName>
<Company>Wabbajack</Company> <Company>Wabbajack</Company>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<AssemblyVersion>2.5.3.16</AssemblyVersion> <AssemblyVersion>2.5.3.18</AssemblyVersion>
<FileVersion>2.5.3.16</FileVersion> <FileVersion>2.5.3.18</FileVersion>
<Copyright>Copyright © 2019-2022</Copyright> <Copyright>Copyright © 2019-2022</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

2
Wabbajack.Common/StoreHandlers/StoreHandler.cs
View File

@ -106,7 +106,7 @@ namespace Wabbajack.Common.StoreHandlers
_name = name; _name = name;
} }
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter) public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
{ {
Utils.Log($"{_name}: {formatter(state, exception)}"); Utils.Log($"{_name}: {formatter(state, exception)}");
} }

3
Wabbajack.Common/Utils.cs
View File

@ -595,6 +595,7 @@ namespace Wabbajack.Common
throw new Exception(msg); throw new Exception(msg);
}*/ }*/
/*
public static Stream GetEmbeddedResourceStream(string name) public static Stream GetEmbeddedResourceStream(string name)
{ {
return (from assembly in AppDomain.CurrentDomain.GetAssemblies() return (from assembly in AppDomain.CurrentDomain.GetAssemblies()
@ -602,7 +603,7 @@ namespace Wabbajack.Common
from rname in assembly.GetManifestResourceNames() from rname in assembly.GetManifestResourceNames()
where rname == name where rname == name
select assembly.GetManifestResourceStream(name)).First(); select assembly.GetManifestResourceStream(name)).First();
} }*/
public static T FromYaml<T>(this Stream s) public static T FromYaml<T>(this Stream s)
{ {

12
Wabbajack.Common/Wabbajack.Common.csproj
View File

@ -48,11 +48,13 @@
<Folder Include="Properties\" /> <Folder Include="Properties\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="GameFinder.StoreHandlers.BethNet" Version="1.7.3" /> <PackageReference Include="GameFinder.StoreHandlers.BethNet" Version="[1.6.3]" />
<PackageReference Include="GameFinder.StoreHandlers.EGS" Version="1.7.3" /> <PackageReference Include="GameFinder.StoreHandlers.EGS" Version="[1.6.3]" />
<PackageReference Include="GameFinder.StoreHandlers.GOG" Version="1.7.3" /> <PackageReference Include="GameFinder.StoreHandlers.GOG" Version="[1.6.3]" />
<PackageReference Include="GameFinder.StoreHandlers.Steam" Version="1.7.3" /> <PackageReference Include="GameFinder.StoreHandlers.Steam" Version="[1.6.3]" />
<PackageReference Include="GameFinder.StoreHandlers.Origin" Version="1.7.3" /> <PackageReference Include="GameFinder.StoreHandlers.Origin" Version="[1.6.3]" />
<PackageReference Include="GameFinder" Version="[1.6.3]" />
<PackageReference Include="GameFinder.RegistryUtils" Version="[1.6.3]" />
<PackageReference Include="Genbox.AlphaFS" Version="2.2.2.1" /> <PackageReference Include="Genbox.AlphaFS" Version="2.2.2.1" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.34" /> <PackageReference Include="HtmlAgilityPack" Version="1.11.34" />
<PackageReference Include="ini-parser-netstandard" Version="2.5.2" /> <PackageReference Include="ini-parser-netstandard" Version="2.5.2" />

4
Wabbajack.Launcher/Wabbajack.Launcher.csproj
View File

@ -4,8 +4,8 @@
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<AssemblyVersion>2.5.3.16</AssemblyVersion> <AssemblyVersion>2.5.3.18</AssemblyVersion>
<FileVersion>2.5.3.16</FileVersion> <FileVersion>2.5.3.18</FileVersion>
<Copyright>Copyright © 2019-2022</Copyright> <Copyright>Copyright © 2019-2022</Copyright>
<Description>Wabbajack Application Launcher</Description> <Description>Wabbajack Application Launcher</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

4
Wabbajack/Wabbajack.csproj
View File

@ -6,8 +6,8 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier> <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<AssemblyVersion>2.5.3.16</AssemblyVersion> <AssemblyVersion>2.5.3.18</AssemblyVersion>
<FileVersion>2.5.3.16</FileVersion> <FileVersion>2.5.3.18</FileVersion>
<Copyright>Copyright © 2019-2022</Copyright> <Copyright>Copyright © 2019-2022</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

25
buildall.bat
View File

@ -1,12 +1,17 @@
rmdir /q/s e:\Games\wabbajack_files
mkdir e:\Games\wabbajack_files
mkdir e:\Games\wabbajack_files\app
mkdir e:\Games\wabbajack_files\cli
mkdir e:\Games\wabbajack_files\launcher
dotnet clean dotnet clean
dotnet restore dotnet restore
dotnet publish Wabbajack\Wabbajack.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o M:\Games\wabbajack_files\app --self-contained dotnet publish Wabbajack\Wabbajack.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o e:\Games\wabbajack_files\app --self-contained
dotnet publish Wabbajack.Launcher\Wabbajack.Launcher.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o M:\Games\wabbajack_files\launcher --self-contained dotnet publish Wabbajack.Launcher\Wabbajack.Launcher.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o e:\Games\wabbajack_files\launcher --self-contained
dotnet publish c:\oss\Wabbajack\Wabbajack.CLI\Wabbajack.CLI.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o M:\Games\wabbajack_files\cli --self-contained dotnet publish c:\oss\Wabbajack\Wabbajack.CLI\Wabbajack.CLI.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o e:\Games\wabbajack_files\cli --self-contained
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com M:\Games\wabbajack_files\launcher\Wabbajack.exe "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com e:\Games\wabbajack_files\launcher\Wabbajack.exe
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com M:\Games\wabbajack_files\app\Wabbajack.exe "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com e:\Games\wabbajack_files\app\Wabbajack.exe
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com M:\Games\wabbajack_files\app\wabbajack-cli.exe "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com e:\Games\wabbajack_files\app\wabbajack-cli.exe
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com M:\Games\wabbajack_files\cli\wabbajack-cli.exe "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com e:\Games\wabbajack_files\cli\wabbajack-cli.exe
"c:\Program Files\7-Zip\7z.exe" a m:\Games\wabbajack_files\app.zip m:\Games\wabbajack_files\app\* "c:\Program Files\7-Zip\7z.exe" a e:\Games\wabbajack_files\app.zip e:\Games\wabbajack_files\app\*
"c:\Program Files\7-Zip\7z.exe" a m:\Games\wabbajack_files\cli-3.0.zip m:\Games\wabbajack_files\cli\* "c:\Program Files\7-Zip\7z.exe" a e:\Games\wabbajack_files\cli-3.0.zip e:\Games\wabbajack_files\cli\*
copy m:\Games\wabbajack_files\launcher\Wabbajack.exe m:\Games\wabbajack_files\Wabbajack.exe copy e:\Games\wabbajack_files\launcher\Wabbajack.exe e:\Games\wabbajack_files\Wabbajack.exe