Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Template fixes #2

Open
wants to merge 46 commits into
base: develop
Choose a base branch
from
Open

Template fixes #2

wants to merge 46 commits into from

Conversation

dim-37
Copy link
Collaborator

@dim-37 dim-37 commented May 27, 2021

No description provided.

@dim-37 dim-37 requested a review from xperiandri May 27, 2021 14:53
xperiandri
xperiandri requested changes May 27, 2021
View reviewed changes
src/Templates/SolutionTemplate/.template.config/template.json Outdated
"tags": {
"language": "F#",
"type": "project"
},
"sourceName": "SolutionTemplate",
"sourceName": "App13",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Это надо откатить

src/Templates/SolutionTemplate/.vsconfig Show resolved Hide resolved
...emplates/SolutionTemplate/SolutionTemplate/SolutionTemplate.Droid/Properties/AssemblyInfo.cs Outdated

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle(AssemblyInfo.Product + " UWP app")]
[assembly: AssemblyDescription("UWP приложение"+ AssemblyInfo.Description)]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Надо откатить до этого. Только оставить

[assembly: AssemblyTitle(AssemblyInfo.Product + " UWP app")]
/// TODO: Modify description per platform
[assembly: AssemblyDescription(AssemblyInfo.Description)]

...lates/SolutionTemplate/SolutionTemplate/SolutionTemplate.Droid/SolutionTemplate.Droid.csproj Outdated
@@ -1,27 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\Solution.Build.props" />
<Import Project="..\..\Solution.Build.props" />
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

По всем файлам проектов пройтись Ctrl+E,D и untabify

...lates/SolutionTemplate/SolutionTemplate/SolutionTemplate.Droid/SolutionTemplate.Droid.csproj Outdated
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>$(AssemblyBaseName)</RootNamespace>
<AssemblyName>$(AssemblyBaseName).Droid</AssemblyName>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Вернуть

...Templates/SolutionTemplate/SolutionTemplate/SolutionTemplate.iOS/SolutionTemplate.iOS.csproj Outdated
<MtouchLink>None</MtouchLink>
<MtouchArch>x86_64</MtouchArch>
<ConsolePause>false</ConsolePause>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Я тут настройки консолидировал по смыслу. Верни порядок

...Templates/SolutionTemplate/SolutionTemplate/SolutionTemplate.iOS/SolutionTemplate.iOS.csproj Outdated
@@ -64,17 +60,13 @@
<OutputPath>bin\iPhone\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<BuildIpa>true</BuildIpa>
<IOSDebugOverWiFi>true</IOSDebugOverWiFi>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Пусть будет

...Templates/SolutionTemplate/SolutionTemplate/SolutionTemplate.iOS/SolutionTemplate.iOS.csproj Outdated
<MtouchUseLlvm>true</MtouchUseLlvm>
<MtouchEnableSGenConc>true</MtouchEnableSGenConc>
<!-- Possible options: -->
<!-- -interpreter=FSharp.Core -->
<!-- -linkskip=FSharp.Core -->
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Оставь

...emplates/SolutionTemplate/SolutionTemplate/SolutionTemplate.macOS/Properties/AssemblyInfo.cs Outdated
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("SolutionTemplate.macOS")]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Тоже с общего файла подтягивать

...lates/SolutionTemplate/SolutionTemplate/SolutionTemplate.macOS/SolutionTemplate.macOS.csproj Outdated
@@ -111,28 +118,24 @@
<ImageAsset Include="Assets.xcassets\unologo.imageset\unoplatform.jpg" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
<Folder Include="Resources\Fonts\" />
<Folder Include="Assets.xcassets\unologo.imageset\" />
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Студия почему-то эти папки выпиливает. По-моему они в шаблоне есть

xperiandri
xperiandri reviewed May 27, 2021
View reviewed changes
...lates/SolutionTemplate/SolutionTemplate/SolutionTemplate.Droid/SolutionTemplate.Droid.csproj Outdated
<Compile Remove="$(_AndroidResourceDesignerFile)" />
</ItemGroup>
</Target>
</Project>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Что-то мне кажется, что здесь табы

