Skip to content

Commit e0467a5

Browse files
rfuzzorfuzzo
committed
update nugets
1 parent 2eace42 commit e0467a5

File tree

9 files changed

+21
-71
lines changed

9 files changed

+21
-71
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ CP77Tools.sln.DotSettings.user
6363
*bin/
6464
*.vs/
6565
*.suo
66+
*.user
67+
*.pubxml
6668
CP77Tools/Properties/launchSettings.json
6769
CP77Tools/Resources/archivehashes.csv
6870

‎CP77.MSTests/ArchiveTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using WolvenKit.Common.Services;
1111
using CP77.CR2W;
1212
using CP77.CR2W.Archive;
13-
using CP77.CR2W.Resources;
1413
using Microsoft.Extensions.Configuration;
1514
using Microsoft.VisualStudio.TestTools.UnitTesting;
1615
using Newtonsoft.Json;

‎CP77.MSTests/CP77.MSTests.csproj

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>
18-
<PackageReference Include="WolvenKit.Common" Version="1.0.0" />
19-
<PackageReference Include="WolvenKit.Cyberformats" Version="1.0.1" />
18+
<PackageReference Include="WolvenKit.Common" Version="1.0.1" />
19+
<PackageReference Include="WolvenKit.Cyberformats" Version="1.0.2" />
2020
</ItemGroup>
2121

2222
<ItemGroup>
@@ -26,13 +26,4 @@
2626
</Content>
2727
</ItemGroup>
2828

29-
<ItemGroup>
30-
<Content Update="C:\Users\ghost\.nuget\packages\wolvenkit.common\1.0.0\contentFiles\any\net5.0-windows7.0\DDS\texconv.exe">
31-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
32-
</Content>
33-
<Content Update="C:\Users\ghost\.nuget\packages\wolvenkit.cyberformats\1.0.0\contentFiles\any\net5.0-windows7.0\Resources\archivehashes.zip">
34-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
35-
</Content>
36-
</ItemGroup>
37-
3829
</Project>

‎CP77.MSTests/Cr2wUnitTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using WolvenKit.Common.Services;
1111
using CP77.CR2W;
1212
using CP77.CR2W.Archive;
13-
using CP77.CR2W.Resources;
1413
using Microsoft.Extensions.Configuration;
1514
using Microsoft.VisualStudio.TestTools.UnitTesting;
1615
using Newtonsoft.Json;

‎CP77.MSTests/GameUnitTest.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Threading.Tasks;
88
using Catel.IoC;
99
using CP77.CR2W.Archive;
10-
using CP77.CR2W.Resources;
1110
using Microsoft.Extensions.Configuration;
1211
using Microsoft.VisualStudio.TestTools.UnitTesting;
1312
using WolvenKit.Common.Services;
@@ -54,7 +53,6 @@ protected static void Setup(TestContext context)
5453

5554
ServiceLocator.Default.RegisterType<ILoggerService, LoggerService>();
5655
ServiceLocator.Default.RegisterType<IHashService, HashService>();
57-
ServiceLocator.Default.RegisterType<IAppSettingsService, AppSettingsService>();
5856

5957
var hashService = ServiceLocator.Default.ResolveType<IHashService>();
6058
hashService.ReloadLocally();

‎CP77Tools/CP77Tools.csproj

Lines changed: 16 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net5.0-windows</TargetFramework>
66
<AssemblyVersion>1.1.0.0</AssemblyVersion>
77
<FileVersion>1.1.0.0</FileVersion>
8-
<DefineConstants Condition=" '$(OS)' == 'Windows_NT' ">IS_WINDOWS_BUILD</DefineConstants>
8+
<PublishSingleFile>true</PublishSingleFile>
9+
<SelfContained>false</SelfContained>
10+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
11+
<PublishTrimmed>true</PublishTrimmed>
12+
<PublishReadyToRun>true</PublishReadyToRun>
13+
<DebugType>embedded</DebugType>
914
</PropertyGroup>
1015

11-
<ItemGroup>
12-
<Compile Remove="Model\**" />
13-
<Compile Remove="Oodle\**" />
14-
<EmbeddedResource Remove="Model\**" />
15-
<EmbeddedResource Remove="Oodle\**" />
16-
<None Remove="Model\**" />
17-
<None Remove="Oodle\**" />
18-
</ItemGroup>
19-
20-
<ItemGroup>
16+
<ItemGroup>
17+
<None Remove="lib\archivehashes.zip" />
2118
<None Remove="lib\kraken.so" />
2219
</ItemGroup>
2320

