Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1b6bf93

Browse files
authored
Merge pull request#2822 from PrismLibrary/uno-hosting
Uno Hosting
2 parents5f3c3e1 +05c087e commit1b6bf93

File tree

253 files changed

+2418
-4163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+2418
-4163
lines changed

‎.github/workflows/build_uno.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
name:Build Prism.Uno
2626
solution-path:PrismLibrary_Uno.slnf
2727
dotnet-version:7.0.102
28+
windows-sdk-version:18362
2829
uno-check:true
2930
uno-check-parameters:'--skip xcode --skip gtk3 --skip vswin --skip vsmac'
3031
run-tests:false

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
name:Build Prism.Uno
6161
solution-path:PrismLibrary_Uno.slnf
6262
dotnet-version:7.0.102
63+
windows-sdk-version:18362
6364
uno-check:true
6465
uno-check-parameters:'--skip xcode --skip gtk3 --skip vswin --skip vsmac'
6566
run-tests:false

‎.github/workflows/start-release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
name:Build Prism.Uno
5353
solution-path:PrismLibrary_Uno.slnf
5454
dotnet-version:7.0.102
55+
windows-sdk-version:18362
5556
uno-check:true
5657
uno-check-parameters:'--skip xcode --skip gtk3 --skip vswin --skip vsmac'
5758
run-tests:false

‎Directory.Build.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@
4949
<MSBuildSdkExtrasVersion>3.0.44</MSBuildSdkExtrasVersion>
5050
</PropertyGroup>
5151

52+
<PropertyGroupCondition="$(IsUnoProject)">
53+
<DefineConstants>$(DefineConstants);UNO_WINUI_PROJECT</DefineConstants>
54+
</PropertyGroup>
55+
5256
<!-- Versioning-->
5357
<PropertyGroup>
5458
<PackageReleaseNotes>https://github.com/PrismLibrary/Prism/releases/tag/v$(Version)</PackageReleaseNotes>

‎Directory.Build.targets‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,23 @@
3939

4040
</Target>
4141

42-
<ItemGroup>
43-
<FrameworkReferenceUpdate="Microsoft.Windows.SDK.NET.Ref"RuntimeFrameworkVersion="10.0.18362.22" />
44-
<FrameworkReferenceUpdate="Microsoft.Windows.SDK.NET.Ref"TargetingPackVersion="10.0.18362.22" />
45-
</ItemGroup>
42+
43+
<Choose>
44+
<WhenCondition="$(IsUnoProject)">
45+
<ItemGroup>
46+
<!--
47+
If you encounter this error message:
48+
49+
error NETSDK1148: A referenced assembly was compiled using a newer version of Microsoft.Windows.SDK.NET.dll. Please update to a newer .NET SDK in order to reference this assembly.
50+
51+
This means that the two packages below must be aligned with the "build" version number of
52+
the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
53+
must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
54+
-->
55+
<FrameworkReferenceUpdate="Microsoft.Windows.SDK.NET.Ref"RuntimeFrameworkVersion="10.0.22621.28" />
56+
<FrameworkReferenceUpdate="Microsoft.Windows.SDK.NET.Ref"TargetingPackVersion="10.0.22621.28" />
57+
</ItemGroup>
58+
</When>
59+
</Choose>
4660

4761
</Project>

