updating version control and style config

hvpaiva · May 9, 2019 · 6c2b2a5 · 6c2b2a5
1 parent 7016315
commit 6c2b2a5
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 5 deletions.
diff --git a/AspDotnetVueJs.nuspec b/AspDotnetVueJs.nuspec
@@ -10,7 +10,7 @@
     <packageTypes>
       <packageType name="Template" />
     </packageTypes>
-    <version>2.1.0</version>
+    <version>{{version}}</version>
     <!--<iconUrl></iconUrl>-->
     <projectUrl>https://github.com/hvpaiva/aspdotnet-vuejs</projectUrl>
     <licenseUrl>https://github.com/hvpaiva/aspdotnet-vuejs/blob/master/LICENSE</licenseUrl>

diff --git a/CodeStyle.xml b/CodeStyle.xml
@@ -1,4 +1,7 @@
-<code_scheme name="Default" version="173">
+<code_scheme name="AspDotnetVueJsStyle" version="173">
+  <HTMLCodeStyleSettings>
+    <option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="html,thead,tbody,tfoot,script" />
+  </HTMLCodeStyleSettings>
   <JSCodeStyleSettings version="0">
     <option name="USE_DOUBLE_QUOTES" value="false" />
     <option name="FORCE_QUOTE_STYlE" value="true" />
@@ -32,19 +35,54 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="JavaScript">
+    <option name="RIGHT_MARGIN" value="100" />
+    <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+    <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+    <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+    <option name="EXTENDS_LIST_WRAP" value="5" />
+    <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+    <option name="BINARY_OPERATION_WRAP" value="1" />
+    <option name="TERNARY_OPERATION_WRAP" value="5" />
+    <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+    <option name="ARRAY_INITIALIZER_WRAP" value="5" />
+    <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
+    <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
+    <option name="WRAP_COMMENTS" value="true" />
+    <option name="IF_BRACE_FORCE" value="1" />
     <indentOptions>
       <option name="USE_TAB_CHARACTER" value="true" />
       <option name="SMART_TABS" value="true" />
     </indentOptions>
+    <arrangement>
+      <groups>
+        <group>
+          <type>GROUP_PROPERTY_FIELD_WITH_GETTER_SETTER</type>
+          <order>KEEP</order>
+        </group>
+        <group>
+          <type>TREAT_LAMBDA_INITIALIZED_FIELDS_AS_METHODS</type>
+          <order>KEEP</order>
+        </group>
+        <group>
+          <type>OVERRIDDEN_METHODS</type>
+          <order>KEEP</order>
+        </group>
+      </groups>
+    </arrangement>
   </codeStyleSettings>
   <codeStyleSettings language="SASS">
     <indentOptions>
+      <option name="INDENT_SIZE" value="4" />
       <option name="USE_TAB_CHARACTER" value="true" />
+      <option name="SMART_TABS" value="true" />
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="SCSS">
     <indentOptions>
+      <option name="INDENT_SIZE" value="4" />
       <option name="USE_TAB_CHARACTER" value="true" />
+      <option name="SMART_TABS" value="true" />
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="TypeScript">

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,12 +1,12 @@
 image: Visual Studio 2017
 
-version: 2.0.{build}
+version: 3.0.{build}
 
 install:
 #  - ps: (new-object Net.WebClient).DownloadString("https://raw.github.com/madskristensen/ExtensionScripts/master/AppVeyor/vsix.ps1") | iex
 
 before_build:
-  - ps: write-host Build v. $env:appveyor_build_version 
+  - ps: write-host Build v. $env:appveyor_build_version
   - nuget restore
 #  - ps: Vsix-IncrementVsixVersion | Vsix-UpdateBuildVersion
 
@@ -21,6 +21,7 @@ dotnet_csproj:
 
 build_script:
   - msbuild /p:configuration=Release /p:DeployExtension=false /p:ZipPackageCompressionLevel=normal /v:m
+  - ps: (Get-Content appsettings.json).replace('{{version}}', $env:appveyor_build_version ) | Set-Content appsettings.json
   - ps: (Get-Content AspDotnetVueJs.nuspec).replace('{{version}}', $env:appveyor_build_version ) | Set-Content AspDotnetVueJs.nuspec
   - nuget pack
   #Nuget auto-packaging can also be done cref: https://www.appveyor.com/docs/deployment/nuget/

diff --git a/content/appsettings.json b/content/appsettings.json
@@ -8,7 +8,7 @@
 	"App": {
 		"Title": "ASP.NET VueJs | Template",
 		"Description": "Template com .NET Core e VueJs",
-		"Version": "3.0.0",
+		"Version": "{{version}}",
 		"TermsOfService": "MIT"
 	},
 	"ApiUrl": "http://localhost:5000",