Skip to content

Commit f23836c

Browse files
dansiegeldansiegel
authored
Merge pull request #3023 from PrismLibrary/dev/ds/uno-csharp
2 parents f72c9ab + 0454421 commit f23836c

8 files changed

+48
-5
lines changed

‎Directory.Packages.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<PackageVersion Include="Prism.Container.Unity" Version="9.0.61-pre" />
66
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
77
<PackageVersion Include="System.Reactive" Version="6.0.0" />
8+
<PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.0.13" />
9+
<PackageVersion Include="Uno.WinUI.Markup" Version="5.0.13" />
810
<PackageVersion Include="Xamarin.Forms" Version="5.0.0.2401" />
911
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
1012
</ItemGroup>

‎PrismLibrary.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Maui.Tests", "
8787
EndProject
8888
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Events", "src\Prism.Events\Prism.Events.csproj", "{8610485A-BE9F-4938-86D4-E9F1FA1739A0}"
8989
EndProject
90+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Uno.WinUI.Markup", "src\Uno\Prism.Uno.Markup\Prism.Uno.WinUI.Markup.csproj", "{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}"
91+
EndProject
9092
Global
9193
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9294
Debug|Any CPU = Debug|Any CPU
@@ -397,6 +399,18 @@ Global
397399
{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Release|x64.Build.0 = Release|Any CPU
398400
{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Release|x86.ActiveCfg = Release|Any CPU
399401
{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Release|x86.Build.0 = Release|Any CPU
402+
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
403+
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Debug|Any CPU.Build.0 = Debug|Any CPU
404+
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Debug|x64.ActiveCfg = Debug|Any CPU
405+
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Debug|x64.Build.0 = Debug|Any CPU
406+
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Debug|x86.ActiveCfg = Debug|Any CPU
407+
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Debug|x86.Build.0 = Debug|Any CPU
408+
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|Any CPU.ActiveCfg = Release|Any CPU
409+
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|Any CPU.Build.0 = Release|Any CPU
410+
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|x64.ActiveCfg = Release|Any CPU
411+
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|x64.Build.0 = Release|Any CPU
412+
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|x86.ActiveCfg = Release|Any CPU
413+
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|x86.Build.0 = Release|Any CPU
400414
EndGlobalSection
401415
GlobalSection(SolutionProperties) = preSolution
402416
HideSolutionNode = FALSE
@@ -436,6 +450,7 @@ Global
436450
{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7} = {540CEEC1-D541-4614-BF0B-18056A83E434}
437451
{8711D306-1118-4A11-9399-EF14AA13015E} = {540CEEC1-D541-4614-BF0B-18056A83E434}
438452
{8610485A-BE9F-4938-86D4-E9F1FA1739A0} = {F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}
453+
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D} = {8F959801-D494-4CAF-9437-90F30472E169}
439454
EndGlobalSection
440455
GlobalSection(ExtensibilityGlobals) = postSolution
441456
SolutionGuid = {C7433AE2-B1A0-4C1A-887E-5CAA7AAF67A6}

‎PrismLibrary_Uno.slnf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"src\\Prism.Events\\Prism.Events.csproj",
77
"src\\Uno\\Prism.DryIoc.Uno\\Prism.DryIoc.Uno.WinUI.csproj",
88
"src\\Uno\\Prism.Uno\\Prism.Uno.WinUI.csproj",
9+
"src\\Uno\\Prism.Uno.Markup\\Prism.Uno.WinUI.Markup.csproj",
910
"tests\\Prism.Core.Tests\\Prism.Core.Tests.csproj"
1011
]
1112
}

‎src/Directory.Build.props

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,18 @@
1616
<DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
1717
</PropertyGroup>
1818
<ItemGroup>
19-
<EmbeddedResource Include="LinkerDefinition.mono.xml">
19+
<EmbeddedResource Include="LinkerDefinition.mono.xml" Condition="Exists('LinkerDefinition.mono.xml')">
2020
<LogicalName>$(AssemblyName).xml</LogicalName>
2121
</EmbeddedResource>
2222
</ItemGroup>
2323
</When>
2424
</Choose>
2525

26+
<PropertyGroup Condition=" $(IsUnoProject) ">
27+
<UnoTargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</UnoTargetFrameworks>
28+
<UnoTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(UnoTargetFrameworks);net7.0-windows10.0.19041</UnoTargetFrameworks>
29+
</PropertyGroup>
30+
2631
<PropertyGroup>
2732
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2833
<GeneratePackageOnBuild>$(IsPackable)</GeneratePackageOnBuild>

‎src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.WinUI.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</TargetFrameworks>
5-
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net7.0-windows10.0.19041</TargetFrameworks>
4+
<TargetFrameworks>$(UnoTargetFrameworks)</TargetFrameworks>
65
<NoWarn>$(NoWarn);1591</NoWarn>
76
<AssemblyName>Prism.DryIoc.Uno</AssemblyName>
87
<PackageId>Prism.DryIoc.Uno.WinUI</PackageId>

‎src/Uno/Prism.Uno.Markup/AssemblyInfo.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
using Prism;
2+
using Uno.Extensions.Markup.Generator;
3+
4+
[assembly: GenerateMarkupForAssembly(typeof(PrismApplicationBase))]

‎src/Uno/Prism.Uno.Markup/Prism.Uno.WinUI.Markup.csproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks>$(UnoTargetFrameworks)</TargetFrameworks>
4+
<GenerateLibraryLayout>true</GenerateLibraryLayout>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<PackageReference Include="Uno.Extensions.Markup.Generators">
9+
<PrivateAssets>all</PrivateAssets>
10+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
11+
</PackageReference>
12+
<PackageReference Include="Uno.WinUI.Markup" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<ProjectReference Include="..\Prism.Uno\Prism.Uno.WinUI.csproj" />
17+
</ItemGroup>
18+
</Project>

‎src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</TargetFrameworks>
5-
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net7.0-windows10.0.19041</TargetFrameworks>
4+
<TargetFrameworks>$(UnoTargetFrameworks)</TargetFrameworks>
65
<GenerateLibraryLayout>true</GenerateLibraryLayout>
76
<AssemblyName>Prism.Uno</AssemblyName>
87
<RootNamespace>Prism</RootNamespace>

0 commit comments

Comments
 (0)