Skip to content
This repository was archived by the owner on Nov 10, 2017. It is now read-only.

Commit 4cc2b32

Browse files
ob1devob1dev
committed
Branching version for Sitecore CMS 7.5
1 parent 04da8a6 commit 4cc2b32

File tree

6 files changed

+276
-20
lines changed

6 files changed

+276
-20
lines changed

‎src/Sitecore.Azure.Startup/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
[assembly: AssemblyTrademark("Sitecore® is a registered trademark of Sitecore Corporation")]
1515
[assembly: AssemblyCulture("")]
1616

17-
[assembly: AssemblyInformationalVersion("7.2 rev. 150614")]
17+
[assembly: AssemblyInformationalVersion("7.5 rev. 150520")]
1818

1919
// Setting ComVisible to false makes the types in this assembly not visible
2020
// to COM components. If you need to access a type in this assembly from
@@ -34,5 +34,5 @@
3434
// You can specify all the values or you can default the Build and Revision Numbers
3535
// by using the '*' as shown below:
3636
// [assembly: AssemblyVersion("1.0.*")]
37-
[assembly: AssemblyVersion("7.2.5187.0")]
38-
[assembly: AssemblyFileVersion("7.2.5187.0")]
37+
[assembly: AssemblyVersion("7.5.5162.0")]
38+
[assembly: AssemblyFileVersion("7.5.5162.0")]

‎src/Sitecore.Azure/ServiceConfiguration.Cloud.cscfg‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33
<Role name="Sitecore">
44
<Instances count="1" />
55
<ConfigurationSettings>
6-
<Setting name="ConnectionStringNames" value="core, master, web, analytics" />
7-
<Setting name="core" value="Server=tcp:{server-name}database.windows.net,1433;Database=Sitecore72_Core;User ID={server-admin-login}@{server-name};Password={password};Trusted_Connection=False;Encrypt=True;Connection Timeout=30" />
8-
<Setting name="master" value="Server=tcp:{server-name}.database.windows.net,1433;Database=Sitecore72_Master;User ID={server-admin-login}@{server-name};Password={password};Trusted_Connection=False;Encrypt=True;Connection Timeout=30" />
9-
<Setting name="web" value="Server=tcp:{server-name}.database.windows.net,1433;Database=Sitecore72_Web;User ID={server-admin-login}@{server-name};Password={password};Trusted_Connection=False;Encrypt=True;Connection Timeout=30" />
10-
<Setting name="reporting" value="Server=tcp:{server-name}.database.windows.net,1433;Database=Sitecore72_Analytics;User ID={server-admin-login}@{server-name};Password={password};Trusted_Connection=False;Encrypt=True;Connection Timeout=30" />
6+
<Setting name="ConnectionStringNames" value="core, master, web, reporting, session, analytics, tracking.live, tracking.history" />
7+
<Setting name="core" value="Server=tcp:{server-name}.database.windows.net,1433;Database=Sitecore75_Core;User ID={server-admin-login}@{server-name};Password={password};Trusted_Connection=False;Encrypt=True;Connection Timeout=30" />
8+
<Setting name="master" value="Server=tcp:{server-name}.database.windows.net,1433;Database=Sitecore75_Master;User ID={server-admin-login}@{server-name};Password={password};Trusted_Connection=False;Encrypt=True;Connection Timeout=30" />
9+
<Setting name="web" value="Server=tcp:{server-name}.database.windows.net,1433;Database=Sitecore75_Web;User ID={server-admin-login}@{server-name};Password={password}Trusted_Connection=False;Encrypt=True;Connection Timeout=30" />
10+
<Setting name="reporting" value="Server=tcp:{server-name}.database.windows.net,1433;Database=Sitecore75_Reporting;User ID={server-admin-login}@{server-name};Password={password};Trusted_Connection=False;Encrypt=True;Connection Timeout=30" />
11+
<Setting name="session" value="Server=tcp:{server-name}.database.windows.net,1433;Database=Sitecore75_Sessions;User ID={server-admin-login}@{server-name};Password={password};Trusted_Connection=False;Encrypt=True;Connection Timeout=30" />
12+
<Setting name="analytics" value="mongodb://{user-name}:{password}@{host}/sitecore_analytics" />
13+
<Setting name="tracking.live" value="mongodb://{user-name}:{password}@{host}/sitecore_tracking_live" />
14+
<Setting name="tracking.history" value="mongodb://{user-name}:{password}@{host}/sitecore_tracking_history" />
1115
<Setting name="Microsoft.WindowsAzure.Plugins.RemoteAccess.Enabled" value="true" />
1216
<Setting name="Microsoft.WindowsAzure.Plugins.RemoteAccess.AccountUsername" value="oburov" />
1317
<Setting name="Microsoft.WindowsAzure.Plugins.RemoteAccess.AccountEncryptedPassword" value="MIIBnQYJKoZIhvcNAQcDoIIBjjCCAYoCAQAxggFOMIIBSgIBADAyMB4xHDAaBgNVBAMME1dpbmRvd3MgQXp1cmUgVG9vbHMCECt9mnBg4OasTOvG1LDjoiwwDQYJKoZIhvcNAQEBBQAEggEAG0BX/z/4RAdf/lA4TOkbf3JcWPC7rleO72fb6a7k8xLdUVGjc1eqaW8ippxJOAvn1lI7egOGX0mp3+FkxglXo5yNDvLLvj5jsoQT8IPadFYSOBvW4CvT8p+/gmiFoYl2Pjo75iDmhqTMnhfN3Bvj93tpq9gkeU4c5bu3kdPizLR0VlhLqPEVhbTS2ugehTWo+bpTTvGtSVPq8PksQV8ZNEYgbEiRPdEltcTahqzdpEfr+Nl0v83EXjDDpeNMu8+//ml3XjNX/GNJ2BPv8B6yvUsny04DQXTpzrXVbRjUVzi7/NhhIPDJrIpR6MAxD9Ak5VKQGqok3Yv7zUfSJKhCFDAzBgkqhkiG9w0BBwEwFAYIKoZIhvcNAwcECLyDAKzPyVIUgBAf0wQ7CDEjn45NPoLVNdQB" />

‎src/Sitecore.Azure/ServiceConfiguration.Local.cscfg‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33
<Role name="Sitecore">
44
<Instances count="1" />
55
<ConfigurationSettings>
6-
<Setting name="ConnectionStringNames" value="core, master, web, analytics" />
7-
<Setting name="core" value="Data Source=.\SQLEXPRESS;Initial Catalog=Sitecore72Sitecore_core;Integrated Security=False;User ID=sa;Password=12345" />
8-
<Setting name="master" value="Data Source=.\SQLEXPRESS;Initial Catalog=Sitecore72Sitecore_master;Integrated Security=False;User ID=sa;Password=12345" />
9-
<Setting name="web" value="Data Source=.\SQLEXPRESS;Initial Catalog=Sitecore72Sitecore_web;Integrated Security=False;User ID=sa;Password=12345" />
10-
<Setting name="analytics" value="Data Source=.\SQLEXPRESS;Initial Catalog=Sitecore72Sitecore_analytics;Integrated Security=False;User ID=sa;Password=12345" />
6+
<Setting name="ConnectionStringNames" value="core, master, web, reporting, session, analytics, tracking.live, tracking.history" />
7+
<Setting name="core" value="Data Source=.\SQLEXPRESS;Initial Catalog=Sitecore75Sitecore_core;Integrated Security=False;User ID=sa;Password=12345" />
8+
<Setting name="master" value="Data Source=.\SQLEXPRESS;Initial Catalog=Sitecore75Sitecore_master;Integrated Security=False;User ID=sa;Password=12345" />
9+
<Setting name="web" value="Data Source=.\SQLEXPRESS;Initial Catalog=Sitecore75Sitecore_web;Integrated Security=False;User ID=sa;Password=12345" />
10+
<Setting name="reporting" value="Data Source=.\SQLEXPRESS;Initial Catalog=Sitecore75Sitecore_reporting;Integrated Security=False;User ID=sa;Password=12345" />
11+
<Setting name="session" value="Data Source=.\SQLEXPRESS;Initial Catalog=Sitecore75Sitecore_sessions;Integrated Security=False;User ID=sa;Password=12345" />
12+
<Setting name="analytics" value="mongodb://localhost:27017/Sitecore75_analytics" />
13+
<Setting name="tracking.live" value="mongodb://localhost:27017/Sitecore75_tracking_live" />
14+
<Setting name="tracking.history" value="mongodb://localhost:27017/Sitecore75_tracking_history" />
1115
<Setting name="Microsoft.WindowsAzure.Plugins.RemoteAccess.Enabled" value="true" />
1216
<Setting name="Microsoft.WindowsAzure.Plugins.RemoteAccess.AccountUsername" value="oburov" />
1317
<Setting name="Microsoft.WindowsAzure.Plugins.RemoteAccess.AccountEncryptedPassword" value="MIIBnQYJKoZIhvcNAQcDoIIBjjCCAYoCAQAxggFOMIIBSgIBADAyMB4xHDAaBgNVBAMME1dpbmRvd3MgQXp1cmUgVG9vbHMCECt9mnBg4OasTOvG1LDjoiwwDQYJKoZIhvcNAQEBBQAEggEAG0BX/z/4RAdf/lA4TOkbf3JcWPC7rleO72fb6a7k8xLdUVGjc1eqaW8ippxJOAvn1lI7egOGX0mp3+FkxglXo5yNDvLLvj5jsoQT8IPadFYSOBvW4CvT8p+/gmiFoYl2Pjo75iDmhqTMnhfN3Bvj93tpq9gkeU4c5bu3kdPizLR0VlhLqPEVhbTS2ugehTWo+bpTTvGtSVPq8PksQV8ZNEYgbEiRPdEltcTahqzdpEfr+Nl0v83EXjDDpeNMu8+//ml3XjNX/GNJ2BPv8B6yvUsny04DQXTpzrXVbRjUVzi7/NhhIPDJrIpR6MAxD9Ak5VKQGqok3Yv7zUfSJKhCFDAzBgkqhkiG9w0BBwEwFAYIKoZIhvcNAwcECLyDAKzPyVIUgBAf0wQ7CDEjn45NPoLVNdQB" />

‎src/Sitecore.Azure/ServiceDefinition.csdef‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
<Setting name="core" />
2020
<Setting name="master" />
2121
<Setting name="web" />
22+
<Setting name="reporting" />
23+
<Setting name="session" />
2224
<Setting name="analytics" />
25+
<Setting name="tracking.live" />
26+
<Setting name="tracking.history" />
2327
<Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" />
2428
</ConfigurationSettings>
2529
<Imports>

0 commit comments

Comments
 (0)