-
Notifications
You must be signed in to change notification settings - Fork 832
fix: Support .NET 10 RC2+ illink.dll path structure with cross-platform compatibility #21732
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
7 commits
Select commit
Hold shift + click to select a range
32b419e
Initial plan
Copilot 888c73b
fix: Support both old and new illink.dll paths for .NET 10 RC2+ compa…
Copilot 971e109
refactor: Rename path variables to remove 'New' suffix and use 'PreNe…
Copilot 903e9e1
refactor: Use Path.Combine for cross-platform compatibility and enabl…
Copilot 77ccfc9
refactor: Add XAML trimming validation to test scripts instead of mod…
Copilot 0dee6db
feat: Add WebAssembly platform support to uno56netcurrent test project
Copilot d7d12c6
refactor: Use publish target with linker enabled for XAML trimming tests
Copilot 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
Some comments aren't visible on the classic Files Changed page.
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
10 changes: 10 additions & 0 deletions
10
...lutionTemplate/5.6/uno56netcurrent/uno56netcurrent/Platforms/WebAssembly/LinkerConfig.xml
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,10 @@ | ||
| <linker> | ||
| <assembly fullname="uno56netcurrent" /> | ||
|
|
||
| <!-- | ||
| Uncomment this section when using JSON.NET | ||
| <assembly fullname="System.Core"> | ||
| <type fullname="System.Linq.Expressions*" /> | ||
| </assembly> | ||
| --> | ||
| </linker> |
16 changes: 16 additions & 0 deletions
16
src/SolutionTemplate/5.6/uno56netcurrent/uno56netcurrent/Platforms/WebAssembly/Program.cs
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,16 @@ | ||
| using Uno.UI.Hosting; | ||
|
|
||
| namespace uno56netcurrent; | ||
|
|
||
| public class Program | ||
| { | ||
| public static async Task Main(string[] args) | ||
| { | ||
| var host = UnoPlatformHostBuilder.Create() | ||
| .App(() => new App()) | ||
| .UseWebAssembly() | ||
| .Build(); | ||
|
|
||
| await host.RunAsync(); | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
...utionTemplate/5.6/uno56netcurrent/uno56netcurrent/Platforms/WebAssembly/WasmCSS/Fonts.css
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,28 @@ | ||
| /** | ||
| When adding fonts here, make sure to add them using a base64 data uri, otherwise | ||
| fonts loading are delayed, and text may get displayed incorrectly. | ||
| */ | ||
|
|
||
| /* https://github.com/unoplatform/uno/issues/3954 */ | ||
| @font-face { | ||
| font-family: 'Segoe UI'; | ||
| src: local('Segoe UI'), local('-apple-system'), local('BlinkMacSystemFont'), local('Inter'), local('Cantarell'), local('Ubuntu'), local('Roboto'), local('Open Sans'), local('Noto Sans'), local('Helvetica Neue'), local('sans-serif'); | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Roboto'; | ||
| src: url(./Uno.Fonts.Roboto/Fonts/Roboto-Light.ttf) format('truetype'); | ||
| font-weight: 300; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Roboto'; | ||
| src: url(./Uno.Fonts.Roboto/Fonts/Roboto-Regular.ttf) format('truetype'); | ||
| font-weight: 400; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Roboto'; | ||
| src: url(./Uno.Fonts.Roboto/Fonts/Roboto-Medium.ttf) format('truetype'); | ||
| font-weight: 500; | ||
| } |
3 changes: 3 additions & 0 deletions
3
...late/5.6/uno56netcurrent/uno56netcurrent/Platforms/WebAssembly/WasmScripts/AppManifest.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,3 @@ | ||
| var UnoAppManifest = { | ||
| displayName: "uno56netcurrent" | ||
| } |
10 changes: 10 additions & 0 deletions
10
...onTemplate/5.6/uno56netcurrent/uno56netcurrent/Platforms/WebAssembly/manifest.webmanifest
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,10 @@ | ||
| { | ||
| "background_color": "#ffffff", | ||
| "description": "uno56netcurrent", | ||
| "display": "standalone", | ||
| "name": "uno56netcurrent", | ||
| "short_name": "uno56netcurrent", | ||
| "start_url": "/index.html", | ||
| "theme_color": "#ffffff", | ||
| "scope": "/" | ||
| } |
30 changes: 30 additions & 0 deletions
30
....6/uno56netcurrent/uno56netcurrent/Platforms/WebAssembly/wwwroot/staticwebapp.config.json
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,30 @@ | ||
| { | ||
| "navigationFallback": { | ||
| "rewrite": "/index.html", | ||
| "exclude": [ | ||
| "*.{css,js}", | ||
| "*.{png}", | ||
| "*.{c,h,wasm,clr,pdb,dat,txt}" | ||
| ] | ||
| }, | ||
| "routes": [ | ||
| { | ||
| "route": "/package_*", | ||
| "headers": { | ||
| "cache-control": "public, immutable, max-age=31536000" | ||
| } | ||
| }, | ||
| { | ||
| "route": "/*.ttf", | ||
| "headers": { | ||
| "cache-control": "public, immutable, max-age=31536000" | ||
| } | ||
| }, | ||
| { | ||
| "route": "/*", | ||
| "headers": { | ||
| "cache-control": "must-revalidate, max-age=3600" | ||
| } | ||
| } | ||
| ] | ||
| } |
78 changes: 78 additions & 0 deletions
78
...tionTemplate/5.6/uno56netcurrent/uno56netcurrent/Platforms/WebAssembly/wwwroot/web.config
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,78 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <system.web> | ||
| <customErrors mode="Off"/> | ||
| </system.web> | ||
|
|
||
| <system.webServer> | ||
|
|
||
| <!-- Disable compression as we're doing it through pre-compressed files --> | ||
| <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" /> | ||
|
|
||
| <staticContent> | ||
| <remove fileExtension=".dll" /> | ||
| <remove fileExtension=".wasm" /> | ||
| <remove fileExtension=".woff" /> | ||
| <remove fileExtension=".woff2" /> | ||
| <mimeMap fileExtension=".wasm" mimeType="application/wasm" /> | ||
| <mimeMap fileExtension=".clr" mimeType="application/octet-stream" /> | ||
| <mimeMap fileExtension=".pdb" mimeType="application/octet-stream" /> | ||
| <mimeMap fileExtension=".woff" mimeType="application/font-woff" /> | ||
| <mimeMap fileExtension=".woff2" mimeType="application/font-woff" /> | ||
| <mimeMap fileExtension=".dat" mimeType="application/octet-stream" /> | ||
| <!-- Required for PWAs --> | ||
| <mimeMap fileExtension=".json" mimeType="application/octet-stream" /> | ||
| </staticContent> | ||
|
|
||
| <rewrite> | ||
| <rules> | ||
| <rule name="Lookup for pre-compressed brotli file" stopProcessing="true"> | ||
| <match url="(.*)$"/> | ||
| <conditions> | ||
| <!-- Match brotli requests --> | ||
| <add input="{HTTP_ACCEPT_ENCODING}" pattern="br" /> | ||
|
|
||
| <!-- Match all but pre-compressed files --> | ||
| <add input="{REQUEST_URI}" pattern="^(?!/_compressed_br/)(.*)$" /> | ||
|
|
||
| <!-- Check if the pre-compressed file exists on the disk --> | ||
| <add input="{DOCUMENT_ROOT}/_compressed_br/{C:0}" matchType="IsFile" negate="false" /> | ||
| </conditions> | ||
| <action type="Rewrite" url="/_compressed_br{C:0}" /> | ||
| </rule> | ||
|
|
||
| <rule name="Lookup for pre-compressed gzip file" stopProcessing="true"> | ||
| <match url="(.*)$"/> | ||
| <conditions> | ||
| <!-- Match gzip requests --> | ||
| <add input="{HTTP_ACCEPT_ENCODING}" pattern="gzip" /> | ||
|
|
||
| <!-- Match all but pre-compressed files --> | ||
| <add input="{REQUEST_URI}" pattern="^(?!/_compressed_gz/)(.*)$" /> | ||
|
|
||
| <!-- Check if the pre-compressed file exists on the disk --> | ||
| <add input="{DOCUMENT_ROOT}/_compressed_gz/{C:0}" matchType="IsFile" negate="false" /> | ||
| </conditions> | ||
| <action type="Rewrite" url="/_compressed_gz{C:0}" /> | ||
| </rule> | ||
| </rules> | ||
|
|
||
| <outboundRules> | ||
| <rule name="Adjust content encoding for gzip pre-compressed files" enabled="true" stopProcessing="true"> | ||
| <match serverVariable="RESPONSE_CONTENT_ENCODING" pattern="" /> | ||
| <conditions> | ||
| <add input="{REQUEST_URI}" pattern="/_compressed_gz/.*$" /> | ||
| </conditions> | ||
| <action type="Rewrite" value="gzip"/> | ||
| </rule> | ||
| <rule name="Adjust content encoding for brotli pre-compressed files" enabled="true" stopProcessing="true"> | ||
| <match serverVariable="RESPONSE_CONTENT_ENCODING" pattern="" /> | ||
| <conditions> | ||
| <add input="{REQUEST_URI}" pattern="/_compressed_br/.*$" /> | ||
| </conditions> | ||
| <action type="Rewrite" value="br"/> | ||
| </rule> | ||
| </outboundRules> | ||
| </rewrite> | ||
| </system.webServer> | ||
| </configuration> | ||
2 changes: 1 addition & 1 deletion
2
src/SolutionTemplate/5.6/uno56netcurrent/uno56netcurrent/uno56netcurrent.csproj
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
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.