1.1

sandorfr · sandorfr · commit ca7481a6b418 · 2016-07-05T11:24:58.000+02:00
diff --git a/GeekLearning.Storage.sln b/GeekLearning.Storage.sln
@@ -21,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
+		global.json = global.json
 		LICENSE.md = LICENSE.md
 		README.md = README.md
 	EndProjectSection
diff --git a/global.json b/global.json
@@ -1,3 +1,4 @@
 {
+  "sdk" : { "version": "1.0.0-preview2-003121"},
   "projects": [ "src", "tests", "samples" ]
 }
diff --git a/samples/GeekLearning.Storage.BasicSample/project.json b/samples/GeekLearning.Storage.BasicSample/project.json
@@ -1,37 +1,33 @@
 ﻿{
   "dependencies": {
     "Microsoft.NETCore.App": {
-      "version": "1.0.0-rc2-3002702",
+      "version": "1.0.0",
       "type": "platform"
     },
-    "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Options": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-final",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+    "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Logging": "1.0.0",
+    "Microsoft.Extensions.Logging.Console": "1.0.0",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0",
+    "Microsoft.Extensions.Options": "1.0.0",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
     "GeekLearning.Storage": "*",
     "GeekLearning.Storage.Azure": "*",
     "GeekLearning.Storage.FileSystem": "*"
   },
 
   "tools": {
-    "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
-    }
+    "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
   },
 
   "frameworks": {
     "netcoreapp1.0": {
       "imports": [
         "dotnet5.6",
-        "dnxcore50",
         "portable-net45+win8"
       ]
     }
@@ -43,7 +39,9 @@
   },
 
   "runtimeOptions": {
-    "gcServer": true
+    "configProperties": {
+      "System.GC.Server": true
+    }
   },
 
   "publishOptions": {
diff --git a/src/GeekLearning.Storage.Azure/project.json b/src/GeekLearning.Storage.Azure/project.json
@@ -9,20 +9,19 @@
   },
 
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-24027",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Options": "1.0.0-rc2-final",
-    "WindowsAzure.Storage": "7.0.1-preview",
+    "NETStandard.Library": "1.6.0",
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
+    "Microsoft.Extensions.Options": "1.0.0",
+    "WindowsAzure.Storage": "7.1.3-preview",
     "GeekLearning.Storage": "*",
-    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-final"
+    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0"
   },
 
   "frameworks": {
     "net451": { },
     "netstandard1.5": {
       "imports": [
         "dotnet5.6",
-        "dnxcore50",
         "portable-net45+win8"
       ]
     }
diff --git a/src/GeekLearning.Storage.FileSystem.Server/project.json b/src/GeekLearning.Storage.FileSystem.Server/project.json
@@ -2,7 +2,7 @@
   "version": "1.0.0-*",
 
   "dependencies": {
-    "GeekLearning.Storage.FileSystem": "1.0.0-*",
+    "GeekLearning.Storage.FileSystem": "*",
     "NETStandard.Library": "1.6.0"
   },
 
diff --git a/src/GeekLearning.Storage.FileSystem/project.json b/src/GeekLearning.Storage.FileSystem/project.json
@@ -9,19 +9,18 @@
   },
 
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-24027",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Options": "1.0.0-rc2-final",
+    "NETStandard.Library": "1.6.0",
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
+    "Microsoft.Extensions.Options": "1.0.0",
     "GeekLearning.Storage": "*",
