Solution: set sdk version to '9.0.100-rc.1'

Core: RequirementFactory: Update GetAlternateLookup api changes.
Xian55 · Sep 13, 2024 · e12e78c · e12e78c
1 parent 5218387
commit e12e78c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 26 deletions.
diff --git a/Core/Requirement/RequirementFactory.cs b/Core/Requirement/RequirementFactory.cs
@@ -1136,7 +1136,7 @@ private Requirement CreateArithmetic(ReadOnlySpan<char> symbol, ReadOnlySpan<cha
         ReadOnlySpan<char> key = requirement[..sep].Trim();
         ReadOnlySpan<char> varOrConst = requirement[(sep + symbol.Length)..];
 
-        var spanLookup = intVariables.GetAlternateLookup<string, Func<int>, ReadOnlySpan<char>>();
+        var spanLookup = intVariables.GetAlternateLookup<ReadOnlySpan<char>>();
         if (!spanLookup.TryGetValue(key, out Func<int>? aliasOrKey))
         {
             LogUnknown(logger, requirement.ToString(), string.Join(", ", intVariables.Keys));
@@ -1200,7 +1200,7 @@ private Requirement CreateArithmetic(ReadOnlySpan<char> symbol, ReadOnlySpan<cha
 
     private static int GetIntValueOrVariable(Dictionary<string, Func<int>> intVariables, ReadOnlySpan<char> count_or_variable)
     {
-        var spanLookup = intVariables.GetAlternateLookup<string, Func<int>, ReadOnlySpan<char>>();
+        var spanLookup = intVariables.GetAlternateLookup<ReadOnlySpan<char>>();
         return spanLookup.TryGetValue(count_or_variable, out Func<int>? countFunc)
             ? countFunc()
             : int.Parse(count_or_variable);

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,7 +4,6 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
-
   <ItemGroup>
     <!-- Define package versions -->
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
@@ -13,37 +12,37 @@
     <PackageVersion Include="Serilog.Enrichers.Process" Version="3.0.0" />
     <PackageVersion Include="Serilog.Expressions" Version="5.0.1-dev-00182" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.1-dev-10398" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-preview.7.24405.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="9.0.0-preview.7.24406.2" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-preview.7.24405.7" />
-    <PackageVersion Include="System.Net.Http.Json" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rc.1.24431.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="9.0.0-rc.1.24452.1" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rc.1.24431.7" />
+    <PackageVersion Include="System.Net.Http.Json" Version="9.0.0-rc.1.24431.7" />
     <PackageVersion Include="GameOverlay.Net" Version="4.3.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.7.24405.7" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.1.24431.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0-rc.1.24431.7" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.0-preview.7.24405.4" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.0-rc.1.24451.1" />
     <PackageVersion Include="BlazorTable" Version="1.17.0" />
     <PackageVersion Include="MatBlazor" Version="2.10.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0-preview.7.24406.2" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0-rc.1.24452.1" />
     <PackageVersion Include="GregsStack.InputSimulatorStandard" Version="1.3.5" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
     <PackageVersion Include="TextCopy" Version="6.2.1" />
     <PackageVersion Include="Vortice.Direct3D11" Version="3.5.13-beta" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0-preview.7.24405.7" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-preview.7.24405.7" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0-preview.7.24405.7" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-preview.7.24405.7" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.7.24405.7" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0-preview.7.24405.7" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.7.24405.7" />
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0-rc.1.24431.7" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rc.1.24431.7" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0-rc.1.24431.7" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rc.1.24431.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rc.1.24431.7" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.1.24431.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0-rc.1.24431.7" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rc.1.24431.7" />
     <PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.2" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.7.3" />
     <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.5" />
-    <PackageVersion Include="System.Management" Version="9.0.0-preview.7.24405.7" />
-  </ItemGroup>
-
+    <PackageVersion Include="System.Management" Version="9.0.0-rc.1.24431.7" />
+  </ItemGroup>	
 </Project>
diff --git 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
@@ -1,5 +1,5 @@
 {
-    "sdk": {
-        "version": "9.0.100-preview.7"
-    }
+  "sdk": {
+    "version": "9.0.100-rc.1"
+  }
 }