diff --git a/.editorconfig b/.editorconfig index 03ea6eff..6155ce2b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,7 +11,28 @@ insert_final_newline = true dotnet_sort_system_directives_first = true dotnet_separate_import_directive_groups = true -[*.{xml,json,js,ts,jsx,tsx,vue,css,styl,*proj,targets,html,props,yml,nim,nimble,nim.cfg,wsdl,wadl,cmake}] +[*.{xml,wsdl,wadl}] +indent_size = 2 + +[*.{json,yml,yaml}] +indent_size = 2 + +[*.{js,jsx,ts,tsx,vue,css,styl,html}] +indent_size = 2 + +[*.{*proj,targets,props}] +indent_size = 2 + +[{{packages,nuget}.config,*.nuspec}] +indent_size = 2 + +[*.{nim,nimble,nim.cfg}] +indent_size = 2 + +[*.rb] +indent_size = 2 + +[*.cmake] indent_size = 2 [CMakeLists.txt] diff --git a/.gitignore b/.gitignore index 83ba0814..1ee53850 100644 --- a/.gitignore +++ b/.gitignore @@ -142,7 +142,9 @@ _TeamCity* !.axoCover/settings.json # Coverlet is a free, cross platform Code Coverage Tool -coverage*[.json, .xml, .info] +coverage*.json +coverage*.xml +coverage*.info # Visual Studio code coverage results *.coverage diff --git a/AllRules.ruleset b/AllRules.ruleset deleted file mode 100644 index f40ae6a1..00000000 --- a/AllRules.ruleset +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/Directory.Build.props b/Directory.Build.props index b260c276..660c10ab 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,51 +1,37 @@ - - - portable + + $(MSBuildThisFileDirectory)bin\$(MSBuildProjectName)\ + $(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\ + - netstandard2.0 + 8 + enable + + + portable + true true true snupkg - - $(MSBuildThisFileDirectory)bin\ - $(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\ - $(MSBuildThisFileDirectory)publish\$(MSBuildProjectName)\ - - - IOperation - $(MSBuildThisFileDirectory)AllRules.ruleset - - - - $(VersionPrefix) - $(FileVersion) - - - $(VersionSuffix)-build$(BuildId) - build$(BuildId) - - - $(FileVersion).$(BuildId) - + - - - - + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + - All + all + runtime; build; native; contentfiles; analyzers diff --git a/Directory.Build.targets b/Directory.Build.targets index 055e5791..f5427131 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,30 +1,101 @@ - - - 8 - enable - annotations + + + <_SourceRootReverseOrder Include="@(SourceRoot->HasMetadata('SourceControl')->Reverse())" /> + + + + %(_SourceRootReverseOrder.Identity)publish\$(MSBuildProjectName)\ + + + + $(PublishDir)$(Configuration)\ + $(PublishDir)$(PlatformName)\ + $(PublishDir)$(TargetFramework)\ + $(PublishDir)$(RuntimeIdentifier)\ + + + + + + + <_InformationalVersionContainsHyphen>false + <_InformationalVersionContainsHyphen Condition="$(InformationalVersion.Contains('-'))">true + + $(InformationalVersion)-build$(BuildId) + $(InformationalVersion).build$(BuildId) + + + + + + $(InformationalVersion) + + + + + + $([System.Version]::Parse('$(AssemblyVersion)').ToString(3)) + $([System.Version]::Parse('$(AssemblyVersion)').ToString(3)).$(BuildId) + + + + + + <_SourceRootReverseOrder Include="@(SourceRoot->HasMetadata('SourceControl')->Reverse())" /> + + + + <_SourceRootLicenseFilePath>%(_SourceRootReverseOrder.Identity)LICENSE + + + LICENSE + + + + + + + + + + InferProjectUrlFromGitHubRepositoryUrl;$(GenerateNuspecDependsOn) - - - all - runtime; build; native; contentfiles; analyzers - - + + + + $(PrivateRepositoryUrl.Substring(0, $(PrivateRepositoryUrl.LastIndexOf('.git')))) + $(PrivateRepositoryUrl) + + diff --git a/Directory.Meta.props b/Directory.Meta.props index 9474c55e..c26bd8f3 100644 --- a/Directory.Meta.props +++ b/Directory.Meta.props @@ -5,18 +5,5 @@ TH-NETII .NET Common libraries and extensions TH-NETII Rasch Solutions Written by Fredrik Høisæther Rasch, $([System.DateTime]::Now.Year) - https://github.com/thnetii/dotnet-common - - git - $(PackageProjectUrl).git - - - LICENSE - - - - - - diff --git a/Directory.Version.props b/Directory.Version.props deleted file mode 100644 index 188e549d..00000000 --- a/Directory.Version.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - 0.0.1 - - - - diff --git a/TH-NETII .NET Common.sln b/TH-NETII .NET Common.sln index 64dee4ac..b7924998 100644 --- a/TH-NETII .NET Common.sln +++ b/TH-NETII .NET Common.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28714.193 @@ -8,13 +8,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig .gitattributes = .gitattributes .gitignore = .gitignore - AllRules.ruleset = AllRules.ruleset Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets Directory.Meta.props = Directory.Meta.props - Directory.Nullable.props = Directory.Nullable.props - Directory.Version.props = Directory.Version.props LICENSE = LICENSE - nuget.config = nuget.config EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A1768F41-219C-424C-92B8-695477251F6A}" diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 2049b1a2..00000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: $(Date:yyyy-MM-dd)-rev$(Rev:r) -trigger: - batch: true - branches: - include: - - master - - rel/* -pr: -- '*' -resources: - repositories: - - repository: templates - type: github - name: thnetii/azure-pipelines - endpoint: thnetii -jobs: -- template: templates/dotnetcore/azure-pipelines.yml@templates - parameters: - checkout: - - checkout: self - submodules: true diff --git a/nuget.config b/nuget.config deleted file mode 100644 index 53af0ae3..00000000 --- a/nuget.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/sample/THNETII.CommandLine.Hosting.Sample/Properties/launchSettings.json b/sample/THNETII.CommandLine.Hosting.Sample/Properties/launchSettings.json index fba6ed9c..a030e868 100644 --- a/sample/THNETII.CommandLine.Hosting.Sample/Properties/launchSettings.json +++ b/sample/THNETII.CommandLine.Hosting.Sample/Properties/launchSettings.json @@ -5,4 +5,4 @@ "commandLineArgs": "[config:Environment=Development]" } } -} \ No newline at end of file +}