From e12e78c0c7f407db2cc1159dc1809b4c9d1dad78 Mon Sep 17 00:00:00 2001 From: Xian55 <367101+Xian55@users.noreply.github.com> Date: Fri, 13 Sep 2024 23:29:28 +0200 Subject: [PATCH] Solution: set sdk version to '9.0.100-rc.1' Core: RequirementFactory: Update GetAlternateLookup api changes. --- Core/Requirement/RequirementFactory.cs | 4 +-- Directory.Packages.props | 39 +++++++++++++------------- MasterOfPuppets.sln | 4 ++- global.json | 6 ++-- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/Core/Requirement/RequirementFactory.cs b/Core/Requirement/RequirementFactory.cs index 05ab517c..f9619d4e 100644 --- a/Core/Requirement/RequirementFactory.cs +++ b/Core/Requirement/RequirementFactory.cs @@ -1136,7 +1136,7 @@ private Requirement CreateArithmetic(ReadOnlySpan symbol, ReadOnlySpan key = requirement[..sep].Trim(); ReadOnlySpan varOrConst = requirement[(sep + symbol.Length)..]; - var spanLookup = intVariables.GetAlternateLookup, ReadOnlySpan>(); + var spanLookup = intVariables.GetAlternateLookup>(); if (!spanLookup.TryGetValue(key, out Func? aliasOrKey)) { LogUnknown(logger, requirement.ToString(), string.Join(", ", intVariables.Keys)); @@ -1200,7 +1200,7 @@ private Requirement CreateArithmetic(ReadOnlySpan symbol, ReadOnlySpan> intVariables, ReadOnlySpan count_or_variable) { - var spanLookup = intVariables.GetAlternateLookup, ReadOnlySpan>(); + var spanLookup = intVariables.GetAlternateLookup>(); return spanLookup.TryGetValue(count_or_variable, out Func? countFunc) ? countFunc() : int.Parse(count_or_variable); diff --git a/Directory.Packages.props b/Directory.Packages.props index 8b02b24c..95e22a88 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,7 +4,6 @@ true AnyCPU;x64;x86 - @@ -13,37 +12,37 @@ - - - - + + + + - - + + - + - + + - - - - - - - - + + + + + + + + - - - + + \ No newline at end of file diff --git a/MasterOfPuppets.sln b/MasterOfPuppets.sln index ae608b4d..93bc7be7 100644 --- a/MasterOfPuppets.sln +++ b/MasterOfPuppets.sln @@ -9,6 +9,8 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3F5D9F67-D788-4811-BB08-F28134BD5DA4}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + Directory.Packages.props = Directory.Packages.props + global.json = global.json EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PathingAPI", "PathingAPI\PathingAPI.csproj", "{1FCAB55D-8AA5-4E68-9502-6C27D9BEF252}" @@ -31,7 +33,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Frontend", "Frontend\Fronte EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HeadlessServer", "HeadlessServer\HeadlessServer.csproj", "{8364AC12-DBF5-4DFF-B3A2-87472413DE01}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarks", "Benchmarks\Benchmarks.csproj", "{488984A0-F158-4EDA-A2CB-57C10D8596E1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks", "Benchmarks\Benchmarks.csproj", "{488984A0-F158-4EDA-A2CB-57C10D8596E1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/global.json b/global.json index bbbd4341..c2088b1f 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { - "sdk": { - "version": "9.0.100-preview.7" - } + "sdk": { + "version": "9.0.100-rc.1" + } } \ No newline at end of file