-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9 from MichaeIDietrich/release/2.0
Release 2.0.0
- Loading branch information
Showing
123 changed files
with
6,808 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,39 @@ | ||
| $project = "$PSScriptRoot\..\src\SmartMvvm.Xaml\SmartMvvm.Xaml.csproj" | ||
| $sharedBuildProps = "$PSScriptRoot\..\src\Directory.Build.props" | ||
| $wpfProject = "$PSScriptRoot\..\src\SmartMvvm.Xaml\SmartMvvm.Xaml.csproj" | ||
| $avaloniaProject = "$PSScriptRoot\..\src\SmartMvvm.Avalonia.Xaml\SmartMvvm.Avalonia.Xaml.csproj" | ||
|
|
||
|
|
||
| $version = & "$PSScriptRoot\common\Get-VersionPrefix.ps1" -projectFilePath $project | ||
| $version = & "$PSScriptRoot\common\Get-VersionPrefix.ps1" -projectFilePath $sharedBuildProps | ||
|
|
||
| $branch = & "$PSScriptRoot\common\Get-CurrentBranch.ps1" | ||
| $versionSuffix = & "$PSScriptRoot\common\Get-VersionSuffix.ps1" -branch $branch | ||
|
|
||
|
|
||
| $props = @($project, '-o', 'artifacts', '-c', 'Release') | ||
| $wpfProjectProps = @($wpfProject, '-o', 'artifacts', '-c', 'Release', '-p:ContinuousIntegrationBuild=true') | ||
| $avaloniaProjectProps = @($avaloniaProject, '-o', 'artifacts', '-c', 'Release', '-p:ContinuousIntegrationBuild=true') | ||
|
|
||
| if ($versionSuffix) | ||
| { | ||
| $props = $props += "-p:VersionSuffix=$versionSuffix" | ||
| $wpfProjectProps += "-p:VersionSuffix=$versionSuffix" | ||
| $avaloniaProjectProps += "-p:VersionSuffix=$versionSuffix" | ||
| $version = "$version-$versionSuffix" | ||
| } | ||
|
|
||
| Update-AppveyorBuild -Version "$version" | ||
| if (Test-Path env:APPVEYOR) | ||
| { | ||
| Update-AppveyorBuild -Version "$version" | ||
| } | ||
|
|
||
| dotnet pack $wpfProjectProps | ||
|
|
||
| if ($LASTEXITCODE) | ||
| { | ||
| exit $LASTEXITCODE | ||
| } | ||
|
|
||
| dotnet pack $props | ||
| dotnet pack $avaloniaProjectProps | ||
|
|
||
| if ($LASTEXITCODE) | ||
| { | ||
| exit $LASTEXITCODE | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,11 @@ | ||
| $project = "$PSScriptRoot\..\src\SmartMvvm.Xaml.UnitTests\SmartMvvm.Xaml.UnitTests.csproj" | ||
| $solution = "$PSScriptRoot\..\src\SmartMvvm.Xaml.sln" | ||
|
|
||
|
|
||
| $props = @($project, '-c', 'Release') | ||
| $props = @($solution, '-c', 'Release') | ||
|
|
||
| dotnet test $props | ||
| dotnet test $props | ||
|
|
||
| if ($LASTEXITCODE) | ||
| { | ||
| exit $LASTEXITCODE | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,16 @@ | ||
| version: 1.0.0 | ||
| image: Visual Studio 2019 | ||
| version: 2.0.0.{build} | ||
| skip_tags: true | ||
| image: Visual Studio 2022 | ||
| build_script: | ||
| - ps: ./.ci/build.ps1 | ||
| test_script: | ||
| - ps: ./.ci/test.ps1 | ||
| artifacts: | ||
| - path: artifacts/*.nupkg | ||
| - path: artifacts/*.snupkg | ||
| deploy: | ||
| - provider: NuGet | ||
| api_key: | ||
| secure: FS7OJwqKtXgQLcreC0htCtc30/5f6Hy8oipDyDg0/a1e70pA0uQ+0HxNk+EVdHNi | ||
| secure: 0bu/b9qP5vZJifyxR/C4D2HET/ZgE0UBXGx5QYZpmz8O7hrjT4vbAntHp4v20HVD | ||
| on: | ||
| branch: /^master|release\/.+$/ | ||
| branch: /^master|release\/.+$/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| # To learn more about .editorconfig see https://aka.ms/editorconfigdocs | ||
| ############################### | ||
| # Core EditorConfig Options # | ||
| ############################### | ||
| # All files | ||
| [*] | ||
| indent_style = space | ||
|
|
||
| # XML project files | ||
| [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}] | ||
| indent_size = 2 | ||
|
|
||
| # XML config files | ||
| [*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}] | ||
| indent_size = 2 | ||
|
|
||
| # Code files | ||
| [*.{cs,csx,vb,vbx}] | ||
| indent_size = 4 | ||
| insert_final_newline = true | ||
| charset = utf-8-bom | ||
| ############################### | ||
| # .NET Coding Conventions # | ||
| ############################### | ||
| [*.{cs,vb}] | ||
| # Organize usings | ||
| dotnet_sort_system_directives_first = true | ||
| # this. preferences | ||
| dotnet_style_qualification_for_field = false:silent | ||
| dotnet_style_qualification_for_property = false:silent | ||
| dotnet_style_qualification_for_method = false:silent | ||
| dotnet_style_qualification_for_event = false:silent | ||
| # Language keywords vs BCL types preferences | ||
| dotnet_style_predefined_type_for_locals_parameters_members = true:silent | ||
| dotnet_style_predefined_type_for_member_access = true:silent | ||
| # Parentheses preferences | ||
| dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent | ||
| dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent | ||
| dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent | ||
| dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent | ||
| # Modifier preferences | ||
| dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent | ||
| dotnet_style_readonly_field = true:suggestion | ||
| # Expression-level preferences | ||
| dotnet_style_object_initializer = true:suggestion | ||
| dotnet_style_collection_initializer = true:suggestion | ||
| dotnet_style_explicit_tuple_names = true:suggestion | ||
| dotnet_style_null_propagation = true:suggestion | ||
| dotnet_style_coalesce_expression = true:suggestion | ||
| dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent | ||
| dotnet_style_prefer_inferred_tuple_names = true:suggestion | ||
| dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion | ||
| dotnet_style_prefer_auto_properties = true:silent | ||
| dotnet_style_prefer_conditional_expression_over_assignment = true:silent | ||
| dotnet_style_prefer_conditional_expression_over_return = true:silent | ||
| ############################### | ||
| # Naming Conventions # | ||
| ############################### | ||
| # Style Definitions | ||
| dotnet_naming_style.pascal_case_style.capitalization = pascal_case | ||
| # Use PascalCase for constant fields | ||
| dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion | ||
| dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields | ||
| dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style | ||
| dotnet_naming_symbols.constant_fields.applicable_kinds = field | ||
| dotnet_naming_symbols.constant_fields.applicable_accessibilities = * | ||
| dotnet_naming_symbols.constant_fields.required_modifiers = const | ||
| ############################### | ||
| # C# Coding Conventions # | ||
| ############################### | ||
| [*.cs] | ||
| # var preferences | ||
| csharp_style_var_for_built_in_types = true:silent | ||
| csharp_style_var_when_type_is_apparent = true:silent | ||
| csharp_style_var_elsewhere = true:silent | ||
| # Expression-bodied members | ||
| csharp_style_expression_bodied_methods = false:silent | ||
| csharp_style_expression_bodied_constructors = false:silent | ||
| csharp_style_expression_bodied_operators = false:silent | ||
| csharp_style_expression_bodied_properties = true:silent | ||
| csharp_style_expression_bodied_indexers = true:silent | ||
| csharp_style_expression_bodied_accessors = true:silent | ||
| # Pattern matching preferences | ||
| csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion | ||
| csharp_style_pattern_matching_over_as_with_null_check = true:suggestion | ||
| # Null-checking preferences | ||
| csharp_style_throw_expression = true:suggestion | ||
| csharp_style_conditional_delegate_call = true:suggestion | ||
| # Modifier preferences | ||
| csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion | ||
| # Expression-level preferences | ||
| csharp_prefer_braces = true:silent | ||
| csharp_style_deconstructed_variable_declaration = true:suggestion | ||
| csharp_prefer_simple_default_expression = true:suggestion | ||
| csharp_style_pattern_local_over_anonymous_function = true:suggestion | ||
| csharp_style_inlined_variable_declaration = true:suggestion | ||
| ############################### | ||
| # C# Formatting Rules # | ||
| ############################### | ||
| # New line preferences | ||
| csharp_new_line_before_open_brace = all | ||
| csharp_new_line_before_else = true | ||
| csharp_new_line_before_catch = true | ||
| csharp_new_line_before_finally = true | ||
| csharp_new_line_before_members_in_object_initializers = true | ||
| csharp_new_line_before_members_in_anonymous_types = true | ||
| csharp_new_line_between_query_expression_clauses = true | ||
| # Indentation preferences | ||
| csharp_indent_case_contents = true | ||
| csharp_indent_switch_labels = true | ||
| csharp_indent_labels = flush_left | ||
| # Space preferences | ||
| csharp_space_after_cast = false | ||
| csharp_space_after_keywords_in_control_flow_statements = true | ||
| csharp_space_between_method_call_parameter_list_parentheses = false | ||
| csharp_space_between_method_declaration_parameter_list_parentheses = false | ||
| csharp_space_between_parentheses = false | ||
| csharp_space_before_colon_in_inheritance_clause = true | ||
| csharp_space_after_colon_in_inheritance_clause = true | ||
| csharp_space_around_binary_operators = before_and_after | ||
| csharp_space_between_method_declaration_empty_parameter_list_parentheses = false | ||
| csharp_space_between_method_call_name_and_opening_parenthesis = false | ||
| csharp_space_between_method_call_empty_parameter_list_parentheses = false | ||
| # Wrapping preferences | ||
| csharp_preserve_single_line_statements = true | ||
| csharp_preserve_single_line_blocks = true | ||
| ############################### | ||
| # VB Coding Conventions # | ||
| ############################### | ||
| [*.vb] | ||
| # Modifier preferences | ||
| visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <Project> | ||
|
|
||
| <PropertyGroup> | ||
| <VersionPrefix>2.0.0</VersionPrefix> | ||
| <Copyright>Copyright © $([System.DateTime]::Now.Year) Michael Dietrich</Copyright> | ||
| <PackageProjectUrl>https://github.com/MichaeIDietrich/SmartMvvm.Xaml</PackageProjectUrl> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <RepositoryType>git</RepositoryType> | ||
| <RepositoryUrl>https://github.com/MichaeIDietrich/SmartMvvm.Xaml</RepositoryUrl> | ||
| <Authors>Michael Dietrich</Authors> | ||
| <PackageReadmeFile>readme.md</PackageReadmeFile> | ||
| <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| <EmbedUntrackedSources>true</EmbedUntrackedSources> | ||
| <IncludeSymbols>true</IncludeSymbols> | ||
| <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <Application xmlns="https://github.com/avaloniaui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| x:Class="SmartMvvm.Avalonia.Xaml.Sample.App"> | ||
| <Application.Styles> | ||
| <FluentTheme Mode="Light"/> | ||
| </Application.Styles> | ||
| </Application> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| using Avalonia; | ||
| using Avalonia.Controls.ApplicationLifetimes; | ||
| using Avalonia.Markup.Xaml; | ||
|
|
||
| namespace SmartMvvm.Avalonia.Xaml.Sample | ||
| { | ||
| public partial class App : Application | ||
| { | ||
| public override void Initialize() | ||
| { | ||
| AvaloniaXamlLoader.Load(this); | ||
| } | ||
|
|
||
| public override void OnFrameworkInitializationCompleted() | ||
| { | ||
| if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) | ||
| { | ||
| desktop.MainWindow = new MainWindow(); | ||
| } | ||
|
|
||
| base.OnFrameworkInitializationCompleted(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.