Skip to content

Commit 7460cf6

Browse files
agneszitteagneszitte
authored
Merge pull request #721 from unoplatform/dev/mara/calc-singleproject
chore: single project migration of SimpleCalc app
2 parents 094d7f1 + 73947c8 commit 7460cf6

File tree

339 files changed

+1804
-6170
lines changed

Some content is hidden

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

339 files changed

+1804
-6170
lines changed

‎reference/SimpleCalc/MVU-X-CSharp/.editorconfig renamed to ‎reference/SimpleCalc/CSharp-MVUX/.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ csharp_indent_labels = one_less_than_current
153153
csharp_using_directive_placement = outside_namespace:silent
154154
csharp_prefer_simple_using_statement = true:suggestion
155155
csharp_prefer_braces = true:silent
156-
csharp_style_namespace_declarations = block_scoped:silent
156+
csharp_style_namespace_declarations = file_scoped:warning
157157
csharp_style_prefer_method_group_conversion = true:silent
158158
csharp_style_prefer_top_level_statements = true:silent
159159
csharp_style_prefer_primary_constructors = true:suggestion

‎reference/SimpleCalc/MVVM-CSharp/.gitignore renamed to ‎reference/SimpleCalc/CSharp-MVUX/.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,5 +399,5 @@ FodyWeavers.xsd
399399

400400
# Single Target Config
401401
solution-config.props
402-
# Windows Publish Profiles
403-
!**/*.Windows/Properties/PublishProfiles/*.pubxml
402+
# Publish Profiles
403+
!**/Properties/PublishProfiles/*.pubxml

‎reference/SimpleCalc/MVVM-CSharp/.vsconfig renamed to ‎reference/SimpleCalc/CSharp-MVUX/.vsconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
"Microsoft.VisualStudio.Component.Merq",
2929
"Component.Xamarin.RemotedSimulator",
3030
"Microsoft.VisualStudio.Component.MonoDebugger",
31-
"Component.Xamarin",
3231
"Microsoft.VisualStudio.ComponentGroup.Maui.All",
3332
"Component.Android.SDK34",
3433
"Component.Android.SDK33",

‎reference/SimpleCalc/CSharp-MVUX/Directory.Build.props

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ImplicitUsings>enable</ImplicitUsings>
4+
<Nullable>enable</Nullable>
5+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
6+
7+
<!--
8+
Adding NoWarn to remove build warnings
9+
NU1507: Warning when there are multiple package sources when using CPM with no source mapping
10+
NETSDK1201: Warning that specifying RID won't create self containing app
11+
PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
12+
-->
13+
<NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
14+
</PropertyGroup>
15+
16+
<PropertyGroup>
17+
<UnoExtensionsVersion>4.1.23</UnoExtensionsVersion>
18+
<UnoToolkitVersion>6.0.24</UnoToolkitVersion>
19+
<UnoThemesVersion>5.0.13</UnoThemesVersion>
20+
<UnoCSharpMarkupVersion>5.2.14</UnoCSharpMarkupVersion>
21+
</PropertyGroup>
22+
</Project>

‎reference/SimpleCalc/CSharp-MVUX/Directory.Build.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<Project>
2+
</Project>

‎reference/SimpleCalc/CSharp-MVUX/Directory.Packages.props

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project ToolsVersion="15.0">
2+
<!--
3+
To update the version of Uno, you should instead update the Sdk version in the global.json file.
4+
5+
See https://aka.platform.uno/using-uno-sdk for more information.
6+
-->
7+
<ItemGroup>
8+
</ItemGroup>
9+
<ItemGroup>
10+
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
11+
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
12+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
13+
<PackageVersion Include="NUnit" Version="4.1.0" />
14+
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
15+
</ItemGroup>
16+
</Project>

‎reference/SimpleCalc/CSharp-MVUX/SimpleCalculator-CSharp-MVUX.sln

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.2.32210.308
4+
MinimumVisualStudioVersion = 15.0.26124.0
5+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleCalculator", "SimpleCalculator\SimpleCalculator.csproj", "{054215D9-1AEB-4AB7-956B-B083419F4166}"
6+
EndProject
7+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BADA71DC-7FFD-4EDC-9F28-FB74AEADC713}"
8+
ProjectSection(SolutionItems) = preProject
9+
.gitignore = .gitignore
10+
Directory.Build.props = Directory.Build.props
11+
Directory.Build.targets = Directory.Build.targets
12+
Directory.Packages.props = Directory.Packages.props
13+
global.json = global.json
14+
EndProjectSection
15+
EndProject
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleCalculator.Tests", "SimpleCalculator.Tests\SimpleCalculator.Tests.csproj", "{FF6373AF-4A90-40C0-87E8-07B0907425BD}"
17+
EndProject
18+
Global
19+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
20+
Debug|Any CPU = Debug|Any CPU
21+
Debug|ARM = Debug|ARM
22+
Debug|ARM64 = Debug|ARM64
23+
Debug|iPhone = Debug|iPhone
24+
Debug|iPhoneSimulator = Debug|iPhoneSimulator
25+
Debug|x64 = Debug|x64
26+
Debug|x86 = Debug|x86
27+
Release|Any CPU = Release|Any CPU
28+
Release|ARM = Release|ARM
29+
Release|ARM64 = Release|ARM64
30+
Release|iPhone = Release|iPhone
31+
Release|iPhoneSimulator = Release|iPhoneSimulator
32+
Release|x64 = Release|x64
33+
Release|x86 = Release|x86
34+
EndGlobalSection
35+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
36+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
39+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|ARM.ActiveCfg = Debug|Any CPU
40+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|ARM.Build.0 = Debug|Any CPU
41+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|ARM.Deploy.0 = Debug|Any CPU
42+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|ARM64.ActiveCfg = Debug|Any CPU
43+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|ARM64.Build.0 = Debug|Any CPU
44+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|ARM64.Deploy.0 = Debug|Any CPU
45+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|iPhone.ActiveCfg = Debug|Any CPU
46+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|iPhone.Build.0 = Debug|Any CPU
47+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|iPhone.Deploy.0 = Debug|Any CPU
48+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
49+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
50+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
51+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|x64.ActiveCfg = Debug|Any CPU
52+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|x64.Build.0 = Debug|Any CPU
53+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|x64.Deploy.0 = Debug|Any CPU
54+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|x86.ActiveCfg = Debug|Any CPU
55+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|x86.Build.0 = Debug|Any CPU
56+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Debug|x86.Deploy.0 = Debug|Any CPU
57+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|Any CPU.ActiveCfg = Release|Any CPU
58+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|Any CPU.Build.0 = Release|Any CPU
59+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|Any CPU.Deploy.0 = Release|Any CPU
60+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|ARM.ActiveCfg = Release|Any CPU
61+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|ARM.Build.0 = Release|Any CPU
62+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|ARM.Deploy.0 = Release|Any CPU
63+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|ARM64.ActiveCfg = Release|Any CPU
64+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|ARM64.Build.0 = Release|Any CPU
65+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|ARM64.Deploy.0 = Release|Any CPU
66+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|iPhone.ActiveCfg = Release|Any CPU
67+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|iPhone.Build.0 = Release|Any CPU
68+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|iPhone.Deploy.0 = Release|Any CPU
69+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
70+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
71+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
72+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|x64.ActiveCfg = Release|Any CPU
73+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|x64.Build.0 = Release|Any CPU
74+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|x64.Deploy.0 = Release|Any CPU
75+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|x86.ActiveCfg = Release|Any CPU
76+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|x86.Build.0 = Release|Any CPU
77+
{054215D9-1AEB-4AB7-956B-B083419F4166}.Release|x86.Deploy.0 = Release|Any CPU
78+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|ARM.ActiveCfg = Debug|Any CPU
81+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|ARM.Build.0 = Debug|Any CPU
82+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|ARM64.ActiveCfg = Debug|Any CPU
83+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|ARM64.Build.0 = Debug|Any CPU
84+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
85+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|iPhone.Build.0 = Debug|Any CPU
86+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
87+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
88+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|x64.ActiveCfg = Debug|Any CPU
89+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|x64.Build.0 = Debug|Any CPU
90+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|x86.ActiveCfg = Debug|Any CPU
91+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Debug|x86.Build.0 = Debug|Any CPU
92+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
93+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|Any CPU.Build.0 = Release|Any CPU
94+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|ARM.ActiveCfg = Release|Any CPU
95+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|ARM.Build.0 = Release|Any CPU
96+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|ARM64.ActiveCfg = Release|Any CPU
97+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|ARM64.Build.0 = Release|Any CPU
98+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|iPhone.ActiveCfg = Release|Any CPU
99+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|iPhone.Build.0 = Release|Any CPU
100+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
101+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
102+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|x64.ActiveCfg = Release|Any CPU
103+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|x64.Build.0 = Release|Any CPU
104+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|x86.ActiveCfg = Release|Any CPU
105+
{FF6373AF-4A90-40C0-87E8-07B0907425BD}.Release|x86.Build.0 = Release|Any CPU
106+
EndGlobalSection
107+
GlobalSection(SolutionProperties) = preSolution
108+
HideSolutionNode = FALSE
109+
EndGlobalSection
110+
GlobalSection(ExtensibilityGlobals) = postSolution
111+
SolutionGuid = {9D26FDA9-5EF0-43F9-84AF-B0ADC8EA2AB4}
112+
EndGlobalSection
113+
EndGlobal

‎reference/SimpleCalc/MVVM-Xaml/SimpleCalculator.Tests/GlobalUsings.cs renamed to ‎reference/SimpleCalc/CSharp-MVUX/SimpleCalculator.Tests/GlobalUsings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
global using FluentAssertions;
2+
global using SimpleCalculator;
23
global using NUnit.Framework;

‎reference/SimpleCalc/MVU-X-CSharp/SimpleCalculator.Tests/SimpleCalculator.Tests.csproj renamed to ‎reference/SimpleCalc/CSharp-MVUX/SimpleCalculator.Tests/SimpleCalculator.Tests.csproj

File renamed without changes.

‎reference/SimpleCalc/MVU-X-CSharp/SimpleCalculator.Tests/UnitTest1.cs renamed to ‎reference/SimpleCalc/CSharp-MVUX/SimpleCalculator.Tests/UnitTest1.cs

File renamed without changes.

0 commit comments

Comments
 (0)