‎Directory.Packages.props‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,40 @@
99
</ItemGroup>
1010
<!-- Uno-->
1111
<ItemGroupCondition=" $(IsUnoProject) == 'true'">
12-
<PackageVersionInclude="Uno.UI"Version="4.7.37" />
1312
<PackageVersionInclude="Uno.WinUI"Version="4.7.37" />
14-
<PackageVersionInclude="Uno.Core"Version="4.0.1" />
15-
<PackageVersionInclude="Uno.Extensions.Hosting.WinUI"Version="2.3.0-dev.662" />
13+
<PackageVersionInclude="Uno.WinUI.Skia.Gtk"Version="4.7.37" />
14+
<PackageVersionInclude="Uno.WinUI.Skia.Linux.FrameBuffer"Version="4.7.37" />
15+
<PackageVersionInclude="Uno.WinUI.Skia.Wpf"Version="4.7.37" />
1616
<PackageVersionInclude="Uno.Wasm.Bootstrap"Version="7.0.17" />
1717
<PackageVersionInclude="Uno.Wasm.Bootstrap.DevServer"Version="7.0.17" />
18+
<PackageVersionInclude="Uno.WinUI.WebAssembly"Version="4.7.37" />
19+
<PackageVersionInclude="Uno.WinUI.RemoteControl"Version="4.7.37" />
20+
<PackageVersionInclude="Uno.UI.Adapter.Microsoft.Extensions.Logging"Version="4.7.37" />
21+
<PackageVersionInclude="Uno.Core"Version="4.0.1" />
22+
<PackageVersionInclude="Uno.Core.Extensions.Logging.Singleton"Version="4.0.1" />
1823
<PackageVersionInclude="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed"Version="2.3.0" />
1924
<PackageVersionInclude="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed"Version="2.3.0" />
2025
<PackageVersionInclude="Microsoft.Xaml.Behaviors.Uwp.Managed"Version="2.0.1" />
2126
<PackageVersionInclude="Microsoft.Xaml.Behaviors.WinUI.Managed"Version="2.0.9" />
22-
<PackageVersionInclude="Microsoft.WindowsAppSDK"Version="1.2.230118.102" />
27+
<PackageVersionInclude="Microsoft.WindowsAppSDK"Version="1.2.221109.1"Condition="$(MSBuildProjectName.Contains('Prism'))" />
28+
<PackageVersionInclude="Microsoft.WindowsAppSDK"Version="1.2.230118.102"Condition="!$(MSBuildProjectName.Contains('Prism'))" />
2329
<PackageVersionInclude="Microsoft.Windows.SDK.BuildTools"Version="10.0.22621.755" />
30+
<PackageVersionInclude="SkiaSharp.Views.Uno.WinUI"Version="2.88.3" />
31+
<PackageVersionInclude="SkiaSharp.Skottie"Version="2.88.3" />
32+
<PackageVersionInclude="Uno.Resizetizer"Version="0.36.0-dev.129" />
33+
<PackageVersionInclude="Uno.Extensions.Core"Version="2.3.0-dev.690" />
34+
<PackageVersionInclude="Uno.Extensions.Logging.OSLog"Version="1.4.0" />
35+
<PackageVersionInclude="Uno.Extensions.Logging.WinUI"Version="2.3.0-dev.690" />
36+
<PackageVersionInclude="Uno.Extensions.Logging.Serilog"Version="2.3.0-dev.690" />
37+
<PackageVersionInclude="Uno.Extensions.Logging.WebAssembly.Console"Version="1.3.0" />
38+
<PackageVersionInclude="Uno.Material.WinUI"Version="2.5.0-dev.31" />
39+
<PackageVersionInclude="Uno.Toolkit.WinUI.Material"Version="2.5.0-dev.23" />
40+
<PackageVersionInclude="Uno.Toolkit.WinUI"Version="2.5.0-dev.23" />
41+
<PackageVersionInclude="Uno.Extensions.Hosting.WinUI"Version="2.3.0-dev.690" />
42+
<PackageVersionInclude="Microsoft.Extensions.Logging.Console"Version="7.0.0" />
43+
<PackageVersionInclude="Xamarin.Google.Android.Material"Version="1.7.0.2" />
44+
<PackageVersionInclude="Uno.UniversalImageLoader"Version="1.9.36" />
45+
<PackageVersionInclude="Microsoft.Windows.Compatibility"Version="7.0.0" />
2446
</ItemGroup>
2547
<!-- Tests-->
2648
<ItemGroup>
@@ -36,8 +58,8 @@
3658
<PackageVersionInclude="Xunit.StaFact"Version="1.1.11" />
3759
</ItemGroup>
3860
<ItemGroupCondition=" $(UseMaui) != 'true'">
39-
<PackageVersionInclude="Microsoft.Extensions.DependencyInjection"Version="6.0.0" />
40-
<PackageVersionInclude="Microsoft.Extensions.Logging"Version="6.0.0" />
61+
<PackageVersionInclude="Microsoft.Extensions.DependencyInjection"Version="7.0.0" />
62+
<PackageVersionInclude="Microsoft.Extensions.Logging"Version="7.0.0" />
4163
</ItemGroup>
4264
<!-- UI Tests-->
4365
<ItemGroup>

