Skip to content

Commit 1da33ae

Browse files
faniereyndersfaniereynders
committed
cleanup
reversioned added dotnet tooling
1 parent dc61201 commit 1da33ae

34 files changed

+56
-3142
lines changed

‎WebApiProxy.sln

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,19 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApiProxy.Core", "src\Web
77
EndProject
88
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApiProxy.Middleware", "src\WebApiProxy.Middleware\WebApiProxy.Middleware.xproj", "{D4461E8F-19B6-414E-AE2B-0DD0FF432B78}"
99
EndProject
10-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2BE59743-E8A2-4289-BAC0-32CEA15260B3}"
11-
ProjectSection(SolutionItems) = preProject
12-
tools\ttgen.exe = tools\ttgen.exe
13-
EndProjectSection
14-
EndProject
1510
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApiProxy.Middleware.JQuery", "src\WebApiProxy.Middleware.JQuery\WebApiProxy.Middleware.JQuery.xproj", "{827E90F4-B274-4B34-9E2E-787C5A2A3D43}"
1611
EndProject
1712
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{297882AD-2D5A-40E4-85A0-2798AAB7C702}"
1813
EndProject
1914
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SampleApi", "samples\SampleApi\SampleApi.xproj", "{70E4D8FB-A7D0-4E9D-8A3A-B50A838556CC}"
2015
EndProject
21-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApiProxy.Clients.JQuery", "src\WebApiProxy.Clients.JQuery\WebApiProxy.Clients.JQuery.xproj", "{F4B61F12-3773-472C-B2B7-5D7D45F81351}"
16+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApiProxy.Generators.JQuery", "src\WebApiProxy.Generators.JQuery\WebApiProxy.Generators.JQuery.xproj", "{F4B61F12-3773-472C-B2B7-5D7D45F81351}"
2217
EndProject
23-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApiProxy.Clients", "src\WebApiProxy.Clients\WebApiProxy.Clients.xproj", "{FDF547F3-82AC-452A-ABB5-BB728EEAE8A6}"
18+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApiProxy.Generators", "src\WebApiProxy.Generators\WebApiProxy.Generators.xproj", "{FDF547F3-82AC-452A-ABB5-BB728EEAE8A6}"
2419
EndProject
2520
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{057DE0AD-F38B-4904-A3B3-D4210EED12F7}"
2621
EndProject
27-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApiproxy.Clients.CSharp", "src\WebApiproxy.Clients.CSharp\WebApiproxy.Clients.CSharp.xproj", "{95A3C87C-AF7B-4B2B-B82F-B1682C29C693}"
22+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApiproxy.Generators.CSharp", "src\WebApiProxy.Generators.CSharp\WebApiproxy.Generators.CSharp.xproj", "{95A3C87C-AF7B-4B2B-B82F-B1682C29C693}"
2823
EndProject
2924
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{090E95EC-2BE1-4BA5-952C-D8F628B5AC78}"
3025
EndProject

‎src/WebApiProxy.Clients.JQuery/JQueryGenerator.generated.cs

Lines changed: 0 additions & 197 deletions
This file was deleted.

‎src/WebApiProxy.Clients.JQuery/project.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/WebApiProxy.Core/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "0.0.1-*",
33

44

