Merge branch 'master' into master

Author: JocaPC

.gitignore

@@ -1,7 +1,5 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
 *.suo
@@ -19,10 +17,11 @@
 [Rr]eleases/
 x64/
 x86/
+build/
 bld/
 [Bb]in/
 [Oo]bj/
-[Ll]og/
+out/
 
 # Visual Studio 2015 cache/options directory
 .vs/
@@ -50,6 +49,9 @@ project.lock.json
 project.fragment.lock.json
 artifacts/
 **/Properties/launchSettings.json
+# DNX
+project.lock.json
+artifacts/
 
 *_i.c
 *_p.c
@@ -89,6 +91,9 @@ ipch/
 *.cachefile
 *.VC.db
 *.VC.VC.opendb
+*.opensdf
+*.sdf
+*.cachefile
 
 # Visual Studio profiler
 *.psess
@@ -153,47 +158,30 @@ DocProject/Help/Html2
 DocProject/Help/html
 
 # Click-Once directory
-#publish/
+# publish/
 
 # Publish Web Output
-#*.[Pp]ublish.xml
 *.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
+# TODO: Comment the next line if you want to checkin your web deploy settings 
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
 
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
+**/packages/*
 # except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
+!**/packages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
+#!**/packages/repositories.config
 
-# Microsoft Azure Build Output
+# Windows Azure Build Output
 csx/
 *.build.csdef
 
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
+# Windows Store app package directory
 AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -203,6 +191,7 @@ _pkginfo.txt
 
 # Others
 ClientBin/
+[Ss]tyle[Cc]op.*
 ~$*
 *~
 *.dbmdl
@@ -216,6 +205,11 @@ orleans.codegen.cs
 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
 #bower_components/
 
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
 # RIA/Silverlight projects
 Generated_Code/
 
@@ -249,6 +243,8 @@ node_modules/
 
 # Typescript v1 declaration files
 typings/
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
 
 # Visual Studio 6 build log
 *.plg
@@ -304,6 +300,61 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
+/build
+/Build
+/deploy
+/package
+bin/
+obj/
+sql/
+*/obj/debug
+**/Debug
+#ignore thumbnails created by windows
+Thumbs.db
+#Ignore files build by Visual Studio
+*.obj
+*.pdb
+*.user
+*.aps
+*.pch
+*.docstates
+*.vspscc
+*_i.c
+*_p.c
+*.ncb
+*.suo
+*.tlb
+*.dbmdl
+*.schemaview
+*.tlh
+*.cache
+*.ilk
+*.log
+[Bb]in
+[Dd]ebug*/
+*.lib
+*.sbr
+obj/
+[Rr]elease*/
+_ReSharper*/
+[Tt]est[Rr]esult*
+*.docstates
+*.swp
+*.*~
+*.gpState
+*.ReSharper*
+*.preflight
+*.nocommit
+#Ignore Recovery Files made by Excel
+~$*.xlsx
+*.rdl.data
+
+*.jfm
+
+#======================================================================================
+# The below section could possibly be removed as these should be ignored by the above.
+#======================================================================================
+
 samples/in-memory/ticket-reservations/DemoWorkload/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
 *.nupkg
 samples/in-memory/ticket-reservations/packages/CircularGauge.1.0.0/CreatePackageFile.bat
@@ -377,3 +428,16 @@ samples/applications/iot-smart-grid/ConsoleClient/obj/Debug/TemporaryGeneratedFi
 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/features/epm-framework/5.0/2Reporting/PolicyReports/PolicyEvaluationErrors.rdl.data
+/samples/features/epm-framework/5.0/2Reporting/PolicyReports/PolicyEvaluationErrorDetails.rdl.data
+/samples/features/epm-framework/5.0/2Reporting/PolicyReports/PolicyEvaluationDetails.rdl.data
+/samples/features/epm-framework/5.0/2Reporting/PolicyReports/PolicyDetails.rdl.data
+/samples/features/epm-framework/5.0/2Reporting/PolicyReports/PolicyDashboard.rdl.data
+/samples/features/epm-framework/5.0/2Reporting/PolicyReports/bin/Debug
+/samples/features/epm-framework/5.0/2Reporting/PolicyReports/PolicyDashboard - Backup.rdl
+/samples/features/epm-framework/5.0/2Reporting/PolicyReports/PolicyDashboardFiltered.rdl.data
+samples/features/sql-management-objects/src/out/CodeCoverage/CodeCoverage.config
+
+# Certificates
+*.pem
+*.p12

README.md

@@ -1,3 +1,5 @@
+![](./media/solutions-microsoft-logo-small.png)
+
 # SQL Server Samples Repository
 This GitHub repository contains code samples that demonstrate how to use Microsoft's SQL products including SQL Server, Azure SQL Database, and Azure SQL Data Warehouse. Each sample includes a README file that explains how to run and use the sample.
 

README_samples_template.md

@@ -1,3 +1,6 @@
+<!-- Always leave the MS logo -->
+![](./media/solutions-microsoft-logo-small.png)
+
 # Sample name
 
 Briefly describe what the sample does. Describe the benefit of running this sample.

media/demos/sql-sampledb/sampledb1/README.md

@@ -0,0 +1,3 @@
+# Sample Database 1 (Employee DB Dummy Data)
+
+This is a fundamental database that houses data based on a conventinal Sales environment. Sourced from progress.com with slight modifications.

media/demos/sql-sampledb/sampledb1/sampleDB1.sql

@@ -0,0 +1,53 @@
+/* 
+This is sourced from progress.com, variation by lightofodin.
+Basic database housing a sales scenario, that features employees and departments.
+*/
+CREATE TABLE emp (
+empno INT PRIMARY KEY,
+ename VARCHAR(10),
+job VARCHAR(9),
+mgr INT NULL,
+hiredate DATETIME,
+sal NUMERIC(7,2),
+comm NUMERIC(7,2) NULL,
+dept INT)
+begin
+insert into emp values
+    (1,'JOHNSON','ADMIN',6,'12-17-1990',18000,NULL,4)
+insert into emp values
+    (2,'HARDING','MANAGER',9,'02-02-1998',52000,300,3)
+insert into emp values
+    (3,'TAFT','SALES I',2,'01-02-1996',25000,500,3)
+insert into emp values
+    (4,'HOOVER','SALES I',2,'04-02-1990',27000,NULL,3)
+insert into emp values
+    (5,'LINCOLN','TECH',6,'06-23-1994',22500,1400,4)
+insert into emp values
+    (6,'GARFIELD','MANAGER',9,'05-01-1993',54000,NULL,4)
+insert into emp values
+    (7,'POLK','TECH',6,'09-22-1997',25000,NULL,4)
+insert into emp values
+    (8,'GRANT','ENGINEER',10,'03-30-1997',32000,NULL,2)
+insert into emp values
+    (9,'JACKSON','CEO',NULL,'01-01-1990',75000,NULL,4)
+insert into emp values
+    (10,'FILLMORE','MANAGER',9,'08-09-1994',56000,NULL,2)
+insert into emp values
+    (11,'ADAMS','ENGINEER',10,'03-15-1996',34000,NULL,2)
+insert into emp values
+    (12,'WASHINGTON','ADMIN',6,'04-16-1998',18000,NULL,4)
+insert into emp values
+    (13,'MONROE','ENGINEER',10,'12-03-2000',30000,NULL,2)
+insert into emp values
+    (14,'ROOSEVELT','CPA',9,'10-12-1995',35000,NULL,1)
+end
+CREATE TABLE dept (
+deptno INT NOT NULL,
+dname VARCHAR(14),
+loc VARCHAR(13))
+begin
+insert into dept values (1,'ACCOUNTING','ST LOUIS')
+insert into dept values (2,'RESEARCH','NEW YORK')
+insert into dept values (3,'SALES','ATLANTA')
+insert into dept values (4, 'OPERATIONS','SEATTLE')
+end

media/solutions-microsoft-logo-small.png

@@ -1,6 +1,6 @@
-# Sample Categories
+![](../media/solutions-microsoft-logo-small.png)
 
-__[applications](applications/)__
+# Sample Categories
 
 End-to-end sample applications that illustrate the use of SQL Server for specific application scenarios.
 
@@ -22,8 +22,8 @@ Samples that help with the management of SQL Server and Azure SQL Database.
 
 __[tutorials](tutorials/)__
 
-Samples showing how to connect to SQL databases using various programming languages, including Python, C#, Java, Ruby, Node.js, and PHP.
+Samples showing how to connect to SQL databases using various programming languages, including Python, C#, F#, Java, Ruby, Node.js, and PHP.
 
 __[containers](containers/)__
 
-Samples showing various SQL Server in container scenarios.
+Samples showing various SQL Server in container scenarios.

samples/README.md

@@ -60,6 +60,6 @@ The code included in this sample is not intended to be a set of best practices o
 For more information, see these articles:
 
 - [In-Memory OLTP (In-Memory Optimization)](https://msdn.microsoft.com/en-us/library/dn133186.aspx)
-- [OLTP and database management](https://www.microsoft.com/en-us/server-cloud/solutions/oltp-database-management.aspx)
+- [OLTP and database management](https://www.microsoft.com/en-us/sql-server/oltp-database-management)
 - [Session State Provider](https://msdn.microsoft.com/en-us/library/aa478952.aspx)
 - [Implementing a Session-State Store Provider](https://msdn.microsoft.com/en-us/library/ms178587.aspx)