Skip to content

Commit daa02f5

Browse files
kazo0kazo0
committed
chore: move to net9
1 parent 129d41a commit daa02f5

127 files changed

Lines changed: 4029 additions & 157 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.

‎.github/workflows/azure-static-app.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
jobs:
1515
build_and_deploy_job:
1616
env:
17-
DIST_PATH: testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist
17+
DIST_PATH: testing/TestHarness/TestHarness/bin/Release/net9.0-browserwasm/dist
1818

1919
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
2020
runs-on: ubuntu-24.04

‎build/ci/scripts/wasm-uitest-run.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ export UNO_UITEST_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarnes
1313
export UNO_UITEST_LOGFILE=$BUILD_ARTIFACTSTAGINGDIRECTORY/screenshots/wasm/nunit-log.txt
1414
export UNO_UITEST_WASM_SOLUTION=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.sln
1515
export UNO_UITEST_WASM_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness/TestHarness.csproj
16-
export UNO_UITEST_WASM_OUTPUT_PATH=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist/
16+
export UNO_UITEST_WASM_OUTPUT_PATH=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness/bin/Release/net9.0-browserwasm/dist/
1717
export UNO_UITEST_WASM_PROJECT_BUILD_OPTIONS=" /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false /p:GeneratePackageOnBuild=false"
1818

1919
cd $BUILD_SOURCESDIRECTORY
2020

2121
dotnet build -c Release $UNO_UITEST_WASM_SOLUTION /p:IsUiAutomationMappingEnabled=True /p:UseWebAssemblyAOT=false /p:Build_MacCatalyst=false /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false /p:GeneratePackageOnBuild=false /bl:$BIN_LOG_PATH
2222

2323
# Start the server
24-
dotnet run --project $UNO_UITEST_WASM_PROJECT -f net8.0-browserwasm /p:Build_MacCatalyst=false /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false -c Release --no-build &
24+
dotnet run --project $UNO_UITEST_WASM_PROJECT -f net9.0-browserwasm /p:Build_MacCatalyst=false /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false -c Release --no-build &
2525

2626
cd $BUILD_SOURCESDIRECTORY/build
2727

‎build/ci/stage-build-runtimetests-skia.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
- script: xvfb-run --auto-servernum --server-args='-screen 0 1280x1024x24' dotnet Uno.Extensions.RuntimeTests.dll
4545
displayName: 'Run Runtime Tests'
46-
workingDirectory: $(Build.SourcesDirectory)/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests/bin/Debug/net8.0-desktop
46+
workingDirectory: $(Build.SourcesDirectory)/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests/bin/Debug/net9.0-desktop
4747
env:
4848
UNO_RUNTIME_TESTS_RUN_TESTS: '{}'
4949
UNO_RUNTIME_TESTS_OUTPUT_PATH: '$(Common.TestResultsDirectory)/skia-runtime-tests-results.xml'

‎build/ci/stage-build-uitests-wasm.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
testResultsFormat: 'NUnit'
3737
testResultsFiles: '$(build.sourcesdirectory)/build/TestResult.xml'
3838
failTaskOnFailedTests: true
39+
failTaskOnMissingResultsFile: true
3940

4041
- task: PublishBuildArtifacts@1
4142
condition: always()

‎build/ci/stage-build-wasm.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- task: CopyFiles@2
2020
displayName: 'Publish Wasm Binaries'
2121
inputs:
22-
SourceFolder: $(build.sourcesdirectory)/testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist
22+
SourceFolder: $(build.sourcesdirectory)/testing/TestHarness/TestHarness/bin/Release/net9.0-browserwasm/wwwroot
2323
Contents: '**/*.*'
2424
TargetFolder: $(build.artifactstagingdirectory)/Wasm
2525
CleanTargetFolder: false

