Skip to content

Commit

Permalink
Update NLog 5.0 & Xamarin.*
Browse files Browse the repository at this point in the history
Fix System.TypeLoadException: Could not resolve type with token 01000026 from typeref (expected class 'Microsoft.Extensions.Primitives.InplaceStringBuilder' in assembly 'Microsoft.Extensions.Primitives, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60')
  • Loading branch information
AigioL committed May 18, 2022
1 parent 6fe0e5a commit 57da5ab
Show file tree
Hide file tree
Showing 35 changed files with 7,092 additions and 152 deletions.
29 changes: 15 additions & 14 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0')) ">
<!-- Entity Framework Plus -->
<!-- A FREE & Open Source library to enhance EF6 and EF Core -->
<PackageVersion Include="Z.EntityFramework.Plus.EFCore" Version="6.13.19" />
<PackageVersion Include="Z.EntityFramework.Plus.EFCore" Version="6.13.20" />

<!-- AspNetCore 6 OpenId/OAuth -->
<PackageVersion Include="AspNet.Security.OpenId.Steam" Version="6.0.0" />
Expand Down Expand Up @@ -77,6 +77,7 @@
<!--<PackageVersion Include="Microsoft.Windows.SDK.NET.Ref" Version="10.0.19041.22" />-->
<!--<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />-->
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.197" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="6.0.0" />

<!-- AppCenter.* -->
<PackageVersion Include="Microsoft.AppCenter" Version="4.5.1" />
Expand Down Expand Up @@ -107,10 +108,10 @@
<PackageVersion Include="Moq" Version="4.18.1" />

<!-- NLog -->
<PackageVersion Include="NLog" Version="4.7.15" />
<PackageVersion Include="NLog.Extensions.Logging" Version="1.7.4" />
<PackageVersion Include="NLog.Web.AspNetCore" Version="4.14.0" />
<PackageVersion Include="AspNetCore2.NETStandard.NLog.Web.AspNetCore" Version="4.14.0" />
<PackageVersion Include="NLog" Version="5.0.0" />
<PackageVersion Include="NLog.Extensions.Logging" Version="5.0.0" />
<PackageVersion Include="NLog.Web.AspNetCore" Version="5.0.0" />
<PackageVersion Include="AspNetCore2.NETStandard.NLog.Web.AspNetCore" Version="5.0.0" />

<!-- ReactiveUI -->
<PackageVersion Include="System.Reactive" Version="5.0.0" />
Expand Down Expand Up @@ -172,9 +173,9 @@
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.3.1" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.3.1" />
<PackageVersion Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.3.1" />
<PackageVersion Include="AspNetCore2.NETStandard.Swashbuckle.AspNetCore" Version="6.3.0" />
<PackageVersion Include="AspNetCore2.NETStandard.Swashbuckle.AspNetCore.Annotations" Version="6.3.0" />
<PackageVersion Include="AspNetCore2.NETStandard.Swashbuckle.AspNetCore.Newtonsoft" Version="6.3.0" />
<PackageVersion Include="AspNetCore2.NETStandard.Swashbuckle.AspNetCore" Version="6.3.1" />
<PackageVersion Include="AspNetCore2.NETStandard.Swashbuckle.AspNetCore.Annotations" Version="6.3.1" />
<PackageVersion Include="AspNetCore2.NETStandard.Swashbuckle.AspNetCore.Newtonsoft" Version="6.3.1" />

<!-- Pay -->
<!--<PackageVersion Include="AlipaySDKNet.Standard" Version="4.6.109" />-->
Expand Down Expand Up @@ -247,8 +248,8 @@
<!--Avalonia End-->

<!-- Xamarin.Android -->
<PackageVersion Include="Xamarin.Build.Download" Version="0.11.1" />
<PackageVersion Include="Xamarin.Google.Dagger" Version="2.39.1" />
<PackageVersion Include="Xamarin.Build.Download" Version="0.11.2" />
<PackageVersion Include="Xamarin.Google.Dagger" Version="2.40.5" />
<PackageVersion Include="Xamarin.Google.MLKit.BarcodeScanning" Version="116.1.2.5" />
<PackageVersion Include="Plugin.CurrentActivity" Version="2.1.0.4" />
<PackageVersion Include="de.hdodenhof.circleimageview" Version="3.1.0.4" />
Expand All @@ -261,17 +262,17 @@
<!-- V2Ray -->
<PackageVersion Include="XAB.AndroidLibV2rayLite" Version="1.0.0.1" />
<!--<PackageVersion Include="Karamunting.KotlinX.Coroutines.Core" Version="1.4.2" />-->
<PackageVersion Include="Xamarin.KotlinX.Coroutines.Core" Version="1.6.0.1" />
<PackageVersion Include="Xamarin.KotlinX.Coroutines.Android" Version="1.6.0.1" />
<PackageVersion Include="Xamarin.KotlinX.Coroutines.Core" Version="1.6.1" />
<PackageVersion Include="Xamarin.KotlinX.Coroutines.Android" Version="1.6.1" />
<PackageVersion Include="Xamarin.Android.ReactiveX.RxJava3.RxJava" Version="3.1.4.1" />

