updated to .NET Core 1.0.0

filipw · filipw · commit 6c90553de44d · 2016-06-28T10:31:25.000+02:00
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 ﻿{
   "projects": [ "src", "test", "other" ],
   "sdk": {
-    "version": "1.0.0-preview1-002702"
+    "version": "1.0.0-preview2-003121"
   }
 }
diff --git a/other/Microsoft.Extensions.Caching.Redis/Microsoft.Extensions.Caching.Redis.xproj b/other/Microsoft.Extensions.Caching.Redis/Microsoft.Extensions.Caching.Redis.xproj
@@ -8,10 +8,10 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>02e23070-947c-4438-8e50-cc2456d237ba</ProjectGuid>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/other/Microsoft.Extensions.Caching.Redis/project.json b/other/Microsoft.Extensions.Caching.Redis/project.json
@@ -21,8 +21,8 @@
     "xmlDoc": true
   },
   "dependencies": {
-    "Microsoft.Extensions.Caching.Abstractions": "1.0.0-*",
-    "Microsoft.Extensions.Options": "1.0.0-*",
+    "Microsoft.Extensions.Caching.Abstractions": "1.0.0",
+    "Microsoft.Extensions.Options": "1.0.0",
     "StackExchange.Redis.StrongName": "1.1.604-alpha"
   },
   "frameworks": {
@@ -33,7 +33,7 @@
         }
       }
     },
-    "netstandard1.5": {
+    "netstandard1.6": {
     }
   }
 }
diff --git a/samples/WebApiContrib.Core.Samples/project.json b/samples/WebApiContrib.Core.Samples/project.json
@@ -1,21 +1,21 @@
 ﻿{
   "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.AspNetCore.StaticFiles": "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.AspNetCore.StaticFiles": "1.0.0",
     "Microsoft.AspNetCore.Razor.Tools": {
-      "version": "1.0.0-preview1-final",
+      "version": "1.0.0-preview2-final",
       "type": "build"
     },
     "WebApiContrib.Core.Formatter.Csv": "*",
@@ -26,11 +26,11 @@
 
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
-      "version": "1.0.0-preview1-final",
+      "version": "1.0.0-preview2-final",
       "imports": "portable-net45+win8+dnxcore50"
     },
     "Microsoft.AspNetCore.Razor.Tools": {
-      "version": "1.0.0-preview1-final",
+      "version": "1.0.0-preview2-final",
       "imports": "portable-net45+win8+dnxcore50"
     }
   },
diff --git a/src/WebApiContrib.Core.Concurrency.Redis/project.json b/src/WebApiContrib.Core.Concurrency.Redis/project.json
@@ -17,7 +17,7 @@
   "frameworks": {
     "net451": {
     },
-    "netstandard1.5": {
+    "netstandard1.6": {
     }
   }
 }
diff --git a/src/WebApiContrib.Core.Concurrency.SqlServer/project.json b/src/WebApiContrib.Core.Concurrency.SqlServer/project.json
@@ -8,7 +8,7 @@
     "projectUrl": ""
   },
   "dependencies": {
-    "Microsoft.Extensions.Caching.SqlServer": "1.0.0-*",
+    "Microsoft.Extensions.Caching.SqlServer": "1.0.0",
     "WebApiContrib.Core.Concurrency": "*"
   },
   "tooling": {
@@ -17,7 +17,7 @@
   "frameworks": {
     "net451": {
     },
-    "netstandard1.5": {
+    "netstandard1.6": {
     }
   }
 }
diff --git a/src/WebApiContrib.Core.Concurrency/project.json b/src/WebApiContrib.Core.Concurrency/project.json
@@ -8,14 +8,14 @@
     "projectUrl": ""
   },
   "dependencies": {
-    "Microsoft.Extensions.Caching.Abstractions": "1.0.0-*",
-    "Microsoft.Extensions.Caching.Memory": "1.0.0-*",
-    "Microsoft.Extensions.Options": "1.0.0-*",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
-    "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
-    "Microsoft.AspNetCore.Mvc.Core": "1.0.0-*",
-    "Microsoft.AspNetCore.Mvc": "1.0.0-*",
-    "System.Net.Http": "4.0.1-*",
+    "Microsoft.Extensions.Caching.Abstractions": "1.0.0",
+    "Microsoft.Extensions.Caching.Memory": "1.0.0",
+    "Microsoft.Extensions.Options": "1.0.0",
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0",
+    "Microsoft.AspNetCore.Mvc.Core": "1.0.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
+    "System.Net.Http": "4.0.1",
     "Newtonsoft.Json": "8.0.4-*"
   },
   "tooling": {
@@ -28,7 +28,7 @@
         "System.Runtime": ""
       }
     },
