Skip to content

Commit 3c75967

Browse files
authored
Merge pull request #3400 from PrismLibrary/dev/ds/uno-e2e
Refactors Uno E2E sample to single-project app model
2 parents 6ed21e2 + 5fd1c62 commit 3c75967

127 files changed

Lines changed: 1020 additions & 1554 deletions

File tree

Some content is hidden

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

Directory.Build.props

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,16 @@
157157
<!-- Versions: Directory.Packages.props (Central Package Management). PrivateAssets=all is implicit. -->
158158
<ItemGroup>
159159
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies"
160-
Condition=" $(UseMaui) != 'true' " />
160+
Condition=" $(UseMaui) != 'true' " />
161161
<PackageReference Include="Nerdbank.GitVersioning"
162-
Condition=" $(DISABLE_GITVERSIONING) != 'true' AND !$(MSBuildProjectDirectory.Contains('e2e')) " />
162+
Condition=" $(DISABLE_GITVERSIONING) != 'true' AND !$(MSBuildProjectDirectory.Contains('e2e')) " />
163163
<PackageReference Include="Microsoft.SourceLink.GitHub"
164-
Condition=" $(IsPackable) " />
164+
Condition=" $(IsPackable) ">
165+
<PrivateAssets>all</PrivateAssets>
166+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
167+
</PackageReference>
165168
<PackageReference Include="Microsoft.Sbom.Targets"
166-
Condition=" $(IsPackable) " />
169+
Condition=" $(IsPackable) " />
167170
</ItemGroup>
168171

169172
</Project>

Directory.Packages.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<ItemGroup>
3-
<PackageVersion Include="PolySharp" Version="1.14.1" />
3+
<PackageVersion Include="PolySharp" Version="1.15.0" />
44
<PackageVersion Include="Prism.Container.Abstractions" Version="9.0.114" />
55
<PackageVersion Include="Prism.Container.DryIoc" Version="9.0.114" />
66
<PackageVersion Include="Prism.Container.Unity" Version="9.0.114" />
@@ -38,10 +38,10 @@
3838
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="$(UnoVersion)" />
3939
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.1.1" />
4040
<PackageVersion Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.4.2" />
41-
<PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
41+
<PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="3.0.1" />
4242
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" Condition="$(MSBuildProjectName.Contains('Prism'))" />
4343
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250909003" Condition="!$(MSBuildProjectName.Contains('Prism'))" />
44-
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
44+
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.1839" />
4545
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="3.119.1" />
4646
<PackageVersion Include="SkiaSharp.Skottie" Version="3.119.1" />
4747
<PackageVersion Include="Uno.Resizetizer" Version="1.12.1" />
@@ -54,7 +54,7 @@
5454
<PackageVersion Include="Uno.Toolkit.WinUI" Version="8.3.2" />
5555
<PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="7.0.4" />
5656
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
57-
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.12.0.4" />
57+
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.12.0.4" Condition="$(TargetFramework.StartsWith('net9.0'))" />
5858
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.12.0.5" Condition="$(TargetFramework.StartsWith('net10.0'))" />
5959
<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.37" />
6060
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.0" />
@@ -72,7 +72,7 @@
7272
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
7373
<PackageVersion Include="System.CodeDom" Version="8.0.0" />
7474
</ItemGroup>
75-
<!-- Tests -->
75+
<!-- Tests -->
7676
<ItemGroup>
7777
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
7878
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
@@ -102,7 +102,7 @@
102102
<!-- GlobalPackageReference in Directory.Build.props — build-only; not transitive to package consumers -->
103103
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
104104
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50" />
105-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
105+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.300" />
106106
<PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.5" />
107107
</ItemGroup>
108108
</Project>

e2e/Uno/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<DotNetVersion>net10.0</DotNetVersion>
43
<ImplicitUsings>enable</ImplicitUsings>
54
<Nullable>enable</Nullable>
65
<IsUnoProject>true</IsUnoProject>

e2e/Uno/HelloWorld.Mobile/Android/Resources/values/Strings.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

e2e/Uno/HelloWorld.Mobile/Android/Resources/values/Styles.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

e2e/Uno/HelloWorld.Mobile/HelloWorld.Mobile.csproj

Lines changed: 0 additions & 78 deletions
This file was deleted.

e2e/Uno/HelloWorld.Mobile/MacCatalyst/Info.plist

Lines changed: 0 additions & 26 deletions
This file was deleted.

e2e/Uno/HelloWorld.Mobile/MacCatalyst/Main.maccatalyst.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.

e2e/Uno/HelloWorld.Mobile/iOS/Entitlements.plist

Lines changed: 0 additions & 6 deletions
This file was deleted.

e2e/Uno/HelloWorld.Mobile/iOS/Info.plist

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)