Merge remote-tracking branch 'refs/remotes/Microsoft/master'

Author: JocaPC

.gitignore

@@ -37,7 +37,6 @@ samples/features/in-memory/ticket-reservations/packages/CircularGauge.1.0.0/Read
 samples/features/in-memory/ticket-reservations/TicketReservations/obj/Release/Model.xml
 samples/features/in-memory/ticket-reservations/DemoWorkload/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
 *.dat
-*.sln
 
 *.user
 samples/features/in-memory/ticket-reservations/DemoWorkload/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
@@ -48,3 +47,27 @@ samples/databases/wide-world-importers/wwi-integration-etl/Daily ETL/obj/Develop
 samples/features/in-memory/ticket-reservations/DemoWorkload/obj/Debug/DemoWorkload.csproj.FileListAbsolute.txt
 samples/features/in-memory/iot-smart-grid/Db/obj/Release/Model.xml
 samples/applications/iot-smart-grid/DataGenerator/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
+samples/databases/wide-world-importers/workload-drivers/order-insert/MultithreadedOrderInsert/bin/Debug/MultithreadedOrderInsert.exe.config
+samples/features/in-memory/iot-smart-grid/ConsoleClient/bin/Release/ConsoleClient.exe.config
+*.jfm
+samples/features/in-memory/ticket-reservations/TicketReservations/bin/Release/TicketReservations.publish.sql
+samples/applications/iot-smart-grid/ConsoleClient/bin/Release/ConsoleClient.exe.config
+samples/applications/iot-smart-grid/Db/Db.dbmdl
+samples/databases/wide-world-importers/workload-drivers/order-insert/MultithreadedOrderInsert/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
+samples/databases/wide-world-importers/wwi-dw-ssdt/wwi-dw-ssdt/obj/Debug/Model.xml
+samples/databases/wide-world-importers/wwi-dw-ssdt/wwi-dw-ssdt/WideWorldImportersDW.dbmdl
+samples/features/in-memory/iot-smart-grid/WinFormsClient/bin/Release/Reports/PowerDashboard.pbix
+samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/WideWorldImporters.dbmdl
+samples/databases/wide-world-importers/workload-drivers/order-insert/MultithreadedOrderInsert/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
+samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd/bin/WWI-SSASMD.asdatabase
+samples/applications/iot-smart-grid/Db/obj/Release/Db.sqlproj.FileListAbsolute.txt
+*.manifest
+samples/applications/iot-smart-grid/WinFormsClient/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
+samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd/obj/Development/IncrementalShapshot.xml
+samples/applications/iot-smart-grid/ConsoleClient/bin/Release/Reports/PowerDashboard.pbix
+samples/applications/iot-smart-grid/Db/obj/Release/Model.xml
+samples/databases/wide-world-importers/workload-drivers/order-insert/MultithreadedOrderInsert/obj/Release/MultithreadedOrderInsert.csproj.FileListAbsolute.txt
+samples/applications/iot-smart-grid/ConsoleClient/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
+samples/applications/iot-smart-grid/WinFormsClient/bin/Release/Client.exe.config
+samples/databases/wide-world-importers/workload-drivers/order-insert/MultithreadedOrderInsert/bin/Release/MultithreadedOrderInsert.exe.config
+samples/databases/wide-world-importers/workload-drivers/order-insert/MultithreadedOrderInsert/obj/Debug/MultithreadedInMemoryTableInsert.MultithreadedOrderInsertMain.resources

samples/applications/iot-connected-car/iot-connected-car.sln

@@ -0,0 +1,34 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+#  Visual Studio 15
+VisualStudioVersion = 15.0.26403.7
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataGenerator", "DataGenerator\DataGenerator.csproj", "{D871B062-06A7-49E3-8BCD-8465B772FC52}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsClient", "WinFormsClient\WinFormsClient.csproj", "{6C0E1820-A10B-47DA-B806-939CBCD0DD39}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2D761B8A-EE55-4825-B19D-F3B04860D9D7}"
+	ProjectSection(SolutionItems) = preProject
+		App.config = App.config
+		sample-sql-queries.sql = sample-sql-queries.sql
+		setup_reset.sql = setup_reset.sql
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D871B062-06A7-49E3-8BCD-8465B772FC52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D871B062-06A7-49E3-8BCD-8465B772FC52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D871B062-06A7-49E3-8BCD-8465B772FC52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D871B062-06A7-49E3-8BCD-8465B772FC52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C0E1820-A10B-47DA-B806-939CBCD0DD39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C0E1820-A10B-47DA-B806-939CBCD0DD39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C0E1820-A10B-47DA-B806-939CBCD0DD39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C0E1820-A10B-47DA-B806-939CBCD0DD39}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

