Skip to content

Commit 5c8dde5

Browse files
authored
Merge pull request #34 from Heroes-Profile/AssemblyVersionSave
Assembly version save
2 parents 2624d96 + 11395c3 commit 5c8dde5

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<AssemblyName>Heroesprofile.Uploader.Common</AssemblyName>
77
<RootNamespace>Heroesprofile.Uploader.Common</RootNamespace>
88
<Version>1.0.4</Version>
9-
<AssemblyVersion>1.0.9.0</AssemblyVersion>
9+
<AssemblyVersion>2.4.0</AssemblyVersion>
1010
</PropertyGroup>
1111

1212
<ItemGroup>

Heroesprofile.Uploader.Common/Uploader.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Heroes.ReplayParser;
1010
using System.IO;
1111
using System.Diagnostics;
12+
using System.Reflection;
1213

1314
namespace Heroesprofile.Uploader.Common
1415
{
@@ -58,10 +59,14 @@ public async Task Upload(Replay replay_results, ReplayFile file, bool PostMatchP
5859
/// <returns>Upload result</returns>
5960
public async Task<UploadStatus> Upload(Replay replay_results, string fingerprint, string file, bool PostMatchPage)
6061
{
62+
Assembly assembly = Assembly.GetExecutingAssembly();
63+
AssemblyName assemblyName = assembly.GetName();
64+
Version assemblyVersion = assemblyName.Version;
65+
6166
try {
6267
string response;
6368
using (var client = new WebClient()) {
64-
var bytes = await client.UploadFileTaskAsync($"{HeroesProfileApiEndpoint}/upload/heroesprofile/desktop/?fingerprint={fingerprint}", file);
69+
var bytes = await client.UploadFileTaskAsync($"{HeroesProfileApiEndpoint}/upload/heroesprofile/desktop/?fingerprint={fingerprint}&version={assemblyVersion}", file);
6570
response = Encoding.UTF8.GetString(bytes);
6671
}
6772

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@
8686
<PackageReference Include="NuGet.CommandLine" Version="4.3.0" />
8787
<PackageReference Include="SharpCompress" Version="0.17.1" />
8888
<PackageReference Include="Splat" Version="1.6.2" />
89-
<PackageReference Include="squirrel.windows" Version="1.9.1" />
89+
<PackageReference Include="squirrel.windows">
90+
<Version>1.7.8</Version>
91+
</PackageReference>
9092
</ItemGroup>
9193
<ItemGroup>
9294
<Reference Include="Microsoft.VisualBasic" />
@@ -222,7 +224,7 @@
222224
<NuGetCommandLine Include="$(UserProfile)\.nuget\packages\NuGet.CommandLine\4.3.0\tools\nuget.exe">
223225
<InProject>False</InProject>
224226
</NuGetCommandLine>
225-
<Squirrel Include="$(UserProfile)\.nuget\packages\Squirrel.Windows\1.7.8\tools\squirrel.exe">
227+
<Squirrel Include="$(UserProfile)\.nuget\packages\Squirrel.Windows\1.9.1\tools\squirrel.exe">
226228
<InProject>False</InProject>
227229
</Squirrel>
228230
</ItemGroup>
@@ -257,4 +259,4 @@
257259
<Move SourceFiles="../Releases/Setup.exe" DestinationFiles="../Releases/HotsApiUploaderSetup.exe" />
258260
<Message Importance="High" Text="Successfully created setup package" />
259261
</Target>
260-
</Project>
262+
</Project>

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("2.3.1")]
56-
[assembly: AssemblyFileVersion("2.3.1")]
55+
[assembly: AssemblyVersion("2.4.0")]
56+
[assembly: AssemblyFileVersion("2.4.0")]
5757
[assembly: AssemblyInformationalVersion("1.0.0")]

Heroesprofile.Uploader.Windows/SquirrelRelease.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88

99
5: CD to Installer directory
1010

11-
6: Squirrel --releasify=Heroesprofile.Uploader.2.3.1.nupkg --no-msi --setupIcon=uploader_icon_light.ico
11+
6: Squirrel --releasify=Heroesprofile.Uploader.2.4.0.nupkg --no-msi --setupIcon=uploader_icon_light.ico

0 commit comments

Comments
 (0)