xperiandri
xperiandri reviewed May 27, 2021
View reviewed changes
...tes/SolutionTemplate/SolutionTemplate/SolutionTemplate.Shared/SolutionTemplate.Shared.shproj Outdated
<ProjectGuid>6279c845-92f8-4333-ab99-3d213163593c</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<ProjectGuid>6279c845-92f8-4333-ab99-3d213163593c</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
Copy link
Owner

@xperiandri xperiandri May 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Тут что-то не так с отступом

xperiandri
xperiandri requested changes May 27, 2021
View reviewed changes
...SolutionTemplate/SolutionTemplate/SolutionTemplate.Skia.Gtk/SolutionTemplate.Skia.Gtk.csproj Outdated
<ProjectReference Include="..\SolutionTemplate\SolutionTemplate.fsproj" />
</ItemGroup>
<Import Project="..\SolutionTemplate.Shared\SolutionTemplate.Shared.projitems" Label="Shared" />
</Project>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Отступы неправильные

...tionTemplate/SolutionTemplate/SolutionTemplate.Skia.Tizen/SolutionTemplate.Skia.Tizen.csproj Outdated
<ProjectReference Include="..\SolutionTemplate\SolutionTemplate.fsproj" />
</ItemGroup>
<Import Project="..\SolutionTemplate.Shared\SolutionTemplate.Shared.projitems" Label="Shared" />
</Project>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Отступы неправильные

...mplate/SolutionTemplate/SolutionTemplate.Skia.Wpf.Host/SolutionTemplate.Skia.Wpf.Host.csproj Outdated
<ProjectReference Include="..\SolutionTemplate.Skia.WPF\SolutionTemplate.Skia.WPF.csproj" />
<ProjectReference Include="..\SolutionTemplate\SolutionTemplate.fsproj" />
</ItemGroup>
</Project>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Отступы неправильные

...mplate/SolutionTemplate/SolutionTemplate.Skia.Wpf.Host/SolutionTemplate.Skia.Wpf.Host.csproj Outdated
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Uno.UI.Skia.Wpf" Version="3.7.4" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.7.4" Condition="'$(Configuration)'=='Debug'" />
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Мы же тут на звёздочку?
А давай версию в props вынесем. Чтобы проще было

src/Templates/SolutionTemplate/SolutionTemplate/SolutionTemplate/SolutionTemplate.fsproj Outdated
</ItemGroup>



Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Много лишних строк пустых

xperiandri
xperiandri requested changes Jun 1, 2021
View reviewed changes
src/Templates/SolutionTemplate/SolutionTemplate.Droid/MainActivity.cs Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.Droid/Properties/AssemblyInfo.cs Outdated Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.Droid/SolutionTemplate.Droid.csproj Outdated Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.Droid/SolutionTemplate.Droid.csproj Outdated
<PackageReference Include="Uno.UI.RemoteControl" Version="3.7.4" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI" Version="3.7.4" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.33" />
<!-- Analyzers -->
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Выдели тогда их вообще в отдельную группу и поставь выше текущей группы надо строкой 65

src/Templates/SolutionTemplate/SolutionTemplate.Droid/SolutionTemplate.Droid.csproj Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.macOS/Main.cs Outdated Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.macOS/Properties/AssemblyInfo.cs Outdated Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.macOS/SolutionTemplate.macOS.csproj Outdated
<ItemGroup>
<ReferencePath Remove="@(_ReferencePathToRemove)" />
</ItemGroup>
</Target>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Аналогино

src/Templates/SolutionTemplate/SolutionTemplate/SolutionTemplate.fsproj Outdated
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.*" />
<PackageReference Include="Uno.Core" Version="2.3.0" />
<PackageReference Include="Uno.UI" Version="3.7.*" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.*" />
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Отступы

src/Templates/SolutionTemplate/SolutionTemplate/SolutionTemplate.fsproj Outdated
</ItemGroup>

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="5.0.*" />
<PackageReference Update="FSharp.Core" Version="5.0.1" />
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Возвращает на звёздочку

