Skip to content

Commit

Permalink
feat: update Uno.ToDo to the new UnoTemplate
Browse files Browse the repository at this point in the history
  • Loading branch information
Arieldelossantos committed Jun 20, 2023
1 parent 824c6c4 commit 8b52aff
Show file tree
Hide file tree
Showing 216 changed files with 3,387 additions and 3,484 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -329,4 +329,5 @@ ASALocalRun/
# MFractors (Xamarin productivity tool) working folder
.mfractor/

*.token.cs
*.token.cs
src/.vsconfig
2 changes: 1 addition & 1 deletion build/workflow/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

steps:
- template: templates/gitversion.yml
- template: templates/dotnet6-install-windows.yml
- template: templates/dotnet7-install-windows.yml

# This SDK version is needed as long as `uap10.0` will be supported in Uno.Core
- powershell: .\build\Install-WindowsSdkISO.ps1 18362
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
DotNetVersion: '6.0.300'
UnoCheck_Version: '1.3.0'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/8c7f669060a6cca50f71bb0845281c424ad7eb0d/manifests/uno.ui-preview.manifest.json'
DotNetVersion: '7.0.203'
UnoCheck_Version: '1.5.4'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json'
Dotnet_Root: '/usr/local/share/dotnet/'
Dotnet_Tools: '~/.dotnet/tools'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
DotNetVersion: '6.0.300'
UnoCheck_Version: '1.3.0'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/8c7f669060a6cca50f71bb0845281c424ad7eb0d/manifests/uno.ui-preview.manifest.json'
DotNetVersion: '7.0.203'
UnoCheck_Version: '1.5.4'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json'

steps:

Expand Down
112 changes: 0 additions & 112 deletions src/.vsconfig

This file was deleted.

62 changes: 47 additions & 15 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,24 +1,56 @@
<Project ToolsVersion="15.0">
<PropertyGroup>
<LangVersion>10.0</LangVersion>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<LangVersion>11</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<UnoExtensionsGeneration_DisableNotNullIfNotNullAttribute>true</UnoExtensionsGeneration_DisableNotNullIfNotNullAttribute>
<UnoExtensionsGeneration_DisableNotNullWhenAttribute>true</UnoExtensionsGeneration_DisableNotNullWhenAttribute>
</PropertyGroup>

<PropertyGroup>
<DebugType>portable</DebugType>
<DebugSymbols>True</DebugSymbols>
<NoWarn>Uno0001;CS1998;CA1416;NU1504;NU1505;NU1507</NoWarn>
<SynthesizeLinkMetadata>true</SynthesizeLinkMetadata>
</PropertyGroup>
<SynthesizeLinkMetadata>true</SynthesizeLinkMetadata>

<PropertyGroup>
<UnoVersion>4.7.0-dev.73</UnoVersion>
<UnoExtensionsVersion>2.3.0-dev.263</UnoExtensionsVersion>
<UnoToolkitVersion>2.4.0-dev.110</UnoToolkitVersion>
<UnoMaterialVersion>2.4.0-dev.57</UnoMaterialVersion>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);Uno0001;CS1998;CA1416;NU1507</NoWarn>

<DefaultLanguage>en</DefaultLanguage>

<IsAndroid>false</IsAndroid>
<IsIOS>false</IsIOS>
<IsMac>false</IsMac>
<IsMacCatalyst>false</IsMacCatalyst>
<IsWinAppSdk>false</IsWinAppSdk>
</PropertyGroup>

<Choose>
<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
<PropertyGroup>
<IsAndroid>true</IsAndroid>
<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
</PropertyGroup>
</When>
<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
<PropertyGroup>
<IsIOS>true</IsIOS>
<SupportedOSPlatformVersion>14.2</SupportedOSPlatformVersion>
</PropertyGroup>
</When>
<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">
<PropertyGroup>
<IsMac>true</IsMac>
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
</PropertyGroup>
</When>
<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
<PropertyGroup>
<IsMacCatalyst>true</IsMacCatalyst>
<SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
</PropertyGroup>
</When>
<When Condition="$(TargetFramework.Contains('windows10'))">
<PropertyGroup>
<IsWinAppSdk>true</IsWinAppSdk>
<SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
</PropertyGroup>
</When>
</Choose>
</Project>
9 changes: 2 additions & 7 deletions src/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
<Project ToolsVersion="15.0" >

<!-- Uno.WinUI.MSAL references Uno.WinUI for windows10 tfm. This target
overrides the protection in uno.winui.targets that raises an error
that breaks build -->
<Target Name="_WinAppSDKNotSupported" BeforeTargets="BeforeBuild" />
</Project>
<Project ToolsVersion="15.0">
</Project>
17 changes: 17 additions & 0 deletions src/ToDo.Base/AppHead.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<local:App x:Class="ToDo.AppHead"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:wasm="http://platform.uno/wasm"
xmlns:local="using:ToDo"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="wasm">

<local:App.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="ms-appx:///ToDo/AppResources.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</local:App.Resources>

</local:App>
13 changes: 13 additions & 0 deletions src/ToDo.Base/AppHead.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace ToDo;

public sealed partial class AppHead : App
{
/// <summary>
/// Initializes the singleton application object. This is the first line of authored code
/// executed, and as such is the logical equivalent of main() or WinMain().
/// </summary>
public AppHead()
{
this.InitializeComponent();
}
}
Loading

0 comments on commit 8b52aff

Please sign in to comment.