Skip to content

Commit

Permalink
Updated to rc1-final. Turned off packages from prerelease feeds - eve…
Browse files Browse the repository at this point in the history
…rything builds from public NuGet and officially released bits.
  • Loading branch information
tillig committed Nov 19, 2015
1 parent ebc12cc commit 72e8422
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 18 deletions.
1 change: 1 addition & 0 deletions NuGet.Config
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<add key="NuGet v3" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<disabledPackageSources>
<add key="AspNetVNext" value="true" />
<add key="AspNetMaster" value="true" />
<add key="NuGet v2" value="true" />
</disabledPackageSources>
Expand Down
4 changes: 2 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ Remove-PathVariable "*Program Files\Microsoft DNX\DNVM*"
Install-Dnvm

# Install DNX
dnvm install $dnxVersion -r CoreCLR -NoNative -Unstable
dnvm install $dnxVersion -r CLR -NoNative -Unstable
dnvm install $dnxVersion -r CoreCLR -NoNative #-Unstable
dnvm install $dnxVersion -r CLR -NoNative #-Unstable
dnvm use $dnxVersion -r CLR

# Package restore
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"sdk": { "version": "1.0.0-rc1-16048" },
"sdk": { "version": "1.0.0-rc1-final" },
"sources": ["src", "test", "samples"]
}
37 changes: 24 additions & 13 deletions samples/AutofacWebApiSample/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
{
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "api/values",
"environmentVariables": {
"ASPNET_ENV": "Development"
}
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:5000/",
"sslPort": 0
}
},
"web": {
"commandName": "web",
"launchBrowser": true,
"launchUrl": "http://localhost:5000/api/values"
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "api/values",
"environmentVariables": {
"ASPNET_ENV": "Development"
}
},
"web": {
"commandName": "web",
"launchBrowser": true,
"launchUrl": "http://localhost:5000/api/values",
"environmentVariables": {
"Hosting:Environment": "Development"
}
}
}
}
}
4 changes: 2 additions & 2 deletions samples/AutofacWebApiSample/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

"dependencies": {
"Microsoft.AspNet.Mvc": "6.0.0-rc1-*",
"Microsoft.AspNet.Server.IIS": "1.0.0-beta8",
"Microsoft.AspNet.Server.IIS": "1.0.0-beta7",
"Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-*",
"Microsoft.AspNet.StaticFiles": "1.0.0-rc1-*",
"Autofac": "4.0.0-rc1-*",
Expand All @@ -25,7 +25,7 @@
},
"dnxcore50": {
"dependencies": {
"System.Reflection.Emit": "4.0.1-beta-*"
"System.Reflection.Emit": "4.0.1-beta-*"
}
}
},
Expand Down

0 comments on commit 72e8422

Please sign in to comment.