Merge remote-tracking branch 'refs/remotes/origin/master' into jodebrui

Author: jodebrui

samples/applications/iot-smart-grid/App.config

@@ -4,7 +4,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
   </startup>
   <connectionStrings>
-    <!--<add name="Db" connectionString="Server=tcp:peskount-hktest1.database.windows.net,1433;Database=PowerConsumption;User ID=demovm001@peskount-hktest1;Password=LetAzureIn0_;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"/>-->
+    <!--<add name="Db" connectionString="Server=tcp:<server>.database.windows.net,1433;Database=PowerConsumption;User ID=<user>;Password=<password>;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"/>-->
     <add name="Db" connectionString="Server=.;Database=PowerConsumption;Integrated Security=True"/>
   </connectionStrings>
   <appSettings>

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

@@ -8,7 +8,7 @@ The sample includes the databases that can be explored, as well as sample applic
 
 **Latest release**: [wide-world-importers-release](http://go.microsoft.com/fwlink/?LinkID=800630)
 
-**Documentation**: [root.md](http://go.microsoft.com/fwlink/?LinkID=800631)
+**Documentation**: [Wide World Importers Documentation](http://go.microsoft.com/fwlink/?LinkID=800631)
 
 **Feedback on the sample**: send to [[email protected]](mailto:[email protected])
 
@@ -43,7 +43,7 @@ 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 2016 April Preview or later (version >= 13.0.14000.36).
+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
 

samples/databases/wide-world-importers/wwi-database-scripts/9-wwi-restore.sql

@@ -3,7 +3,7 @@
 USE [master]
 ALTER DATABASE [WideWorldImporters] SET SINGLE_USER WITH ROLLBACK IMMEDIATE
 RESTORE DATABASE [WideWorldImporters] 
-FROM DISK = N'C:\YourPath\WideWorldImporters_AtShipDate.bak' 
+FROM DISK = N'C:\YourPath\WideWorldImporters.bak' 
 WITH FILE = 1,  NOUNLOAD,  REPLACE,  STATS = 5
 ALTER DATABASE [WideWorldImporters] SET MULTI_USER
 GO

samples/databases/wide-world-importers/wwi-database-scripts/README.md

@@ -59,7 +59,7 @@ Note that each time the databases are reconstructed from empty, they will contai
 5. Execute the script **5-wwi-load-seed-data.sql**. This script populates the seed data required for the database. It will typically take a few minutes to execute.
 
 6. Execute the script **6-wwi-data-simulation.sql**. This script runs data simulation to populate the transaction tables. It can take 20-30 minutes to execute.
-<br/><br/>The statements in this script remove the temporal nature of the tables, and implements a series of triggers. They then emulate typical activities that would occur during each day. Finally, they remove the triggers and re-establishes the temporal tables. You can see the progress of the simulation in the Messages tab in SSMS as the query executes. (IsSilentMode = 1 produces just date output if AreDatesPrinted = 1. When 0, it produces much more detailed output about each task being undertaken).
+<br/><br/>The statements in this script remove the temporal nature of the tables, and implements a series of triggers. They then emulate typical activities that would occur during each day. Finally, they remove the triggers and re-establishes the temporal tables. You can see the progress of the simulation in the Messages tab in SSMS as the query executes. (AreDatesPrinted controls whether dates are printed to the messages window as data is generated. IsSilentMode controls whether detailed output is printed. IsSilentMode = 1 produces just date output if AreDatesPrinted = 1.).
 Note that a different outcome is produced each time it is run as it uses many random values.
 StartDate and EndDate cover the period for generation. Other code populates the 2012 period when expanding the columnstore tables so do not populate back into 2012 or earlier with this procedure. The EndDate must also be at or before the current date as temporal tables do not allow future dates.
 You can configure the amount of data produced by modifying the number of orders per day. The default is 60 orders and produces a reasonable OLTP database size of around 93MB compressed. You are also able to configure how busy Saturday and Sunday are compared to normal Monday to Friday working days, as a percentage. The suggested values are 50% for Saturday and 0% for Sunday.

samples/databases/wide-world-importers/wwi-dw-database-scripts/README.md

@@ -35,7 +35,7 @@ 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 2016 April Preview or later (version >= 13.0.14000.36)
+2. SQL Server Management Studio, preferably June 2016 release or later (version >= 13.0.15000.23)
 
 
 <a name=run-this-sample></a>

samples/features/in-memory/iot-smart-grid/Db/Db.dbmdl

@@ -2,16 +2,16 @@
 
 Contains samples for managing Microsoft's SQL databases including SQL Server, Azure SQL Database, and Azure SQL Data Warehouse.
 
-Samples are coming soon!
-
-
 ## Collect and monitor resource usage data across multiple pools in a subscription  
-This Solution Quick Start provides a solution for collecting and monitoring Azure SQL Database resource usage accross multiple pools in a subscription. When you have a large number of databases in a subscription, it is cumbersome to monitor each elastic pool separately. To solve this, you can combine SQL database PowerShell cmdlets and T-SQL queries to collect resource usage data from multiple pools and their databases for monitoring and analysis of resource usage.   
+This Solution Quick Start provides a solution for collecting and monitoring Azure SQL Database resource usage across multiple pools in a subscription. When you have a large number of databases in a subscription, it is cumbersome to monitor each elastic pool separately. To solve this, you can combine SQL database PowerShell cmdlets and T-SQL queries to collect resource usage data from multiple pools and their databases for monitoring and analysis of resource usage.   
 
 [Manage Mulitiple Elastic Pools in SQL Database Using PowerShell and Power BI](https://github.com/Microsoft/sql-server-samples/tree/master/samples/manage/azure-sql-db-elastic-pools) in the GitHub SQL Server samples repository provides a set of powershell scripts and T-SQL queries along with documentation on what it does and how to use it.  
 
 ## Get started using Elastic Pools in a SaaS scenario  
-
 This Solution Quick Start provides a solution for a Softwware-as-a-Solution (SaaS) scenario that leverages Elastic Pools to provide a cost-effective, scalable database back-end of a SaaS application. In this solution, you will walk-though the implementation of a web app that lets you visualize the load created on an Elastic Pool by a load generator using a custom dashboard that supplements the Azure Portal.  
 
 [saas-scenario-with-elastic-pools](https://github.com/Microsoft/sql-server-samples/tree/master/samples/manage/azure-sql-db-elastic-pools-custom-dashboard) in the GitHub SQL Server samples repository provides a load generator and monitoring web app along with the documentation on what it does and how to use it.  
+
+## Windows Containers
+This includes samples for setting up mssql-server in Windows Containers. Currently it includes the following:
+- __[windows-containers] (windows-containers/)__

samples/manage/README.md

@@ -0,0 +1,30 @@
+# mssql server 2014 express image listening on static port 1433
+# 
+# Note: This dockerfile is based on Buc Rogers' work here: 
+# https://github.com/brogersyh/Dockerfiles-for-windows/tree/master/sqlexpress
+#
+# .NET 3.5 required for SQL Server
+FROM microsoft/dotnet35
+
+# maintainer for image metadata
+MAINTAINER Perry Skountrianos
+
+# set environment variables
+ENV sql_express_download_url "https://download.microsoft.com/download/1/5/6/156992E6-F7C7-4E55-833D-249BD2348138/ENU/x64/SQLEXPR_x64_ENU.exe"
+ENV sa_password _
+
+# make install files accessible
+COPY . /
+WORKDIR /
+
+# download and install Microsoft SQL 2014 Express Edition in one step  
+RUN powershell -Command (New-Object System.Net.WebClient).DownloadFile('%sql_express_download_url%', 'sqlexpress.exe') && /sqlexpress.exe /qs /x:setup && /setup/setup.exe /q /ACTION=Install /INSTANCENAME=SQLEXPRESS /FEATURES=SQLEngine /UPDATEENABLED=0 /SQLSVCACCOUNT="NT AUTHORITY\System" /SQLSYSADMINACCOUNTS="BUILTIN\ADMINISTRATORS" /TCPENABLED=1 /NPENABLED=0 /IACCEPTSQLSERVERLICENSETERMS && del /F /Q sqlexpress.exe && rd /q /s setup
+
+RUN powershell -Command \
+        set-strictmode -version latest ; \
+        stop-service MSSQL`$%sqlinstance% ; \
+        set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql12.SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall' -name tcpdynamicports -value '' ; \
+        set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql12.SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall' -name tcpport -value 1433 ; \
+        set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql12.SQLEXPRESS\mssqlserver\' -name LoginMode -value 2 ; 
+
+CMD powershell ./start %sa_password%

samples/manage/windows-containers/mssql-server-2014-express-windows/dockerfile

@@ -0,0 +1,64 @@
+# mssql-server-2014-express-windows
+This Dockerfile helps developers to get started using SQL Server 2014 Express in Windows Server Core Containers. The file downloads and installs SQL Server 2014 Express with the default setup parameters.
+
+Note: This dockerfile is based on Buc Rogers' work that can be found [here] (https://github.com/brogersyh/Dockerfiles-for-windows/tree/master/sqlexpress)
+
+### Contents
+
+[About this sample](#about-this-sample)<br/>
+[Before you begin](#before-you-begin)<br/>
+[Run this sample](#run-this-sample)<br/>
+[Sample details](#sample-details)<br/>
+[Disclaimers](#disclaimers)<br/>
+[Related links](#related-links)<br/>
+
+<a name=about-this-sample></a>
+
+## About this sample
+
+1. **Applies to:** SQL Server 2014 Express, Windows Server Technical Preview 4 or later
+5. **Authors:** Perry Skountrianos [perrysk-msft]
+
+<a name=before-you-begin></a>
+
+## Before you begin
+
+To run this sample, you need the following prerequisites.
+
+**Software prerequisites:**
+
+You can run the container with the following command. Note the you'll need Windows Server Core TP5 v10.0.14300.1000.
+docker run -p 1433:1433 --env sa_password=<YOUR SA PASSWORD> microsoft/mssql-server-2014-express-windows
+
+<a name=run-this-sample></a>
+
+## Run this sample
+
+The image provides one environment variable to set the sa password: </br>
+- sa_password: Sets the sa password and enables the sa login
+
+<a name=sample-details></a>
+
+## Sample details
+
+The Dockerfile downloads and installs SQL Server 2014 Express with the following default setup parameters that could be changed (if needed) after the image is installed.
+- Collation: SQL_Latin1_General_CP1_CI_AS
+- SQL Instance Name: SQLEXPRESS
+- Root Directory: C:\Program Files\Microsoft SQL Server\MSSQL12.SQLEXPRESS\MSSQL
+- Language: English (United Stated)
+
+<a name=disclaimers></a>
+
+## Disclaimers
+The code included in this sample is not intended to be a set of best practices on how to build scalable enterprise grade applications. This is beyond the scope of this quick start sample.
+
+<a name=related-links></a>
+
+## Related Links
+<!-- Links to more articles. Remember to delete "en-us" from the link path. -->
+
+For more information, see these articles:
+- [Windows Containers] (https://msdn.microsoft.com/en-us/virtualization/windowscontainers/about/about_overview)
+- [Windows-based containers: Modern app development with enterprise-grade control] (https://www.youtube.com/watch?v=Ryx3o0rD5lY&feature=youtu.be)
+- [Windows Containers: What, Why and How] (https://channel9.msdn.com/Events/Build/2015/2-704)
+- [SQL Server in Windows Containers] (https://blogs.msdn.microsoft.com/sqlserverstorageengine/2016/03/21/sql-server-in-windows-containers/#comments)

samples/manage/windows-containers/mssql-server-2014-express-windows/readme.md

@@ -0,0 +1,17 @@
+# The script sets the sa password and start the SQl Service 
+
+param(
+[Parameter(Mandatory=$false)]
+[string]$sa_password
+)
+
+# start the service
+start-service MSSQL`$SQLEXPRESS
+
+
+if($sa_password -ne "_"){
+    $sqlcmd = "ALTER LOGIN sa with password=" +"'" + $sa_password + "'" + ";ALTER LOGIN sa ENABLE;"
+    Invoke-Sqlcmd -Query $sqlcmd -ServerInstance ".\SQLEXPRESS" 
+}
+
+while ($true) { Start-Sleep -Seconds 3600 }