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

Commit 0246871

Browse files
ob1devob1dev
committed
Branching version for Sitecore Azure 7.5 module.
1 parent 24a4d7f commit 0246871

File tree

8 files changed

+172
-78
lines changed

8 files changed

+172
-78
lines changed

‎src/Sitecore.Azure.Diagnostics.UI/Properties/AssemblyInfo.cs‎

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

16-
[assembly: AssemblyInformationalVersion("7.2 rev. 150107")]
16+
[assembly: AssemblyInformationalVersion("7.5 rev. 150112")]
1717

1818
// Setting ComVisible to false makes the types in this assembly not visible
1919
// to COM components. If you need to access a type in this assembly from
@@ -32,5 +32,5 @@
3232
//
3333
// You can specify all the values or you can default the Revision and Build Numbers
3434
// by using the '*' as shown below:
35-
[assembly: AssemblyVersion("7.2.5028.0")]
36-
[assembly: AssemblyFileVersion("7.2.5028.0")]
35+
[assembly: AssemblyVersion("7.5.5033.0")]
36+
[assembly: AssemblyFileVersion("7.5.5033.0")]

‎src/Sitecore.Azure.Diagnostics.UI/Sitecore.Azure.Diagnostics.UI.csproj‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,43 @@
4343
</PropertyGroup>
4444
<ItemGroup>
4545
<Reference Include="Microsoft.CSharp" />
46-
<Reference Include="Microsoft.Data.Edm, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Microsoft.Data.Edm.5.2.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
46+
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47+
<HintPath>..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
4848
</Reference>
49-
<Reference Include="Microsoft.Data.OData, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Microsoft.Data.OData.5.2.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
49+
<Reference Include="Microsoft.Data.OData">
50+
<HintPath>..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
51+
<Private>True</Private>
52+
</Reference>
53+
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
5155
</Reference>
5256
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57+
<SpecificVersion>False</SpecificVersion>
5358
<HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
59+
<Private>False</Private>
5460
</Reference>
55-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=2.1.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.2.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5662
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\packages\WindowsAzure.Storage.2.1.0.3\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
63+
<HintPath>..\packages\WindowsAzure.Storage.4.2.1\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
64+
<Private>False</Private>
65+
</Reference>
66+
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
67+
<HintPath>..\packages\Newtonsoft.Json.5.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
68+
<Private>False</Private>
5869
</Reference>
59-
<Reference Include="Sitecore.Client">
60-
<HintPath>..\packages\Sitecore.Client.7.2.3\lib\net45\Sitecore.Client.dll</HintPath>
70+
<Reference Include="Sitecore.Client, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
71+
<SpecificVersion>False</SpecificVersion>
72+
<HintPath>..\packages\Sitecore.Client.7.5.0\lib\net45\Sitecore.Client.dll</HintPath>
73+
<Private>False</Private>
6174
</Reference>
62-
<Reference Include="Sitecore.Kernel">
63-
<HintPath>..\packages\Sitecore.Kernel.7.2.3\lib\net45\Sitecore.Kernel.dll</HintPath>
75+
<Reference Include="Sitecore.Kernel, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
76+
<SpecificVersion>False</SpecificVersion>
77+
<HintPath>..\packages\Sitecore.Kernel.7.5.0\lib\net45\Sitecore.Kernel.dll</HintPath>
78+
<Private>False</Private>
6479
</Reference>
6580
<Reference Include="System.Data.Services.Client" />
66-
<Reference Include="System.Spatial, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<HintPath>..\packages\System.Spatial.5.2.0\lib\net40\System.Spatial.dll</HintPath>
81+
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
82+
<HintPath>..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
6883
</Reference>
6984
<Reference Include="System.Web.DynamicData" />
7085
<Reference Include="System.Web.Entity" />
@@ -84,7 +99,9 @@
8499
<Reference Include="System.EnterpriseServices" />
85100
</ItemGroup>
86101
<ItemGroup>
87-
<Content Include="packages.config" />
102+
<Content Include="packages.config">
103+
<SubType>Designer</SubType>
104+
</Content>
88105
</ItemGroup>
89106
<ItemGroup>
90107
<Content Include="Properties\PublishProfiles\sc72rev140526.pubxml.user" />
@@ -120,6 +137,7 @@
120137
</ItemGroup>
121138
<ItemGroup>
122139
<None Include="Properties\PublishProfiles\sc72rev140526.pubxml" />
140+
<None Include="Properties\PublishProfiles\sc75rev141003.pubxml" />
123141
</ItemGroup>
124142
<ItemGroup />
125143
<PropertyGroup>

‎src/Sitecore.Azure.Diagnostics.UI/packages.config‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Data.Edm" version="5.2.0" targetFramework="net45" />
4-
<package id="Microsoft.Data.OData" version="5.2.0" targetFramework="net45" />
3+
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
4+
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
5+
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
56
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.2.0" targetFramework="net45" />
6-
<package id="System.Spatial" version="5.2.0" targetFramework="net45" />
7-
<package id="WindowsAzure.Storage" version="2.1.0.3" targetFramework="net45" />
7+
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
8+
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
9+
<package id="WindowsAzure.Storage" version="4.2.1" targetFramework="net45" />
810
</packages>

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

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

