Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions build/test-scripts/run-net7-template-linux.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ $projects =

# 5.6 net-current runtime folder validation
@(1, "5.6/uno56netcurrent/uno56netcurrent/uno56netcurrent.csproj", @(), @()),

# 5.6 net-current with XAML trimming validation - desktop
@(1, "5.6/uno56netcurrent/uno56netcurrent/uno56netcurrent.csproj", @("-f", "net10.0-desktop", "-p:UnoXamlResourcesTrimming=true", "-p:PublishTrimmed=true", "-r", "linux-x64"), @("Publish")),

# 5.6 net-current with XAML trimming validation - wasm
@(1, "5.6/uno56netcurrent/uno56netcurrent/uno56netcurrent.csproj", @("-f", "net10.0-browserwasm", "-p:UnoXamlResourcesTrimming=true", "-p:WasmShellILLinkerEnabled=true"), @("Publish")),

# 5.3 Uno App with Library reference
@(2, "5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj", @(), @()),
Expand Down
6 changes: 6 additions & 0 deletions build/test-scripts/run-netcore-mobile-template-tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,12 @@ $projects =

# 5.6 net-current runtime folder validation
@(3, "5.6/uno56netcurrent/uno56netcurrent/uno56netcurrent.csproj", @(), @("macOS", "NetCore")),

# 5.6 net-current with XAML trimming validation - desktop
@(3, "5.6/uno56netcurrent/uno56netcurrent/uno56netcurrent.csproj", @("-f", "net10.0-desktop", "-p:UnoXamlResourcesTrimming=true", "-p:PublishTrimmed=true", "-r", "win-x64"), @("NetCore", "Publish")),

# 5.6 net-current with XAML trimming validation - wasm
@(3, "5.6/uno56netcurrent/uno56netcurrent/uno56netcurrent.csproj", @("-f", "net10.0-browserwasm", "-p:UnoXamlResourcesTrimming=true", "-p:WasmShellILLinkerEnabled=true"), @("macOS", "NetCore", "Publish")),

# Ensure that build can happen even if a RID is specified
@(4, "5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj", @("-f", "net9.0"), @("macOS", "NetCore")),
Expand Down
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>
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();
}
}
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;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
var UnoAppManifest = {
displayName: "uno56netcurrent"
}
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": "/"
}
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"
}
}
]
}
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>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Uno.Sdk.Private">
<PropertyGroup>
<TargetFrameworks>net10.0-desktop</TargetFrameworks>
<TargetFrameworks>net10.0-desktop;net10.0-browserwasm</TargetFrameworks>

<OutputType>Exe</OutputType>
<UnoSingleProject>true</UnoSingleProject>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<_ResourceStampFile>$(IntermediateOutputPath)g\uno.stamp</_ResourceStampFile>
</PropertyGroup>

<ResourcesGenerationTask_v0 Resources="@(PRIResourceWithTargetPath)"

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/PagerControl/Strings/zh-TW/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/PagerControl/Strings/zh-CN/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/PagerControl/Strings/quz-PE/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/PagerControl/Strings/pa-IN/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/PagerControl/Strings/ca-Es-VALENCIA/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/CommandBarFlyout/Strings/zh-TW/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/CommandBarFlyout/Strings/zh-CN/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/CommandBarFlyout/Strings/quz-PE/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/CommandBarFlyout/Strings/pa-IN/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/CommandBarFlyout/Strings/ca-Es-VALENCIA/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/PagerControl/Strings/zh-TW/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/PagerControl/Strings/zh-CN/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/PagerControl/Strings/quz-PE/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/PagerControl/Strings/pa-IN/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/PagerControl/Strings/ca-Es-VALENCIA/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/CommandBarFlyout/Strings/zh-TW/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/CommandBarFlyout/Strings/zh-CN/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/CommandBarFlyout/Strings/quz-PE/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/CommandBarFlyout/Strings/pa-IN/Resources.resw, could not determine the language

Check warning on line 105 in src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Ignoring resource ./UI/Xaml/Controls/CommandBarFlyout/Strings/ca-Es-VALENCIA/Resources.resw, could not determine the language
TargetProjectDirectory="$(ProjectDir)"
TargetPlatform="$(_UnoUnderlyingPlatform)"
OutputPath="$(_ResourceOutputPath)"
Expand Down Expand Up @@ -341,7 +341,14 @@
or '%(UnoRuntimeEnabledPackage.Identity)'=='Uno.WinUI'"
>%(UnoRuntimeEnabledPackage.PackageBasePath)</_UnoUIPackageBasePath>

<_UnoLinkerHintGeneratorILLinkerPath Condition="'$(ILLinkTasksAssembly)'!=''">$([System.IO.Path]::GetDirectoryName($(ILLinkTasksAssembly)))\..\net$(TargetFrameworkVersion.Substring(1))</_UnoLinkerHintGeneratorILLinkerPath>
<!-- .NET 10 RC2+ path structure: tools/net/illink.dll -->
<_UnoLinkerHintGeneratorILLinkerPath Condition="'$(ILLinkTasksAssembly)'!=''">$([System.IO.Path]::Combine($([System.IO.Path]::GetDirectoryName($(ILLinkTasksAssembly))), '..', 'net'))</_UnoLinkerHintGeneratorILLinkerPath>
<!-- Pre-.NET 10 path structure: tools/net10.0/illink.dll -->
<_UnoLinkerHintGeneratorILLinkerPath_PreNet10 Condition="'$(ILLinkTasksAssembly)'!=''">$([System.IO.Path]::Combine($([System.IO.Path]::GetDirectoryName($(ILLinkTasksAssembly))), '..', 'net$(TargetFrameworkVersion.Substring(1))'))</_UnoLinkerHintGeneratorILLinkerPath_PreNet10>

<!-- Fall back to pre-.NET 10 path if .NET 10 RC2+ path doesn't exist -->
<_UnoLinkerHintGeneratorILLinkerPath Condition="'$(ILLinkTasksAssembly)'!='' and !Exists($([System.IO.Path]::Combine($(_UnoLinkerHintGeneratorILLinkerPath), 'illink.dll')))">$(_UnoLinkerHintGeneratorILLinkerPath_PreNet10)</_UnoLinkerHintGeneratorILLinkerPath>

<_UnoLinkerHintsOutputPath>$([System.IO.Path]::Combine($([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)')),'linkerhints'))</_UnoLinkerHintsOutputPath>
</PropertyGroup>

Expand Down
Loading