diff --git a/Avalonia.Templates.csproj b/Avalonia.Templates.csproj index e9f557f8..3714bf54 100644 --- a/Avalonia.Templates.csproj +++ b/Avalonia.Templates.csproj @@ -2,7 +2,7 @@ Template - 0.10.18.5 + 0.10.18.6 Avalonia.Templates Avalonia Templates Templates for creating Avalonia applications and libraries. diff --git a/readme.md b/readme.md index 5f5a0896..632af6dc 100644 --- a/readme.md +++ b/readme.md @@ -53,10 +53,18 @@ Available parameters: *Description*: The target version of Avalonia NuGet packages. -*Options*: **0.10.18**, **11.0.0-preview4** +*Options*: **0.10.18**, **11.0.0-preview5** *By default*: 0.10.18 +``-cp, --compiled-bindings`` + +*Description*: Defines if CompiledBindings should be enabled by default in the project (only supported in 11.0 version and newer). See [documentation](https://docs.avaloniaui.net/docs/data-binding/compiledbindings) for more details. + +*Options*: **true**, **false** + +*By default*: true + ``--no-restore`` *Description*: If specified, skips the automatic restore of the project on create. @@ -90,6 +98,14 @@ Available parameters: *By default*: 0.10.18 +``-cp, --compiled-bindings`` + +*Description*: Defines if CompiledBindings should be enabled by default in the project (only supported in 11.0 version and newer). See [documentation](https://docs.avaloniaui.net/docs/data-binding/compiledbindings) for more details. + +*Options*: **true**, **false** + +*By default*: true + ``-m, --mvvm`` *Description*: MVVM toolkit to use in the template. @@ -110,7 +126,17 @@ To create a new Cross-Platform application in its own subdirectory, run: dotnet new avalonia.xplat ``` **Note:** -This type of template allows you to create an application that will work on Desktop, Browser (preview) and Mobile (iOS & Android) (preview). +This type of template allows you to create an application that will work on Desktop, Browser and Mobile (iOS & Android). Only available with 11.0 preview versions. + +Available parameters: + +``-cp, --compiled-bindings`` + +*Description*: Defines if CompiledBindings should be enabled by default in the project. See [documentation](https://docs.avaloniaui.net/docs/data-binding/compiledbindings) for more details. + +*Options*: **true**, **false** + +*By default*: true # Creating a new Window diff --git a/templates/csharp/app-mvvm/.gitignore b/templates/csharp/app-mvvm/.gitignore deleted file mode 100644 index 8afdcb63..00000000 --- a/templates/csharp/app-mvvm/.gitignore +++ /dev/null @@ -1,454 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# Tye -.tye/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd - -## -## Visual studio for Mac -## - - -# globs -Makefile.in -*.userprefs -*.usertasks -config.make -config.status -aclocal.m4 -install-sh -autom4te.cache/ -*.tar.gz -tarballs/ -test-results/ - -# Mac bundle stuff -*.dmg -*.app - -# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore -# Windows thumbnail cache files -Thumbs.db -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# JetBrains Rider -.idea/ -*.sln.iml - -## -## Visual Studio Code -## -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json diff --git a/templates/csharp/app-mvvm/.template.config/dotnetcli.host.json b/templates/csharp/app-mvvm/.template.config/dotnetcli.host.json index 374fc9eb..b41e987b 100644 --- a/templates/csharp/app-mvvm/.template.config/dotnetcli.host.json +++ b/templates/csharp/app-mvvm/.template.config/dotnetcli.host.json @@ -13,6 +13,9 @@ }, "MVVMToolkit": { "longName": "mvvm" + }, + "UseCompiledBindings": { + "longName": "compiled-bindings" } }, "usageExamples": [ diff --git a/templates/csharp/app-mvvm/.template.config/ide.host.json b/templates/csharp/app-mvvm/.template.config/ide.host.json index 01f1de90..756378a6 100644 --- a/templates/csharp/app-mvvm/.template.config/ide.host.json +++ b/templates/csharp/app-mvvm/.template.config/ide.host.json @@ -15,6 +15,13 @@ "text": "MVVM Toolkit" }, "isVisible": true + }, + { + "id": "UseCompiledBindings", + "name": { + "text": "Use Compiled Bindings" + }, + "isVisible": true } ] } \ No newline at end of file diff --git a/templates/csharp/app-mvvm/.template.config/template.json b/templates/csharp/app-mvvm/.template.config/template.json index fabedd81..f63ccac2 100644 --- a/templates/csharp/app-mvvm/.template.config/template.json +++ b/templates/csharp/app-mvvm/.template.config/template.json @@ -83,6 +83,14 @@ "type": "computed", "value": "(AvaloniaVersion == \"0.10.18\")" }, + "UseCompiledBindings": { + "type": "parameter", + "description": "Defines if CompiledBindings should be enabled by default in the project (only supported in 11.0 version and newer).", + "datatype": "bool", + "displayName": "Use compiled Bindings", + "defaultValue": "true", + "isEnabled": "(AvaloniaVersion != \"0.10.18\")" + }, "HostIdentifier": { "type": "bind", "binding": "HostIdentifier" diff --git a/templates/csharp/app-mvvm/AvaloniaAppTemplate.csproj b/templates/csharp/app-mvvm/AvaloniaAppTemplate.csproj index e8524dc0..db349618 100644 --- a/templates/csharp/app-mvvm/AvaloniaAppTemplate.csproj +++ b/templates/csharp/app-mvvm/AvaloniaAppTemplate.csproj @@ -5,17 +5,21 @@ enable true app.manifest + + true + - + - + + diff --git a/templates/csharp/app-mvvm/Roots.xml b/templates/csharp/app-mvvm/Roots.xml deleted file mode 100644 index 828fb952..00000000 --- a/templates/csharp/app-mvvm/Roots.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/templates/csharp/app-mvvm/Views/MainWindow.axaml b/templates/csharp/app-mvvm/Views/MainWindow.axaml index c8b938c5..2fd41ce0 100644 --- a/templates/csharp/app-mvvm/Views/MainWindow.axaml +++ b/templates/csharp/app-mvvm/Views/MainWindow.axaml @@ -5,6 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="AvaloniaAppTemplate.Views.MainWindow" + x:DataType="vm:MainWindowViewModel" Icon="/Assets/avalonia-logo.ico" Title="AvaloniaAppTemplate"> diff --git a/templates/csharp/app/.gitignore b/templates/csharp/app/.gitignore deleted file mode 100644 index 8afdcb63..00000000 --- a/templates/csharp/app/.gitignore +++ /dev/null @@ -1,454 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# Tye -.tye/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd - -## -## Visual studio for Mac -## - - -# globs -Makefile.in -*.userprefs -*.usertasks -config.make -config.status -aclocal.m4 -install-sh -autom4te.cache/ -*.tar.gz -tarballs/ -test-results/ - -# Mac bundle stuff -*.dmg -*.app - -# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore -# Windows thumbnail cache files -Thumbs.db -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# JetBrains Rider -.idea/ -*.sln.iml - -## -## Visual Studio Code -## -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json diff --git a/templates/csharp/app/.template.config/dotnetcli.host.json b/templates/csharp/app/.template.config/dotnetcli.host.json index 02379f43..b4b553bb 100644 --- a/templates/csharp/app/.template.config/dotnetcli.host.json +++ b/templates/csharp/app/.template.config/dotnetcli.host.json @@ -10,6 +10,9 @@ }, "AvaloniaVersion": { "longName": "avalonia-version" + }, + "UseCompiledBindings": { + "longName": "compiled-bindings" } }, "usageExamples": [ diff --git a/templates/csharp/app/.template.config/ide.host.json b/templates/csharp/app/.template.config/ide.host.json index 937f4730..db78fdfb 100644 --- a/templates/csharp/app/.template.config/ide.host.json +++ b/templates/csharp/app/.template.config/ide.host.json @@ -8,6 +8,13 @@ "text": "Avalonia Version" }, "isVisible": true + }, + { + "id": "UseCompiledBindings", + "name": { + "text": "Use Compiled Bindings" + }, + "isVisible": true } ] } \ No newline at end of file diff --git a/templates/csharp/app/.template.config/template.json b/templates/csharp/app/.template.config/template.json index 37db4e2f..c425c4b4 100644 --- a/templates/csharp/app/.template.config/template.json +++ b/templates/csharp/app/.template.config/template.json @@ -59,6 +59,14 @@ "type": "computed", "value": "(AvaloniaVersion == \"0.10.18\")" }, + "UseCompiledBindings": { + "type": "parameter", + "description": "Defines if CompiledBindings should be enabled by default in the project (only supported in 11.0 version and newer).", + "datatype": "bool", + "displayName": "Use compiled Bindings", + "defaultValue": "true", + "isEnabled": "(AvaloniaVersion != \"0.10.18\")" + }, "HostIdentifier": { "type": "bind", "binding": "HostIdentifier" diff --git a/templates/csharp/app/AvaloniaAppTemplate.csproj b/templates/csharp/app/AvaloniaAppTemplate.csproj index 1b77fc83..45828951 100644 --- a/templates/csharp/app/AvaloniaAppTemplate.csproj +++ b/templates/csharp/app/AvaloniaAppTemplate.csproj @@ -5,14 +5,16 @@ enable true app.manifest + + true + - - - + - + + diff --git a/templates/csharp/app/Roots.xml b/templates/csharp/app/Roots.xml deleted file mode 100644 index 828fb952..00000000 --- a/templates/csharp/app/Roots.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/templates/csharp/xplat/.template.config/dotnetcli.host.json b/templates/csharp/xplat/.template.config/dotnetcli.host.json index da1886f4..863c89f7 100644 --- a/templates/csharp/xplat/.template.config/dotnetcli.host.json +++ b/templates/csharp/xplat/.template.config/dotnetcli.host.json @@ -3,6 +3,9 @@ "symbolInfo": { "Framework": { "longName": "framework" + }, + "UseCompiledBindings": { + "longName": "compiled-bindings" } }, "usageExamples": [ diff --git a/templates/csharp/xplat/.template.config/ide.host.json b/templates/csharp/xplat/.template.config/ide.host.json new file mode 100644 index 00000000..f0d412a3 --- /dev/null +++ b/templates/csharp/xplat/.template.config/ide.host.json @@ -0,0 +1,20 @@ +{ + "$schema": "http://json.schemastore.org/ide.host", + "icon": "icon.png", + "symbolInfo": [ + { + "id": "UseCompiledBindings", + "name": { + "text": "Use Compiled Bindings" + }, + "isVisible": true + }, + { + "id": "UseCompiledBindings", + "name": { + "text": "Use Compiled Bindings" + }, + "isVisible": true + } + ] +} \ No newline at end of file diff --git a/templates/csharp/xplat/.template.config/template.json b/templates/csharp/xplat/.template.config/template.json index d70ef910..4bf63c9f 100644 --- a/templates/csharp/xplat/.template.config/template.json +++ b/templates/csharp/xplat/.template.config/template.json @@ -28,6 +28,13 @@ "replaces": "FrameworkParameter", "defaultValue": "net7.0" }, + "UseCompiledBindings": { + "type": "parameter", + "description": "Defines if CompiledBindings should be enabled by default in the project (only supported in 11.0 version and newer).", + "datatype": "bool", + "displayName": "Use compiled Bindings", + "defaultValue": "true" + }, "HostIdentifier": { "type": "bind", "binding": "HostIdentifier" diff --git a/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj b/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj index 6065e914..4d9ede19 100644 --- a/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj +++ b/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj @@ -3,11 +3,19 @@ FrameworkParameter enable latest + + true + + + + + + + - diff --git a/templates/csharp/xplat/AvaloniaTest/Roots.xml b/templates/csharp/xplat/AvaloniaTest/Roots.xml deleted file mode 100644 index ae3389c1..00000000 --- a/templates/csharp/xplat/AvaloniaTest/Roots.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/templates/csharp/xplat/AvaloniaTest/Views/MainView.axaml b/templates/csharp/xplat/AvaloniaTest/Views/MainView.axaml index b1eb7cc3..8ee32c55 100644 --- a/templates/csharp/xplat/AvaloniaTest/Views/MainView.axaml +++ b/templates/csharp/xplat/AvaloniaTest/Views/MainView.axaml @@ -2,15 +2,14 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:viewModels="clr-namespace:AvaloniaTest.ViewModels" + xmlns:vm="clr-namespace:AvaloniaTest.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="AvaloniaTest.Views.MainView" - Foreground="White" - Background="#171C2C"> + x:DataType="vm:MainViewModel"> - + diff --git a/templates/fsharp/app-mvvm/.gitignore b/templates/fsharp/app-mvvm/.gitignore deleted file mode 100644 index 8afdcb63..00000000 --- a/templates/fsharp/app-mvvm/.gitignore +++ /dev/null @@ -1,454 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# Tye -.tye/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd - -## -## Visual studio for Mac -## - - -# globs -Makefile.in -*.userprefs -*.usertasks -config.make -config.status -aclocal.m4 -install-sh -autom4te.cache/ -*.tar.gz -tarballs/ -test-results/ - -# Mac bundle stuff -*.dmg -*.app - -# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore -# Windows thumbnail cache files -Thumbs.db -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# JetBrains Rider -.idea/ -*.sln.iml - -## -## Visual Studio Code -## -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json diff --git a/templates/fsharp/app-mvvm/.template.config/dotnetcli.host.json b/templates/fsharp/app-mvvm/.template.config/dotnetcli.host.json index 374fc9eb..b41e987b 100644 --- a/templates/fsharp/app-mvvm/.template.config/dotnetcli.host.json +++ b/templates/fsharp/app-mvvm/.template.config/dotnetcli.host.json @@ -13,6 +13,9 @@ }, "MVVMToolkit": { "longName": "mvvm" + }, + "UseCompiledBindings": { + "longName": "compiled-bindings" } }, "usageExamples": [ diff --git a/templates/fsharp/app-mvvm/.template.config/ide.host.json b/templates/fsharp/app-mvvm/.template.config/ide.host.json index 01f1de90..756378a6 100644 --- a/templates/fsharp/app-mvvm/.template.config/ide.host.json +++ b/templates/fsharp/app-mvvm/.template.config/ide.host.json @@ -15,6 +15,13 @@ "text": "MVVM Toolkit" }, "isVisible": true + }, + { + "id": "UseCompiledBindings", + "name": { + "text": "Use Compiled Bindings" + }, + "isVisible": true } ] } \ No newline at end of file diff --git a/templates/fsharp/app-mvvm/.template.config/template.json b/templates/fsharp/app-mvvm/.template.config/template.json index 1a678084..f59390c8 100644 --- a/templates/fsharp/app-mvvm/.template.config/template.json +++ b/templates/fsharp/app-mvvm/.template.config/template.json @@ -83,6 +83,14 @@ "type": "computed", "value": "(AvaloniaVersion == \"0.10.18\")" }, + "UseCompiledBindings": { + "type": "parameter", + "description": "Defines if CompiledBindings should be enabled by default in the project (only supported in 11.0 version and newer).", + "datatype": "bool", + "displayName": "Use compiled Bindings", + "defaultValue": "true", + "isEnabled": "(AvaloniaVersion != \"0.10.18\")" + }, "HostIdentifier": { "type": "bind", "binding": "HostIdentifier" diff --git a/templates/fsharp/app-mvvm/AvaloniaAppTemplate.fsproj b/templates/fsharp/app-mvvm/AvaloniaAppTemplate.fsproj index e807336f..85e026c0 100644 --- a/templates/fsharp/app-mvvm/AvaloniaAppTemplate.fsproj +++ b/templates/fsharp/app-mvvm/AvaloniaAppTemplate.fsproj @@ -4,12 +4,20 @@ FrameworkParameter true app.manifest + + true + + + + + + + - @@ -21,10 +29,6 @@ - - - - diff --git a/templates/fsharp/app-mvvm/Roots.xml b/templates/fsharp/app-mvvm/Roots.xml deleted file mode 100644 index 828fb952..00000000 --- a/templates/fsharp/app-mvvm/Roots.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/templates/fsharp/app-mvvm/Views/MainWindow.axaml b/templates/fsharp/app-mvvm/Views/MainWindow.axaml index 088be440..c6fe4417 100644 --- a/templates/fsharp/app-mvvm/Views/MainWindow.axaml +++ b/templates/fsharp/app-mvvm/Views/MainWindow.axaml @@ -5,6 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="AvaloniaAppTemplate.Views.MainWindow" + x:DataType="vm:MainWindowViewModel" Icon="/Assets/avalonia-logo.ico" Title="AvaloniaAppTemplate"> diff --git a/templates/fsharp/app/.gitignore b/templates/fsharp/app/.gitignore deleted file mode 100644 index 8afdcb63..00000000 --- a/templates/fsharp/app/.gitignore +++ /dev/null @@ -1,454 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# Tye -.tye/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd - -## -## Visual studio for Mac -## - - -# globs -Makefile.in -*.userprefs -*.usertasks -config.make -config.status -aclocal.m4 -install-sh -autom4te.cache/ -*.tar.gz -tarballs/ -test-results/ - -# Mac bundle stuff -*.dmg -*.app - -# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore -# Windows thumbnail cache files -Thumbs.db -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# JetBrains Rider -.idea/ -*.sln.iml - -## -## Visual Studio Code -## -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json diff --git a/templates/fsharp/app/.template.config/dotnetcli.host.json b/templates/fsharp/app/.template.config/dotnetcli.host.json index 02379f43..b4b553bb 100644 --- a/templates/fsharp/app/.template.config/dotnetcli.host.json +++ b/templates/fsharp/app/.template.config/dotnetcli.host.json @@ -10,6 +10,9 @@ }, "AvaloniaVersion": { "longName": "avalonia-version" + }, + "UseCompiledBindings": { + "longName": "compiled-bindings" } }, "usageExamples": [ diff --git a/templates/fsharp/app/.template.config/ide.host.json b/templates/fsharp/app/.template.config/ide.host.json index 937f4730..db78fdfb 100644 --- a/templates/fsharp/app/.template.config/ide.host.json +++ b/templates/fsharp/app/.template.config/ide.host.json @@ -8,6 +8,13 @@ "text": "Avalonia Version" }, "isVisible": true + }, + { + "id": "UseCompiledBindings", + "name": { + "text": "Use Compiled Bindings" + }, + "isVisible": true } ] } \ No newline at end of file diff --git a/templates/fsharp/app/.template.config/template.json b/templates/fsharp/app/.template.config/template.json index 09f72072..bac8a880 100644 --- a/templates/fsharp/app/.template.config/template.json +++ b/templates/fsharp/app/.template.config/template.json @@ -59,6 +59,14 @@ "type": "computed", "value": "(AvaloniaVersion == \"0.10.18\")" }, + "UseCompiledBindings": { + "type": "parameter", + "description": "Defines if CompiledBindings should be enabled by default in the project (only supported in 11.0 version and newer).", + "datatype": "bool", + "displayName": "Use compiled Bindings", + "defaultValue": "true", + "isEnabled": "(AvaloniaVersion != \"0.10.18\")" + }, "HostIdentifier": { "type": "bind", "binding": "HostIdentifier" diff --git a/templates/fsharp/app/AvaloniaAppTemplate.fsproj b/templates/fsharp/app/AvaloniaAppTemplate.fsproj index e5344c00..1912e4e8 100644 --- a/templates/fsharp/app/AvaloniaAppTemplate.fsproj +++ b/templates/fsharp/app/AvaloniaAppTemplate.fsproj @@ -4,20 +4,21 @@ FrameworkParameter true app.manifest + + true + + - - - - - - - + + - + + + diff --git a/templates/fsharp/app/Roots.xml b/templates/fsharp/app/Roots.xml deleted file mode 100644 index 828fb952..00000000 --- a/templates/fsharp/app/Roots.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/templates/fsharp/xplat/.template.config/dotnetcli.host.json b/templates/fsharp/xplat/.template.config/dotnetcli.host.json index da1886f4..863c89f7 100644 --- a/templates/fsharp/xplat/.template.config/dotnetcli.host.json +++ b/templates/fsharp/xplat/.template.config/dotnetcli.host.json @@ -3,6 +3,9 @@ "symbolInfo": { "Framework": { "longName": "framework" + }, + "UseCompiledBindings": { + "longName": "compiled-bindings" } }, "usageExamples": [ diff --git a/templates/fsharp/xplat/.template.config/ide.host.json b/templates/fsharp/xplat/.template.config/ide.host.json new file mode 100644 index 00000000..8920d486 --- /dev/null +++ b/templates/fsharp/xplat/.template.config/ide.host.json @@ -0,0 +1,13 @@ +{ + "$schema": "http://json.schemastore.org/ide.host", + "icon": "icon.png", + "symbolInfo": [ + { + "id": "UseCompiledBindings", + "name": { + "text": "Use Compiled Bindings" + }, + "isVisible": true + } + ] +} \ No newline at end of file diff --git a/templates/fsharp/xplat/.template.config/template.json b/templates/fsharp/xplat/.template.config/template.json index e9273245..b1012108 100644 --- a/templates/fsharp/xplat/.template.config/template.json +++ b/templates/fsharp/xplat/.template.config/template.json @@ -28,6 +28,13 @@ "replaces": "FrameworkParameter", "defaultValue": "net7.0" }, + "UseCompiledBindings": { + "type": "parameter", + "description": "Defines if CompiledBindings should be enabled by default in the project (only supported in 11.0 version and newer).", + "datatype": "bool", + "displayName": "Use compiled Bindings", + "defaultValue": "true" + }, "HostIdentifier": { "type": "bind", "binding": "HostIdentifier" diff --git a/templates/fsharp/xplat/AvaloniaTest/AvaloniaTest.fsproj b/templates/fsharp/xplat/AvaloniaTest/AvaloniaTest.fsproj index 910c7f7a..44c0d2e6 100644 --- a/templates/fsharp/xplat/AvaloniaTest/AvaloniaTest.fsproj +++ b/templates/fsharp/xplat/AvaloniaTest/AvaloniaTest.fsproj @@ -3,8 +3,17 @@ FrameworkParameter enable latest + + true + + + + + + + @@ -18,10 +27,6 @@ - - - - diff --git a/templates/fsharp/xplat/AvaloniaTest/Roots.xml b/templates/fsharp/xplat/AvaloniaTest/Roots.xml deleted file mode 100644 index ae3389c1..00000000 --- a/templates/fsharp/xplat/AvaloniaTest/Roots.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/templates/fsharp/xplat/AvaloniaTest/Views/MainView.axaml b/templates/fsharp/xplat/AvaloniaTest/Views/MainView.axaml index 466f65fa..c753c187 100644 --- a/templates/fsharp/xplat/AvaloniaTest/Views/MainView.axaml +++ b/templates/fsharp/xplat/AvaloniaTest/Views/MainView.axaml @@ -2,15 +2,14 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:viewModels="clr-namespace:AvaloniaTest.ViewModels" + xmlns:vm="clr-namespace:AvaloniaTest.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="AvaloniaTest.Views.MainView" - Foreground="White" - Background="#171C2C"> + x:DataType="vm:MainViewModel"> - + diff --git a/tests/build-test.ps1 b/tests/build-test.ps1 index e1046e0b..4fad25d0 100644 --- a/tests/build-test.ps1 +++ b/tests/build-test.ps1 @@ -98,6 +98,8 @@ Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "f" "net6.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "f" "net7.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "0.10.18" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "11.0.0-preview5" $binlog +Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "cb" "true" $binlog +Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "cb" "false" $binlog # Build the project only twice with all item templates,once with .net6.0 tfm and once with .net7.0 tfm for C# and F# Test-Template "avalonia.mvvm" "AvaloniaMvvm" "C#" "f" "net6.0" $binlog @@ -106,13 +108,19 @@ Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "0.10.18" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "11.0.0-preview5" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "m" "ReactiveUI" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "m" "CommunityToolkit" $binlog +Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "cb" "true" $binlog +Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "cb" "false" $binlog Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "f" "net7.0" $binlog +Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "cb" "true" $binlog +Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "cb" "false" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "f" "net6.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "f" "net7.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "0.10.18" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "11.0.0-preview5" $binlog +Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "cb" "true" $binlog +Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "cb" "false" $binlog Test-Template "avalonia.mvvm" "AvaloniaMvvm" "F#" "f" "net6.0" $binlog Test-Template "avalonia.mvvm" "AvaloniaMvvm" "F#" "f" "net7.0" $binlog @@ -120,5 +128,9 @@ Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "0.10.18" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "11.0.0-preview5" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "m" "ReactiveUI" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "m" "CommunityToolkit" $binlog +Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "cb" "true" $binlog +Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "cb" "false" $binlog Create-And-Build "avalonia.xplat" "AvaloniaXplat" "F#" "f" "net7.0" $binlog +Create-And-Build "avalonia.xplat" "AvaloniaXplat" "F#" "cb" "true" $binlog +Create-And-Build "avalonia.xplat" "AvaloniaXplat" "F#" "cb" "false" $binlog