Skip to content

Commit 7a382ec

Browse files
VincentH-NetVincentH-Net
authored
Merge pull request #43 from VincentH-Net/net-9-uno-5-6
Update to .NET 9/8 and Uno Platform 5.6
2 parents 75bd287 + d3f4bf6 commit 7a382ec

File tree

87 files changed

+8775
-7465
lines changed

Some content is hidden

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

87 files changed

+8775
-7465
lines changed

‎global.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
{
1+
{
2+
"msbuild-sdks": {
3+
"Uno.Sdk": "5.6.54"
4+
},
25
"sdk": {
3-
"version": "8.0.202"
4-
//"rollForward": "latestFeature"
6+
"version": "9.0.200",
7+
"rollForward": "latestPatch"
58
}
69
}

‎src/CSharpMarkup.WinUI.Examples/Directory.Build.props

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,4 @@
1212
-->
1313
<NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
1414
</PropertyGroup>
15-
16-
<!-- See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages version properties. -->
17-
<PropertyGroup>
18-
<UnoExtensionsVersion>4.1.14</UnoExtensionsVersion>
19-
<UnoToolkitVersion>6.0.18</UnoToolkitVersion>
20-
<UnoThemesVersion>5.0.13</UnoThemesVersion>
21-
<UnoCSharpMarkupVersion>5.2.13</UnoCSharpMarkupVersion>
22-
</PropertyGroup>
2315
</Project>

‎src/CSharpMarkup.WinUI.Examples/Directory.Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
See https://aka.platform.uno/using-uno-sdk for more information.
66
-->
77
<ItemGroup>
8-
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
8+
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
99
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
10-
<PackageVersion Include="CSharpMarkup.WinUI" Version="2.4.16" />
11-
<PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation" Version="2.4.16" />
12-
<PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit" Version="2.4.16" />
13-
<PackageVersion Include="CSharpMarkup.WinUI.Uno.Toolkit" Version="2.4.16" />
10+
<PackageVersion Include="CSharpMarkup.WinUI" Version="3.0.3" />
11+
<PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation" Version="3.0.3" />
12+
<PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit" Version="3.0.3" />
13+
<PackageVersion Include="CSharpMarkup.WinUI.Uno.Toolkit" Version="3.0.3" />
1414
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
1515
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1616
<PackageVersion Include="NUnit" Version="4.1.0" />

‎src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/FlutterViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ public sealed partial class FlutterViewModel : BaseViewModel
66
readonly List<string> subTitles = ["Subtitle 1", "Subtitle 2", "Subtitle 3"];
77

88
[ObservableProperty]
9-
string title = "Flutter-Like UI markup";
9+
public partial string Title { get; set; } = "Flutter-Like UI markup";
1010

1111
[ObservableProperty][NotifyPropertyChangedFor(nameof(ToggleMoreText))]
12-
bool showMore = true;
12+
public partial bool ShowMore { get; set; } = true;
1313

1414
public string ToggleMoreText => ShowMore ? "Less" : "More";
1515

‎src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/SearchViewModel.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ namespace WinUICsMarkupExamples.Presentation.Example;
33
[UIBindable]
44
public sealed partial class SearchViewModel(INavigator navigator) : BaseViewModel
55
{
6-
[ObservableProperty] string searchText = "#CSharpForMarkup";
6+
[ObservableProperty] public partial string SearchText { get; set; } = "#CSharpForMarkup";
77

8-
[ObservableProperty] List<Tweet> searchResults = [
8+
[ObservableProperty] public partial List<Tweet> SearchResults { get; set; } = [
99
new() {
1010
AuthorImage = "https://pbs.twimg.com/profile_images/1382769074569154561/2ukpzO8E_400x400.jpg",
1111
Header = "Uno Platform @UnoPlatform · Nov 30",
@@ -122,10 +122,10 @@ public sealed partial class SearchViewModel(INavigator navigator) : BaseViewMode
122122

123123
public sealed partial class Tweet : BaseViewModel
124124
{
125-
[ObservableProperty] string? authorImage;
126-
[ObservableProperty] string? header;
127-
[ObservableProperty] List<TextFragment>? body;
128-
[ObservableProperty] bool isLikedByMe;
125+
[ObservableProperty] public partial string? AuthorImage { get; set; }
126+
[ObservableProperty] public partial string? Header { get; set; }
127+
[ObservableProperty] public partial List<TextFragment>? Body { get; set; }
128+
[ObservableProperty] public partial bool IsLikedByMe { get; set; }
129129
}
130130

131131
public sealed class TextFragment

‎src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/WinUICsMarkupExamples.Presentation.csproj

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
<Project Sdk="Uno.Sdk">
22
<PropertyGroup>
33
<RootNamespace>WinUICsMarkupExamples.Presentation</RootNamespace>
4-
5-
<TargetFrameworks>
6-
net8.0-android;
7-
net8.0-ios;
8-
net8.0-maccatalyst;
9-
net8.0-windows10.0.19041;
10-
net8.0;
11-
net8.0-desktop;
12-
net8.0-browserwasm;
13-
</TargetFrameworks>
4+
<LangVersion>preview</LangVersion>
5+
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop</TargetFrameworks>
146

157
<UnoSingleProject>true</UnoSingleProject>
168
<OutputType>Library</OutputType>

‎src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Tests/AppInfoTests.cs

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

‎src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Tests/GlobalUsings.cs

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

‎src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Tests/WinUICsMarkupExamples.Tests.csproj

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

‎src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.UITests/Constants.cs

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

‎src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.UITests/Given_MainPage.cs

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

‎src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.UITests/GlobalUsings.cs

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

‎src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.UITests/TestBase.cs

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

‎src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.UITests/WinUICsMarkupExamples.UITests.csproj

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

‎src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.sln

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
23
# Visual Studio Version 17
34
VisualStudioVersion = 17.2.32210.308
45
MinimumVisualStudioVersion = 15.0.26124.0
5-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{EA0B7E2A-08AE-4673-847F-154C3E35C188}"
6-
EndProject
76
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUICsMarkupExamples", "WinUICsMarkupExamples\WinUICsMarkupExamples.csproj", "{F21C3D96-75AE-4830-8067-D6BDEA123CB3}"
87
EndProject
9-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUICsMarkupExamples.Tests", "WinUICsMarkupExamples.Tests\WinUICsMarkupExamples.Tests.csproj", "{9BF3C0FE-3082-4617-B05B-625874DA6730}"
10-
EndProject
11-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUICsMarkupExamples.UITests", "WinUICsMarkupExamples.UITests\WinUICsMarkupExamples.UITests.csproj", "{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}"
12-
EndProject
138
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BADA71DC-7FFD-4EDC-9F28-FB74AEADC713}"
149
ProjectSection(SolutionItems) = preProject
1510
.gitignore = .gitignore
1611
Directory.Build.props = Directory.Build.props
1712
Directory.Build.targets = Directory.Build.targets
18-
global.json = global.json
1913
Directory.Packages.props = Directory.Packages.props
2014
EndProjectSection
2115
EndProject
@@ -81,62 +75,6 @@ Global
8175
{F21C3D96-75AE-4830-8067-D6BDEA123CB3}.Release|x86.ActiveCfg = Release|Any CPU
8276
{F21C3D96-75AE-4830-8067-D6BDEA123CB3}.Release|x86.Build.0 = Release|Any CPU
8377
{F21C3D96-75AE-4830-8067-D6BDEA123CB3}.Release|x86.Deploy.0 = Release|Any CPU
84-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
85-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|Any CPU.Build.0 = Debug|Any CPU
86-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|ARM.ActiveCfg = Debug|Any CPU
87-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|ARM.Build.0 = Debug|Any CPU
88-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|ARM64.ActiveCfg = Debug|Any CPU
89-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|ARM64.Build.0 = Debug|Any CPU
90-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|iPhone.ActiveCfg = Debug|Any CPU
91-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|iPhone.Build.0 = Debug|Any CPU
92-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
93-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
94-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|x64.ActiveCfg = Debug|Any CPU
95-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|x64.Build.0 = Debug|Any CPU
96-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|x86.ActiveCfg = Debug|Any CPU
97-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Debug|x86.Build.0 = Debug|Any CPU
98-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|Any CPU.ActiveCfg = Release|Any CPU
99-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|Any CPU.Build.0 = Release|Any CPU
100-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|ARM.ActiveCfg = Release|Any CPU
101-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|ARM.Build.0 = Release|Any CPU
102-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|ARM64.ActiveCfg = Release|Any CPU
103-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|ARM64.Build.0 = Release|Any CPU
104-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|iPhone.ActiveCfg = Release|Any CPU
105-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|iPhone.Build.0 = Release|Any CPU
106-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
107-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
108-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|x64.ActiveCfg = Release|Any CPU
109-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|x64.Build.0 = Release|Any CPU
110-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|x86.ActiveCfg = Release|Any CPU
111-
{9BF3C0FE-3082-4617-B05B-625874DA6730}.Release|x86.Build.0 = Release|Any CPU
112-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
113-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
114-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|ARM.ActiveCfg = Debug|Any CPU
115-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|ARM.Build.0 = Debug|Any CPU
116-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
117-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|ARM64.Build.0 = Debug|Any CPU
118-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
119-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|iPhone.Build.0 = Debug|Any CPU
120-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
121-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
122-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|x64.ActiveCfg = Debug|Any CPU
123-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|x64.Build.0 = Debug|Any CPU
124-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|x86.ActiveCfg = Debug|Any CPU
125-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Debug|x86.Build.0 = Debug|Any CPU
126-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
127-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|Any CPU.Build.0 = Release|Any CPU
128-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|ARM.ActiveCfg = Release|Any CPU
129-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|ARM.Build.0 = Release|Any CPU
130-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|ARM64.ActiveCfg = Release|Any CPU
131-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|ARM64.Build.0 = Release|Any CPU
132-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|iPhone.ActiveCfg = Release|Any CPU
133-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|iPhone.Build.0 = Release|Any CPU
134-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
135-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
136-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|x64.ActiveCfg = Release|Any CPU
137-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|x64.Build.0 = Release|Any CPU
138-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|x86.ActiveCfg = Release|Any CPU
139-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF}.Release|x86.Build.0 = Release|Any CPU
14078
{E4227EC8-6AFC-4513-A69E-ECB65D81C9A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14179
{E4227EC8-6AFC-4513-A69E-ECB65D81C9A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
14280
{E4227EC8-6AFC-4513-A69E-ECB65D81C9A8}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -169,10 +107,6 @@ Global
169107
GlobalSection(SolutionProperties) = preSolution
170108
HideSolutionNode = FALSE
171109
EndGlobalSection
172-
GlobalSection(NestedProjects) = preSolution
173-
{9BF3C0FE-3082-4617-B05B-625874DA6730} = {EA0B7E2A-08AE-4673-847F-154C3E35C188}
174-
{FA020AD1-F074-4D2D-BD00-F65DF5689EBF} = {EA0B7E2A-08AE-4673-847F-154C3E35C188}
175-
EndGlobalSection
176110
GlobalSection(ExtensibilityGlobals) = postSolution
177111
SolutionGuid = {B7E6DA85-5365-43F2-8DFD-751EF0617520}
178112
EndGlobalSection

0 commit comments

Comments
 (0)