Skip to content

Commit dcd41cf

Browse files
authored
Merge pull request #436 from immutable/fix/windows-warnings
[DX-3621] fix: windows warnings
2 parents 459502f + 6dd1f8a commit dcd41cf

File tree

6 files changed

+20
-21
lines changed

6 files changed

+20
-21
lines changed

sample/Assets/Editor/MacBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public static void RemoveAltFromScene(string scene)
114114
var sceneToModify = EditorSceneManager.OpenScene(scene);
115115

116116
// Find the AltTesterPrefab instance in the scene
117-
var altRunner = GameObject.FindObjectOfType<AltRunner>();
117+
var altRunner = GameObject.FindFirstObjectByType<AltRunner>();
118118

119119
if (altRunner != null)
120120
{

sample/Assets/Editor/MobileBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private static string GetBundleIdentifierFromArgs()
9898
return "com.immutable.Immutable-Sample";
9999
}
100100

101-
private static string GetAltTesterHostFromArgs()
101+
private static string? GetAltTesterHostFromArgs()
102102
{
103103
string[] args = Environment.GetCommandLineArgs();
104104
for (int i = 0; i < args.Length; i++)
@@ -165,7 +165,7 @@ public static void RemoveAltFromScene(string scene)
165165
var sceneToModify = EditorSceneManager.OpenScene(scene);
166166

167167
// Find the AltTesterPrefab instance in the scene
168-
var altRunner = GameObject.FindObjectOfType<AltRunner>();
168+
var altRunner = GameObject.FindFirstObjectByType<AltRunner>();
169169

170170
if (altRunner != null)
171171
{

sample/Assets/Editor/WindowsBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public static void RemoveAltFromScene(string scene)
114114
var sceneToModify = EditorSceneManager.OpenScene(scene);
115115

116116
// Find the AltTesterPrefab instance in the scene
117-
var altRunner = GameObject.FindObjectOfType<AltRunner>();
117+
var altRunner = GameObject.FindFirstObjectByType<AltRunner>();
118118

119119
if (altRunner != null)
120120
{

sample/Assets/Scripts/Passport/AuthenticatedScript.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class AuthenticatedScript : MonoBehaviour
3737
private Passport Passport;
3838
#pragma warning restore CS8618
3939

40-
async void Start()
40+
void Start()
4141
{
4242
if (Passport.Instance != null)
4343
{
@@ -165,8 +165,8 @@ public async void GetLinkedAddresses()
165165
{
166166
ShowOutput($"Failed to get linked addresses: {ex.Message}");
167167
}
168-
}
169-
168+
}
169+
170170
/// <summary>
171171
/// Navigates to Link Wallet scene.
172172
/// </summary>

sample/Assets/Scripts/Passport/SelectAuthMethodScript.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void UsePKCE()
8181
/// authorisation has been granted by the user</param>
8282
/// <param name="logoutRedirectUri">The URL to which auth will redirect the browser
8383
/// after log out is complete</param>
84-
private async void InitialisePassport(string redirectUri = null, string logoutRedirectUri = null)
84+
private async void InitialisePassport(string? redirectUri = null, string? logoutRedirectUri = null)
8585
{
8686
ShowOutput("Initialising Passport...");
8787

src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Runtime/UwbWebView.cs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,25 @@ public async UniTask Init(int engineStartupTimeoutMs)
6262
webBrowserClient.initialUrl = GameBridge.GetFilePath();
6363

6464
// Set up engine
65-
webBrowserClient.engine = new EngineConfiguration
65+
EngineConfiguration engineConfig = ScriptableObject.CreateInstance<EngineConfiguration>();
66+
engineConfig.engineAppName = "UnityWebBrowser.Engine.Cef";
67+
engineConfig.engineFiles = new Engine.EnginePlatformFiles[]
6668
{
67-
engineFiles = new Engine.EnginePlatformFiles[]
69+
new Engine.EnginePlatformFiles()
6870
{
69-
new()
70-
{
71-
platform = Platform.Windows64,
72-
engineBaseAppLocation = "",
73-
engineRuntimeLocation = "UWB/"
71+
platform = Platform.Windows64,
72+
engineBaseAppLocation = "",
73+
engineRuntimeLocation = "UWB/"
7474
#if UNITY_EDITOR
75-
,
76-
engineEditorLocation = "Packages/com.immutable.passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Engine~"
75+
,
76+
engineEditorLocation = "Packages/com.immutable.passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Engine~"
7777
#endif
78-
}
79-
},
80-
engineAppName = "UnityWebBrowser.Engine.Cef"
78+
}
8179
};
80+
webBrowserClient.engine = engineConfig;
8281

8382
// Find available ports
84-
var tcpCommunicationLayer = new TCPCommunicationLayer();
83+
TCPCommunicationLayer tcpCommunicationLayer = ScriptableObject.CreateInstance<TCPCommunicationLayer>();
8584
var rnd = new System.Random();
8685
do
8786
{

0 commit comments

Comments
 (0)