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

Merge pull request #1375 from wabbajack-tools/update-deps-remove-framework-libs

Browse Source 
Remove .net Framework libs bit of code cleanup
This commit is contained in:
Timothy Baldridge 2021-03-18 22:30:26 -07:00 committed by GitHub
commit 2319c8a098
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Compression.BSA.Test/BSATests.cs
View File

@ -156,7 +156,7 @@ namespace Compression.BSA.Test
{ {
Assert.Equal(await GetData(pair.ai), await GetData(pair.bi)); Assert.Equal(await GetData(pair.ai), await GetData(pair.bi));
} }
catch (Exception e) catch (Exception)
{ {
} }

10
Wabbajack.App.Test/FilePickerTests.cs
View File

@ -291,11 +291,11 @@ namespace Wabbajack.Test
public async Task FileWithFilters_Passes() public async Task FileWithFilters_Passes()
{ {
var vm = new FilePickerVM(); var vm = new FilePickerVM();
await using (CreateSetFile(vm)) await using (var file = CreateSetFile(vm))
{ {
vm.PathType = FilePickerVM.PathTypeOptions.File; vm.PathType = FilePickerVM.PathTypeOptions.File;
vm.ExistCheckOption = FilePickerVM.CheckOptions.Off; vm.ExistCheckOption = FilePickerVM.CheckOptions.Off;
vm.Filters.Add(new Microsoft.WindowsAPICodePack.Dialogs.CommonFileDialogFilter("test", $"*.{vm.TargetPath.Extension}")); vm.Filters.Add(new Microsoft.WindowsAPICodePack.Dialogs.CommonFileDialogFilter("test", $"*{vm.TargetPath.Extension}"));
await Task.Delay(250); await Task.Delay(250);
Assert.False(vm.Exists); Assert.False(vm.Exists);
Assert.True(vm.ErrorState.Succeeded); Assert.True(vm.ErrorState.Succeeded);
@ -312,7 +312,7 @@ namespace Wabbajack.Test
{ {
vm.PathType = FilePickerVM.PathTypeOptions.File; vm.PathType = FilePickerVM.PathTypeOptions.File;
vm.ExistCheckOption = FilePickerVM.CheckOptions.Off; vm.ExistCheckOption = FilePickerVM.CheckOptions.Off;
vm.Filters.Add(new Microsoft.WindowsAPICodePack.Dialogs.CommonFileDialogFilter("test", $"*.{vm.TargetPath.Extension}z")); vm.Filters.Add(new Microsoft.WindowsAPICodePack.Dialogs.CommonFileDialogFilter("test", $"*{vm.TargetPath.Extension}z"));
await Task.Delay(250); await Task.Delay(250);
Assert.False(vm.Exists); Assert.False(vm.Exists);
Assert.False(vm.ErrorState.Succeeded); Assert.False(vm.ErrorState.Succeeded);
@ -328,7 +328,7 @@ namespace Wabbajack.Test
vm.PathType = FilePickerVM.PathTypeOptions.File; vm.PathType = FilePickerVM.PathTypeOptions.File;
vm.ExistCheckOption = FilePickerVM.CheckOptions.Off; vm.ExistCheckOption = FilePickerVM.CheckOptions.Off;
vm.TargetPath = (AbsolutePath)"SomePath.png"; vm.TargetPath = (AbsolutePath)"SomePath.png";
vm.Filters.Add(new Microsoft.WindowsAPICodePack.Dialogs.CommonFileDialogFilter("test", $"*.{vm.TargetPath.Extension}")); vm.Filters.Add(new Microsoft.WindowsAPICodePack.Dialogs.CommonFileDialogFilter("test", $"*{vm.TargetPath.Extension}"));
await Task.Delay(250); await Task.Delay(250);
Assert.False(vm.Exists); Assert.False(vm.Exists);
Assert.True(vm.ErrorState.Succeeded, vm.ErrorState.Reason); Assert.True(vm.ErrorState.Succeeded, vm.ErrorState.Reason);
@ -345,7 +345,7 @@ namespace Wabbajack.Test
ExistCheckOption = FilePickerVM.CheckOptions.Off, ExistCheckOption = FilePickerVM.CheckOptions.Off,
FilterCheckOption = FilePickerVM.CheckOptions.IfPathNotEmpty FilterCheckOption = FilePickerVM.CheckOptions.IfPathNotEmpty
}; };
vm.Filters.Add(new Microsoft.WindowsAPICodePack.Dialogs.CommonFileDialogFilter("test", $"*.{vm.TargetPath.Extension}")); vm.Filters.Add(new Microsoft.WindowsAPICodePack.Dialogs.CommonFileDialogFilter("test", $"*{vm.TargetPath.Extension}"));
await Task.Delay(250); await Task.Delay(250);
Assert.False(vm.Exists); Assert.False(vm.Exists);
Assert.True(vm.ErrorState.Succeeded); Assert.True(vm.ErrorState.Succeeded);

2
Wabbajack.Launcher/MainWindowVM.cs
View File

@ -162,7 +162,7 @@ namespace Wabbajack.Launcher
}; };
Process.Start(info); Process.Start(info);
} }
catch (Exception ex) catch (Exception)
{ {
if (_errors.Count == 0) if (_errors.Count == 0)
{ {

4
Wabbajack.Lib/Wabbajack.Lib.csproj
View File

@ -7,10 +7,10 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CefSharp.Common"> <PackageReference Include="CefSharp.Common.NETCore">
<Version>88.2.90</Version> <Version>88.2.90</Version>
</PackageReference> </PackageReference>
<PackageReference Include="CefSharp.OffScreen"> <PackageReference Include="CefSharp.OffScreen.NETCore">
<Version>88.2.90</Version> <Version>88.2.90</Version>
</PackageReference> </PackageReference>
<PackageReference Include="F23.StringSimilarity"> <PackageReference Include="F23.StringSimilarity">

9
Wabbajack.Server/Controllers/AuthoredFiles.cs
View File

@ -130,14 +130,7 @@ namespace Wabbajack.BuildServer.Controllers
private async Task UploadAsync(Stream stream, string path) private async Task UploadAsync(Stream stream, string path)
{ {
using var client = await GetBunnyCdnFtpClient(); using var client = await GetBunnyCdnFtpClient();
try await client.UploadAsync(stream, path);
{
await client.UploadAsync(stream, path);
}
catch (Exception ex)
{
throw ex;
}
} }
[HttpDelete] [HttpDelete]

4
Wabbajack.Test/Wabbajack.Test.csproj
View File

@ -28,8 +28,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CefSharp.Common" Version="88.2.90" /> <PackageReference Include="CefSharp.Common.NETCore" Version="88.2.90" />
<PackageReference Include="CefSharp.OffScreen" Version="88.2.90" /> <PackageReference Include="CefSharp.OffScreen.NETCore" Version="88.2.90" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />

3
Wabbajack/Util/FilePickerVM.cs
View File

@ -65,7 +65,7 @@ namespace Wabbajack
private readonly ObservableAsPropertyHelper<string> _errorTooltip; private readonly ObservableAsPropertyHelper<string> _errorTooltip;
public string ErrorTooltip => _errorTooltip.Value; public string ErrorTooltip => _errorTooltip.Value;
public SourceList<CommonFileDialogFilter> Filters { get; } = new SourceList<CommonFileDialogFilter>(); public SourceList<CommonFileDialogFilter> Filters { get; } = new();
public const string PathDoesNotExistText = "Path does not exist"; public const string PathDoesNotExistText = "Path does not exist";
public const string DoesNotPassFiltersText = "Path does not pass designated filters"; public const string DoesNotPassFiltersText = "Path does not pass designated filters";
@ -158,6 +158,7 @@ namespace Wabbajack
Filters.Connect().QueryWhenChanged(), Filters.Connect().QueryWhenChanged(),
resultSelector: (target, type, checkOption, query) => resultSelector: (target, type, checkOption, query) =>
{ {
Console.WriteLine("fff");
switch (type) switch (type)
{ {
case PathTypeOptions.Either: case PathTypeOptions.Either:

2
Wabbajack/View Models/Compilers/MO2CompilerVM.cs
View File

@ -50,7 +50,7 @@ namespace Wabbajack
PathType = FilePickerVM.PathTypeOptions.File, PathType = FilePickerVM.PathTypeOptions.File,
PromptTitle = "Select a Modlist" PromptTitle = "Select a Modlist"
}; };
ModListLocation.Filters.Add(new CommonFileDialogFilter("MO2 Profile (modlist.txt) or Native Settings (native_compiler_settings.json)", ".txt,.json")); ModListLocation.Filters.Add(new CommonFileDialogFilter("MO2 Profile (modlist.txt) or Native Settings (native_compiler_settings.json)", "*.txt,*.json"));
DownloadLocation = new FilePickerVM() DownloadLocation = new FilePickerVM()
{ {

2
Wabbajack/View Models/Installers/InstallerVM.cs
View File

@ -113,7 +113,7 @@ namespace Wabbajack
PathType = FilePickerVM.PathTypeOptions.File, PathType = FilePickerVM.PathTypeOptions.File,
PromptTitle = "Select a ModList to install" PromptTitle = "Select a ModList to install"
}; };
ModListLocation.Filters.Add(new CommonFileDialogFilter("Wabbajack Modlist", ".wabbajack")); ModListLocation.Filters.Add(new CommonFileDialogFilter("Wabbajack Modlist", "*.wabbajack"));
// Swap to proper sub VM based on selected type // Swap to proper sub VM based on selected type
_installer = this.WhenAny(x => x.TargetManager) _installer = this.WhenAny(x => x.TargetManager)

6
Wabbajack/Wabbajack.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
@ -55,7 +55,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CefSharp.Wpf" Version="88.2.90" /> <PackageReference Include="CefSharp.Wpf.NETCore" Version="88.2.90" />
<PackageReference Include="DynamicData" Version="7.1.1" /> <PackageReference Include="DynamicData" Version="7.1.1" />
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.2" /> <PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.2" />
<PackageReference Include="Fody" Version="6.4.0"> <PackageReference Include="Fody" Version="6.4.0">
@ -69,13 +69,13 @@
</PackageReference> </PackageReference>
<PackageReference Include="MahApps.Metro" Version="2.4.4" /> <PackageReference Include="MahApps.Metro" Version="2.4.4" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" /> <PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
<PackageReference Include="PInvoke.Gdi32" Version="0.7.104" /> <PackageReference Include="PInvoke.Gdi32" Version="0.7.104" />
<PackageReference Include="PInvoke.User32" Version="0.7.104" /> <PackageReference Include="PInvoke.User32" Version="0.7.104" />
<PackageReference Include="ReactiveUI" Version="13.2.2" /> <PackageReference Include="ReactiveUI" Version="13.2.2" />
<PackageReference Include="ReactiveUI.Fody" Version="13.2.2" /> <PackageReference Include="ReactiveUI.Fody" Version="13.2.2" />
<PackageReference Include="ReactiveUI.WPF" Version="13.2.2" /> <PackageReference Include="ReactiveUI.WPF" Version="13.2.2" />
<PackageReference Include="SharpDX.DXGI" Version="4.2.0" /> <PackageReference Include="SharpDX.DXGI" Version="4.2.0" />
<PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
<PackageReference Include="WPFThemes.DarkBlend" Version="1.0.8" /> <PackageReference Include="WPFThemes.DarkBlend" Version="1.0.8" />
</ItemGroup> </ItemGroup>