‎PrismLibrary.sln‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Containers", "Containers",
7979
EndProject
8080
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") ="Prism.Container.Wpf.Shared","tests\Wpf\Prism.Container.Wpf.Shared\Prism.Container.Wpf.Shared.shproj","{BD42A7D6-A84D-4D27-9C28-7F6A2EC477F1}"
8181
EndProject
82-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="WinUI","WinUI","{9DF4BF66-FEFA-4135-A37A-963E46B77D13}"
83-
EndProject
8482
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="Prism.Uno.WinUI","src\Uno\Prism.Uno\Prism.Uno.WinUI.csproj","{E74664C1-1BB1-4920-8099-2C9125CFD00B}"
8583
EndProject
8684
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="Prism.DryIoc.Uno.WinUI","src\Uno\Prism.DryIoc.Uno\Prism.DryIoc.Uno.WinUI.csproj","{DB530D15-0556-4B6F-96B2-1497C8DF08D6}"
@@ -458,9 +456,8 @@ Global
458456
{78932299-2281-4A59-BFB8-07DE3014F748} ={D62DD517-CA80-449D-A26B-9AB427379825}
459457
{D62DD517-CA80-449D-A26B-9AB427379825} ={00FFDC13-7397-46F1-897E-A62A7575D28A}
460458
{BD42A7D6-A84D-4D27-9C28-7F6A2EC477F1} ={F1F91777-01EA-43A3-A3ED-D473B382F46C}
461-
{9DF4BF66-FEFA-4135-A37A-963E46B77D13} ={8F959801-D494-4CAF-9437-90F30472E169}
462-
{E74664C1-1BB1-4920-8099-2C9125CFD00B} ={9DF4BF66-FEFA-4135-A37A-963E46B77D13}
463-
{DB530D15-0556-4B6F-96B2-1497C8DF08D6} ={9DF4BF66-FEFA-4135-A37A-963E46B77D13}
459+
{E74664C1-1BB1-4920-8099-2C9125CFD00B} ={8F959801-D494-4CAF-9437-90F30472E169}
460+
{DB530D15-0556-4B6F-96B2-1497C8DF08D6} ={8F959801-D494-4CAF-9437-90F30472E169}
464461
{1DECC7D9-9F2A-4FF5-9FBB-A5245F1C73D7} ={F8A0FDE6-8E75-47D1-9E33-02AB8E8AB473}
465462
{24639CEB-266D-40E1-B0A8-B78BB6F8CEF8} ={F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}
466463
{BC84ABD6-A230-4367-8E6A-85B6BA1D851A} ={24639CEB-266D-40E1-B0A8-B78BB6F8CEF8}

‎README.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ Don't forget both Brian and Dan have content on YouTube and stream there from ti
1717