samples/databases/README.md

@@ -9,8 +9,3 @@ The new sample database for SQL Server 2016 and Azure SQL Database. It illustrat
 __[contoso-data-warehouse](contoso-data-warehouse/)__
 
 Sample data warehouse that illustrates loading data into Azure SQL Data Warehouse.
-
-__[adventure-works-lt](adventure-works-lt/)__
-
-AdventureWorksLT sample database.
-

samples/databases/adventure-works-lt/AdventureWorksLT.bacpac

@@ -30,8 +30,11 @@ The sample includes the databases that can be explored, as well as sample applic
 1. **Key features:** Core database features
 1. **Workload:** OLTP, OLAP, IoT
 1. **Programming Language:** T-SQL, C#
-1. **Authors:** Greg Low, Denzil Ribeiro, Jos de Bruijn
-1. **Update history:** 25 May 2016 - initial revision
+1. **Authors:** Greg Low, Denzil Ribeiro, Jos de Bruijn, Robert Cain
+1. **Update history:**
+	21 June 2017 - restructure using SSDT
+	25 May 2016 - initial revision
+
 
 <a name=before-you-begin></a>
 
@@ -43,39 +46,51 @@ To run this sample, you need the following prerequisites.
 
 <!-- Examples -->
 1. SQL Server 2016 (or higher) or an Azure SQL Database.
