Skip to content

Commit 94aaceb

Browse files
avdynutavdynut
committed
v0.1.7
1 parent ed3811f commit 94aaceb

File tree

11 files changed

+67
-80
lines changed

11 files changed

+67
-80
lines changed

‎.github/workflows/build-package.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build XRSharp.CommunityToolkit
22
env:
33
package-source-myget: 'https://www.myget.org/F/xrsharp/api/v2/package'
44
nuget: 'https://api.nuget.org/v3/index.json'
5-
package-version: '0.1.6'
5+
package-version: '0.1.7'
66
suffix: 'preview'
77
on:
88
push:

‎build/build-nuget-package-XRSharp-CommunityToolkit-cicd.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ set "currentdatetime=%currentdatetime: =0%"
1111

1212
rem If argument 1 is not given, use default value for PackageVersion:
1313
set "PackageVersion=%~1"
14-
if not defined PackageVersion set "PackageVersion=0.1.6-private-%currentdatetime%"
14+
if not defined PackageVersion set "PackageVersion=0.1.7-private-%currentdatetime%"
1515

1616
rem If argument 2 is not given, use default value for XRSharpVersion:
1717
set "XRSharpVersion=%~2"
18-
if not defined XRSharpVersion set "XRSharpVersion=0.1.6-preview-2024-01-11-062323-28482d56"
18+
if not defined XRSharpVersion set "XRSharpVersion=0.1.7-preview-2024-07-03-083945-ec96f694"
1919

2020
if not exist "nuspec/XRSharp.CommunityToolkit.nuspec" (
2121
echo Wrong working directory. Please navigate to the folder that contains the BAT file before executing it.

‎build/build-nuget-package-XRSharp-CommunityToolkit-private.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ rem Define the escape character for colored text
1010
for /F %%a in ('"prompt $E$S & echo on & for %%b in (1) do rem"') do set "ESC=%%a"
1111

1212
rem Define the "%PackageVersion%" variable:
13-
set /p PackageVersion="%ESC%[92mXRSharp.CommunityToolkit version:%ESC%[0m 0.1.6-private-"
13+
set /p PackageVersion="%ESC%[92mXRSharp.CommunityToolkit version:%ESC%[0m 0.1.7-private-"
1414

15-
set PackageVersion="0.1.6-private-%PackageVersion%"
15+
set PackageVersion="0.1.7-private-%PackageVersion%"
1616

17-
set XRSharpVersion="0.1.6-preview-2024-01-11-062323-28482d56"
17+
set XRSharpVersion="0.1.7-preview-2024-07-03-083945-ec96f694"
1818

1919
call "build-nuget-package-XRSharp-CommunityToolkit-cicd.bat" %PackageVersion% %XRSharpVersion%
2020

‎src/XRSharp.CommunityToolkit.Networked/XRSharp.CommunityToolkit.Networked.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="XRSharp" Version="0.1.6-*" />
11+
<PackageReference Include="XRSharp" Version="0.1.7-*" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/Pages/Index.cs

+11-2
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,28 @@
22
using Microsoft.AspNetCore.Components;
33
using Microsoft.AspNetCore.Components.Rendering;
44
using Microsoft.JSInterop;
5+
using System;
6+
using System.Threading.Tasks;
57
using XRSharp.CommunityToolkit.Browser.Interop;
68

79
namespace XRSharp.CommunityToolkit.Browser.Pages;
10+
811
[Route("/")]
912
public class Index : ComponentBase
1013
{
1114
protected override void BuildRenderTree(RenderTreeBuilder __builder)
1215
{
1316
}
1417

15-
protected override void OnInitialized()
18+
protected async override Task OnInitializedAsync()
1619
{
17-
base.OnInitialized();
20+
await base.OnInitializedAsync();
21+
22+
if (!await JSRuntime.InvokeAsync<bool>("getOSFilesLoadedPromise"))
23+
{
24+
throw new InvalidOperationException("Failed to initialize OpenSilver. Check your browser's console for error details.");
25+
}
26+
1827
Cshtml5Initializer.Initialize(new UnmarshalledJavaScriptExecutionHandler(JSRuntime));
1928
Program.RunApplication();
2029
}

‎src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/XRSharp.CommunityToolkit.Browser.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<NoXamlPreprocessor>True</NoXamlPreprocessor>
6-
<OpenSilverType>5</OpenSilverType>
6+
<OpenSilverType>6</OpenSilverType>
77
<PublishTrimmed>true</PublishTrimmed>
88
<PublishIISAssets>true</PublishIISAssets>
99
<DisableImplicitNamespaceImports>True</DisableImplicitNamespaceImports>
@@ -12,9 +12,9 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
16-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.1" PrivateAssets="all" />
17-
<PackageReference Include="XRSharp" Version="0.1.6-*" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
16+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
17+
<PackageReference Include="XRSharp" Version="0.1.7-*" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/wwwroot/BlazorLoader.js

-25
This file was deleted.

‎src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/wwwroot/index.html

+37-9
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,46 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
66
<title>XR# Community Toolkit</title>
77
<base href="/" />
8+
<script>
9+
(function () {
10+
const style = document.createElement('link');
11+
style.setAttribute('rel', 'stylesheet');
12+
style.setAttribute('type', 'text/css');
13+
style.setAttribute('href', 'loading-indicator.css?date=' + new Date().toISOString());
14+
document.head.appendChild(style);
15+
const script = document.createElement('script');
16+
script.setAttribute('type', 'application/javascript');
17+
script.setAttribute('src', 'libs/opensilver.js?date=' + new Date().toISOString());
18+
document.head.appendChild(script);
19+
})();
20+
</script>
821
</head>
922
<body>
10-
<div id="app" style="position:absolute;width:100%;height:100%;left:0;top:0;"></div>
23+
<div id="app">
24+
<div class="loading-indicator-wrapper">
25+
<div class="loading-indicator">
26+
<div class="loading-indicator-ball"></div>
27+
<div class="loading-indicator-ball"></div>
28+
<div class="loading-indicator-ball"></div>
29+
<div class="loading-indicator-ball"></div>
30+
<div class="loading-indicator-ball"></div>
31+
<div class="loading-indicator-ball"></div>
32+
<div class="loading-indicator-ball"></div>
33+
<div class="loading-indicator-ball"></div>
34+
<div class="loading-indicator-ball"></div>
35+
<div class="loading-indicator-ball"></div>
36+
<div class="loading-indicator-ball"></div>
37+
<div class="loading-indicator-ball"></div>
38+
<div class="loading-indicator-ball"></div>
39+
<div class="loading-indicator-ball"></div>
40+
<div class="loading-indicator-ball"></div>
41+
<div class="loading-indicator-ball"></div>
42+
<div class="loading-indicator-text"></div>
43+
</div>
44+
</div>
45+
</div>
1146
<div id="opensilver-root" style="position: relative; width: 100%; height: 100%; overflow-x: hidden; overflow-y: hidden"></div>
1247

13-
<!-- loading indicator -->
14-
<!-- modify these files to change the loading animation -->
15-
<link rel="stylesheet" type="text/css" href="loading-indicator.css" />
16-
<script type="text/javascript" src="loading-indicator.js"></script>
17-
18-
<script src="_framework/blazor.webassembly.js" autostart="false"></script>
19-
<script type="text/javascript" src="libs/opensilver.js"></script>
20-
<script type="text/javascript" src="BlazorLoader.js"></script>
48+
<script src="_framework/blazor.webassembly.js"></script>
2149
</body>
2250
</html>

‎src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/wwwroot/loading-indicator.css

+7-4
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
display: flex;
2525
justify-content: center;
2626
align-items: center;
27-
position: relative;
28-
width: 100%;
29-
height: 100%;
27+
width: 100vw;
28+
height: 100vh;
3029
}
3130

3231
.loading-indicator {
@@ -145,10 +144,14 @@
145144
animation-delay: 5.9s;
146145
}
147146

148-
.loading-indicator-percentage-container {
147+
.loading-indicator-text {
149148
display: flex;
150149
justify-content: center;
151150
align-items: center;
152151
width: 100%;
153152
height: 100%;
154153
}
154+
155+
.loading-indicator-text:after {
156+
content: var(--blazor-load-percentage-text, "Loading...");
157+
}

‎src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/wwwroot/loading-indicator.js

-28
This file was deleted.

‎src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="XRSharp" Version="0.1.6-*" />
10+
<PackageReference Include="XRSharp" Version="0.1.7-*" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

0 commit comments

Comments
 (0)