Skip to content

Commit

Permalink
v0.1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@avdynut
avdynut committed Jul 3, 2024
1 parent ed3811f commit 94aaceb
Show file tree
Hide file tree
Showing 11 changed files with 67 additions and 80 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-package.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build XRSharp.CommunityToolkit
env:
package-source-myget: 'https://www.myget.org/F/xrsharp/api/v2/package'
nuget: 'https://api.nuget.org/v3/index.json'
package-version: '0.1.6'
package-version: '0.1.7'
suffix: 'preview'
on:
push:
Expand Down
4 changes: 2 additions & 2 deletions build/build-nuget-package-XRSharp-CommunityToolkit-cicd.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ set "currentdatetime=%currentdatetime: =0%"

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

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

if not exist "nuspec/XRSharp.CommunityToolkit.nuspec" (
echo Wrong working directory. Please navigate to the folder that contains the BAT file before executing it.
Expand Down
6 changes: 3 additions & 3 deletions build/build-nuget-package-XRSharp-CommunityToolkit-private.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ rem Define the escape character for colored text
for /F %%a in ('"prompt $E$S & echo on & for %%b in (1) do rem"') do set "ESC=%%a"

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

set PackageVersion="0.1.6-private-%PackageVersion%"
set PackageVersion="0.1.7-private-%PackageVersion%"

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

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

Expand Down
2 changes: 1 addition & 1 deletion src/XRSharp.CommunityToolkit.Networked/XRSharp.CommunityToolkit.Networked.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="XRSharp" Version="0.1.6-*" />
<PackageReference Include="XRSharp" Version="0.1.7-*" />
</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 11 additions & 2 deletions src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/Pages/Index.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,28 @@
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.JSInterop;
using System;
using System.Threading.Tasks;
using XRSharp.CommunityToolkit.Browser.Interop;

namespace XRSharp.CommunityToolkit.Browser.Pages;

[Route("/")]
public class Index : ComponentBase
{
protected override void BuildRenderTree(RenderTreeBuilder __builder)
{
}

protected override void OnInitialized()
protected async override Task OnInitializedAsync()
{
base.OnInitialized();
await base.OnInitializedAsync();

if (!await JSRuntime.InvokeAsync<bool>("getOSFilesLoadedPromise"))
{
throw new InvalidOperationException("Failed to initialize OpenSilver. Check your browser's console for error details.");
}

Cshtml5Initializer.Initialize(new UnmarshalledJavaScriptExecutionHandler(JSRuntime));
Program.RunApplication();
}
Expand Down
8 changes: 4 additions & 4 deletions ...CommunityToolkit/XRSharp.CommunityToolkit.Browser/XRSharp.CommunityToolkit.Browser.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<NoXamlPreprocessor>True</NoXamlPreprocessor>
<OpenSilverType>5</OpenSilverType>
<OpenSilverType>6</OpenSilverType>
<PublishTrimmed>true</PublishTrimmed>
<PublishIISAssets>true</PublishIISAssets>
<DisableImplicitNamespaceImports>True</DisableImplicitNamespaceImports>
Expand All @@ -12,9 +12,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.1" PrivateAssets="all" />
<PackageReference Include="XRSharp" Version="0.1.6-*" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="XRSharp" Version="0.1.7-*" />
</ItemGroup>

<ItemGroup>
Expand Down
25 changes: 0 additions & 25 deletions src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/wwwroot/BlazorLoader.js
View file

This file was deleted.

46 changes: 37 additions & 9 deletions src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/wwwroot/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,46 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>XR# Community Toolkit</title>
<base href="/" />
<script>
(function () {
const style = document.createElement('link');
style.setAttribute('rel', 'stylesheet');
style.setAttribute('type', 'text/css');
style.setAttribute('href', 'loading-indicator.css?date=' + new Date().toISOString());
document.head.appendChild(style);
const script = document.createElement('script');
script.setAttribute('type', 'application/javascript');
script.setAttribute('src', 'libs/opensilver.js?date=' + new Date().toISOString());
document.head.appendChild(script);
})();
</script>
</head>
<body>
<div id="app" style="position:absolute;width:100%;height:100%;left:0;top:0;"></div>
<div id="app">
<div class="loading-indicator-wrapper">
<div class="loading-indicator">
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-ball"></div>
<div class="loading-indicator-text"></div>
</div>
</div>
</div>
<div id="opensilver-root" style="position: relative; width: 100%; height: 100%; overflow-x: hidden; overflow-y: hidden"></div>

<!-- loading indicator -->
<!-- modify these files to change the loading animation -->
<link rel="stylesheet" type="text/css" href="loading-indicator.css" />
<script type="text/javascript" src="loading-indicator.js"></script>

<script src="_framework/blazor.webassembly.js" autostart="false"></script>
<script type="text/javascript" src="libs/opensilver.js"></script>
<script type="text/javascript" src="BlazorLoader.js"></script>
<script src="_framework/blazor.webassembly.js"></script>
</body>
</html>
11 changes: 7 additions & 4 deletions src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/wwwroot/loading-indicator.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
display: flex;
justify-content: center;
align-items: center;
position: relative;
width: 100%;
height: 100%;
width: 100vw;
height: 100vh;
}

.loading-indicator {
Expand Down Expand Up @@ -145,10 +144,14 @@
animation-delay: 5.9s;
}

.loading-indicator-percentage-container {
.loading-indicator-text {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
}

.loading-indicator-text:after {
content: var(--blazor-load-percentage-text, "Loading...");
}
28 changes: 0 additions & 28 deletions src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/wwwroot/loading-indicator.js
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="XRSharp" Version="0.1.6-*" />
<PackageReference Include="XRSharp" Version="0.1.7-*" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 94aaceb

Please sign in to comment.