-2. SQL Server Management Studio, preferably June 2016 release or later (version >= 13.0.15000.23).
-3. (to build sample apps) Visual Studio 2015.
-4. (to run ETL jobs) SQL Server 2016 Integration Services
+1. SQL Server Management Studio, preferably June 2016 release or later (version >= 13.0.15000.23).
+1. Visual Studio 2015 Update 3 (or higher) with SQL Server Data Tools.
+1. (to run ETL jobs) SQL Server 2016 (or higher) Integration Services (SSIS). At the time of writing, Visual Studio 2017 does not yet support Integration Services projects. You will need to install Visual Studio 2015 to open the SSIS project.
+1. (to install the SSASMD sample) SQL Server 2016 (or higher) Analysis Services (SSAS). If you are using Visual Studio 2017, download and install the following: [Analysis Services](https://marketplace.visualstudio.com/items?itemName=ProBITools.MicrosoftAnalysisServicesModelingProjects)
 
 <a name=run-this-sample></a>
 
 ## Sample structure
 
-The latest release of this sample is available here: TBD
+The latest release of this sample is available here: [wide-world-importers-release](http://go.microsoft.com/fwlink/?LinkID=800630)
+
+This sample contains databases as well as a number of sample scripts and workload drivers.
+
+The sample databases are created through SQL Server Data Tools projects in Visual Studio. Each database has its own project; the solution [wwi-sample.sln](wwi-sample.sln) in the root folder of the sample has references to all the projects. To load all project in the solution, SQL Server Integration Services and SQL Server Analysis Services need to be installed on the machine.
+
+The sample scripts are available as Transact-SQL. The workload drivers are sample applications created in Visual Studio.
 
-The source code for the sample is structured as follows:
+The source code for the sample is further structured as follows:
 
-__[sample-scripts] (sample-scripts/)__
+__[sample-scripts](sample-scripts/)__
 
 Sample scripts that illustrate the use of various SQL Server features with the WideWorldImporters sample database.
 
-__[workload-drivers] (workload-drivers/)__
+__[workload-drivers](workload-drivers/)__
 
 Simple apps that simulate workloads for the WideWorldImporters sample database.
 
-__[wwi-database-scripts] (wwi-database-scripts/)__
+__[wwi-dw-ssdt](wwi-dw-ssdt/)__
 
-T-SQL scripts to create the main WideWorldImporters database.
+SQL Server Data Tools project for the OLAP database WideWorldImporters.
 
-__[wwi-dw-database-scripts] (wwi-dw-database-scripts/)__
+__[wwi-ssasmd](wwi-ssasmd/)__
 
-T-SQL scripts to create the analytics database WideWorldImportersDW.
+SQL Server Analysis Services Multidimensional project to create the Analysis Services database WWI-SSASMD.
 
-__[wwi-integration-etl] (wwi-integration-etl/)__
+__[wwi-ssdt](wwi-ssdt/)__
+
+SQL Server Data Tools project for the main OLTP database WideWorldImporters.
+
+__[wwi-ssis](wwi-ssis/)__
 
 SQL Server Integration Services (SSIS) project for the Extract, Transform, and Load (ETL) process that takes data from the transactional database WideWorldImporters and loads it into the WideWorldImportersDW database.
 
 
+
 <a name=disclaimers></a>
 
 ## Disclaimers

samples/databases/wide-world-importers/README.md

@@ -29,6 +29,7 @@ GO
 
 -- 1a. In Object Explorer, expand the security node in WideWorldImporters, then expand
 --     the Always Encrypted Keys node and note the contents.
+--       If you do not see the Always Encrypted node, install the latest version of Management Studio (17.X or higher): https://aka.ms/ssms
 -- 1b. Right-click the Column Master Keys node and click New Column Master Key.
 -- 1c. For the name, enter WWI_ColumnMasterKey.
 -- 1d. Note the available entries in the Key store dropdown list. Choose Windows Certificate Store - Current User. 

samples/databases/wide-world-importers/sample-scripts/always-encrypted/DemonstrateAlwaysEncrypted.sql

@@ -78,6 +78,7 @@ GO
 
 GRANT SELECT, UPDATE ON Sales.Customers TO [Great Lakes Sales];
 GRANT SELECT ON [Application].Cities TO [Great Lakes Sales];
+GRANT SELECT ON [Application].StateProvinces TO [Great Lakes Sales];
 GRANT SELECT ON [Application].Countries TO [Great Lakes Sales];
 GO
 
@@ -94,20 +95,37 @@ GO
 -- where are those customers? 
 -- note the spatial results tab
 
-SELECT c.Border 
+SELECT c.Border
 FROM [Application].Countries AS c
 WHERE c.CountryName = N'United States'
 UNION ALL
-SELECT c.DeliveryLocation 
-FROM Sales.Customers AS c;
+SELECT c.DeliveryLocation
+FROM Sales.Customers AS c
 GO
 
+-----------------------------------------------------------------------
 -- updating rows that are accessible to a non-accessible row is blocked
+-----------------------------------------------------------------------
+DECLARE @GreatLakesCustomerID INT
+DECLARE @NonGreatLakesCityID INT
 
-UPDATE Sales.Customers            -- Attempt to update
-SET DeliveryCityID = 3            -- to a city that is not in the Great Lakes Sales Territory
-WHERE DeliveryCityID = 32887;     -- for a customer that is in the Great Lakes Sales Territory
+-- pick a customer in the Great Lakes sales territory
+SELECT TOP 1 @GreatLakesCustomerID=c.CustomerID
+FROM Sales.Customers c JOIN Application.Cities ci ON c.DeliveryCityID=ci.CityID 
+	JOIN Application.StateProvinces sp ON ci.StateProvinceID=sp.StateProvinceID
+WHERE sp.SalesTerritory=N'Great Lakes'
 
+-- pick a City outside of the Great Lakes sales territory
+SELECT @NonGreatLakesCityID=c.CityID
+FROM Application.Cities c JOIN Application.StateProvinces sp ON c.StateProvinceID=sp.StateProvinceID
+WHERE CityName=N'Seattle' AND sp.StateProvinceCode=N'WA'
+
+UPDATE Sales.Customers                    -- Attempt to update
+SET DeliveryCityID = @NonGreatLakesCityID -- to a city that is not in the Great Lakes Sales Territory
+WHERE CustomerID = @GreatLakesCustomerID; -- for a customer that is in the Great Lakes Sales Territory
+GO
+
+-- revert the impersonation
 REVERT;
 GO
 
@@ -133,9 +151,6 @@ REVOKE SELECT ON [Application].Cities FROM [Website];
 REVOKE SELECT ON [Application].Countries FROM [Website];
 GO
 
-EXEC [Application].Configuration_RemoveRowLevelSecurity;
-GO
-
 DROP USER GreatLakesUser;
 GO