<!-- Xamarin.AndroidX -->
<PackageVersion Include="Xamarin.AndroidX.Migration" Version="1.0.8" />
<PackageVersion Include="Xamarin.AndroidX.Migration" Version="1.0.9" />
<PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.4.1.1" />
<PackageVersion Include="Xamarin.AndroidX.Emoji.AppCompat" Version="1.1.0.8" />
<PackageVersion Include="Xamarin.AndroidX.Fragment" Version="1.4.1.1" />
<PackageVersion Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.6" />
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.5.0.2" />
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.6.0" />
<PackageVersion Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.8" />
<PackageVersion Include="Xamarin.AndroidX.ConstraintLayout" Version="2.1.3.1" />
<PackageVersion Include="Xamarin.AndroidX.Navigation.UI" Version="2.4.2" />
Expand Down
34 changes: 33 additions & 1 deletion SteamToolsV2+.sln
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Avalonia.App.Msix
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FDELauncher", "src\FDELauncher\FDELauncher.csproj", "{7AAA8A01-A4FE-49AD-9664-AC53C4C8EAC6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Net.Http.Headers", "src\Microsoft.Net.Http.Headers\Microsoft.Net.Http.Headers.csproj", "{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1908,6 +1910,7 @@ Global
{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|x86.Build.0 = Release|Any CPU
{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|ARM.ActiveCfg = Debug|Any CPU
{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|ARM.Build.0 = Debug|Any CPU
{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|ARM64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -2160,6 +2163,34 @@ Global
{7AAA8A01-A4FE-49AD-9664-AC53C4C8EAC6}.Release|x64.Build.0 = Release|Any CPU
{7AAA8A01-A4FE-49AD-9664-AC53C4C8EAC6}.Release|x86.ActiveCfg = Release|Any CPU
{7AAA8A01-A4FE-49AD-9664-AC53C4C8EAC6}.Release|x86.Build.0 = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|ARM.ActiveCfg = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|ARM.Build.0 = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|ARM64.Build.0 = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|iPhone.Build.0 = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|x64.ActiveCfg = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|x64.Build.0 = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|x86.ActiveCfg = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Debug|x86.Build.0 = Debug|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|Any CPU.Build.0 = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|ARM.ActiveCfg = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|ARM.Build.0 = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|ARM64.ActiveCfg = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|ARM64.Build.0 = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|iPhone.ActiveCfg = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|iPhone.Build.0 = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|x64.ActiveCfg = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|x64.Build.0 = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|x86.ActiveCfg = Release|Any CPU
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -2234,9 +2265,10 @@ Global
{3950554F-7219-4AB9-9BE8-9B5EBDBCA88C} = {17667B53-1A09-45A6-855A-0F07F9AE044F}
{058F9955-8EFE-4BF3-A8F9-44C57B1F812E} = {17667B53-1A09-45A6-855A-0F07F9AE044F}
{FA9F0E89-E410-400A-86F3-C603E51E62A8} = {910D6A0F-42AB-4B65-B532-852E864EC006}
{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0} = {673FF8CD-9E85-4FA1-ABFC-D1149675E138}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9313F2B4-10DA-43AA-A481-CAA7571C740C}
RESX_NeutralResourcesLanguage = zh-Hans
SolutionGuid = {9313F2B4-10DA-43AA-A481-CAA7571C740C}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion references/ArchiSteamFarm
72 changes: 72 additions & 0 deletions src/Microsoft.Net.Http.Headers/BaseHeaderParser.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using Microsoft.Extensions.Primitives;

namespace Microsoft.Net.Http.Headers
{
internal abstract class BaseHeaderParser<T> : HttpHeaderParser<T>
{
protected BaseHeaderParser(bool supportsMultipleValues)
: base(supportsMultipleValues)
{
}

protected abstract int GetParsedValueLength(StringSegment value, int startIndex, out T parsedValue);

public sealed override bool TryParseValue(StringSegment value, ref int index, out T parsedValue)
{
parsedValue = default(T);

// If multiple values are supported (i.e. list of values), then accept an empty string: The header may
// be added multiple times to the request/response message. E.g.
// Accept: text/xml; q=1
// Accept:
// Accept: text/plain; q=0.2
if (StringSegment.IsNullOrEmpty(value) || (index == value.Length))
{
return SupportsMultipleValues;
}

var separatorFound = false;
var current = HeaderUtilities.GetNextNonEmptyOrWhitespaceIndex(value, index, SupportsMultipleValues,
out separatorFound);

if (separatorFound && !SupportsMultipleValues)
{
return false; // leading separators not allowed if we don't support multiple values.
}

if (current == value.Length)
{
if (SupportsMultipleValues)
{
index = current;
}
return SupportsMultipleValues;
}

T result;
var length = GetParsedValueLength(value, current, out result);

if (length == 0)
{
return false;
}

current = current + length;
current = HeaderUtilities.GetNextNonEmptyOrWhitespaceIndex(value, current, SupportsMultipleValues,
out separatorFound);

// If we support multiple values and we've not reached the end of the string, then we must have a separator.
if ((separatorFound && !SupportsMultipleValues) || (!separatorFound && (current < value.Length)))
{
return false;
}

index = current;
parsedValue = result;
return true;
}
}
}
Loading

0 comments on commit 57da5ab

Please sign in to comment.