diff --git a/README.md b/README.md index d272248e..7671a409 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ Note that certain features like In-Memory OLTP are edition specific for SQL Serv ## Working in GitHub To work in GitHub, go to https://github.com/microsoft/sql-server-samples and fork the repository. Work in your own fork and when you are ready to submit to make a change or publish your sample for the first time, submit a pull request into the master branch of sql-server-samples. One of the approvers will review your request and accept or reject the pull request. +Each sample should be in its own folder with a README.md file that follows the [template](README_samples_template.md). Generated files (e.g., .exe or .bacpac) and user configuration settings (e.g., .user) should not be committed to GitHub. + ## License These samples and templates are all licensed under the MIT license. See the license.txt file in the root. diff --git a/samples/README.md b/samples/README.md index 1e0e0063..1caea435 100644 --- a/samples/README.md +++ b/samples/README.md @@ -12,6 +12,6 @@ __[features] (features/)__ Samples illustrating specific SQL Server and Azure SQL Database features, including In-Memory OLTP, Master Data Services (MDS), and R Services. -__[management] (management/)__ +__[management] (manage/)__ Samples that help with the management of SQL Server and Azure SQL Database. diff --git a/samples/databases/wide-world-importers/workload-drivers/vehicle-location-insert/VehicleLocation.sql b/samples/databases/wide-world-importers/workload-drivers/vehicle-location-insert/VehicleLocation.sql index ddd92821..c6fa6f71 100644 Binary files a/samples/databases/wide-world-importers/workload-drivers/vehicle-location-insert/VehicleLocation.sql and b/samples/databases/wide-world-importers/workload-drivers/vehicle-location-insert/VehicleLocation.sql differ diff --git a/samples/features/in-memory/ticket-reservations/README.md b/samples/features/in-memory/ticket-reservations/README.md index c71479f7..6e167823 100644 --- a/samples/features/in-memory/ticket-reservations/README.md +++ b/samples/features/in-memory/ticket-reservations/README.md @@ -8,13 +8,14 @@ This Windows Forms sample application built on .NET Framework 4.6 demonstrates ## About this sample -1. **Applies to:** SQL Server 2014 (or higher), Azure SQL Database -1. **Key features:** In-Memory OLTP -1. **Workload:** OLTP -1. **Programming Language:** T-SQL, C# -1. **Authors:** Jos de Bruijn +* **Latest release:** [in-memory-oltp-perf-demo-v1.0](https://github.com/Microsoft/sql-server-samples/releases/tag/in-memory-oltp-demo-v1.0) +* **Applies to:** SQL Server 2014 (or higher), Azure SQL Database +* **Key features:** In-Memory OLTP +* **Workload:** OLTP +* **Programming Language:** T-SQL, C# +* **Authors:** Jos de Bruijn -![Alt text](Screenshots/1.png "Ticket Reservations") +![Alt text](/media/in-memory-oltp-performance.png "Ticket Reservations") ## Running this sample 1. Before you can run this sample, you must have the following perquisites: diff --git a/samples/manage/windows-containers/mssql-server-2014-express-windows/dockerfile b/samples/manage/windows-containers/mssql-server-2014-express-windows/dockerfile index 8bd3e52b..da4c84c1 100644 --- a/samples/manage/windows-containers/mssql-server-2014-express-windows/dockerfile +++ b/samples/manage/windows-containers/mssql-server-2014-express-windows/dockerfile @@ -22,9 +22,9 @@ RUN powershell -Command (New-Object System.Net.WebClient).DownloadFile('%sql_exp RUN powershell -Command \ set-strictmode -version latest ; \ - stop-service MSSQL`$%sqlinstance% ; \ + stop-service MSSQL`$SQLEXPRESS ; \ 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% \ No newline at end of file +CMD powershell ./start %sa_password%