‎build/tests.runsettings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RunSettings>
33
<TargetPlatform>x86</TargetPlatform>
4-
<TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
4+
<TargetFrameworkVersion>net9.0</TargetFrameworkVersion>
55
<TestSessionTimeout>10000</TestSessionTimeout>
66
<TreatNoTestsAsError>true</TreatNoTestsAsError>
77
</RunSettings>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"msbuild-sdks": {
33
"MSBuild.Sdk.Extras": "3.0.44",
44
"Uno.Sdk": "6.0.67",
5-
"Uno.Sdk.Private": "6.0.465"
5+
"Uno.Sdk.Private": "6.4.43"
66
}
77
}

‎samples/Directory.Packages.props‎

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,25 @@
11
<Project ToolsVersion="15.0">
22
<PropertyGroup>
3-
<!-- <UnoVersion>6.0.465</UnoVersion> -->
4-
<UnoExtensionsVersion>5.3.8</UnoExtensionsVersion>
5-
<UnoToolkitVersion>7.0.7</UnoToolkitVersion>
6-
<UnoThemesVersion>5.5.1</UnoThemesVersion>
7-
<UnoCSharpMarkupVersion>6.0.15</UnoCSharpMarkupVersion>
8-
<UnoWasmBootstrapVersion>8.0.23</UnoWasmBootstrapVersion>
9-
<UnoLoggingVersion>1.7.0</UnoLoggingVersion>
10-
<UnoCoreLoggingSingletonVersion>4.1.1</UnoCoreLoggingSingletonVersion>
11-
<UnoUniversalImageLoaderVersion>1.9.37</UnoUniversalImageLoaderVersion>
12-
<UnoDspTasksVersion>1.4.0</UnoDspTasksVersion>
13-
<UnoResizetizerVersion>1.8.1</UnoResizetizerVersion>
14-
<SkiaSharpVersion>3.119.0-preview.1.2</SkiaSharpVersion>
3+
<SkiaSharpVersion>3.119.1</SkiaSharpVersion>
154
<SvgSkiaVersion>3.0.2</SvgSkiaVersion>
16-
<WinAppSdkVersion>1.7.250513003</WinAppSdkVersion>
17-
<WinAppSdkBuildToolsVersion>10.0.26100.4188</WinAppSdkBuildToolsVersion>
18-
<MicrosoftLoggingVersion>8.0.1</MicrosoftLoggingVersion>
5+
<WinAppSdkVersion>1.7.250909003</WinAppSdkVersion>
6+
<WinAppSdkBuildToolsVersion>10.0.26100.4948</WinAppSdkBuildToolsVersion>
7+
<MicrosoftLoggingVersion>9.0.9</MicrosoftLoggingVersion>
198
<WindowsCompatibilityVersion>8.0.15</WindowsCompatibilityVersion>
209
<MicrosoftIdentityClientVersion>4.70.2</MicrosoftIdentityClientVersion>
2110
<CommunityToolkitMvvmVersion>8.4.0</CommunityToolkitMvvmVersion>
2211
<PrismVersion>9.0.537</PrismVersion>
23-
<AndroidMaterialVersion>1.12.0.2</AndroidMaterialVersion>
24-
<AndroidXLegacySupportV4Version>1.0.0.23</AndroidXLegacySupportV4Version>
12+
<AndroidMaterialVersion>1.12.0.3</AndroidMaterialVersion>
13+
<AndroidXLegacySupportV4Version>1.0.0.33</AndroidXLegacySupportV4Version>
2514
<AndroidXSplashScreenVersion>1.0.1.14</AndroidXSplashScreenVersion>
26-
<AndroidXAppCompatVersion>1.7.0.5</AndroidXAppCompatVersion>
27-
<AndroidXRecyclerViewVersion>1.3.2.10</AndroidXRecyclerViewVersion>
28-
<AndroidXActivityVersion>1.9.3.2</AndroidXActivityVersion>
29-
<AndroidXBrowserVersion>1.8.0.8</AndroidXBrowserVersion>
30-
<AndroidXSwipeRefreshLayoutVersion>1.1.0.24</AndroidXSwipeRefreshLayoutVersion>
31-
<AndroidXNavigationVersion>2.8.5.1</AndroidXNavigationVersion>
32-
<AndroidXCollectionVersion>1.4.5.2</AndroidXCollectionVersion>
33-
<MauiVersion>8.0.100</MauiVersion>
15+
<AndroidXAppCompatVersion>1.7.1.1</AndroidXAppCompatVersion>
16+
<AndroidXRecyclerViewVersion>1.4.0.3</AndroidXRecyclerViewVersion>
17+
<AndroidXActivityVersion>1.10.1.3</AndroidXActivityVersion>
18+
<AndroidXBrowserVersion>1.8.0.9</AndroidXBrowserVersion>
19+
<AndroidXSwipeRefreshLayoutVersion>1.1.0.27</AndroidXSwipeRefreshLayoutVersion>
20+
<AndroidXNavigationVersion>2.8.9.1</AndroidXNavigationVersion>
21+
<AndroidXCollectionVersion>1.5.0.3</AndroidXCollectionVersion>
22+
<MauiVersion>9.0.120</MauiVersion>
3423
</PropertyGroup>
3524

