Merge branch 'master' into master

Author: ananto-msft

samples/applications/iot-smart-grid/README.md

@@ -45,6 +45,18 @@ To run this sample, you need the following prerequisites.
 <a name=run-this-sample></a>
 
 ## Run this sample
+1. Create a database with the name: PowerConsumption
+
+2. Run the script setup-or-reset-demo.sql to create the DB Objects
+
+3. Start the DataGenerator (WindowsForms: Client.exe OR Console: ConsoleClient.exe)application DemoWorkload.exe
+
+4. Change the connection string in the configuration settings, if needed. By default, it points to the local default SQL Server instance with integrated authentication.
+
+5. Load the Power BI Report (WindowsForms: Click on the lower left link, Console: Type REPORT)
+
+-**or**-
+
 1. Clone this repository using Git for Windows (http://www.git-scm.com/), or download the zip file.
 
 2. From Visual Studio, open the **IoT-Smart-Grid.sln** file from the root directory.

…p/Controllers/FrontEndViewsController.cs …Controllers/FrontEndController.Static.cssamples/databases/wide-world-importers/wwi-app/Controllers/FrontEndViewsController.cs renamed to samples/databases/wide-world-importers/wwi-app/Controllers/FrontEndController.Static.cs samples/databases/wide-world-importers/wwi-app/Controllers/FrontEndViewsController.cs renamed to samples/databases/wide-world-importers/wwi-app/Controllers/FrontEndController.Static.cs

@@ -1,5 +1,4 @@
-
-using Belgrade.SqlClient;
+using Belgrade.SqlClient;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using MsSql.RestApi;
@@ -20,7 +19,7 @@ public ODataController(ICommand sqlCommandService)
         }
 
 
-		TableSpec salesorders = new TableSpec(schema: "WebApi", table: "SalesOrders", columns: "OrderID,OrderDate,CustomerPurchaseOrderNumber,ExpectedDeliveryDate,PickingCompletedWhen,CustomerID,CustomerName,PhoneNumber,FaxNumber,WebsiteURL,DeliveryLocation,SalesPerson,SalesPersonPhone,SalesPersonEmail");
+		TableSpec salesorders = new TableSpec("WebApi","SalesOrders", "OrderID,OrderDate,CustomerPurchaseOrderNumber,ExpectedDeliveryDate,PickingCompletedWhen,CustomerID,CustomerName,PhoneNumber,FaxNumber,WebsiteURL,DeliveryLocation,SalesPerson,SalesPersonPhone,SalesPersonEmail");
 
 		[HttpGet]
         public async Task SalesOrders(int? id)

samples/databases/wide-world-importers/wwi-app/Controllers/ODataController.cs

@@ -6,7 +6,6 @@
 	var json = o["ApiModel"].ToString();
 	TableDef[] config = Newtonsoft.Json.JsonConvert.DeserializeObject<TableDef[]>(json);
 #>
-
 using Belgrade.SqlClient;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

samples/databases/wide-world-importers/wwi-app/Controllers/ODataController.tt

@@ -20,7 +20,6 @@ public async Task SalesOrders()
         {
             await this
 				.Table(salesorders)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -29,7 +28,6 @@ public async Task PurchaseOrders()
         {
             await this
 				.Table(purchaseorders)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -38,7 +36,6 @@ public async Task Invoices()
         {
             await this
 				.Table(invoices)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -47,7 +44,6 @@ public async Task CustomerTransactions()
         {
             await this
 				.Table(customertransactions)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -56,7 +52,6 @@ public async Task SupplierTransactions()
         {
             await this
 				.Table(suppliertransactions)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -65,7 +60,6 @@ public async Task Customers()
         {
             await this
 				.Table(customers)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -74,7 +68,6 @@ public async Task Suppliers()
         {
             await this
 				.Table(suppliers)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -83,7 +76,6 @@ public async Task Countries()
         {
             await this
 				.Table(countries)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -92,7 +84,6 @@ public async Task Cities()
         {
             await this
 				.Table(cities)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -101,7 +92,6 @@ public async Task StateProvinces()
         {
             await this
 				.Table(stateprovinces)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -110,7 +100,6 @@ public async Task StockItems()
         {
             await this
 				.Table(stockitems)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 																		    }

samples/databases/wide-world-importers/wwi-app/Controllers/TableController.cs

@@ -30,7 +30,6 @@ namespace wwi_app.Controllers
         {
             await this
 				.Table(<#= t.Table.ToLower() #>)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 <# } #>

samples/databases/wide-world-importers/wwi-app/Controllers/TableController.tt

@@ -17,7 +17,7 @@ info:
   license:
     name: "Apache 2.0"
     url: "http://www.apache.org/licenses/LICENSE-2.0.html"
-host: "localhost:64958"
+host: "localhost:64959"
 basePath: "/OData"
 tags:
 <# foreach(var t in config) {#>