-
Notifications
You must be signed in to change notification settings - Fork 18
Upgraded to net7.0, updated deps, enabled all WASM optimizations #117
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
7a7686c
Upgraded to net7.0, updated all dependencies, enabled all WASM optimi…
Arlodotexe 450c379
Bump Uno, fix missing Uno.UI.RemoteControl version
Arlodotexe 7202f14
Restore default enable TargetFrameworks
Arlodotexe 0c7fbc5
Use net6 where appropriate
Arlodotexe fc5b9bc
Added MultiTarget missing TFM error messages. Aligned UseTargetFramew…
Arlodotexe a314f2a
Restore default enabled TFMs
Arlodotexe 792cc4d
Enable JIT when using Interpreter
Arlodotexe 4bb8811
Downgraded EnsureNoEnabledMultiTargetsWithMissingTfms to Warning
Arlodotexe 69920cc
Update editorconfig
Arlodotexe 0d073f9
Enable 'netstandard' MultiTarget tfm by default
Arlodotexe 33af1ce
Update uno.check to latest version (required for android30.0)
Arlodotexe 59e689d
Use android30 and macos, remove maccatalyst
Arlodotexe e1ac3ca
Set CA2213 to 'None'
Arlodotexe 65fb517
Use Interpreter on WASM
Arlodotexe d942529
Remove os version from Android TFM
Arlodotexe f5aae02
Suppress CA1060
Arlodotexe ddf9cbb
Fixed TitleBar build errors on Uno / WinUI 3
Arlodotexe 9faa351
Update uno-check
Arlodotexe 91c42a2
Use stable Uno 4.x version
Arlodotexe 6c958ed
Add parameter notes
Arlodotexe cf47b67
Bump Uno.Wasm.Bootstrap
Arlodotexe 1fe7460
Added portable SharedArrayBuffer workaround to single-sample componen…
Arlodotexe 9e186fd
Renamed NetCoreCommonTargetFramework and NetStandardCommonTargetFram…
Arlodotexe 6b08232
Merge branch 'targets/upgrade/net7' of https://github.com/CommunityTo…
Arlodotexe 026ca8c
Merge branch 'main' into targets/upgrade/net7
Arlodotexe 0e3e4c4
Switch to maccatalyst
Arlodotexe 989cebd
Fix for net7.0-maccatalyst, use dotnet 7.0.100
Arlodotexe 2f8caf5
Additional net7 mobile error suppression
Arlodotexe 9f18b05
More error suppression for net7 mobile
Arlodotexe 0a36c62
Update Pack Script to accept extra argument for build properties
michael-hawker faeaab9
Use net7.0-android33.0 instead of net7.0-android
Arlodotexe fc7bd95
Cleanup CheckEnabledMultiTargetsWithMissingTfms
Arlodotexe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,50 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <CommonUnoPackageVersion>4.9.45</CommonUnoPackageVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- This file is modified by UseUnoWinUI.ps1 to switch between WinUI 2 and 3 under Uno Platform --> | ||
| <!-- All Uno-based project heads and MultiTarget-enabled library projects need to reference this file, while native (UWP/WinAppSdk) heads don't. --> | ||
| <ItemGroup Condition="'$(IsUno)' == 'true'"> | ||
| <PackageReference Include="Uno.UI" Version="4.9.26" /> | ||
| <PackageReference Include="Uno.UI" Version="$(CommonUnoPackageVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(IsUno)' == 'true'"> | ||
| <UnoUIUseRoslynSourceGenerators>true</UnoUIUseRoslynSourceGenerators> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition="'$(IsWasm)' == 'true' OR '$(IsWpf)' == 'true' OR '$(IsGtk)' == 'true'"> | ||
| <PackageReference Include="Uno.UI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" /> | ||
| <PackageReference Include="Uno.UI.RemoteControl" Version="$(CommonUnoPackageVersion)" Condition="'$(Configuration)'=='Debug'" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(IsGtkHead)' == 'true'"> | ||
| <PackageReference Include="Uno.UI.Skia.Gtk" Version="4.9.26" /> | ||
| <PackageReference Include="Uno.UI.Skia.Gtk" Version="$(CommonUnoPackageVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(IsWpfHead)' == 'true'"> | ||
| <PackageReference Include="Uno.UI.Skia.Wpf" Version="4.9.26" /> | ||
| <PackageReference Include="Uno.UI.Skia.Wpf" Version="$(CommonUnoPackageVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(IsWpfHead)' == 'true'"> | ||
| <!-- Ignorable issue from SkiaSharp package, see: https://github.com/CommunityToolkit/Labs-Windows/pull/119#issuecomment-1125373091 --> | ||
| <NoWarn>$(NoWarn);NU1701</NoWarn> | ||
| <NoWarn>$(NoWarn);NU1701;</NoWarn> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <!-- | ||
| Uno uses IDisposable internally, but exposes it publicly. | ||
| See https://github.com/CommunityToolkit/Labs-Windows/pull/275#issuecomment-1331113635 | ||
| --> | ||
| <NoWarn>$(NoWarn);CA1063;CA1001;</NoWarn> | ||
| <NoWarn>$(NoWarn);CA1063;CA1001;CA2213</NoWarn> | ||
|
|
||
| <!-- "This call site is reachable on all platforms" --> | ||
| <NoWarn>$(NoWarn);CA1416;</NoWarn> | ||
|
|
||
| <!-- "XML comment 'End tag was not expected at this location.'" --> | ||
| <NoWarn>$(NoWarn);CS1570;</NoWarn> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition="'$(IsWasmHead)' == 'true'"> | ||
| <PackageReference Include="Uno.UI.WebAssembly" Version="4.9.26" /> | ||
| <PackageReference Include="Uno.UI.WebAssembly" Version="$(CommonUnoPackageVersion)" /> | ||
| </ItemGroup> | ||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
ProjectHeads/AllComponents/Wasm/wwwroot/SharedArrayBufferServiceWorker.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // From https://dev.to/stefnotch/enabling-coop-coep-without-touching-the-server-2d3n | ||
|
|
||
| self.addEventListener("install", function () { | ||
| self.skipWaiting(); | ||
| }); | ||
|
|
||
| self.addEventListener("activate", (event) => { | ||
| event.waitUntil(self.clients.claim()); | ||
| }); | ||
|
|
||
| self.addEventListener("fetch", function (event) { | ||
| if (event.request.cache === "only-if-cached" && event.request.mode !== "same-origin") { | ||
| return; | ||
| } | ||
|
|
||
| event.respondWith( | ||
| fetch(event.request) | ||
| .then(function (response) { | ||
| // It seems like we only need to set the headers for index.html | ||
| // If you want to be on the safe side, comment this out | ||
| // if (!response.url.includes("index.html")) return response; | ||
|
|
||
| const newHeaders = new Headers(response.headers); | ||
| newHeaders.set("Cross-Origin-Embedder-Policy", "credentialless"); | ||
| newHeaders.set("Cross-Origin-Opener-Policy", "same-origin"); | ||
|
|
||
| const moddedResponse = new Response(response.body, { | ||
| status: response.status, | ||
| statusText: response.statusText, | ||
| headers: newHeaders, | ||
| }); | ||
|
|
||
| return moddedResponse; | ||
| }) | ||
| .catch(function (e) { | ||
| console.error(e); | ||
| }) | ||
| ); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
|
|
||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
| <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> | ||
|
|
||
| <!-- | ||
| Only needed if multithreading is enabled. | ||
| Required for using SharedArrayBuffer | ||
| --> | ||
| <script type="text/javascript" src="scripts/EnableSharedArrayBuffer.js"></script> | ||
| <script type="text/javascript" src="./require.js"></script> | ||
| <script type="module" src="./uno-bootstrap.js"></script> | ||
| $(ADDITIONAL_CSS) | ||
| $(ADDITIONAL_HEAD) | ||
| </head> | ||
| <body> | ||
| <div id="uno-body" class="container-fluid uno-body"> | ||
| <div class="uno-loader" | ||
| loading-position="bottom" | ||
| loading-alert="none"> | ||
|
|
||
| <!-- Logo: change src to customize the logo --> | ||
| <img class="logo" | ||
| src="" | ||
| title="Uno is loading your application" /> | ||
|
|
||
| <progress></progress> | ||
| <span class="alert"></span> | ||
| </div> | ||
| </div> | ||
| <noscript> | ||
| <p>This application requires Javascript and WebAssembly to be enabled.</p> | ||
| </noscript> | ||
| </body> | ||
| </html> |
19 changes: 19 additions & 0 deletions
19
ProjectHeads/AllComponents/Wasm/wwwroot/scripts/EnableSharedArrayBuffer.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| // From https://dev.to/stefnotch/enabling-coop-coep-without-touching-the-server-2d3n | ||
|
|
||
| if ("serviceWorker" in navigator) { | ||
| // Register service worker | ||
| navigator.serviceWorker.register(new URL("SharedArrayBufferServiceWorker.js", window.location.href)).then( | ||
| function (registration) { | ||
| console.log("COOP/COEP Service Worker registered", registration.scope); | ||
| // If the registration is active, but it's not controlling the page | ||
| if (registration.active && !navigator.serviceWorker.controller) { | ||
| window.location.reload(); | ||
| } | ||
| }, | ||
| function (err) { | ||
| console.log("COOP/COEP Service Worker failed to register", err); | ||
| } | ||
| ); | ||
| } else { | ||
| console.warn("Cannot register a service worker"); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.