Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Dev to Master #88

Merged
merged 7 commits into from
Mar 1, 2016
Merged

Merge Dev to Master #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a7f2f52
- Code cleanup
onionhammer Jan 29, 2016
6b8e597
fixing #85 bug when generating using ps script
faniereynders Feb 25, 2016
1f836c6
Update WebApiProxy.Server.nuspec
faniereynders Feb 26, 2016
ebbe890
Update WebApiProxy.Server.nuspec
faniereynders Feb 26, 2016
1cdbcdd
Update WebApiProxy.Server.nuspec
faniereynders Feb 26, 2016
992854d
Update WebApiProxy.Server.nuspec
faniereynders Feb 26, 2016
c9ce729
Update AssemblyInfo.cs
faniereynders Mar 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion WebApiProxy.Server/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyInformationalVersion("1.2.0.*")]
[assembly: AssemblyVersion("1.2.1.*")]
[assembly: AssemblyFileVersion("1.2.1.*")]
12 changes: 8 additions & 4 deletions WebApiProxy.Server/WebApiProxy.Server.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,22 @@
<metadata>
<id>WebApiProxy</id>
<version>$version$</version>
<title>$title$</title>
<title>Web Api Proxy Provider</title>
<authors>Fanie Reynders</authors>
<owners>Fanie Reynders</owners>
<projectUrl>https://github.com/faniereynders/WebApiProxy</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>$description$</description>
<description>Provides an endpoint for ASP.NET Web Api services to serve a JavaScript proxy and metadata.</description>
<releaseNotes />
<copyright>$copyright$</copyright>
<copyright>Copyright © 2016</copyright>
<tags>AspNet WebAPI Proxy JavaScript CSharp</tags>
<dependencies>
<dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.2" />
<dependency id="DocsByReflection" version="[1.0.11]" />
</dependencies>
</metadata>
</package>
<files>
<file src="bin\$configuration$\WebApiProxy.Core.dll" target="lib\net45" />
<file src="bin\$configuration$\WebApiProxy.Server.dll" target="lib\net45" />
</files>
</package>
18 changes: 4 additions & 14 deletions WebApiProxy.Tasks/ProxyGenerationTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
using System;
using System.IO;
using System.Net.Http;
using Microsoft.Build.Framework;
using WebApiProxy.Core.Models;
using WebApiProxy.Tasks.Templates;
using WebApiProxy.Tasks.Models;
using Microsoft.Build.Evaluation;
using System.Linq;
using WebApiProxy.Tasks.Infrastructure;
using WebApiProxy.Tasks.Models;

namespace WebApiProxy.Tasks
{
public class ProxyGenerationTask : ITask
Expand Down Expand Up @@ -50,13 +46,10 @@ public bool Execute()
{
throw ex;
}

return true;
}





private void tryReadFromCache()
{
if (!File.Exists(Configuration.CacheFile))
Expand All @@ -66,8 +59,5 @@ private void tryReadFromCache()
var source = File.ReadAllText(Configuration.CacheFile);
File.WriteAllText(Filename, source);
}


}
}

}
Loading