Update to DNX beta6 and increment Autofac projects to alpha4.

HaloQQQ · Jun 14, 2015 · 021a60d · 021a60d
1 parent 708b176
commit 021a60d
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 46 deletions.
diff --git a/NuGet.Config b/NuGet.Config
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <packageRestore>
+    <add key="automatic" value="False" />
+  </packageRestore>
   <packageSources>
-    <clear />
-    <add key="NuGet.org" value="https://nuget.org/api/v2/" />
-    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v2" />
-    <add key="CI Builds (xunit)" value="https://www.myget.org/F/xunit/" />
+    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v2/" />
+    <add key="xUnit.net" value="https://www.myget.org/F/xunit/api/v2/" />
+    <add key="NuGet" value="https://www.nuget.org/api/v2/" />
   </packageSources>
-</configuration>
+</configuration>
diff --git a/build.ps1 b/build.ps1
@@ -1,5 +1,5 @@
 # Build variables
-$dnvmVersion = "1.0.0-beta5-11911";
+$dnvmVersion = "1.0.0-beta6-12032";
 
 ########################
 # FUNCTIONS
@@ -72,4 +72,10 @@ Get-ChildItem -Path .\src -Filter *.xproj -Recurse | ForEach-Object { Build-Proj
 # Test
 Get-ChildItem -Path .\test -Filter *.xproj -Exclude Autofac.Test.Scenarios.ScannedAssembly.xproj -Recurse | ForEach-Object { Test-Projects $_.DirectoryName }
 
+# Switch to Core CLR
+dnvm use $dnvmVersion -r CoreCLR
+
+# Test again
+Get-ChildItem -Path .\test -Filter *.xproj -Exclude Autofac.Test.Scenarios.ScannedAssembly.xproj -Recurse | ForEach-Object { Test-Projects $_.DirectoryName }
+
 Pop-Location
diff --git a/global.json b/global.json
@@ -1,4 +1,4 @@
 {
-  "sdk": { "version": "1.0.0-beta5-11911" },
-  "sources": ["src", "test"]
+  "sdk": { "version": "1.0.0-beta6-12032" },
+  "sources": ["src", "test", "samples"]
 }
diff --git a/samples/AutofacWebApiSample/project.json b/samples/AutofacWebApiSample/project.json
@@ -3,12 +3,12 @@
   "version": "1.0.0-*",
 
   "dependencies": {
-    "Microsoft.AspNet.Mvc": "6.0.0-beta4",
-    "Microsoft.AspNet.Server.IIS": "1.0.0-beta4",
-    "Microsoft.AspNet.Server.WebListener": "1.0.0-beta4",
-    "Microsoft.AspNet.StaticFiles": "1.0.0-beta4",
-    "Autofac": "4.0.0-alpha2-*",
-    "Autofac.Dnx": "4.0.0-alpha2-*"
+    "Microsoft.AspNet.Mvc": "6.0.0-beta6-*",
+    "Microsoft.AspNet.Server.IIS": "1.0.0-beta6-*",
+    "Microsoft.AspNet.Server.WebListener": "1.0.0-beta6-*",
+    "Microsoft.AspNet.StaticFiles": "1.0.0-beta6-*",
+    "Autofac": "4.0.0-alpha4-*",
+    "Autofac.Dnx": "4.0.0-alpha4-*"
   },
 
   "commands": {

diff --git a/src/Autofac.Dnx/project.json b/src/Autofac.Dnx/project.json
@@ -1,5 +1,5 @@
 {
-    "version": "4.0.0-alpha3-*",
+    "version": "4.0.0-alpha4-*",
     "authors": ["Autofac Contributors"],
     "description": "Autofac integration for ASP.NET 5.0.",
     "projectUrl": "http://autofac.org",
@@ -10,14 +10,14 @@
     "compile": ["**/*.cs"],
     "resource": ["**/*.resx"],
     "dependencies": {
-        "Autofac": "4.0.0-alpha3-*",
-        "Microsoft.Framework.DependencyInjection": "1.0.0-beta5-*"
+        "Autofac": "4.0.0-alpha4-*",
+        "Microsoft.Framework.DependencyInjection": "1.0.0-beta6-*"
     },
     "frameworks": {
         "dnx451": { },
         "dnxcore50": {
             "dependencies": {
-                "System.Runtime": "4.0.20-beta-*"
+                "System.Runtime": "4.0.20-*"
             }
         }
     }

diff --git a/src/Autofac/project.json b/src/Autofac/project.json
@@ -1,5 +1,5 @@
 {
-    "version": "4.0.0-alpha3-*",
+    "version": "4.0.0-alpha4-*",
     "authors": ["Autofac Contributors"],
     "description": "Core assembly for the Autofac Inversion of Control container",
     "summary": "Autofac is an IoC container for Microsoft .NET. It manages the dependencies between classes so that applications stay easy to change as they grow in size and complexity.",
@@ -17,23 +17,23 @@
         "dnx451": { },
         "dnxcore50": {
             "dependencies": {
-                "System.Collections": "4.0.10-beta-*",
-                "System.Collections.Concurrent": "4.0.10-beta-*",
-                "System.ComponentModel": "4.0.0-beta-*",
-                "System.Diagnostics.Contracts": "4.0.0-beta-*",
-                "System.Diagnostics.Debug": "4.0.10-beta-*",
-                "System.Diagnostics.Tools": "4.0.0-beta-*",
-                "System.Globalization": "4.0.10-beta-*",
-                "System.Linq": "4.0.0-beta-*",
-                "System.Linq.Expressions": "4.0.10-beta-*",
-                "System.Reflection": "4.0.10-beta-*",
-                "System.Reflection.Extensions": "4.0.0-beta-*",
-                "System.Reflection.TypeExtensions": "4.0.0-beta-*",
-                "System.Resources.ResourceManager": "4.0.0-beta-*",
-                "System.Runtime": "4.0.20-beta-*",
-                "System.Threading.Thread": "4.0.0-beta-*",
-                "System.Threading": "4.0.10-beta-*",
-                "System.Threading.Tasks": "4.0.10-beta-*"
+                "System.Collections": "4.0.10-*",
+                "System.Collections.Concurrent": "4.0.10-*",
+                "System.ComponentModel": "4.0.0-*",
+                "System.Diagnostics.Contracts": "4.0.0-*",
+                "System.Diagnostics.Debug": "4.0.10-*",
+                "System.Diagnostics.Tools": "4.0.0-*",
+                "System.Globalization": "4.0.10-*",
+                "System.Linq": "4.0.0-*",
+                "System.Linq.Expressions": "4.0.10-*",
+                "System.Reflection": "4.0.10-*",
+                "System.Reflection.Extensions": "4.0.0-*",
+                "System.Reflection.TypeExtensions": "4.0.0-*",
+                "System.Resources.ResourceManager": "4.0.0-*",
+                "System.Runtime": "4.0.20-*",
+                "System.Threading.Thread": "4.0.0-*",
+                "System.Threading": "4.0.10-*",
+                "System.Threading.Tasks": "4.0.10-*"
             }
         },
         ".NETPortable,Version=v4.5,Profile=Profile259": {

diff --git a/test/Autofac.Dnx.Test/project.json b/test/Autofac.Dnx.Test/project.json
@@ -7,17 +7,17 @@
         "test": "xunit.runner.dnx"
     },
     "dependencies": {
-        "Autofac": "4.0.0-alpha3-*",
-        "Autofac.Dnx": "4.0.0-alpha3-*",
+        "Autofac": "4.0.0-alpha4-*",
+        "Autofac.Dnx": "4.0.0-alpha4-*",
         "Microsoft.Framework.DependencyInjection": "1.0.0-*",
-        "xunit": "2.1.0-beta3-*",
-        "xunit.runner.dnx": "2.1.0-beta3-*"
+        "xunit": "2.1.0-*",
+        "xunit.runner.dnx": "2.1.0-*"
     },
     "frameworks": {
         "dnx451": { },
         "dnxcore50": {
             "dependencies": {
-                "System.Runtime": "4.0.20-beta-*"
+                "System.Runtime": "4.0.20-*"
             }
         }
     }

diff --git a/test/Autofac.Test/project.json b/test/Autofac.Test/project.json
@@ -6,17 +6,17 @@
 		"test": "xunit.runner.dnx"
 	},
 	"dependencies": {
-        "Autofac": "4.0.0-alpha3-*",
-        "xunit": "2.1.0-beta3-*",
-		"xunit.runner.dnx": "2.1.0-beta3-*",
+        "Autofac": "4.0.0-alpha4-*",
+        "xunit": "2.1.0-*",
+		"xunit.runner.dnx": "2.1.0-*",
 		"Autofac.Test.Scenarios.ScannedAssembly": "1.0.0-*"
 	},
 	"frameworks": {
 		"dnx451": { },
 		"dnxcore50": {
 			"dependencies": {
-				"System.Runtime": "4.0.20-beta-22816",
-				"System.Threading": "4.0.10-beta-22816"
+				"System.Runtime": "4.0.20-*",
+				"System.Threading": "4.0.10-*"
 			}
 		}
 	}