Skip to content

Commit 5182e9a

Browse files
committed
Updated Fody;
Minor fix.
1 parent 0c6699e commit 5182e9a

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

src/FreeLauncher/FreeLauncher.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -308,9 +308,9 @@
308308
<ErrorText>Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их. Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText>
309309
</PropertyGroup>
310310
<Error Condition="!Exists('..\..\packages\EmptyLicensesLicx.1.1.0\build\EmptyLicensesLicx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EmptyLicensesLicx.1.1.0\build\EmptyLicensesLicx.targets'))" />
311-
<Error Condition="!Exists('..\..\packages\Fody.3.1.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.3.1.3\build\Fody.targets'))" />
312311
<Error Condition="!Exists('..\..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets'))" />
312+
<Error Condition="!Exists('..\..\packages\Fody.3.1.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.3.1.4\build\Fody.targets'))" />
313313
</Target>
314-
<Import Project="..\..\packages\Fody.3.1.3\build\Fody.targets" Condition="Exists('..\..\packages\Fody.3.1.3\build\Fody.targets')" />
315314
<Import Project="..\..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets" Condition="Exists('..\..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets')" />
315+
<Import Project="..\..\packages\Fody.3.1.4\build\Fody.targets" Condition="Exists('..\..\packages\Fody.3.1.4\build\Fody.targets')" />
316316
</Project>

src/FreeLauncher/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("0.2.3.1792")]
35-
[assembly: AssemblyFileVersion("0.2.3.1792")]
34+
[assembly: AssemblyVersion("0.2.3.1794")]
35+
[assembly: AssemblyFileVersion("0.2.3.1794")]

src/FreeLauncher/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<package id="Costura.Fody" version="3.1.0" targetFramework="net461" />
55
<package id="DotNetZip" version="1.11.0" targetFramework="net461" />
66
<package id="EmptyLicensesLicx" version="1.1.0" targetFramework="net461" developmentDependency="true" />
7-
<package id="Fody" version="3.1.3" targetFramework="net461" developmentDependency="true" />
7+
<package id="Fody" version="3.1.4" targetFramework="net461" developmentDependency="true" />
88
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
99
</packages>

src/dotMCLauncher.Versioning/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// Можно задать все значения или принять номера сборки и редакции по умолчанию
3232
// используя "*", как показано ниже:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("18.8.11.49")]
35-
[assembly: AssemblyFileVersion("18.8.11.49")]
34+
[assembly: AssemblyVersion("18.8.11.51")]
35+
[assembly: AssemblyFileVersion("18.8.11.51")]

src/dotMCLauncher.Versioning/VersionManifest/VersionManifest.cs

+7-8
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ private JObject ArgumentGroups
129129
[JsonIgnore]
130130
public string GetClientDownloadUrl
131131
=>
132-
DownloadInfo?.Client.Url ??
133-
$@"https://s3.amazonaws.com/Minecraft.Download/versions/{VersionId}/{VersionId}.jar";
132+
DownloadInfo?.Client.Url ??
133+
$@"https://s3.amazonaws.com/Minecraft.Download/versions/{VersionId}/{VersionId}.jar";
134134

135135
/// <summary>
136136
/// Parses build's JSON file.
@@ -213,13 +213,12 @@ public string GetBaseJar()
213213

214214
public string BuildArgumentsByGroup(ArgumentsGroupType group, Dictionary<string, string> jvmArgumentDictionary, IEnumerable<Rule> rulesFilter)
215215
{
216-
string toReturn = string.Empty;
217-
toReturn = ArgGroups.FirstOrDefault(
216+
IEnumerable<Rule> rules = rulesFilter as Rule[] ?? rulesFilter.ToArray();
217+
string toReturn = ArgGroups.FirstOrDefault(
218218
ag => ag.Type == group)?
219-
.ToString(jvmArgumentDictionary, rulesFilter.ToArray()) ?? string.Empty;
220-
if (InheritableVersionManifest != null && InheritableVersionManifest.Type == VersionManifestType.V2)
221-
{
222-
toReturn = (toReturn == string.Empty ? string.Empty : toReturn + " ") + InheritableVersionManifest.BuildArgumentsByGroup(group, jvmArgumentDictionary, rulesFilter);
219+
.ToString(jvmArgumentDictionary, rules.ToArray()) ?? string.Empty;
220+
if (InheritableVersionManifest != null && InheritableVersionManifest.Type == VersionManifestType.V2) {
221+
toReturn = (toReturn == string.Empty ? string.Empty : toReturn + " ") + InheritableVersionManifest.BuildArgumentsByGroup(group, jvmArgumentDictionary, rules);
223222
}
224223
return toReturn;
225224
}

0 commit comments

Comments
 (0)