Skip to content

Commit 1b957de

Browse files
anierzadanierzad
committed
Merge branch 'development' into 'development'
 Development See merge request !3
2 parents 3581b83 + 356b766 commit 1b957de

File tree

99 files changed

+2344
-1717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+2344
-1717
lines changed

‎.gitignore

+5-2
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,11 @@ __pycache__/
296296

297297
## Project Specific
298298

299-
# Angular Build
300-
**/Angular/dist
299+
# Client dist folders
300+
**/Clients/**/dist
301+
302+
# Temporarily ignore assets folder until it's moved.
303+
**/Clients/assets
301304

302305
# Compiled LESS
303306
**/css/**/*.css

‎DeployClient/API.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private static HttpClient BuildClient()
2626

2727
public static string CreateSession()
2828
{
29-
string endpoint = "CI/CreateSession";
29+
string endpoint = "Remote/CreateSession";
3030

3131
using (HttpClient client = BuildClient())
3232
{
@@ -49,7 +49,7 @@ public static string CreateSession()
4949

5050
public static Dictionary<string, dynamic> GetSession(string sessionGuid)
5151
{
52-
string endpoint = string.Format("CI/GetSession?sessionGuid={0}", sessionGuid);
52+
string endpoint = string.Format("Remote/GetSession?sessionGuid={0}", sessionGuid);
5353

5454
JavaScriptSerializer jsonSer = new JavaScriptSerializer();
5555

@@ -63,7 +63,7 @@ public static Dictionary<string, dynamic> GetSession(string sessionGuid)
6363

6464
public static void AddPackages(string sessionGuid, List<KeyValuePair<string, Stream>> streams)
6565
{
66-
string endpoint = string.Format("CI/AddPackages?sessionGuid={0}", sessionGuid);
66+
string endpoint = string.Format("Remote/AddPackages?sessionGuid={0}", sessionGuid);
6767

6868
using (HttpClient client = BuildClient())
6969
{
@@ -80,7 +80,7 @@ public static void AddPackages(string sessionGuid, List<KeyValuePair<string, Str
8080

8181
public static void AddPackageAsync(string sessionGuid, Stream stream, string filename)
8282
{
83-
string endpoint = string.Format("CI/AddPackages?sessionGuid={0}", sessionGuid);
83+
string endpoint = string.Format("Remote/AddPackages?sessionGuid={0}", sessionGuid);
8484

8585
using (HttpClient client = BuildClient())
8686
{
@@ -94,7 +94,7 @@ public static void AddPackageAsync(string sessionGuid, Stream stream, string fil
9494

9595
public static bool Install(string sessionGuid, out Dictionary<string, dynamic> response)
9696
{
97-
string endpoint = string.Format("CI/Install?sessionGuid={0}", sessionGuid);
97+
string endpoint = string.Format("Remote/Install?sessionGuid={0}", sessionGuid);
9898

9999
bool success = false;
100100

‎PolyDeploy.sln

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployClient", "DeployClien
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
14-
Angular|Any CPU = Angular|Any CPU
14+
Clients|Any CPU = Clients|Any CPU
1515
Debug|Any CPU = Debug|Any CPU
1616
Release|Any CPU = Release|Any CPU
1717
EndGlobalSection
1818
GlobalSection(ProjectConfigurationPlatforms) = postSolution
19-
{B15D41DD-2D1A-490C-977F-2F14E56447D5}.Angular|Any CPU.ActiveCfg = Angular|Any CPU
20-
{B15D41DD-2D1A-490C-977F-2F14E56447D5}.Angular|Any CPU.Build.0 = Angular|Any CPU
19+
{B15D41DD-2D1A-490C-977F-2F14E56447D5}.Clients|Any CPU.ActiveCfg = Clients|Any CPU
20+
{B15D41DD-2D1A-490C-977F-2F14E56447D5}.Clients|Any CPU.Build.0 = Clients|Any CPU
2121
{B15D41DD-2D1A-490C-977F-2F14E56447D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2222
{B15D41DD-2D1A-490C-977F-2F14E56447D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
2323
{B15D41DD-2D1A-490C-977F-2F14E56447D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
2424
{B15D41DD-2D1A-490C-977F-2F14E56447D5}.Release|Any CPU.Build.0 = Release|Any CPU
25-
{AB5A3320-F260-42EE-8F19-CCF7546CA511}.Angular|Any CPU.ActiveCfg = Release|Any CPU
26-
{AB5A3320-F260-42EE-8F19-CCF7546CA511}.Angular|Any CPU.Build.0 = Release|Any CPU
25+
{AB5A3320-F260-42EE-8F19-CCF7546CA511}.Clients|Any CPU.ActiveCfg = Release|Any CPU
26+
{AB5A3320-F260-42EE-8F19-CCF7546CA511}.Clients|Any CPU.Build.0 = Release|Any CPU
2727
{AB5A3320-F260-42EE-8F19-CCF7546CA511}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2828
{AB5A3320-F260-42EE-8F19-CCF7546CA511}.Debug|Any CPU.Build.0 = Debug|Any CPU
2929
{AB5A3320-F260-42EE-8F19-CCF7546CA511}.Release|Any CPU.ActiveCfg = Release|Any CPU
3030
{AB5A3320-F260-42EE-8F19-CCF7546CA511}.Release|Any CPU.Build.0 = Release|Any CPU
31-
{B6122CCD-75F9-4DEF-8DAA-E11789D6D6D8}.Angular|Any CPU.ActiveCfg = Release|Any CPU
32-
{B6122CCD-75F9-4DEF-8DAA-E11789D6D6D8}.Angular|Any CPU.Build.0 = Release|Any CPU
31+
{B6122CCD-75F9-4DEF-8DAA-E11789D6D6D8}.Clients|Any CPU.ActiveCfg = Release|Any CPU
32+
{B6122CCD-75F9-4DEF-8DAA-E11789D6D6D8}.Clients|Any CPU.Build.0 = Release|Any CPU
3333
{B6122CCD-75F9-4DEF-8DAA-E11789D6D6D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3434
{B6122CCD-75F9-4DEF-8DAA-E11789D6D6D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
3535
{B6122CCD-75F9-4DEF-8DAA-E11789D6D6D8}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎PolyDeploy/.babelrc

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"plugins": ["transform-object-rest-spread"],
3+
"presets": ["es2015"]
4+
}

‎PolyDeploy/Angular/src/app.js

-51
This file was deleted.

‎PolyDeploy/Angular/src/bundle.js

-13
This file was deleted.

‎PolyDeploy/Angular/src/controllers/InstallController.js

-15
This file was deleted.

‎PolyDeploy/Angular/src/controllers/MainController.js

-14
This file was deleted.

‎PolyDeploy/Angular/src/controllers/ManageUsersController.js

-46
This file was deleted.

‎PolyDeploy/Angular/src/controllers/ResultController.js

-67
This file was deleted.

‎PolyDeploy/Angular/src/controllers/SummaryController.js

-33
This file was deleted.

0 commit comments

Comments
 (0)