16-
[assembly: AssemblyInformationalVersion("7.2 rev. 150107")]
16+
[assembly: AssemblyInformationalVersion("7.5 rev. 150112")]
1717

1818
// Setting ComVisible to false makes the types in this assembly not visible
1919
// to COM components. If you need to access a type in this assembly from
@@ -32,5 +32,5 @@
3232
//
3333
// You can specify all the values or you can default the Revision and Build Numbers
3434
// by using the '*' as shown below:
35-
[assembly: AssemblyVersion("7.2.5028.0")]
36-
[assembly: AssemblyFileVersion("7.2.5028.0")]
35+
[assembly: AssemblyVersion("7.5.5033.0")]
36+
[assembly: AssemblyFileVersion("7.5.5033.0")]

‎src/Sitecore.Azure.Diagnostics/Serialization/master/sitecore/templates/Azure/Deployment/Azure Deployment/__Standard Values.item‎

Lines changed: 49 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ templatekey: Azure Deployment
1313
field: {99518902-33BC-46DB-9BE6-659AC446BF34}
1414
name: Service Definition
1515
key: service definition
16-
content-length: 2040
16+
content-length: 2620
1717

1818
<?xml version="1.0" encoding="utf-8"?>
19-
<ServiceDefinition name="SitecoreCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2013-10.2.2">
19+
<ServiceDefinition name="SitecoreCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2014-06.2.4">
2020
<WebRole name="SitecoreWebRole" enableNativeCodeExecution="false" vmsize="Medium" >
2121
<ConfigurationSettings>
2222
<Setting name="StorageName"/>
@@ -25,7 +25,6 @@ content-length: 2040
2525
</ConfigurationSettings>
2626
<Imports>
2727
<Import moduleName="Diagnostics" />
28-
<Import moduleName="Caching" />
2928
</Imports>
3029
<Endpoints>
3130
<InputEndpoint name="HttpIn" protocol="http" port="80" />
@@ -36,6 +35,7 @@ cleanOnRecycle should be false cause it causes some file locks during role recyc
3635
-->
3736
<LocalStorage name="DiagnosticStore" sizeInMB="10240" cleanOnRoleRecycle="false" />
3837
<LocalStorage name="SitecoreWebSite" sizeInMB="102400" cleanOnRoleRecycle="false" />
38+
<LocalStorage name="Temp" sizeInMB="102400" cleanOnRoleRecycle="true" />
3939
</LocalResources>
4040
<Runtime executionContext="elevated">
4141
<EntryPoint>
@@ -63,22 +63,43 @@ cleanOnRecycle should be false cause it causes some file locks during role recyc
6363
</Task>
6464
</Startup>
6565
</WebRole>
66+
<WorkerRole name="SitecoreCacheWorkerRole" vmsize="Medium">
67+
<Imports>
68+
<Import moduleName="Diagnostics" />
69+
<Import moduleName="Caching" />
70+
</Imports>
71+
<Runtime executionContext="elevated">
72+
<EntryPoint>
73+
<NetFxEntryPoint assemblyName="Sitecore.Azure.CacheWorkerRole.dll" targetFrameworkVersion="4.5" />
74+
</EntryPoint>
75+
</Runtime>
76+
<LocalResources>
77+
<LocalStorage name="DiagnosticStore" sizeInMB="10240" cleanOnRoleRecycle="false" />
78+
</LocalResources>
79+
</WorkerRole>
6680
</ServiceDefinition>
6781
----field----
6882
field: {9F850E0C-8FE8-4022-8562-39E565B1925D}
6983
name: Service Configuration
7084
key: service configuration
71-
content-length: 928
85+
content-length: 1568
7286

7387
<?xml version="1.0"?>
74-
<ServiceConfiguration serviceName="SitecoreCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="3" osVersion="*" schemaVersion="2013-10.2.2">
88+
<ServiceConfiguration serviceName="SitecoreCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="3" osVersion="*" schemaVersion="2014-06.2.4">
7589
<Role name="SitecoreWebRole">
7690
<Instances count="2" />
7791
<ConfigurationSettings>
7892
<Setting name="StorageName" value="" />
7993
<Setting name="SqlServerName" value="" />
8094
<Setting name="Sitecore.Azure.ServiceRuntime.WarmupTimeout" value="3600000" />
81-
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.NamedCaches" value="" />
95+
<Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="" />
96+
</ConfigurationSettings>
97+
</Role>
98+
<Role name="SitecoreCacheWorkerRole">
99+
<Instances count="2" />
100+
<ConfigurationSettings>
101+
<Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="" />
102+
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.NamedCaches" value="{&quot;caches&quot;:[{&quot;name&quot;:&quot;default&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:10,&quot;isExpirable&quot;:true,&quot;type&quot;:1},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0}]}" />
82103
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.DiagnosticLevel" value="1" />
83104
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.CacheSizePercentage" value="" />
84105
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.ConfigStoreConnectionString" value="" />
@@ -100,6 +121,13 @@ content-length: 22
100121

