Merge pull request #238 from valdisiljuconoks/master

v7

.editorconfig

@@ -8,17 +8,27 @@ root=true
 indent_style=space
 
 # ReSharper properties
+resharper_align_multiline_argument=true
 resharper_align_multiline_calls_chain=true
 resharper_align_multiline_extends_list=true
 resharper_align_multline_type_parameter_constrains=true
 resharper_align_multline_type_parameter_list=true
 resharper_align_tuple_components=true
-resharper_csharp_max_line_length=140
+resharper_csharp_align_multiline_calls_chain=false
+resharper_csharp_align_multiple_declaration=true
+resharper_csharp_max_line_length=130
+resharper_csharp_stick_comment=false
+resharper_csharp_wrap_after_declaration_lpar=true
 resharper_csharp_wrap_arguments_style=chop_if_long
+resharper_csharp_wrap_extends_list_style=chop_if_long
 resharper_csharp_wrap_parameters_style=chop_if_long
 resharper_max_initializer_elements_on_line=3
 resharper_place_attribute_on_same_line=false
+resharper_place_simple_accessorholder_on_single_line=true
 resharper_space_within_single_line_array_initializer_braces=true
+resharper_wrap_before_extends_colon=true
+resharper_xmldoc_indent_text=ZeroIndent
+resharper_xmldoc_max_line_length=140
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
 # Code files
@@ -218,6 +228,3 @@ csharp_space_between_square_brackets=false
 csharp_prefer_braces=true:silent
 csharp_preserve_single_line_blocks=true
 csharp_preserve_single_line_statements=true
-
-# IDE1006: Naming Styles
-dotnet_diagnostic.IDE1006.severity = none

DbLocalizationProvider.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32104.313
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbLocalizationProvider.Abstractions", "src\DbLocalizationProvider.Abstractions\DbLocalizationProvider.Abstractions.csproj", "{5453BED3-0A29-414C-9535-57264C1F37E9}"
 EndProject
@@ -20,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution-items", "solution-
 		LICENSE = LICENSE
 		netfx.props = netfx.props
 		nuget.config = nuget.config
+		push-packages.ps1 = push-packages.ps1
 		README.md = README.md
 	EndProjectSection
 EndProject