-    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-final"
+    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0"
   },
 
   "frameworks": {
     "net451": { },
     "netstandard1.5": {
       "imports": [
         "dotnet5.6",
-        "dnxcore50",
         "portable-net45+win8"
       ]
     }
diff --git a/src/GeekLearning.Storage/project.json b/src/GeekLearning.Storage/project.json
@@ -9,9 +9,9 @@
   },
 
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-24027",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Options": "1.0.0-rc2-final"
+    "NETStandard.Library": "1.6.0",
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
+    "Microsoft.Extensions.Options": "1.0.0"
   },
 
   "frameworks": {
diff --git a/tests/GeekLearning.Integration.Test/IntegrationCollection.cs b/tests/GeekLearning.Integration.Test/IntegrationCollection.cs
@@ -6,8 +6,8 @@
 
 namespace GeekLearning.Integration.Test
 {
-    [CollectionDefinition(nameof(Integration))]
-    public class Integration: ICollectionFixture<StoresFixture>
+    [CollectionDefinition(nameof(IntegrationCollection))]
+    public class IntegrationCollection: ICollectionFixture<StoresFixture>
     {
 
     }
diff --git a/tests/GeekLearning.Integration.Test/ListTests.cs b/tests/GeekLearning.Integration.Test/ListTests.cs
@@ -8,7 +8,8 @@
     using GeekLearning.Storage;
     using Microsoft.Extensions.DependencyInjection;
 
-    [Collection(nameof(Integration)), Trait("Operation", "List"), Trait("Kind", "Integration")]
+    [Collection(nameof(IntegrationCollection))]
+    [Trait("Operation", "List"), Trait("Kind", "Integration")]
     public class ListTests
     {
         StoresFixture storeFixture;
diff --git a/tests/GeekLearning.Integration.Test/Program.cs b/tests/GeekLearning.Integration.Test/Program.cs
diff --git a/tests/GeekLearning.Integration.Test/ReadTests.cs b/tests/GeekLearning.Integration.Test/ReadTests.cs
@@ -9,7 +9,8 @@
     using Microsoft.Extensions.DependencyInjection;
     using System.IO;
 
-    [Collection(nameof(Integration)), Trait("Operation", "Read"), Trait("Kind", "Integration")]
+    [Collection(nameof(IntegrationCollection))]
+    [Trait("Operation", "Read"), Trait("Kind", "Integration")]
     public class ReadTests
     {
         StoresFixture storeFixture;
diff --git a/tests/GeekLearning.Integration.Test/project.json b/tests/GeekLearning.Integration.Test/project.json
@@ -1,7 +1,6 @@
 {
   "version": "1.0.0-*",
   "buildOptions": {
-    "emitEntryPoint": true,
     "copyToOutput": [
       "SampleDirectory/**/*.*",
       "appsettings.json",
@@ -15,35 +14,34 @@
     "GeekLearning.Storage": "*",
     "GeekLearning.Storage.Azure": "*",
     "GeekLearning.Storage.FileSystem": "*",
-    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
-    "dotnet-test-xunit": "1.0.0-rc2-build10025",
-    "xunit": "2.1.0-rc2-build3176",
-    "xunit.runner.visualstudio": "2.1.0",
-    "Microsoft.Extensions.DependencyInjection": "1.0.0-rc2-final",
-    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Options": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-final"
+    "Microsoft.NETCore.Platforms": "1.0.1",
+    "dotnet-test-xunit": "2.2.0-preview2-build1029",
+    "xunit": "2.2.0-beta2-build3300",
+    "xunit.runner.visualstudio": "2.2.0-beta2-build1149",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0",
+    "Microsoft.Extensions.PlatformAbstractions": "1.0.0",
+    "Microsoft.Extensions.Configuration": "1.0.0",
+    "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+    "Microsoft.Extensions.Options": "1.0.0",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0"
   },
 
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [ "dotnet", "dnxcore50", "portable-net45+win8" ],
+      "imports": [ "dotnet", "portable-net45+win8" ],
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.0-rc2-3002702"
+          "version": "1.0.0"
         }
       }
     },
     "net451": {
       "frameworkAssemblies": {
       },
       "dependencies": {
-        "xunit.runner.console": "2.1.0"
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`{`
	`2`	`+ "sdk" : { "version": "1.0.0-preview2-003121"},`
`2`	`3`	`"projects": [ "src", "tests", "samples" ]`
`3`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`
`7`	`7`	`namespace GeekLearning.Integration.Test`
`8`	`8`	`{`
`9`		`- [CollectionDefinition(nameof(Integration))]`
`10`		`- public class Integration: ICollectionFixture<StoresFixture>`
	`9`	`+ [CollectionDefinition(nameof(IntegrationCollection))]`
	`10`	`+ public class IntegrationCollection: ICollectionFixture<StoresFixture>`
`11`	`11`	`{`
`12`	`12`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`	`using GeekLearning.Storage;`
`9`	`9`	`using Microsoft.Extensions.DependencyInjection;`
`10`	`10`
`11`		`- [Collection(nameof(Integration)), Trait("Operation", "List"), Trait("Kind", "Integration")]`
	`11`	`+ [Collection(nameof(IntegrationCollection))]`
	`12`	`+ [Trait("Operation", "List"), Trait("Kind", "Integration")]`
`12`	`13`	`public class ListTests`
`13`	`14`	`{`
`14`	`15`	`StoresFixture storeFixture;`