3625
<ItemGroup>
@@ -59,6 +48,12 @@
5948
<PackageVersion Include="Xamarin.AndroidX.Collection.Ktx" Version="$(AndroidXCollectionVersion)" />
6049
<PackageVersion Include="Xamarin.AndroidX.Collection.Jvm" Version="$(AndroidXCollectionVersion)" />
6150

51+
<PackageVersion Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="$(AndroidXSwipeRefreshLayoutVersion)" />
52+
<PackageVersion Include="Xamarin.AndroidX.RecyclerView" Version="$(AndroidXRecyclerViewVersion)" />
53+
<PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="$(AndroidXAppCompatVersion)" />
54+
<PackageVersion Include="Xamarin.AndroidX.Activity" Version="$(AndroidXActivityVersion)" />
55+
56+
6257
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="$(WinAppSdkBuildToolsVersion)" />
6358
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="$(WinAppSdkVersion)" />
6459
</ItemGroup>

‎samples/Maui2/.editorconfig‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
; This file is for unifying the coding style for different editors and IDEs.
2+
; More information at http://editorconfig.org
3+
4+
# This file is the top-most EditorConfig file
5+
root = true
6+
7+
##########################################
8+
# Common Settings
9+
##########################################
10+
11+
[*]
12+
indent_style = space
13+
end_of_line = crlf
14+
trim_trailing_whitespace = true
15+
insert_final_newline = true
16+
charset = utf-8
17+
18+
##########################################
19+
# File Extension Settings
20+
##########################################
21+
22+
[*.{yml,yaml}]
23+
indent_size = 2
24+
25+
[.vsconfig]
26+
indent_size = 2
27+
end_of_line = lf
28+
29+
[*.sln]
30+
indent_style = tab
31+
indent_size = 2
32+
33+
[*.{csproj,proj,projitems,shproj}]
34+
indent_size = 4
35+
36+
[*.{json,slnf}]
37+
indent_size = 2
38+
end_of_line = lf
39+
40+
[*.{props,targets}]
41+
indent_size = 4
42+
43+
[*.xaml]
44+
indent_size = 4
45+
charset = utf-8-bom
46+
47+
[*.xml]
48+
indent_size = 4
49+
end_of_line = lf
50+
51+
[*.plist]
52+
indent_size = 4
53+
indent_style = tab
54+
end_of_line = lf
55+
56+
[*.manifest]
57+
indent_size = 4
58+
59+
[*.appxmanifest]
60+
indent_size = 4
61+
62+
[*.{json,css,webmanifest}]
63+
indent_size = 2
64+
end_of_line = lf
65+
66+
[web.config]
67+
indent_size = 4
68+
end_of_line = lf
69+
70+
[*.sh]
71+
indent_size = 2
72+
end_of_line = lf
73+
74+
[*.cs]
75+
# EOL should be normalized by Git. See https://github.com/dotnet/format/issues/1099
76+
end_of_line = unset
77+
78+
# See https://github.com/dotnet/roslyn/issues/20356#issuecomment-310143926
79+
trim_trailing_whitespace = false
80+
81+
tab_width = 4
82+
indent_size = 4
83+
84+
# Sort using and Import directives with System.* appearing first
85+
dotnet_sort_system_directives_first = true
86+
87+
# Avoid "this." and "Me." if not necessary
88+
dotnet_style_qualification_for_field = false:suggestion
89+
dotnet_style_qualification_for_property = false:suggestion
90+
dotnet_style_qualification_for_method = false:suggestion
91+
dotnet_style_qualification_for_event = false:suggestion
92+
93+
#### Naming styles ####
94+
95+
# Naming rules
96+
97+
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
98+
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
99+
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
100+
101+
dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
102+
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
103+
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
104+
105+
dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
106+
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
107+
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
108+
109+
# Symbol specifications
110+
111+
dotnet_naming_symbols.interface.applicable_kinds = interface
112+
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
113+
dotnet_naming_symbols.interface.required_modifiers =
114+
115+
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
116+
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
117+
dotnet_naming_symbols.types.required_modifiers =
118+
119+
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
120+
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
121+
dotnet_naming_symbols.non_field_members.required_modifiers =
122+
123+
# Naming styles
124+
125+
dotnet_naming_style.begins_with_i.required_prefix = I
126+
dotnet_naming_style.begins_with_i.required_suffix =
127+
dotnet_naming_style.begins_with_i.word_separator =
128+
dotnet_naming_style.begins_with_i.capitalization = pascal_case
129+
130+
dotnet_naming_style.pascal_case.required_prefix =
131+
dotnet_naming_style.pascal_case.required_suffix =
132+
dotnet_naming_style.pascal_case.word_separator =
133+
dotnet_naming_style.pascal_case.capitalization = pascal_case
134+
135+
dotnet_naming_style.pascal_case.required_prefix =
136+
dotnet_naming_style.pascal_case.required_suffix =
137+
dotnet_naming_style.pascal_case.word_separator =
138+
dotnet_naming_style.pascal_case.capitalization = pascal_case
139+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
140+
dotnet_style_coalesce_expression = true:suggestion
141+
dotnet_style_null_propagation = true:suggestion
142+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
143+
dotnet_style_prefer_auto_properties = true:silent
144+
dotnet_style_object_initializer = true:suggestion
145+
dotnet_style_collection_initializer = true:suggestion
146+
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
147+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
148+
dotnet_style_prefer_conditional_expression_over_return = true:silent
149+
dotnet_style_explicit_tuple_names = true:suggestion
150+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
151+
152+
csharp_indent_labels = one_less_than_current
153+
csharp_using_directive_placement = outside_namespace:silent
154+
csharp_prefer_simple_using_statement = true:suggestion
155+
csharp_prefer_braces = true:silent
156+
csharp_style_namespace_declarations = file_scoped:warning
157+
csharp_style_prefer_method_group_conversion = true:silent
158+
csharp_style_prefer_top_level_statements = true:silent
159+
csharp_style_prefer_primary_constructors = true:suggestion
160+
csharp_style_expression_bodied_methods = false:silent
161+
csharp_style_expression_bodied_constructors = false:silent
162+
csharp_style_expression_bodied_operators = false:silent
163+
csharp_style_expression_bodied_properties = true:silent
164+
csharp_style_expression_bodied_indexers = true:silent
165+
csharp_style_expression_bodied_accessors = true:silent
166+
csharp_style_expression_bodied_lambdas = true:silent
167+
csharp_style_expression_bodied_local_functions = false:silent

0 commit comments

Comments
 (0)