@@ -33,12 +30,16 @@
3330

3431
<ItemGroup>
3532
<PackageReference Include="Luna.ConsoleProgressBar" Version="1.0.29" />
36-
<PackageReference Include="CsvHelper" Version="21.1.0" />
33+
<PackageReference Include="CsvHelper" Version="21.1.1" />
3734
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />
38-
<PackageReference Include="WolvenKit.Common" Version="1.0.0" />
39-
<PackageReference Include="WolvenKit.Cyberformats" Version="1.0.1" />
35+
<PackageReference Include="WolvenKit.Common" Version="1.0.2" GeneratePathProperty="true" />
36+
<PackageReference Include="WolvenKit.Cyberformats" Version="1.0.2" />
4037
</ItemGroup>
4138

39+
<ItemGroup>
40+
<None Include="$(PkgWolvenKit_Common)\contentFiles\any\net5.0-windows7.0\texconv.exe" CopyToOutputDirectory="PreserveNewest" />
41+
</ItemGroup>
42+
4243
<ItemGroup>
4344
<Content Include="lib\\kraken.dll" Condition=" '$(OS)' == 'Windows_NT' ">
4445
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -48,26 +49,4 @@
4849
</Content>
4950
</ItemGroup>
5051

51-
<ItemGroup>
52-
<Content Update="C:\Users\ghost\.nuget\packages\wolvenkit.common\1.0.0\contentFiles\any\net5.0-windows7.0\DDS\texconv.exe">
53-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
54-
</Content>
55-
<Content Update="C:\Users\ghost\.nuget\packages\wolvenkit.cyberformats\1.0.0\contentFiles\any\net5.0-windows7.0\Resources\archivehashes.zip">
56-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
57-
</Content>
58-
<Content Update="C:\Users\ghost\.nuget\packages\wolvenkit.cyberformats\1.0.1\contentFiles\any\net5.0-windows7.0\Resources\archivehashes.zip">
59-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
60-
</Content>
61-
</ItemGroup>
62-
63-
<ItemGroup>
64-
<None Update="oo2core_8_win64.dll">
65-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
66-
</None>
67-
</ItemGroup>
68-
69-
70-
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
71-
<DefineConstants>_WINDOWS</DefineConstants>
72-
</PropertyGroup>
7352
</Project>

‎CP77Tools/Commands/HashCommand.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,7 @@ public HashCommand() : base(Name, Description)
1313
{
1414
AddOption(new Option<string[]>(new[] {"--input", "-i"}, "Create FNV1A hash of given string"));
1515
AddOption(new Option<bool>(new[] {"--missing", "-m"}, ""));
16-
17-
AddCommand(new Command("update", "Update the Archived Hashes")
18-
{
19-
Handler = CommandHandler.Create(ConsoleFunctions.UpdateHashesAsync)
20-
});
21-
16+
2217
Handler = CommandHandler.Create<string[], bool>(ConsoleFunctions.HashTask);
2318
}
2419
}

‎CP77Tools/Program.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.ComponentModel;
77
using System.IO;
88
using System.Reflection;
9-
using CP77.CR2W.Resources;
109
using CP77Tools.Commands;
1110
using CP77Tools.Extensions;
1211
using Luna.ConsoleProgressBar;
@@ -31,7 +30,6 @@ public static async Task Main(string[] args)
3130

3231
ServiceLocator.Default.RegisterType<ILoggerService, LoggerService>();
3332
ServiceLocator.Default.RegisterType<IHashService, HashService>();
34-
ServiceLocator.Default.RegisterType<IAppSettingsService, AppSettingsService>();
3533

3634
var logger = ServiceLocator.Default.ResolveType<ILoggerService>();
3735
var hashService = ServiceLocator.Default.ResolveType<IHashService>();

‎CP77Tools/Tasks/HashTask.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,6 @@ public static int HashTask(string[] input, bool missing)
5454
}
5555

5656

57-
return 1;
58-
}
59-
60-
public static async Task<int> UpdateHashesAsync()
61-
{
62-
var hashService = ServiceLocator.Default.ResolveType<IHashService>();
63-
if (await hashService.RefreshAsync())
64-
{
65-
/*await*/ hashService.ReloadLocally();
66-
}
67-
6857
return 1;
6958
}
7059
}

0 commit comments

Comments
 (0)