Skip to content

Commit a047e91

Browse files
committed
fix: Resolved issue with SharpCompress version mismatch with parser
1 parent 2dbed20 commit a047e91

File tree

7 files changed

+27
-8
lines changed

7 files changed

+27
-8
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "Heroes.ReplayParser"]
22
path = Heroes.ReplayParser
3-
url = https://github.com/poma/Heroes.ReplayParser.git
3+
url = https://github.com/Heroes-Profile/Heroes.ReplayParser

Heroes.ReplayParser

Submodule Heroes.ReplayParser added at 5d5e4b8

Heroesprofile.Uploader.Common.Test/Heroesprofile.Uploader.Common.Test.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21+
<ProjectReference Include="..\Heroes.ReplayParser\Heroes.ReplayParser\Heroes.ReplayParser.csproj" />
2122
<ProjectReference Include="..\Heroesprofile.Uploader.Common\Heroesprofile.Uploader.Common.csproj" />
2223
</ItemGroup>
2324

Heroesprofile.Uploader.Common/Heroesprofile.Uploader.Common.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Heroes.ReplayParser" Version="1.2.10" />
1211
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
1312
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.0.0-pre-05" />
1413
<PackageReference Include="NLog" Version="4.5.11" />
@@ -17,5 +16,9 @@
1716
<ItemGroup>
1817
<Folder Include="Properties\" />
1918
</ItemGroup>
19+
20+
<ItemGroup>
21+
<ProjectReference Include="..\Heroes.ReplayParser\Heroes.ReplayParser\Heroes.ReplayParser.csproj" />
22+
</ItemGroup>
2023

2124
</Project>

Heroesprofile.Uploader.Windows/Heroesprofile.Uploader.Windows.csproj

+8-4
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383
<PackageReference Include="NLog.Config" Version="4.5.11" />
8484
<PackageReference Include="NLog.Schema" Version="4.5.11" />
8585
<PackageReference Include="NuGet.CommandLine" Version="4.3.0" />
86-
<PackageReference Include="SharpCompress" Version="0.24.0" />
86+
<PackageReference Include="SharpCompress" Version="0.17.1" />
8787
<PackageReference Include="Splat" Version="1.6.2" />
88-
<PackageReference Include="squirrel.windows" Version="1.7.8" />
88+
<PackageReference Include="squirrel.windows" Version="1.9.1" />
8989
</ItemGroup>
9090
<ItemGroup>
9191
<Reference Include="Microsoft.VisualBasic" />
@@ -181,8 +181,12 @@
181181
<Resource Include="uploader_icon_dark.ico" />
182182
<Resource Include="uploader_dark.png" />
183183
<Resource Include="uploader_light.png" />
184-
<Resource Include="Resources\uploader_dark.png" />
185-
<Resource Include="Resources\uploader_light.png" />
184+
<Resource Include="Resources\uploader_dark.png">
185+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
186+
</Resource>
187+
<Resource Include="Resources\uploader_light.png">
188+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
189+
</Resource>
186190
<EmbeddedResource Include="Properties\Resources.resx">
187191
<Generator>ResXFileCodeGenerator</Generator>
188192
<LastGenOutput>Resources.Designer.cs</LastGenOutput>

Heroesprofile.Uploader.Windows/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@
5252
// You can specify all the values or you can default the Build and Revision Numbers
5353
// by using the '*' as shown below:
5454
// [assembly: AssemblyVersion("1.0.*")]
55-
[assembly: AssemblyVersion("1.0.2")]
56-
[assembly: AssemblyFileVersion("1.0.2")]
55+
[assembly: AssemblyVersion("1.0.3")]
56+
[assembly: AssemblyFileVersion("1.0.3")]
5757
[assembly: AssemblyInformationalVersion("1.0.0")]

Heroesprofile.Uploader.sln

+10
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Heroesprofile.Uploader.Wind
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Heroesprofile.Uploader.Common.Test", "Heroesprofile.Uploader.Common.Test\Heroesprofile.Uploader.Common.Test.csproj", "{F0AF2897-857E-462E-86E0-2812624E2F78}"
1111
EndProject
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Heroes.ReplayParser", "Heroes.ReplayParser\Heroes.ReplayParser\Heroes.ReplayParser.csproj", "{85CFBB82-4AA8-49D8-874B-ED5D4EEEC3BB}"
13+
EndProject
1214
Global
1315
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1416
Debug|Any CPU = Debug|Any CPU
@@ -41,6 +43,14 @@ Global
4143
{F0AF2897-857E-462E-86E0-2812624E2F78}.Release|Any CPU.Build.0 = Release|Any CPU
4244
{F0AF2897-857E-462E-86E0-2812624E2F78}.Zip|Any CPU.ActiveCfg = Debug|Any CPU
4345
{F0AF2897-857E-462E-86E0-2812624E2F78}.Zip|Any CPU.Build.0 = Debug|Any CPU
46+
{85CFBB82-4AA8-49D8-874B-ED5D4EEEC3BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{85CFBB82-4AA8-49D8-874B-ED5D4EEEC3BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{85CFBB82-4AA8-49D8-874B-ED5D4EEEC3BB}.Installer|Any CPU.ActiveCfg = Debug|Any CPU
49+
{85CFBB82-4AA8-49D8-874B-ED5D4EEEC3BB}.Installer|Any CPU.Build.0 = Debug|Any CPU
50+
{85CFBB82-4AA8-49D8-874B-ED5D4EEEC3BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
51+
{85CFBB82-4AA8-49D8-874B-ED5D4EEEC3BB}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{85CFBB82-4AA8-49D8-874B-ED5D4EEEC3BB}.Zip|Any CPU.ActiveCfg = Debug|Any CPU
53+
{85CFBB82-4AA8-49D8-874B-ED5D4EEEC3BB}.Zip|Any CPU.Build.0 = Debug|Any CPU
4454
EndGlobalSection
4555
GlobalSection(SolutionProperties) = preSolution
4656
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)