@dim-37 dim-37 force-pushed the template_fixes branch 2 times, most recently from 124d3b0 to ab05c1f Compare June 1, 2021 13:43
xperiandri
xperiandri requested changes Jun 1, 2021
View reviewed changes
src/Templates/SolutionTemplate/SolutionTemplate.Skia.Tizen/SolutionTemplate.Skia.Tizen.csproj Outdated Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.Skia.Wpf/Program.cs Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.Skia.Wpf/SolutionTemplate.Skia.Wpf.csproj Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.UWP/SolutionTemplate.UWP.csproj Outdated Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.UWP/SolutionTemplate.UWP.csproj Outdated Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.iOS/SolutionTemplate.iOS.csproj Outdated Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.iOS/SolutionTemplate.iOS.csproj Outdated Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.iOS/SolutionTemplate.iOS.csproj Outdated Show resolved Hide resolved
src/Templates/SolutionTemplate/SolutionTemplate.iOS/SolutionTemplate.iOS.csproj Outdated Show resolved Hide resolved
@dim-37 dim-37 force-pushed the template_fixes branch 4 times, most recently from b1c3d17 to 7a4e4fb Compare June 1, 2021 14:15
@xperiandri xperiandri force-pushed the template_fixes branch 3 times, most recently from 8706b7c to 932d4c6 Compare June 2, 2021 20:23
@xperiandri xperiandri force-pushed the template_fixes branch 6 times, most recently from a458d39 to 7c8f6e7 Compare June 8, 2021 14:48
@xperiandri xperiandri force-pushed the develop branch 2 times, most recently from 0d5e392 to 43c92d0 Compare August 24, 2021 13:23
xperiandri and others added 23 commits October 23, 2021 23:11
@xperiandri
Added AppStore configuration for Android, set linking to SDK Only and…
012b6a2 
… disabled LLVM
@xperiandri
Added missing NoWarn for Release|iPhone
2e3ddcb
@xperiandri
Fixed issue with UseDotNetNativeToolchain for all platforms except x8…
0a3cae0 
…6, however crashes on runtime
@xperiandri
Disabled UseDotNetNativeToolchain
9bf516e
@dim-37 @xperiandri
Added UnoCoreVersion variable to Solution.Build.props.
49dcf53 
Renamed UnoVersion variable to UnoUIVersion.
Updated Uno Version from 3.7.* to 3.8.*.
Updated Uno Core Version from 2.3.0 to 2.4.*.
@xperiandri
Aligned output path for Android, iOS and macOS, removed root namespac…
53e3df4 
…e from projects as it is added from props
@xperiandri
Added sample configuration code for IOptions pattern usage
8e1336e
@xperiandri
Updated NuGet packages
72c299e
@xperiandri
Added System.Text.Json to linker
b3ebf71
@xperiandri
Fixed notifications and added configuration
aba039c
@xperiandri
Renamed Models.fs to Notification.fs and removed Notification module
b5ad3e0
@xperiandri
Fixed versions to work on Android, updated Uno.UI to 3.9.*
a8fe210
@xperiandri
Fixed global navigation in samples shell
3dc10f5
@xperiandri
Added TextBox with two way binding and throttling
f169dba
@xperiandri
Fixed deadlock on WASM
1f68dc7
@xperiandri
Updated NuGet packages
0c8b919 
Uno.Core to 2.4.*
Microsoft.UI.Xaml to 2.6.*
FSharp.Control.FusionTasks to 2.4.*
FSharpPlus to 1.2.*
Xamarin.Essentials to 1.7.*
@xperiandri
Fixed linked issue for WASM on .NET 5 and moved WASM to .NET 5
160f309
@xperiandri
Fixed InfoBarSeverity enum parsing issue on WASM
e0c2465
@xperiandri
Migrated core and samples projects to Solution.Build.props and aligne…
6845f14 
…d versions with SolutionTemplate
@xperiandri
Added trys with Debugger.Break() if exception for PropertyChanged and…
7abb04a 
… ErrorsChanged subscriptions in ViewModel
@xperiandri
Fixed ValidationControl bugs and improved implementation
3bc2f4c
@xperiandri
Fixed SubModelSeq sample containing TreeView by using WinUI version
ae5a42f
@xperiandri
Implemented validation sample using ValidationControl with error styling
0e01c25
@xperiandri xperiandri force-pushed the develop branch 4 times, most recently from f2a63b3 to eac5d9c Compare January 17, 2022 01:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xperiandri xperiandri xperiandri requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dim-37 @xperiandri