55
"dependencies": {

‎src/WebApiProxy.Clients.JQuery/JQuery.template renamed to ‎src/WebApiProxy.Generators.JQuery/JQuery.template

File renamed without changes.

‎src/WebApiProxy.Clients.JQuery/JQueryGenerator.cs renamed to ‎src/WebApiProxy.Generators.JQuery/JQueryGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace WebApiProxy.Clients.JQuery
1+
namespace WebApiProxy.Generators.JQuery
22
{
33
using System.Threading.Tasks;
44
using Core.Infrastructure;

‎src/WebApiProxy.Clients.JQuery/Properties/AssemblyInfo.cs renamed to ‎src/WebApiProxy.Generators.JQuery/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// associated with an assembly.
77
[assembly: AssemblyConfiguration("")]
88
[assembly: AssemblyCompany("")]
9-
[assembly: AssemblyProduct("WebApiProxy.Clients.JQuery")]
9+
[assembly: AssemblyProduct("WebApiProxy.Generators.JQuery")]
1010
[assembly: AssemblyTrademark("")]
1111

1212
// Setting ComVisible to false makes the types in this assembly not visible

‎src/WebApiProxy.Clients.JQuery/WebApiProxy.Clients.JQuery.xproj renamed to ‎src/WebApiProxy.Generators.JQuery/WebApiProxy.Generators.JQuery.xproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
88
<PropertyGroup Label="Globals">
99
<ProjectGuid>f4b61f12-3773-472c-b2b7-5d7d45f81351</ProjectGuid>
10-
<RootNamespace>WebApiProxy.Clients.JQuery</RootNamespace>
10+
<RootNamespace>WebApiProxy.Generators.JQuery</RootNamespace>
1111
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
1212
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
1313
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

‎src/WebApiProxy.Generators.JQuery/project.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"version": "0.0.1-*",
3+
4+
"dependencies": {
5+
"WebApiProxy.Generators": "0.0.1-*",
6+
"WebApiProxy.Core": "0.0.1-*"
7+
},
8+
"tools": {
9+
"WebApiProxy.Tools.TTGenerator": "0.0.1-alpha-26"
10+
},
11+
"scripts": {
12+
"precompile": "dotnet ttgen create -s .\\JQuery.template -c JQueryGenerator -ns WebApiProxy.Generators.JQuery"
13+
14+
},
15+
"frameworks": {
16+
"netstandard1.3": {
17+
"imports": "dnx50"
18+
}
19+
},
20+
"runtimes": {
21+
"win10-x64": {}
22+
}
23+
}

‎src/WebApiProxy.Clients/Infrastructure/ExternalMetadataProvider.cs renamed to ‎src/WebApiProxy.Generators/Infrastructure/ExternalMetadataProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace WebApiProxy.Clients.Infrastructure
1+
namespace WebApiProxy.Generators.Infrastructure
22
{
33
using Newtonsoft.Json;
44
using Core.Infrastructure;

‎src/WebApiProxy.Clients/Infrastructure/GeneratorInterop.cs renamed to ‎src/WebApiProxy.Generators/Infrastructure/GeneratorInterop.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
namespace WebApiProxy.Clients
1+
namespace WebApiProxy.Generators
22
{
33
using Infrastructure;
4-
using Clients.Models;
54
using Core.Infrastructure;
65
using System;
76
using System.Dynamic;
87
using System.Threading.Tasks;
9-
using System.Collections.Generic;
10-
using System.Diagnostics;
118
using System.Reflection;
9+
using Models;
1210

1311
public class GeneratorInterop
1412
{

‎src/WebApiProxy.Clients/Infrastructure/Mapper.cs renamed to ‎src/WebApiProxy.Generators/Infrastructure/Mapper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace WebApiProxy.Clients.Infrastructure
1+
namespace WebApiProxy.Generators.Infrastructure
22
{
33
using System;
44
using System.Dynamic;

‎src/WebApiProxy.Clients/Models/ClientConfiguration.cs renamed to ‎src/WebApiProxy.Generators/Models/ClientConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace WebApiProxy.Clients.Models
1+
namespace WebApiProxy.Generators.Models
22
{
33
public class ClientConfiguration
44
{

‎src/WebApiProxy.Clients/Properties/AssemblyInfo.cs renamed to ‎src/WebApiProxy.Generators/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// associated with an assembly.
77
[assembly: AssemblyConfiguration("")]
88
[assembly: AssemblyCompany("")]
9-
[assembly: AssemblyProduct("WebApiProxy.Clients")]
9+
[assembly: AssemblyProduct("WebApiProxy.Generators")]
1010
[assembly: AssemblyTrademark("")]
1111

1212
// Setting ComVisible to false makes the types in this assembly not visible

‎src/WebApiProxy.Clients/WebApiProxy.Clients.xproj renamed to ‎src/WebApiProxy.Generators/WebApiProxy.Generators.xproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@
44
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
7-
87
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
98
<PropertyGroup Label="Globals">
109
<ProjectGuid>fdf547f3-82ac-452a-abb5-bb728eeae8a6</ProjectGuid>
11-
<RootNamespace>WebApiProxy.NodeJs</RootNamespace>
10+
<RootNamespace>WebApiProxy.Generators</RootNamespace>
1211
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
1312
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
1413
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1514
</PropertyGroup>
16-
1715
<PropertyGroup>
1816
<SchemaVersion>2.0</SchemaVersion>
1917
</PropertyGroup>
2018
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
21-
</Project>
19+
</Project>

‎src/WebApiProxy.Clients/project.json renamed to ‎src/WebApiProxy.Generators/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"version": "0.0.1-alpha-*",
2+
"version": "0.0.1-*",
33

44
"dependencies": {
55
"Newtonsoft.Json": "9.0.1",
66
"System.Net.Requests": "4.0.11",
7-
"WebApiProxy.Core": "1.0.0-*"
7+
"WebApiProxy.Core": "0.0.1-*"
88
},
99

1010
"frameworks": {

‎src/WebApiProxy.Middleware.JQuery/JQueryClientProviderMiddleware.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
using Microsoft.AspNetCore.Http;
44
using System.Threading.Tasks;
55
using Core.Infrastructure;
6-
using Clients.JQuery;
76
using Microsoft.Extensions.Options;
87
using Middleware;
8+
using Generators.JQuery;
99

1010
public class JQueryClientProviderMiddleware: WebApiProxyMiddlewareBase
1111
{

0 commit comments

Comments
 (0)