-    "netstandard1.5": {
+    "netstandard1.6": {
       "dependencies": {
         "System.Dynamic.Runtime": "4.0.11-*",
         "System.Private.DataContractSerialization": "4.1.1-*"
diff --git a/src/WebApiContrib.Core.Formatter.Bson/project.json b/src/WebApiContrib.Core.Formatter.Bson/project.json
@@ -8,7 +8,7 @@
     "projectUrl": ""
   },
   "dependencies": {
-    "Microsoft.AspNetCore.Mvc.Core": "1.0.0-*",
+    "Microsoft.AspNetCore.Mvc.Core": "1.0.0",
     "Newtonsoft.Json": "8.0.4-*"
   },
   "tooling": {
@@ -17,7 +17,7 @@
   "frameworks": {
     "net451": {
     },
-    "netstandard1.5": {
+    "netstandard1.6": {
     }
   }
 }
diff --git a/src/WebApiContrib.Core.Formatter.Csv/project.json b/src/WebApiContrib.Core.Formatter.Csv/project.json
@@ -18,11 +18,11 @@
         }
     },
     "dependencies": {
-        "Microsoft.AspNetCore.Mvc.Core": "1.0.0-rc2-final"
+        "Microsoft.AspNetCore.Mvc.Core": "1.0.0"
     },
 
     "frameworks": {
-        "netstandard1.5": {
+        "netstandard1.6": {
             "imports": "dnxcore50"
         },
         "net451": {
diff --git a/src/WebApiContrib.Core.Formatter.Jsonp/project.json b/src/WebApiContrib.Core.Formatter.Jsonp/project.json
@@ -1,11 +1,11 @@
 ﻿{
   "version": "1.0.0-*",
   "dependencies": {
-    "Microsoft.AspNetCore.Mvc.Core": "1.0.0-rc2-final"
+    "Microsoft.AspNetCore.Mvc.Core": "1.0.0"
   },
   "frameworks": {
     "net451":  {},
-    "netstandard1.5": {
+    "netstandard1.6": {
       "imports": "dnxcore50"
     }
   }
diff --git a/src/WebApiContrib.Core.Formatter.PlainText/project.json b/src/WebApiContrib.Core.Formatter.PlainText/project.json
@@ -1,11 +1,11 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "Microsoft.AspNetCore.Mvc.Core": "1.0.0-rc2-final"
+    "Microsoft.AspNetCore.Mvc.Core": "1.0.0"
   },
   "frameworks": {
     "net451":  {},
-    "netstandard1.5": {
+    "netstandard1.6": {
       "imports": "dnxcore50"
     }
   }
diff --git a/src/WebApiContrib.Core.TagHelpers.Markdown/project.json b/src/WebApiContrib.Core.TagHelpers.Markdown/project.json
@@ -4,13 +4,13 @@
     "copyToOutput": [ "markdig-license.txt" ]
   },
   "dependencies": {
-    "Microsoft.AspNetCore.Mvc.Core": "1.0.0-rc2-final",
+    "Microsoft.AspNetCore.Mvc.Core": "1.0.0",
     "Markdig": "0.5.9",
-    "Microsoft.AspNetCore.Razor.Runtime": "1.0.0-rc2-final"
+    "Microsoft.AspNetCore.Razor.Runtime": "1.0.0"
   },
   "frameworks": {
     "net451": { },
-    "netstandard1.5": {
+    "netstandard1.6": {
       "imports": "dnxcore50"
     }
   }
diff --git a/src/WebApiContrib.Core/project.json b/src/WebApiContrib.Core/project.json
@@ -10,14 +10,13 @@
     }
   },
   "dependencies": {
-    "Microsoft.AspNetCore.Mvc.Core": "1.0.0-rc2-final",
-    "Newtonsoft.Json": "8.0.4-*"
+    "Microsoft.AspNetCore.Mvc.Core": "1.0.0"
   },
   "tooling": {
     "defaultNamespace": "WebApiContrib.Core"
   },
   "frameworks": {
       "net451": { },
-      "netstandard1.5": { }
+      "netstandard1.6": { }
   }
 }
diff --git a/tests/WebApiContrib.Core.Concurrency.Integration.Tests/project.json b/tests/WebApiContrib.Core.Concurrency.Integration.Tests/project.json
@@ -1,12 +1,12 @@
 {
   "dependencies": {
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
-    "Microsoft.Extensions.Configuration.CommandLine": "1.0.0-*",
-    "Microsoft.AspNetCore.Mvc": "1.0.0-*",
-    "Microsoft.AspNetCore.Mvc.Core": "1.0.0-*",
-    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+    "Microsoft.Extensions.Configuration.CommandLine": "1.0.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
+    "Microsoft.AspNetCore.Mvc.Core": "1.0.0",
+    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
     "WebApiContrib.Core.Concurrency": "*",
     "WebApiContrib.Core.Concurrency.SqlServer": "*",
     "WebApiContrib.Core.Concurrency.Redis": "*"
@@ -22,7 +22,7 @@
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.0-*"
+          "version": "1.0.0"
         }
       }
     }
diff --git a/tests/WebApiContrib.Core.Concurrency.Tests/project.json b/tests/WebApiContrib.Core.Concurrency.Tests/project.json
@@ -14,16 +14,16 @@
   "dependencies": {
     "xunit": "2.1.0",
     "dotnet-test-xunit": "1.0.0-*",
-    "Microsoft.AspNetCore.TestHost": "1.0.0-*",
+    "Microsoft.AspNetCore.TestHost": "1.0.0",
     "WebApiContrib.Core.Concurrency": "*",
-    "System.Runtime.Serialization.Primitives": "4.1.1-*"
+    "System.Runtime.Serialization.Primitives": "4.1.1"
   },
   "frameworks": {
     "net451": {
       "frameworkAssemblies": { },
       "dependencies": {
         "Moq": "4.5.9-*",
-        "Microsoft.NETCore.Platforms": "1.0.1-*"
+        "Microsoft.NETCore.Platforms": "1.0.1"
       }
     }
   }
diff --git a/tests/WebApiContrib.Core.Formatter.Integration.Tests/project.json b/tests/WebApiContrib.Core.Formatter.Integration.Tests/project.json
@@ -1,12 +1,12 @@
 {
   "dependencies": {
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
-    "Microsoft.Extensions.Configuration.CommandLine": "1.0.0-*",
-    "Microsoft.AspNetCore.Mvc": "1.0.0-*",
-    "Microsoft.AspNetCore.Mvc.Core": "1.0.0-*",
-    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+    "Microsoft.Extensions.Configuration.CommandLine": "1.0.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
+    "Microsoft.AspNetCore.Mvc.Core": "1.0.0",
+    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
     "WebApiContrib.Core.Formatter.Bson": "*"
   },
   "frameworks": {
@@ -20,7 +20,7 @@
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.0-*"
+          "version": "1.0.0"
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"projects": [ "src", "test", "other" ],`
`3`	`3`	`"sdk": {`
`4`		`- "version": "1.0.0-preview1-002702"`
	`4`	`+ "version": "1.0.0-preview2-003121"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@`
`21`	`21`	`"xmlDoc": true`
`22`	`22`	`},`
`23`	`23`	`"dependencies": {`
`24`		`- "Microsoft.Extensions.Caching.Abstractions": "1.0.0-*",`
`25`		`- "Microsoft.Extensions.Options": "1.0.0-*",`
	`24`	`+ "Microsoft.Extensions.Caching.Abstractions": "1.0.0",`
	`25`	`+ "Microsoft.Extensions.Options": "1.0.0",`
`26`	`26`	`"StackExchange.Redis.StrongName": "1.1.604-alpha"`
`27`	`27`	`},`
`28`	`28`	`"frameworks": {`
`@@ -33,7 +33,7 @@`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`},`
`36`		`- "netstandard1.5": {`
	`36`	`+ "netstandard1.6": {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"frameworks": {`
`18`	`18`	`"net451": {`
`19`	`19`	`},`
`20`		`- "netstandard1.5": {`
	`20`	`+ "netstandard1.6": {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"projectUrl": ""`
`9`	`9`	`},`
`10`	`10`	`"dependencies": {`
`11`		`- "Microsoft.Extensions.Caching.SqlServer": "1.0.0-*",`
	`11`	`+ "Microsoft.Extensions.Caching.SqlServer": "1.0.0",`
`12`	`12`	`"WebApiContrib.Core.Concurrency": "*"`
`13`	`13`	`},`
`14`	`14`	`"tooling": {`
`@@ -17,7 +17,7 @@`
`17`	`17`	`"frameworks": {`
`18`	`18`	`"net451": {`
`19`	`19`	`},`
`20`		`- "netstandard1.5": {`
	`20`	`+ "netstandard1.6": {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "1.0.0-*",`
`3`	`3`	`"dependencies": {`
`4`		`- "Microsoft.AspNetCore.Mvc.Core": "1.0.0-rc2-final"`
	`4`	`+ "Microsoft.AspNetCore.Mvc.Core": "1.0.0"`
`5`	`5`	`},`
`6`	`6`	`"frameworks": {`
`7`	`7`	`"net451": {},`
`8`		`- "netstandard1.5": {`
	`8`	`+ "netstandard1.6": {`
`9`	`9`	`"imports": "dnxcore50"`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,13 @@`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`"dependencies": {`
`13`		`- "Microsoft.AspNetCore.Mvc.Core": "1.0.0-rc2-final",`
`14`		`- "Newtonsoft.Json": "8.0.4-*"`
	`13`	`+ "Microsoft.AspNetCore.Mvc.Core": "1.0.0"`
`15`	`14`	`},`
`16`	`15`	`"tooling": {`
`17`	`16`	`"defaultNamespace": "WebApiContrib.Core"`
`18`	`17`	`},`
`19`	`18`	`"frameworks": {`
`20`	`19`	`"net451": { },`
`21`		`- "netstandard1.5": { }`
	`20`	`+ "netstandard1.6": { }`
`22`	`21`	`}`
`23`	`22`	`}`