Merge branch 'master' into 'release'

Release 2.5.5 See merge request voltstro-studios/uwb/unitywebbrowser!8
Voltstro-Studios · Nov 13, 2024 · 2c57a1d · 2c57a1d
2 parents cca549e + a50fca6
commit 2c57a1d
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.5] - 2024-11-13
+
+### Changed
+
+- Update CEF to 130.1.16
+- Bump deps
+
+### Fixed
+
+- Add missing `System.Runtime.InteropServices` for `RuntimeInformation` and `Architecture` in `WebBrowserUtils` (#366)
+
 ## [2.2.4] - 2024-10-26
 
 ### Fixed

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -3,7 +3,7 @@
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
       <PrivateAssets>all</PrivateAssets>
-      <Version>3.6.143</Version>
+      <Version>3.6.146</Version>
     </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/src/Packages/UnityWebBrowser/Runtime/Helper/WebBrowserUtils.cs b/src/Packages/UnityWebBrowser/Runtime/Helper/WebBrowserUtils.cs
@@ -145,7 +145,7 @@ public static Platform GetRunningPlatform()
 #elif UNITY_STANDALONE_LINUX
             return Platform.Linux64;
 #elif UNITY_STANDALONE_OSX
-            return RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? Platform.MacOSArm64 : Platform.MacOS;
+            return System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.Arm64 ? Platform.MacOSArm64 : Platform.MacOS;
 #endif
         }
 

diff --git a/src/ThirdParty/CefGlue b/src/ThirdParty/CefGlue
diff --git a/src/UnityWebBrowser.Engine.Cef/version.json b/src/UnityWebBrowser.Engine.Cef/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.2.3-130.1.2",
+  "version": "2.2.3-130.1.16",
   "publicReleaseRefSpec": [
     "^refs/heads/master$"
   ],

diff --git a/src/UnityWebBrowser.Pages/package.json b/src/UnityWebBrowser.Pages/package.json
@@ -10,8 +10,8 @@
   },
   "devDependencies": {
     "@types/node": "^18.0.0",
-    "typescript": "^5.6.2",
-    "vite": "^5.4.8",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.10",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-singlefile": "^2.0.2"
   }

diff --git a/src/UnityWebBrowser.Pages/yarn.lock b/src/UnityWebBrowser.Pages/yarn.lock
@@ -820,10 +820,10 @@ tslib@^2.0.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
   integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
 
-typescript@^5.6.2:
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0"
-  integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==
+typescript@^5.6.3:
+  version "5.6.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
+  integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==
 
 undici-types@~5.26.4:
   version "5.26.5"
@@ -860,10 +860,10 @@ vite-plugin-singlefile@^2.0.2:
   dependencies:
     micromatch "^4.0.7"
 
-vite@^5.4.8:
-  version "5.4.8"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.8.tgz#af548ce1c211b2785478d3ba3e8da51e39a287e8"
-  integrity sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==
+vite@^5.4.10:
+  version "5.4.10"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.10.tgz#d358a7bd8beda6cf0f3b7a450a8c7693a4f80c18"
+  integrity sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==
   dependencies:
     esbuild "^0.21.3"
     postcss "^8.4.43"

diff --git a/...tudios.UnityWebBrowser.Engine.Shared/VoltstroStudios.UnityWebBrowser.Engine.Shared.csproj b/...tudios.UnityWebBrowser.Engine.Shared/VoltstroStudios.UnityWebBrowser.Engine.Shared.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Serilog" Version="4.0.2" />
+        <PackageReference Include="Serilog" Version="4.1.0" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
         <PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />