Skip to content

Commit 61e5578

Browse files
authored
Merge pull request #31 from egvijayanand/working
DateCalculator updated to .NET MAUI RC2
2 parents 8a88cc7 + 6997050 commit 61e5578

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

src/DateCalculator/DateCalculator.Maui/DateCalculator.Maui.csproj

+10-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
<PropertyGroup>
44
<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
55
<!-- Targets possible from Windows OS -->
6-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) AND '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
6+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
7+
<!-- Uncomment to also build the Tizen app. You will need to install Tizen by following this: https://github.com/Samsung/Tizen.NET -->
8+
<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
79
<OutputType>Exe</OutputType>
810

911
<!-- .NET MAUI -->
@@ -20,20 +22,21 @@
2022

2123
<!-- App Identifier -->
2224
<ApplicationId>com.egvijayanand.maui.datecalculator</ApplicationId>
23-
<ApplicationId Condition="$(TargetFramework.Contains('-windows'))">E4995291-7DD1-45F2-B37C-2CF5FA897267</ApplicationId>
25+
<ApplicationIdGuid>E4995291-7DD1-45F2-B37C-2CF5FA897267</ApplicationIdGuid>
2426

2527
<!-- Versions -->
2628
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
2729
<ApplicationVersion>1</ApplicationVersion>
2830

2931
<!-- Target Platform Options -->
30-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
31-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
32-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
33-
<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
32+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
33+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
34+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
35+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
36+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
3437

3538
<!-- Minimum Target OS Version for Windows Platform -->
36-
<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
39+
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
3740
</PropertyGroup>
3841

3942
<ItemGroup>

src/DateCalculator/DateCalculator.sln

+1-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DateCalculator.iOS", "DateC
2424
{5A3A2A5D-3707-4DAF-BE16-61557AC6A169} = {5A3A2A5D-3707-4DAF-BE16-61557AC6A169}
2525
EndProjectSection
2626
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DateCalculator.Wpf", "DateCalculator.Wpf\DateCalculator.Wpf.csproj", "{85712D75-C3B5-42B5-A41C-813EF313D1E7}"
27+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DateCalculator.Wpf", "DateCalculator.Wpf\DateCalculator.Wpf.csproj", "{85712D75-C3B5-42B5-A41C-813EF313D1E7}"
2828
EndProject
2929
Global
3030
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -103,7 +103,6 @@ Global
103103
{62B466BB-9349-4249-95E4-739FF15ACA2D}.Release|x86.ActiveCfg = Release|Any CPU
104104
{62B466BB-9349-4249-95E4-739FF15ACA2D}.Release|x86.Build.0 = Release|Any CPU
105105
{5A3A2A5D-3707-4DAF-BE16-61557AC6A169}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
106-
{5A3A2A5D-3707-4DAF-BE16-61557AC6A169}.Debug|Any CPU.Build.0 = Debug|Any CPU
107106
{5A3A2A5D-3707-4DAF-BE16-61557AC6A169}.Debug|ARM.ActiveCfg = Debug|Any CPU
108107
{5A3A2A5D-3707-4DAF-BE16-61557AC6A169}.Debug|ARM.Build.0 = Debug|Any CPU
109108
{5A3A2A5D-3707-4DAF-BE16-61557AC6A169}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -161,8 +160,6 @@ Global
161160
{99E69267-7FF2-49A3-A940-AD7B47B70CDB}.Release|x86.Build.0 = Release|Any CPU
162161
{99E69267-7FF2-49A3-A940-AD7B47B70CDB}.Release|x86.Deploy.0 = Release|Any CPU
163162
{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|Any CPU.ActiveCfg = Debug|x86
164-
{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|Any CPU.Build.0 = Debug|x86
165-
{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|Any CPU.Deploy.0 = Debug|x86
166163
{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|ARM.ActiveCfg = Debug|ARM
167164
{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|ARM.Build.0 = Debug|ARM
168165
{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -203,7 +200,6 @@ Global
203200
{4447AABB-F522-4633-A1B7-F07FFB05D4D7}.Release|x64.ActiveCfg = Release|iPhoneSimulator
204201
{4447AABB-F522-4633-A1B7-F07FFB05D4D7}.Release|x86.ActiveCfg = Release|iPhoneSimulator
205202
{85712D75-C3B5-42B5-A41C-813EF313D1E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
206-
{85712D75-C3B5-42B5-A41C-813EF313D1E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
207203
{85712D75-C3B5-42B5-A41C-813EF313D1E7}.Debug|ARM.ActiveCfg = Debug|Any CPU
208204
{85712D75-C3B5-42B5-A41C-813EF313D1E7}.Debug|ARM.Build.0 = Debug|Any CPU
209205
{85712D75-C3B5-42B5-A41C-813EF313D1E7}.Debug|iPhone.ActiveCfg = Debug|Any CPU

0 commit comments

Comments
 (0)