Skip to content

Commit

Permalink
Updated codebase to work with beta4
Browse files Browse the repository at this point in the history
Project wouldn't compile with latest Visual Studio Community 2015 RC
otherwise
  • Loading branch information
rtpHarry committed May 16, 2015
1 parent f41d369 commit a1f09a2
Show file tree
Hide file tree
Showing 12 changed files with 6,001 additions and 77 deletions.
1,028 changes: 1,028 additions & 0 deletions .vs/config/applicationhost.config

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ExtensionGallery.sln
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22512.0
VisualStudioVersion = 14.0.22823.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F21BC57F-7D70-4278-BD7C-463AEEF6C889}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExtensionGallery", "src\ExtensionGallery\ExtensionGallery.kproj", "{5092448C-B511-4077-B31C-00685E56FB2D}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExtensionGallery", "src\ExtensionGallery\ExtensionGallery.xproj", "{5092448C-B511-4077-B31C-00685E56FB2D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C5D93B6B-F583-4464-B315-E1D13A164FF6}"
ProjectSection(SolutionItems) = preProject
Expand Down
7 changes: 5 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"sources": [ "src", "test" ]
}
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-beta4"
}
}
2 changes: 1 addition & 1 deletion src/ExtensionGallery/Controllers/ApiController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class ApiController : Controller
public ApiController(IHostingEnvironment env)
{
_env = env;
_helper = new PackageHelper(env.WebRoot);
_helper = new PackageHelper(env.WebRootPath);
}

public object Get(string id)
Expand Down
2 changes: 1 addition & 1 deletion src/ExtensionGallery/Controllers/FeedController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class FeedController : Controller

public FeedController(IHostingEnvironment env)
{
_helper = new PackageHelper(env.WebRoot);
_helper = new PackageHelper(env.WebRootPath);
_feed = new FeedWriter();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>5092448c-b511-4077-b31c-00685e56fb2d</ProjectGuid>
<RootNamespace>ExtensionGallery</RootNamespace>
Expand All @@ -21,10 +20,11 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<ProduceOutputsOnBuild>False</ProduceOutputsOnBuild>
</PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
<ProjectExtensions>
<VisualStudio>
<UserProperties bower_1json__JSONSchema="http://json.schemastore.org/bower" project_1json__JSONSchema="http://www.asp.net/media/4878834/project.json" package_1json__JSONSchema="http://json.schemastore.org/package" />
</VisualStudio>
</ProjectExtensions>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" />
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" />
</Project>
2 changes: 1 addition & 1 deletion src/ExtensionGallery/app/views/templates.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

132 changes: 66 additions & 66 deletions src/ExtensionGallery/project.json
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
{
/* Click to learn more about project.json http://go.microsoft.com/fwlink/?LinkID=517074 */
"webroot": "wwwroot",
"version": "1.0.0-*",
"dependencies": {
// "EntityFramework.SqlServer": "7.0.0-beta2",
// "EntityFramework.Commands": "7.0.0-beta2",
"Microsoft.AspNet.Mvc": "6.0.0-beta2",
//"Microsoft.AspNet.Mvc.WebApiCompatShim": "6.0.0-beta1",
"Microsoft.AspNet.Diagnostics": "1.0.0-beta2",
// "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-beta2",
// "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta2",
"Microsoft.AspNet.Security.Cookies": "1.0.0-beta2",
"Microsoft.AspNet.Server.IIS": "1.0.0-beta2",
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta2",
"Microsoft.AspNet.StaticFiles": "1.0.0-beta2",
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta2",
"Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-beta2",
"Microsoft.Framework.Logging": "1.0.0-beta2",
"Microsoft.Framework.Logging.Console": "1.0.0-beta2",
//"Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-beta1",
"Newtonsoft.Json": "6.0.7"
},
"commands": {
/* Change the port number when you are self hosting this application */
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000",
"gen": "Microsoft.Framework.CodeGeneration",
"ef": "EntityFramework.Commands"
},
"frameworks": {
// "aspnet50": {
// "frameworkAssemblies": {
// "System.Net.Http": "4.0.0.0",
// "System.Xml": "4.0.0.0"
// }
// },
"aspnetcore50": {
"dependencies": {
"System.Net.Http": "4.0.0.0",
"System.Xml.XmlDocument": "4.0.0.0",
"System.IO.Compression.ZipFile": "4.0.0.0"
}
}
},
"exclude": [
"wwwroot",
"node_modules",
"bower_components",
"app",
".tmp"
],
"packExclude": [
"node_modules",
"bower_components",
"app",
"wwwroot/extensions",
"wwwroot/temp",
".tmp",
"**.kproj",
"**.user",
"**.vspscc",
"**._references.js"
],
"scripts": {
"postrestore": [ "npm install" ],
"prepack": ["grunt build"]
}
/* Click to learn more about project.json http://go.microsoft.com/fwlink/?LinkID=517074 */
"webroot": "wwwroot",
"version": "1.0.0-*",
"dependencies": {
// "EntityFramework.SqlServer": "7.0.0-beta2",
// "EntityFramework.Commands": "7.0.0-beta2",
"Microsoft.AspNet.Mvc": "6.0.0-beta4",
//"Microsoft.AspNet.Mvc.WebApiCompatShim": "6.0.0-beta1",
"Microsoft.AspNet.Diagnostics": "1.0.0-beta4",
// "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-beta2",
// "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta2",
"Microsoft.AspNet.Security.Cookies": "1.0.0-beta3",
"Microsoft.AspNet.Server.IIS": "1.0.0-beta4",
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta4",
"Microsoft.AspNet.StaticFiles": "1.0.0-beta4",
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
"Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-beta4",
"Microsoft.Framework.Logging": "1.0.0-beta4",
"Microsoft.Framework.Logging.Console": "1.0.0-beta4",
//"Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-beta1",
"Newtonsoft.Json": "6.0.7"
},
"commands": {
/* Change the port number when you are self hosting this application */
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000",
"gen": "Microsoft.Framework.CodeGeneration",
"ef": "EntityFramework.Commands"
},
"frameworks": {
// "dnx451": {
// "frameworkAssemblies": {
// "System.Net.Http": "4.0.0.0",
// "System.Xml": "4.0.0.0"
// }
// },
"dnxcore50": {
"dependencies": {
"System.Net.Http": "4.0.0-beta-22816",
"System.Xml.XmlDocument": "4.0.0-beta-22816",
"System.IO.Compression.ZipFile": "4.0.0-beta-22816"
}
}
},
"exclude": [
"wwwroot",
"node_modules",
"bower_components",
"app",
".tmp"
],
"publishExclude": [
"node_modules",
"bower_components",
"app",
"wwwroot/extensions",
"wwwroot/temp",
".tmp",
"**.kproj",
"**.user",
"**.vspscc",
"**._references.js"
],
"scripts": {
"postrestore": [ "npm install" ],
"prepack": [ "grunt build" ]
}
}
Loading

0 comments on commit a1f09a2

Please sign in to comment.