diff --git a/Core/Resgrid.Config/InfoConfig.cs b/Core/Resgrid.Config/InfoConfig.cs new file mode 100644 index 00000000..224e3b62 --- /dev/null +++ b/Core/Resgrid.Config/InfoConfig.cs @@ -0,0 +1,7 @@ +namespace Resgrid.Config +{ + public static class InfoConfig + { + public static int ConfigVersion = 0; + } +} diff --git a/Core/Resgrid.Config/Resgrid.Config.csproj b/Core/Resgrid.Config/Resgrid.Config.csproj index 163c9c73..01d5d0b5 100644 --- a/Core/Resgrid.Config/Resgrid.Config.csproj +++ b/Core/Resgrid.Config/Resgrid.Config.csproj @@ -79,6 +79,7 @@ + diff --git a/Core/Resgrid.Config/ResgridConfig.json b/Core/Resgrid.Config/ResgridConfig.json index 63e36673..d0d5df8b 100644 --- a/Core/Resgrid.Config/ResgridConfig.json +++ b/Core/Resgrid.Config/ResgridConfig.json @@ -1,5 +1,8 @@ { + "InfoConfig.ConfigVersion": "1", + "DataConfig.ConnectionString": "Data Source=(local);Initial Catalog=Resgrid;Integrated Security=True;MultipleActiveResultSets=True;", + "SystemBehaviorConfig.ResgridBaseUrl": "http://resgrid.local", "SystemBehaviorConfig.ResgridApiBaseUrl": "http://resgridapi.local", "SystemBehaviorConfig.DoNotBroadcast": "false", diff --git a/Web/Resgrid.Services/Properties/PublishProfiles/FolderProfile.pubxml.user b/Web/Resgrid.Services/Properties/PublishProfiles/FolderProfile.pubxml.user index 043b1f1a..11ca5dcb 100644 --- a/Web/Resgrid.Services/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/Web/Resgrid.Services/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,5 +6,812 @@ by editing this MSBuild file. In order to learn more about this please visit htt + <_PublishTargetUrl>G:\Resgrid\ResgridCore\Web\Resgrid.Services\bin\Release\Publish + + + 03/30/2018 19:04:59 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 12/14/2015 16:48:07 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 09/10/2013 16:29:20 + + + 09/10/2013 16:29:20 + + + 03/30/2018 19:04:59 + + + 09/30/2019 07:23:02 + + + 09/30/2019 07:23:02 + + + 01/27/2019 20:43:26 + + + 07/25/2017 05:11:08 + + + 04/10/2017 15:40:32 + + + 08/02/2017 18:28:14 + + + 05/11/2017 14:28:44 + + + 05/11/2017 14:28:44 + + + 05/11/2017 14:32:10 + + + 05/11/2017 14:32:10 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 04/26/2016 12:16:00 + + + 09/20/2017 08:32:46 + + + 07/22/2016 14:52:40 + + + 01/30/2018 13:23:04 + + + 04/30/2014 02:07:34 + + + 04/30/2014 02:07:34 + + + 03/02/2015 09:32:26 + + + 11/13/2014 21:56:20 + + + 11/13/2014 21:56:20 + + + 03/02/2015 09:32:26 + + + 08/16/2018 18:04:26 + + + 06/13/2017 16:42:06 + + + 07/20/2016 19:07:28 + + + 07/22/2015 20:17:37 + + + 07/20/2018 10:09:26 + + + 07/20/2018 10:09:26 + + + 07/20/2018 10:09:14 + + + 07/20/2018 10:09:14 + + + 07/20/2018 10:09:20 + + + 07/20/2018 10:09:20 + + + 09/08/2017 10:49:52 + + + 09/08/2017 10:49:52 + + + 05/15/2015 10:15:52 + + + 03/08/2017 19:26:22 + + + 07/11/2016 16:31:08 + + + 06/27/2017 12:59:34 + + + 07/07/2017 17:39:02 + + + 07/07/2017 17:44:52 + + + 06/27/2017 15:30:06 + + + 07/07/2017 17:44:50 + + + 07/07/2017 17:44:52 + + + 06/27/2017 15:33:08 + + + 12/02/2016 08:57:04 + + + 07/14/2016 02:35:18 + + + 03/30/2018 19:04:59 + + + 03/30/2018 19:04:59 + + + 08/19/2014 20:13:24 + + + 03/30/2018 19:04:59 + + + 03/30/2018 19:04:59 + + + 03/30/2018 19:04:59 + + + 03/30/2018 19:04:59 + + + 03/30/2018 19:04:59 + + + 03/24/2016 17:49:52 + + + 03/24/2016 17:49:52 + + + 03/30/2018 19:04:59 + + + 03/30/2018 19:04:59 + + + 03/30/2018 19:04:59 + + + 06/28/2017 15:05:26 + + + 09/08/2017 22:02:28 + + + 09/08/2017 22:02:28 + + + 09/08/2017 22:02:30 + + + 09/08/2017 22:02:30 + + + 09/08/2017 22:02:30 + + + 09/08/2017 22:02:30 + + + 09/08/2017 22:02:30 + + + 09/08/2017 22:02:30 + + + 04/27/2017 18:53:24 + + + 04/27/2017 18:53:24 + + + 04/27/2017 18:53:24 + + + 06/21/2018 07:54:22 + + + 04/27/2017 18:53:26 + + + 08/09/2016 00:10:36 + + + 12/01/2015 14:31:46 + + + 08/31/2016 18:26:18 + + + 04/27/2017 18:53:26 + + + 04/27/2017 18:53:26 + + + 04/27/2017 18:53:26 + + + 04/27/2017 18:53:26 + + + 04/27/2017 18:53:26 + + + 04/27/2017 18:53:26 + + + 04/27/2017 18:53:26 + + + 04/27/2017 18:53:26 + + + 06/11/2017 20:59:08 + + + 06/11/2017 20:59:18 + + + 04/27/2017 18:53:26 + + + 02/13/2015 13:16:32 + + + 02/13/2015 13:16:30 + + + 02/13/2015 13:16:34 + + + 02/13/2015 13:16:38 + + + 02/13/2015 13:16:36 + + + 02/13/2015 13:16:40 + + + 02/08/2017 18:46:24 + + + 07/25/2012 11:48:56 + + + 02/03/2016 16:22:42 + + + 09/03/2017 10:53:24 + + + 06/03/2016 15:01:02 + + + 06/03/2016 15:01:02 + + + 09/05/2017 19:18:04 + + + 08/28/2017 09:14:34 + + + 06/18/2017 13:57:10 + + + 07/08/2017 21:53:26 + + + 07/08/2017 21:53:26 + + + 03/30/2018 19:04:59 + + + 11/13/2012 12:19:34 + + + 02/26/2016 16:31:00 + + + 02/26/2016 16:31:00 + + + 02/26/2016 16:31:00 + + + 02/26/2016 16:31:00 + + + 08/04/2017 16:51:16 + + + 06/18/2018 15:49:02 + + + 09/30/2019 06:57:32 + + + 09/30/2019 06:57:32 + + + 09/30/2019 06:57:32 + + + 09/11/2019 17:09:13 + + + 09/30/2019 06:57:32 + + + 09/30/2019 06:57:33 + + + 09/11/2019 17:09:24 + + + 09/30/2019 06:57:33 + + + 09/30/2019 06:57:33 + + + 09/11/2019 17:09:49 + + + 09/30/2019 06:57:33 + + + 09/30/2019 06:57:33 + + + 09/11/2019 17:10:02 + + + 09/30/2019 06:57:33 + + + 09/30/2019 06:57:33 + + + 09/11/2019 17:10:16 + + + 09/30/2019 06:57:33 + + + 09/30/2019 06:57:33 + + + 09/11/2019 17:10:38 + + + 09/30/2019 06:57:33 + + + 09/30/2019 06:57:33 + + + 09/11/2019 17:10:45 + + + 09/30/2019 06:57:33 + + + 09/30/2019 06:57:33 + + + 09/11/2019 17:10:55 + + + 09/30/2019 06:57:33 + + + 09/30/2019 06:57:33 + + + 09/11/2019 17:11:10 + + + 09/30/2019 06:57:33 + + + 09/11/2019 17:11:22 + + + 09/30/2019 06:57:33 + + + 09/30/2019 06:57:33 + + + 09/11/2019 17:11:31 + + + 09/30/2019 06:57:33 + + + 09/30/2019 06:57:33 + + + 09/11/2019 17:11:43 + + + 09/30/2019 06:57:33 + + + 09/30/2019 06:57:35 + + + 09/11/2019 17:11:54 + + + 09/30/2019 06:57:35 + + + 09/30/2019 06:57:34 + + + 09/11/2019 17:12:03 + + + 09/30/2019 06:57:34 + + + 09/30/2019 06:57:35 + + + 09/11/2019 17:12:13 + + + 09/30/2019 06:57:35 + + + 09/30/2019 06:57:34 + + + 09/11/2019 17:09:35 + + + 09/30/2019 06:57:34 + + + 09/30/2019 06:57:37 + + + 09/30/2019 06:57:37 + + + 02/22/2019 14:03:05 + + + 08/26/2015 16:33:34 + + + 09/25/2016 14:57:12 + + + 09/25/2016 14:57:12 + + + 12/03/2017 20:05:46 + + + 04/21/2018 11:05:46 + + + 10/29/2017 18:30:08 + + + 06/20/2017 16:12:50 + + + 01/03/2017 03:05:26 + + + 07/30/2016 07:47:50 + + + 02/06/2017 19:36:56 + + + 02/06/2017 19:36:56 + + + 08/01/2017 12:19:14 + + + 08/01/2017 12:20:24 + + + 11/29/2016 08:40:10 + + + 11/05/2016 04:55:30 + + + 09/28/2019 08:54:20 + + + 06/27/2017 11:17:34 + + + 06/11/2017 20:59:28 + + + 03/26/2018 16:24:54 + + + 01/28/2015 04:02:42 + + + 11/05/2016 04:56:46 + + + 04/19/2017 16:58:54 + + + 01/28/2015 04:01:46 + + + 01/28/2015 04:04:30 + + + 01/28/2015 04:03:04 + + + 01/28/2015 04:02:54 + + + 01/28/2015 04:03:46 + + + 01/28/2015 04:02:18 + + + 02/11/2014 15:26:04 + + + 01/28/2015 04:02:32 + + + 01/28/2015 04:04:30 + + + 01/28/2015 04:04:30 + + + 01/28/2015 04:04:30 + + + 06/04/2019 19:46:50 + + + 09/19/2016 21:12:34 + + + 09/19/2016 21:12:34 + + + 05/24/2017 12:01:40 + + + 03/15/2016 23:53:18 + + + 03/15/2016 23:53:18 + + + 08/24/2016 01:10:42 + + + 08/24/2016 01:10:42 + + + 03/15/2016 23:53:12 + + + 03/15/2016 23:53:12 + + + 06/14/2017 21:32:16 + + + 07/11/2016 08:36:52 + + + 07/11/2016 08:36:52 + + + 07/31/2017 21:41:08 + + + 01/23/2014 13:57:34 + + + 01/31/2019 11:06:41 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 03/30/2018 19:04:59 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 09/11/2019 17:13:11 + + + 09/30/2019 07:22:58 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 07/22/2015 20:17:46 + + + 02/28/2019 09:46:32 + + + 07/22/2015 20:17:46 + + + 03/01/2019 09:21:11 + + \ No newline at end of file diff --git a/Web/Resgrid.WebCore/Properties/PublishProfiles/FolderProfile.pubxml b/Web/Resgrid.WebCore/Properties/PublishProfiles/FolderProfile.pubxml index cbd27c6e..48d279de 100644 --- a/Web/Resgrid.WebCore/Properties/PublishProfiles/FolderProfile.pubxml +++ b/Web/Resgrid.WebCore/Properties/PublishProfiles/FolderProfile.pubxml @@ -12,10 +12,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt True False - net462 + net472 win7-x86 d867d4ca-d348-4485-a7b0-5293df8f93d5 - bin\Release\net462\publish\ + bin\Release\net472\publish\ True \ No newline at end of file diff --git a/Web/Resgrid.WebCore/Properties/PublishProfiles/FolderProfile.pubxml.user b/Web/Resgrid.WebCore/Properties/PublishProfiles/FolderProfile.pubxml.user deleted file mode 100644 index 043b1f1a..00000000 --- a/Web/Resgrid.WebCore/Properties/PublishProfiles/FolderProfile.pubxml.user +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/docs/source/installation/index.rst b/docs/source/installation/index.rst index f6b128ad..8158706f 100644 --- a/docs/source/installation/index.rst +++ b/docs/source/installation/index.rst @@ -104,13 +104,6 @@ Installing Microsoft IIS (Webserver) will differ based on what version of Window .. note:: Depending on the requirements of your web server, environment and other factors your installed IIS options may be different. Resgrid requires at a minimum the .NET Extensibility and ASP.NET Options to run minimally. -Microsoft SQL Server -======================= - -.. important:: Resgrid only supports SQL Server 2014 or newer and we recommend SQL 2016 SP1 or newer. A server collation of "SQL_Latin1_General_CP1_CI_AS" is also required. - -.. note:: If your using a Named SQL server instance, i.e. any SQL instance that's not the default instance and your are supplying the named instance name in the ResgridConfig.json file you will need to use double back slash's in between the server and SQL instance name. For example if you have a named SQL instance SQL2014 on the locally installed SQL server you need to specify the DataSource as "(local)\\SQL2014" with 2 backslashes "\\" in between the server and instance names. - Install Resgrid **************************** @@ -143,18 +136,61 @@ Setup Hosts File Run Notepad as Administrator, open up the hosts file in the following directory 'C:\\Windows\\System32\\drivers\\etc' and add the following lines at the bottom. - 127.0.0.1 resgrid.local - 127.0.0.1 resgridapi.local + | 127.0.0.1 resgrid.local + | 127.0.0.1 resgridapi.local + | 127.0.0.1 rgdevserver This will allow you to access locally on the box using the above domain names. If you have your own names you can use those in the IIS configuration below. If you already have the entries into your hosts file you do not need to add them again. +.. note:: If you are installing Resgrid components on multiple systems (i.e. web server boxes, api boxes, database server, etc) replace '127.0.0.1' with the static IP address of the server where those components are installed. + Database Installation **************************** -You will need to install and configure Microsoft SQL Server you can find tutorials online an example of one is `from tutorialpoint `_. You will need SQL Server and SQL Managment Studio which can be `downloaded form Microsoft `_. +You will need to install and configure Microsoft SQL Server you can find tutorials online an example of one is `from tutorialpoint `_. You will need SQL Server and SQL Management Studio which can be `downloaded from Microsoft `_. + +Microsoft SQL Server +======================= + +.. important:: Resgrid only supports SQL Server 2014 or newer and we recommend SQL 2016 SP1 or newer. A server collation of "SQL_Latin1_General_CP1_CI_AS" is also required. + +For the most basic SQL Server installation you will need "Database Engine Services" and "Management Tools". If Management Tools isn't available for your SQL Install. + +.. image:: https://raw.githubusercontent.com/resgrid/core/master/misc/images/SQLServerOptions1.png + :width: 800 + :alt: SQL Install Options 1 + +.. image:: https://raw.githubusercontent.com/resgrid/core/master/misc/images/SQLServerOptions2.png + :width: 800 + :alt: SQL Install Options 2 + +SQL Server can be installed as a "Default Instance" or "Named Instance" the standard way Resgrid is configured out of the box is a locally installed Default Instance of SQL Server. If you are installing SQL Server on another server then the Resgrid applications or you are configuring SQL to be a Named Instance you will need to modify the ResgridConfig.json which is located in the Config directory of the Resgrid installation folder. Default location is C:\\Resgrid\\Config\\. + +.. image:: https://raw.githubusercontent.com/resgrid/core/master/misc/images/SQLServerInstance.png + :width: 800 + :alt: SQL Instance Setup + +During the installation of SQL Server you will need to set the collation for the SQL server. Resgrid requires "SQL_Latin1_General_CP1_CI_AS", but this can also be set at the Database level if this SQL Server is shared. + +.. image:: https://raw.githubusercontent.com/resgrid/core/master/misc/images/SQLServerCollation.png + :width: 800 + :alt: SQL Server SQL_Latin1_General_CP1_CI_AS Collation + +.. note:: If your using a Named SQL server instance, i.e. any SQL instance that's not the default instance and your are supplying the named instance name in the ResgridConfig.json file you will need to use double back slash's in between the server and SQL instance name. For example if you have a named SQL instance SQL2014 on the locally installed SQL server you need to specify the DataSource as "(local)\\SQL2014" with 2 backslashes "\\" in between the server and instance names. + +Database Creation +======================= Once you have Microsoft SQL and Microsoft SQL Management Studio installed; open up Microsoft SQL Management studio, connect to your SQL Server and create an empty database called Resgrid. +.. image:: https://raw.githubusercontent.com/resgrid/core/master/misc/images/SQLDatabase.png + :width: 800 + :alt: Database Creation 1 + +.. image:: https://raw.githubusercontent.com/resgrid/core/master/misc/images/SQLDatabaseOptions.png + :width: 800 + :alt: Database Creation 2 + Install\\Update Resgrid Schema ======================= @@ -178,7 +214,7 @@ That will start the Resgrid Database Update process and either Update or Install C:\\Resgrid\\Tools> -This will be run when your upgrading your Resgrid installation as well. +This will be run when your upgrading your Resgrid installation as well. If you installed (unzipped and copied) Resgrid to another path other then C:\\Resgrid ensure you are opening the command prompt to that directory instead of C:\\Resgrid. IIS Installation **************************** diff --git a/misc/images/SQLDatabase.png b/misc/images/SQLDatabase.png new file mode 100644 index 00000000..cc30e17e Binary files /dev/null and b/misc/images/SQLDatabase.png differ diff --git a/misc/images/SQLDatabaseOptions.png b/misc/images/SQLDatabaseOptions.png new file mode 100644 index 00000000..36afb81e Binary files /dev/null and b/misc/images/SQLDatabaseOptions.png differ diff --git a/misc/images/SQLServerCollation.png b/misc/images/SQLServerCollation.png new file mode 100644 index 00000000..3efb417f Binary files /dev/null and b/misc/images/SQLServerCollation.png differ diff --git a/misc/images/SQLServerInstance.png b/misc/images/SQLServerInstance.png new file mode 100644 index 00000000..7f6f0337 Binary files /dev/null and b/misc/images/SQLServerInstance.png differ diff --git a/misc/images/SQLServerOptions1.png b/misc/images/SQLServerOptions1.png new file mode 100644 index 00000000..a16d322c Binary files /dev/null and b/misc/images/SQLServerOptions1.png differ diff --git a/misc/images/SQLServerOptions2.png b/misc/images/SQLServerOptions2.png new file mode 100644 index 00000000..05a55b9c Binary files /dev/null and b/misc/images/SQLServerOptions2.png differ