Skip to content

Commit 2c57a1d

Browse files
committed
Merge branch 'master' into 'release'
Release 2.5.5 See merge request voltstro-studios/uwb/unitywebbrowser!8
2 parents cca549e + a50fca6 commit 2c57a1d

File tree

8 files changed

+26
-15
lines changed

8 files changed

+26
-15
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [2.2.5] - 2024-11-13
8+
9+
### Changed
10+
11+
- Update CEF to 130.1.16
12+
- Bump deps
13+
14+
### Fixed
15+
16+
- Add missing `System.Runtime.InteropServices` for `RuntimeInformation` and `Architecture` in `WebBrowserUtils` (#366)
17+
718
## [2.2.4] - 2024-10-26
819

920
### Fixed

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ItemGroup>
44
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
55
<PrivateAssets>all</PrivateAssets>
6-
<Version>3.6.143</Version>
6+
<Version>3.6.146</Version>
77
</PackageReference>
88
</ItemGroup>
99
</Project>

src/Packages/UnityWebBrowser/Runtime/Helper/WebBrowserUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public static Platform GetRunningPlatform()
145145
#elif UNITY_STANDALONE_LINUX
146146
return Platform.Linux64;
147147
#elif UNITY_STANDALONE_OSX
148-
return RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? Platform.MacOSArm64 : Platform.MacOS;
148+
return System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.Arm64 ? Platform.MacOSArm64 : Platform.MacOS;
149149
#endif
150150
}
151151

src/UnityWebBrowser.Engine.Cef/version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "2.2.3-130.1.2",
3+
"version": "2.2.3-130.1.16",
44
"publicReleaseRefSpec": [
55
"^refs/heads/master$"
66
],

src/UnityWebBrowser.Pages/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
},
1111
"devDependencies": {
1212
"@types/node": "^18.0.0",
13-
"typescript": "^5.6.2",
14-
"vite": "^5.4.8",
13+
"typescript": "^5.6.3",
14+
"vite": "^5.4.10",
1515
"vite-plugin-html": "^3.2.0",
1616
"vite-plugin-singlefile": "^2.0.2"
1717
}

src/UnityWebBrowser.Pages/yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -820,10 +820,10 @@ tslib@^2.0.3:
820820
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
821821
integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
822822

823-
typescript@^5.6.2:
824-
version "5.6.2"
825-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0"
826-
integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==
823+
typescript@^5.6.3:
824+
version "5.6.3"
825+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
826+
integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==
827827

828828
undici-types@~5.26.4:
829829
version "5.26.5"
@@ -860,10 +860,10 @@ vite-plugin-singlefile@^2.0.2:
860860
dependencies:
861861
micromatch "^4.0.7"
862862

863-
vite@^5.4.8:
864-
version "5.4.8"
865-
resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.8.tgz#af548ce1c211b2785478d3ba3e8da51e39a287e8"
866-
integrity sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==
863+
vite@^5.4.10:
864+
version "5.4.10"
865+
resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.10.tgz#d358a7bd8beda6cf0f3b7a450a8c7693a4f80c18"
866+
integrity sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==
867867
dependencies:
868868
esbuild "^0.21.3"
869869
postcss "^8.4.43"

src/VoltstroStudios.UnityWebBrowser.Engine.Shared/VoltstroStudios.UnityWebBrowser.Engine.Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Serilog" Version="4.0.2" />
12+
<PackageReference Include="Serilog" Version="4.1.0" />
1313
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
1414
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
1515
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />

0 commit comments

Comments
 (0)