1818
|| Status|
1919
| --------| ------|
20-
| Full Build|[![Build Status](https://dev.azure.com/prismlibrary/Prism/_apis/build/status/Prism-CI?branchName=master&stageName=Build%20Prism%20Library)](https://dev.azure.com/prismlibrary/Prism/_build/latest?definitionId=9&branchName=master)|
21-
| Prism.Core|[![Build Status](https://dev.azure.com/prismlibrary/Prism/_apis/build/status/Prism-CI?branchName=master&stageName=Build%20%26%20Test&jobName=Prism.Core)](https://dev.azure.com/prismlibrary/Prism/_build/latest?definitionId=9&branchName=master)|
22-
| Prism.Wpf|[![Build Status](https://dev.azure.com/prismlibrary/Prism/_apis/build/status/Prism-CI?branchName=master&stageName=Build%20%26%20Test&jobName=Prism.Wpf)](https://dev.azure.com/prismlibrary/Prism/_build/latest?definitionId=9&branchName=master)|
23-
| Prism.Forms|[![Build Status](https://dev.azure.com/prismlibrary/Prism/_apis/build/status/Prism-CI?branchName=master&stageName=Build%20%26%20Test&jobName=Prism.Forms)](https://dev.azure.com/prismlibrary/Prism/_build/latest?definitionId=9&branchName=master)|
24-
| Prism.Uno|[![Build Status](https://dev.azure.com/prismlibrary/Prism/_apis/build/status/Prism-CI?branchName=master&stageName=Build%20%26%20Test&jobName=Prism.Uno)](https://dev.azure.com/prismlibrary/Prism/_build/latest?definitionId=9&branchName=master)|
20+
| Full Build|[![Prism CI](https://github.com/PrismLibrary/Prism/actions/workflows/ci.yml/badge.svg)](https://github.com/PrismLibrary/Prism/actions/workflows/ci.yml)|
21+
| Prism.Core|[![build_core](https://github.com/PrismLibrary/Prism/actions/workflows/build_core.yml/badge.svg)](https://github.com/PrismLibrary/Prism/actions/workflows/build_core.yml)|
22+
| Prism.Wpf|[![build_wpf](https://github.com/PrismLibrary/Prism/actions/workflows/build_wpf.yml/badge.svg)](https://github.com/PrismLibrary/Prism/actions/workflows/build_wpf.yml)|
23+
| Prism.Forms|[![build_forms](https://github.com/PrismLibrary/Prism/actions/workflows/build_forms.yml/badge.svg)](https://github.com/PrismLibrary/Prism/actions/workflows/build_forms.yml)|
24+
| Prism.Uno|[![build_uno](https://github.com/PrismLibrary/Prism/actions/workflows/build_uno.yml/badge.svg)](https://github.com/PrismLibrary/Prism/actions/workflows/build_uno.yml)|
25+
| Prism.Maui|[![build_maui](https://github.com/PrismLibrary/Prism/actions/workflows/build_maui.yml/badge.svg)](https://github.com/PrismLibrary/Prism/actions/workflows/build_maui.yml)|
2526

2627
##Support
2728

@@ -130,6 +131,7 @@ For stable samples be sure to check out the samples repo for the platform you ar
130131
-[Prism for WPF Samples](https://github.com/PrismLibrary/Prism-Samples-Wpf)
131132
-[Prism for Xamarim.Forms](https://github.com/PrismLibrary/Prism-Samples-Forms)
132133
-[Prism for Uno Platform](#) (Coming soon)
134+
-[Prism for .NET MAUI](#) (Coming soon)
133135

134136
##Contributing
135137

‎e2e/Uno/.vscode/launch.json‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
// Use IntelliSense to find out which attributes exist for C# debugging
3+
// Use hover for the description of the existing attributes
4+
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
5+
"version":"0.2.0",
6+
"configurations": [
7+
{
8+
// Use IntelliSense to find out which attributes exist for C# debugging
9+
// Use hover for the description of the existing attributes
10+
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
11+
"name":"Debug (Chrome, WebAssembly)",
12+
"type":"chrome",
13+
"request":"launch",
14+
"url":"http://localhost:5000",
15+
"webRoot":"${workspaceFolder}/HelloWorld.Wasm",
16+
"inspectUri":"{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
17+
"timeout":30000,
18+
"server": {
19+
"runtimeExecutable":"dotnet",
20+
"program":"run",
21+
"outputCapture":"std",
22+
"timeout":30000,
23+
"cwd":"${workspaceFolder}/HelloWorld.Wasm"
24+
}
25+
},
26+
{
27+
// Use IntelliSense to find out which attributes exist for C# debugging
28+
// Use hover for the description of the existing attributes
29+
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
30+
"name":"Skia.GTK (Debug)",
31+
"type":"coreclr",
32+
"request":"launch",
33+
"preLaunchTask":"build-skia-gtk",
34+
// If you have changed target frameworks, make sure to update the program path.
35+
"program":"${workspaceFolder}/HelloWorld.Skia.Gtk/bin/Debug/net7.0/HelloWorld.Skia.Gtk.dll",
36+
"args": [],
37+
"env": {
38+
"DOTNET_MODIFIABLE_ASSEMBLIES":"debug"
39+
},
40+
"cwd":"${workspaceFolder}/HelloWorld.Skia.Gtk",
41+
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
42+
"console":"internalConsole",
43+
"stopAtEntry":false
44+
}
45+
]
46+
}

‎e2e/Uno/.vscode/settings.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"explorer.fileNesting.enabled":true,
3+
"explorer.fileNesting.expand":false,
4+
"explorer.fileNesting.patterns": {
5+
"*.xaml":"$(capture).xaml.cs"
6+
}
7+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp