Merge branch 'master' into release

linq2db · Jul 7, 2017 · 135812d · 135812d
2 parents c1ec07b + 420bab5
commit 135812d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ services.AddIdentity<ApplicationUser, IdentityRole>(options => {
     options.Cookies.ApplicationCookie.CookieName = "Interop";
     options.Cookies.ApplicationCookie.DataProtectionProvider = DataProtectionProvider.Create(new DirectoryInfo("C:\\Github\\Identity\\artifacts"));
 })
-    .AddLinqToDBStores(new DefaultConnectionFactory<DataContext, ApplicationDataConnection>()) //here
+    .AddLinqToDBStores(new DefaultConnectionFactory()) //here
     .AddDefaultTokenProviders();
 ```
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,3 +1,5 @@
+
+
 init:
   - git config --global core.autocrlf true
   - ps: $env:TestSqlServerDefaultConnectionString = "Server=(local)\SQL2012SP1;Database=master;Integrated Security=true"
@@ -7,7 +9,7 @@ cache:
 - '%USERPROFILE%\.nuget\packages -> **\project.json'
 
 environment:
-  nugetVersion: 1.1.1
+  nugetVersion: 1.2.0
 
 version: $(nugetVersion).{build}
 
@@ -28,7 +30,6 @@ build:
   project: LinqToDB.Identity.sln
   verbosity: minimal
 
-
 deploy:
 - provider: NuGet
   server: https://www.myget.org/F/linq2db/api/v2
@@ -43,4 +44,7 @@ deploy:
     secure: oTYw2IwTnz4qMD8c/MR/6mo+Nx3wa5Pp8MYfsKBCKCVuU6QCHlj+6QMXpnQses8G
   skip_symbols: false
   on:
-    branch: release
+    branch: release
+
+skip_commits:
+  message: /ci skip/      # Regex for matching commit message