101122
App_Data/MvcAssemblies
102123
----field----
124+
field: {6DF7215E-2966-4926-93BF-90292224F087}
125+
name: Cache Worker Role Folder
126+
key: cache worker role folder
127+
content-length: 39
128+
129+
App_Data/Sitecore.Azure.CacheWorkerRole
130+
----field----
103131
field: {5552573A-3B78-45CC-8AB3-3956DBE1B62A}
104132
name: Exclude File Extensions
105133
key: exclude file extensions
@@ -130,11 +158,12 @@ bin\ServiceDescription.dll
130158
field: {06B47032-7F0A-46B5-A500-EDB642B68EBE}
131159
name: Exclude Directories
132160
key: exclude directories
133-
content-length: 976
161+
content-length: 1017
134162

135163
upload;
136164
temp;
137-
App_Config\AzureVendors;
165+
App_Config\AzureVendors;
166+
App_Data\Sitecore.Azure.CacheWorkerRole;
138167
App_Data\AzureEnvironments;
139168
App_Data\AzureOverrideFiles;
140169
App_Data\MvcAssemblies;
@@ -166,7 +195,7 @@ sitecore\shell\Themes\Standard\WordProcessing
166195
field: {FD10E34E-C2F1-4FA8-A09F-D7422C2B2A04}
167196
name: Connection Strings Patch
168197
key: connection strings patch
169-
content-length: 811
198+
content-length: 897
170199

171200
<?xml version="1.0" encoding="utf-8"?>
172201
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl">
@@ -188,7 +217,9 @@ content-length: 811
188217
</xsl:template>
189218
-->
190219
<xsl:template match="/connectionStrings">
191-
<connectionStrings />
220+
<connectionStrings>
221+
<add name="reporting" connectionString="do not remove" />
222+
</connectionStrings>
192223
</xsl:template>
193224

194225
</xsl:stylesheet>
@@ -231,7 +262,7 @@ content-length: 393
231262
field: {F22E4787-F052-445A-97A8-5FF52C8CF228}
232263
name: Global WebConfig Patch
233264
key: global webconfig patch
234-
content-length: 9171
265+
content-length: 9080
235266

236267
<?xml version="1.0" encoding="utf-8"?>
237268
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl">
@@ -290,13 +321,9 @@ content-length: 9171
290321
<!-- Viewstate storage End -->
291322
<!-- Distributed cache Begin -->
292323
<xsl:template match="configuration/system.web/sessionState">
293-
<sessionState mode="Custom" customProvider="DistributedCacheSessionStateStoreProvider">
324+
<sessionState mode="Custom" customProvider="AzureInRoleCacheSessionStateProvider" timeout="20">
294325
<providers>
295-
<add name="DistributedCacheSessionStateStoreProvider"
296-
type="Microsoft.Web.DistributedCache.DistributedCacheSessionStateStoreProvider, Microsoft.Web.DistributedCache"
297-
cacheName="default"
298-
useBlobMode="true"
299-
dataCacheClientName="default" />
326+
<add name="AzureInRoleCacheSessionStateProvider" type="Sitecore.Azure.SessionStateProviders.AzureInRoleCacheSessionStateProvider, Sitecore.Azure.SessionStateProviders" cacheName="default" dataCacheClientName="default" applicationName="SitecoreAzure" pollingInterval="5" />
300327
</providers>
301328
</sessionState>
302329
</xsl:template>
@@ -315,9 +342,8 @@ content-length: 9171
315342
</xsl:template>
316343
<xsl:param name="pDataCacheClients">
317344
<dataCacheClients>
318-
<dataCacheClient name="default" isCompressionEnabled="false">
319-
<autoDiscover isEnabled="true" identifier="" />
320-
<localCache isEnabled="true" sync="TimeoutBased" objectCount="100000" ttlValue="300" />
345+
<dataCacheClient name="default">
346+
<autoDiscover isEnabled="true" identifier="SitecoreCacheWorkerRole" />
321347
</dataCacheClient>
322348
</dataCacheClients>
323349
<cacheDiagnostics>
@@ -452,7 +478,7 @@ Staging
452478
----version----
453479
language: en
454480
version: 1
455-
revision: f9914845-89ea-4842-9f58-0aef4cc805ff
481+
revision: c12267f4-d103-4f02-b157-076c051d4e8d
456482

457483
----field----
458484
field: {25BED78C-4957-4165-998A-CA1B52F67497}
@@ -474,14 +500,14 @@ name: __Revision
474500
key: __revision
475501
content-length: 36
476502

477-
f9914845-89ea-4842-9f58-0aef4cc805ff
503+
c12267f4-d103-4f02-b157-076c051d4e8d
478504
----field----
479505
field: {D9CF14B1-FA16-4BA6-9288-E8A174D4D522}
480506
name: __Updated
481507
key: __updated
482508
content-length: 34
483509

484-
20150107T163350:635562452307645712
510+
20150112T125955:635566643951098953
485511
----field----
486512
field: {BADD9CF9-53E0-4D0C-BCC0-2D784C282F6A}
487513
name: __Updated by

0 commit comments

Comments
 (0)