@@ -30,6 +31,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{EAB35BEA-9
 		docs\foreign-resources.md = docs\foreign-resources.md
 		docs\hidden-resources.md = docs\hidden-resources.md
 		docs\migr.md = docs\migr.md
+		docs\migrate-to-v7.md = docs\migrate-to-v7.md
 		mssql.md = mssql.md
 		docs\ref-resources.md = docs\ref-resources.md
 		docs\required-fields.md = docs\required-fields.md
@@ -53,6 +55,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbLocalizationProvider.Admi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbLocalizationProvider.Csv", "src\DbLocalizationProvider.Csv\DbLocalizationProvider.Csv.csproj", "{99B4803B-4837-492F-92A4-C1F3AC8134CF}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbLocalizationProvider.Storage.AzureTables", "src\DbLocalizationProvider.Storage.AzureTables\DbLocalizationProvider.Storage.AzureTables.csproj", "{5B732162-38CF-4A75-8014-5D0D0B2D673E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbLocalizationProvider.Xliff", "src\DbLocalizationProvider.Xliff\DbLocalizationProvider.Xliff.csproj", "{1361BC6A-CACA-43B5-8201-0160792C69C5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -95,6 +101,14 @@ Global
 		{99B4803B-4837-492F-92A4-C1F3AC8134CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{99B4803B-4837-492F-92A4-C1F3AC8134CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{99B4803B-4837-492F-92A4-C1F3AC8134CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B732162-38CF-4A75-8014-5D0D0B2D673E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B732162-38CF-4A75-8014-5D0D0B2D673E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B732162-38CF-4A75-8014-5D0D0B2D673E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B732162-38CF-4A75-8014-5D0D0B2D673E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1361BC6A-CACA-43B5-8201-0160792C69C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1361BC6A-CACA-43B5-8201-0160792C69C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1361BC6A-CACA-43B5-8201-0160792C69C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1361BC6A-CACA-43B5-8201-0160792C69C5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

README.md

@@ -12,25 +12,23 @@ Giving you main following features:
 * Supports hierarchical resource organization (with help of child classes)
 * Administration UI for editors to change or add new translations for required languages
 
-## What's new in v6?
+## Upgrade to v7?
+
+TODO (upcoming)!
+
+## What was new in v6?
 Please [refer to this post](https://blog.tech-fellow.net/2020/02/21/localization-provider-major-6/) to read more about new features in v6.
 
 ## Source Code Repos
 Whole package of libraries is split into multiple git repos (with submodule linkage in between). Below is list of all related repositories:
 * [Main Repository](https://github.com/valdisiljuconoks/LocalizationProvider/)
-* [Asp.Net Core Repository](https://github.com/valdisiljuconoks/localization-provider-core)
-* [Asp.Net Repository](https://github.com/valdisiljuconoks/localization-provider-aspnet)
-* [Episerver Repository](https://github.com/valdisiljuconoks/localization-provider-epi)
+* [.NET Runtime Repository](https://github.com/valdisiljuconoks/localization-provider-core)
+* [Optimizely Integration Repository](https://github.com/valdisiljuconoks/localization-provider-epi)
 
-## Getting Started (Asp.Net)
+## Getting Started (.NET)
 * [Getting Started](https://github.com/valdisiljuconoks/localization-provider-aspnet/blob/master/docs/getting-started-net.md)
 
-## Getting Started (Asp.Net Core)
-* [Getting Started](https://github.com/valdisiljuconoks/localization-provider-core/blob/master/docs/getting-started-netcore.md)
-* [Getting Started with AdminUI](https://github.com/valdisiljuconoks/localization-provider-core/blob/master/docs/getting-started-adminui.md)
-* [Localizing App Content](https://github.com/valdisiljuconoks/localization-provider-core/blob/master/docs/localizing-content-netcore.md)
-
-## Working with DbLocalizationProvider
+## Working with DbLocalizationProvider Package
 * [Localized Resource Types](docs/resource-types.md)
 * [Synchronization Process](docs/sync-net.md)
 * [MSSQL Storage Configuration](docs/mssql.md)
@@ -45,14 +43,14 @@ Whole package of libraries is split into multiple git repos (with submodule link
 * [XLIFF Support](docs/xliff.md)
 * [Migrations & Refactorings](docs/migr.md)
 
-## Integrating with EPiServer
-* For more information about Episerver integration - read [here](https://github.com/valdisiljuconoks/localization-provider-epi/blob/master/README.md)
+## Integrating with Optimizely
+* For more information about Optimizely integration - read [here](https://github.com/valdisiljuconoks/localization-provider-epi/blob/master/README.md)
 
 ## Build Statuses
 
-|    | Main | Asp.Net | .Net Core | Episerver |
-|:---|-----:|--------:|----------:|----------:|
-|**Azure Build**|[<img src="https://tech-fellow-consulting.visualstudio.com/_apis/public/build/definitions/a3f0ad74-99ed-446b-8cb9-ff35e99a6e2b/12/badge"/>](https://tech-fellow-consulting.visualstudio.com/localization-provider/_build/index?definitionId=12)|[<img src="https://tech-fellow-consulting.visualstudio.com/_apis/public/build/definitions/70e95aed-5f16-4125-b7bb-60aeea07539d/10/badge"/>](https://tech-fellow-consulting.visualstudio.com/localization-provider-aspnet/_build/index?definitionId=10)|[<img src="https://tech-fellow-consulting.visualstudio.com/_apis/public/build/definitions/f63fd8ab-e3f1-48c1-bca0-f027727a53c4/9/badge"/>](https://tech-fellow-consulting.visualstudio.com/localization-provider-core/_build/index?definitionId=9)|[<img src="https://tech-fellow-consulting.visualstudio.com/_apis/public/build/definitions/7cf5a00f-7a74-440c-83bd-45d6c8a80602/11/badge"/>](https://tech-fellow-consulting.visualstudio.com/localization-provider-epi/_build/index?definitionId=11)|
+|    | Main | .NET | Optimizely |
+|:---|-----:|-----:|-----------:|
+|**Build**|[<img src="https://tech-fellow-consulting.visualstudio.com/_apis/public/build/definitions/a3f0ad74-99ed-446b-8cb9-ff35e99a6e2b/12/badge"/>](https://tech-fellow-consulting.visualstudio.com/localization-provider/_build/index?definitionId=12)|[<img src="https://tech-fellow-consulting.visualstudio.com/_apis/public/build/definitions/f63fd8ab-e3f1-48c1-bca0-f027727a53c4/9/badge"/>](https://tech-fellow-consulting.visualstudio.com/localization-provider-core/_build/index?definitionId=9)|[<img src="https://tech-fellow-consulting.visualstudio.com/_apis/public/build/definitions/7cf5a00f-7a74-440c-83bd-45d6c8a80602/11/badge"/>](https://tech-fellow-consulting.visualstudio.com/localization-provider-epi/_build/index?definitionId=11)|
 
 # More Info
 

Tests/DbLocalizationProvider.Storage.PostgreSql.Tests/DbLocalizationProvider.Storage.PostgreSql.Tests.csproj

@@ -1,18 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
-
     <SignAssembly>true</SignAssembly>
-
     <AssemblyOriginatorKeyFile>..\..\strongname.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>