Merge branch 'dev' into net8

Piotrekol · Nov 4, 2024 · b6607ad · b6607ad
2 parents bb1cd50 + 2641e45
commit b6607ad
Show file tree

Hide file tree

Showing 23 changed files with 452 additions and 236 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,5 +1,35 @@
 <Project>
-	<ItemGroup>
-		<PackageReference Include="StreamCompanionTypes" version="9.0.0" />
-	</ItemGroup>
-</Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
+  </PropertyGroup>
+  <ItemGroup>
+	  <PackageReference Include="StreamCompanionTypes" />
+  </ItemGroup>
+  <ItemGroup>
+	<PackageVersion Include="StreamCompanionTypes" version="9.0.0" />
+	<PackageVersion Include="CollectionManager" Version="1.0.8" />
+    <PackageVersion Include="EmbedIO" Version="3.4.3" />
+    <PackageVersion Include="Fody" Version="6.3.0" />
+    <PackageVersion Include="Grace" Version="7.2.0" />
+    <PackageVersion Include="Jace" Version="1.0.0" />
+    <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="NUnit" Version="4.2.2" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageVersion Include="OsuMemoryDataProvider" Version="0.10.3" />
+    <PackageVersion Include="PropertyChanged.Fody" Version="3.3.0" />
+    <PackageVersion Include="ScottPlot.WPF" Version="4.0.48" />
+    <PackageVersion Include="Sentry" Version="4.12.1" />
+    <PackageVersion Include="SharpCompress" Version="0.38.0" />
+    <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="5.0.0" />
+    <PackageVersion Include="System.Data.DataSetExtensions" Version="4.5.0" />
+    <PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
+    <PackageVersion Include="System.Runtime.Caching" Version="5.0.0" />
+    <PackageVersion Include="System.Security.AccessControl" Version="5.0.0" />
+    <PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
+  </ItemGroup>
+</Project>
diff --git a/PpCalculator/PpCalculator.csproj b/PpCalculator/PpCalculator.csproj
@@ -5,9 +5,6 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <LangVersion>11.0</LangVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="ppy.ManagedBass" Version="2022.1216.0" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PpCalculatorTypes\PpCalculatorTypes.csproj" />
     <ProjectReference Include="..\submodules\osu\osu.Game\osu.Game.csproj" />

diff --git a/PpCalculatorTests/PpCalculatorTests.csproj b/PpCalculatorTests/PpCalculatorTests.csproj
@@ -9,9 +9,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-		<PackageReference Include="NUnit" Version="4.2.2" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" />
+		<PackageReference Include="NUnit" />
+		<PackageReference Include="NUnit3TestAdapter" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\PpCalculator\PpCalculator.csproj" />

diff --git a/PpCalculatorTypes/PpCalculatorTypes.csproj b/PpCalculatorTypes/PpCalculatorTypes.csproj
@@ -4,6 +4,6 @@
     <LangVersion>11.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" />
   </ItemGroup>
 </Project>
diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+  <packageSourceMapping>
+    <packageSource key="nuget.org">
+      <package pattern="*" />
+    </packageSource>
+  </packageSourceMapping>
+</configuration>
diff --git a/osu!StreamCompanion/Code/Modules/MapDataReplacements/Map/MapReplacement.cs b/osu!StreamCompanion/Code/Modules/MapDataReplacements/Map/MapReplacement.cs
@@ -11,6 +11,7 @@
 using StreamCompanionTypes.Interfaces.Sources;
 using System;
 using System.Globalization;
+using Jace.Tokenizer;
 
 namespace osu_StreamCompanion.Code.Modules.MapDataReplacements.Map
 {
@@ -25,8 +26,17 @@ public MapReplacement(ILogger logger, ISettings settings)
         {
             _settings = settings;
             _tokenSetter = Tokens.CreateTokenSetter("MapReplacements");
+            PrepareTokens();
+        }
 
+        private void PrepareTokens()
+        {
+            foreach (var token in GetTokens(new Beatmap()))
+            {
+                _ = _tokenSetter(token.Key, token.Value);
+            }
         }
+
         public void Start(ILogger logger)
         {
             Started = true;

diff --git a/osu!StreamCompanion/osu!StreamCompanion.csproj b/osu!StreamCompanion/osu!StreamCompanion.csproj
@@ -71,33 +71,21 @@
     <Content Include="Resources\compiled.ico" />
     <EmbeddedResource Include="Resources\logo_256x256.png" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.7.1">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.7.1 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PpCalculatorTypes\PpCalculatorTypes.csproj" ExcludeAssets="all" />
     <ProjectReference Include="..\PpCalculator\PpCalculator.csproj" ExcludeAssets="all" />
     <ProjectReference Include="..\StreamCompanion.Common\StreamCompanion.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CollectionManager" version="1.0.8" />
-    <PackageReference Include="Grace" Version="7.2.0" />
-    <PackageReference Include="Jace" Version="1.0.0" />
-    <PackageReference Include="Sentry" Version="4.12.1" />
-    <PackageReference Include="SharpCompress" Version="0.38.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.6" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
+	<PackageReference Include="CollectionManager" />
+	<PackageReference Include="Grace" />
+	<PackageReference Include="Jace" />
+	<PackageReference Include="Sentry" />
+	<PackageReference Include="SharpCompress" />
+	<PackageReference Include="Newtonsoft.Json" />
+	<PackageReference Include="System.ComponentModel.Composition" />
+	<PackageReference Include="System.Drawing.Common" />
+	<PackageReference Include="System.Security.AccessControl" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">

diff --git a/plugins/IngameOverlays/BrowserOverlay/BrowserOverlay.cs b/plugins/IngameOverlays/BrowserOverlay/BrowserOverlay.cs
@@ -95,8 +95,20 @@ private void OnSettingUpdated(object sender, (string SettingName, object Value)?
             _settings.Add(BrowserOverlayConfigurationConfigEntry, _browserOverlayConfiguration);
             SendConfiguration();
 
-            if (eventData != null && eventData.Value.SettingName == "enable")
-                _restarter($"Browser overlay was toggled. isEnabled:{eventData.Value.Value}");
+            if (eventData == null)
+            {
+                return;
+            }
+
+            switch (eventData.Value.SettingName)
+            {
+                case "enable":
+                    _restarter($"Browser overlay was toggled. Enabled:{eventData.Value.Value}");
+                    break;
+                case "osuCheck":
+                    _restarter($"Browser overlay osu startup check was toggled. Enabled:{eventData.Value.Value}");
+                    break;
+            }
         }
 
         private bool TryRemoveOldAssets()
@@ -165,7 +177,7 @@ private async Task Initialize()
                 return;
             }
 
-            _loaderWatchdog = new LoaderWatchdog(_logger, GetFullDllLocation(_saver), new Progress<OverlayReport>(HandleOverlayReport));
+            _loaderWatchdog = new LoaderWatchdog(_logger, GetFullDllLocation(_saver), new Progress<OverlayReport>(HandleOverlayReport), _browserOverlayConfiguration.BypassOsuStartupCheck);
             _ = _loaderWatchdog.WatchForProcessStart(CancellationToken.None).HandleExceptions();
             return;
         }
@@ -247,6 +259,7 @@ private void ClientOnDownloadProgressChanged(object sender, DownloadProgressChan
     public class Configuration
     {
         public bool Enabled { get; set; } = true;
+        public bool BypassOsuStartupCheck { get; set; } = false;
         public List<OverlayTab> OverlayTabs { get; set; }
     }
     public class OverlayTab