Skip to content

Commit 221a112

Browse files
nickwesselmannickwesselman
authored
Merge pull request #77 from Sitecore/issue/76/sitecore-93
[closes #76] Support for Sitecore 9.3
2 parents 162a361 + 4e40c47 commit 221a112

35 files changed

Lines changed: 570 additions & 374 deletions

File tree

‎examples/helix-basic-tds-consolidated/src/BasicCompany.Web.Tests/BasicCompany.Web.Tests.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,20 @@
3838
<Reference Include="System.Core" />
3939
</ItemGroup>
4040
<ItemGroup>
41+
<PackageReference Include="Microsoft.Extensions.DependencyInjection">
42+
<Version>2.2.0</Version>
43+
</PackageReference>
44+
<PackageReference Include="Microsoft.Extensions.Logging">
45+
<Version>2.2.0</Version>
46+
</PackageReference>
4147
<PackageReference Include="Moq">
4248
<Version>4.10.1</Version>
4349
</PackageReference>
4450
<PackageReference Include="Sitecore.FakeDb">
45-
<Version>1.7.4</Version>
51+
<Version>3.0.0-alpha1</Version>
4652
</PackageReference>
4753
<PackageReference Include="Sitecore.Nexus">
48-
<Version>9.2.0</Version>
54+
<Version>9.3.0</Version>
4955
</PackageReference>
5056
<PackageReference Include="xunit" Version="2.4.1" />
5157
<PackageReference Include="xunit.runner.visualstudio">

‎examples/helix-basic-tds-consolidated/src/BasicCompany.Web.Tests/app.config‎

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,11 @@
1010
<sitecore>
1111
<settings>
1212
<setting name="LicenseFile" value="..\..\..\..\..\..\install-assets\license.xml" />
13-
<setting name="MailServer" value="localhost" />
1413
</settings>
1514
<!-- DATABASE TYPE
1615
For Sitecore versions prior to 8.2 should be 'Sitecore.Data.Database, Sitecore.Kernel'.
1716
For Sitecore 8.2 and later should be 'Sitecore.Data.DefaultDatabase, Sitecore.Kernel'. -->
1817
<sc.variable name="databaseType" value="Sitecore.Data.DefaultDatabase, Sitecore.Kernel" />
19-
<factories>
20-
<factory id="nsubstitute" type="Sitecore.FakeDb.NSubstitute.NSubstituteFactory, Sitecore.FakeDb.NSubstitute" />
21-
</factories>
2218
</sitecore>
2319
<log4net />
2420
<system.web>
@@ -45,4 +41,51 @@
4541
</properties>
4642
</profile>
4743
</system.web>
44+
<runtime>
45+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
46+
<dependentAssembly>
47+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
48+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
49+
</dependentAssembly>
50+
<dependentAssembly>
51+
<assemblyIdentity name="NSubstitute" publicKeyToken="92dd2e9066daa5ca" culture="neutral" />
52+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
53+
</dependentAssembly>
54+
<dependentAssembly>
55+
<assemblyIdentity name="xunit.core" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
56+
<bindingRedirect oldVersion="0.0.0.0-2.4.1.0" newVersion="2.4.1.0" />
57+
</dependentAssembly>
58+
<dependentAssembly>
59+
<assemblyIdentity name="AutoFixture" publicKeyToken="b24654c590009d4f" culture="neutral" />
60+
<bindingRedirect oldVersion="0.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
61+
</dependentAssembly>
62+
<dependentAssembly>
63+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
64+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
65+
</dependentAssembly>
66+
<dependentAssembly>
67+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
68+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
69+
</dependentAssembly>
70+
<dependentAssembly>
71+
<assemblyIdentity name="System.Security.Cryptography.Xml" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
72+
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
73+
</dependentAssembly>
74+
<dependentAssembly>
75+
<assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
76+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
77+
</dependentAssembly>
78+
<dependentAssembly>
79+
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
80+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
81+
</dependentAssembly>
82+
<dependentAssembly>
83+
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
84+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
85+
</dependentAssembly>
86+
</assemblyBinding>
87+
</runtime>
88+
<startup>
89+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
90+
</startup>
4891
</configuration>

‎examples/helix-basic-tds-consolidated/src/BasicCompany.Web/App_Config/Include/Project/Project.BasicCompany.config‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,6 @@
99
dictionaryDomain="{B741B17B-67B2-4DD8-A216-D092813871F0}"
1010
patch:before="site[@name='website']" />
1111
</sites>
12-
<events>
13-
<event name="publish:end">
14-
<handler type="Sitecore.Publishing.HtmlCacheClearer, Sitecore.Kernel" method="ClearCache">
15-
<sites hint="list">
16-
<site hint="basic-company">basic-company</site>
17-
</sites>
18-
</handler>
19-
</event>
20-
<event name="publish:end:remote">
21-
<handler type="Sitecore.Publishing.HtmlCacheClearer, Sitecore.Kernel" method="ClearCache">
22-
<sites hint="list">
23-
<site hint="basic-company">basic-company</site>
24-
</sites>
25-
</handler>
26-
</event>
27-
</events>
2812
<settings>
2913
<setting name="Media.RequestExtension" set:value="" />
3014
<setting name="Media.RequestProtection.SharedSecret" set:value="CA972DAE5E21D2D65C945DD21D489" />

‎examples/helix-basic-tds-consolidated/src/BasicCompany.Web/BasicCompany.Web.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
<PackageReference Include="HedgehogDevelopment.FxCop.Helix">
4848
<Version>1.0.0.7</Version>
4949
</PackageReference>
50-
<PackageReference Include="Sitecore.Kernel" Version="9.2.0" />
51-
<PackageReference Include="Sitecore.Mvc" Version="9.2.0" />
52-
<PackageReference Include="Sitecore.ContentSearch" Version="9.2.0" />
53-
<PackageReference Include="Sitecore.ContentSearch.Linq" Version="9.2.0" />
50+
<PackageReference Include="Sitecore.Kernel" Version="9.3.0" />
51+
<PackageReference Include="Sitecore.Mvc" Version="9.3.0" />
52+
<PackageReference Include="Sitecore.ContentSearch" Version="9.3.0" />
53+
<PackageReference Include="Sitecore.ContentSearch.Linq" Version="9.3.0" />
5454
</ItemGroup>
5555
<ItemGroup>
5656
<Reference Include="Microsoft.CSharp" />
@@ -101,7 +101,7 @@
101101
<Content Include="Views\BasicContent\SectionHeader.cshtml" />
102102
</ItemGroup>
103103
<ItemGroup>
104-
<Content Include="Views\web.config" />
104+
<None Include="Views\web.config" />
105105
</ItemGroup>
106106
<ItemGroup>
107107
<Content Include="App_Config\Include\Feature\Feature.Navigation.config" />

‎examples/helix-basic-tds/src/Feature/BasicContent/website/BasicCompany.Feature.BasicContent.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<WarningLevel>4</WarningLevel>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<PackageReference Include="Sitecore.Kernel" Version="9.2.0" />
47-
<PackageReference Include="Sitecore.Mvc" Version="9.2.0" />
46+
<PackageReference Include="Sitecore.Kernel" Version="9.3.0" />
47+
<PackageReference Include="Sitecore.Mvc" Version="9.3.0" />
4848
</ItemGroup>
4949
<ItemGroup>
5050
<Reference Include="Microsoft.CSharp" />

‎examples/helix-basic-tds/src/Feature/Navigation/tests/BasicCompany.Feature.Navigation.Tests.csproj‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,23 @@
4848
<Compile Include="Properties\AssemblyInfo.cs" />
4949
</ItemGroup>
5050
<ItemGroup>
51+
<PackageReference Include="Microsoft.Extensions.DependencyInjection">
52+
<Version>2.2.0</Version>
53+
</PackageReference>
54+
<PackageReference Include="Microsoft.Extensions.Logging">
55+
<Version>2.2.0</Version>
56+
</PackageReference>
5157
<PackageReference Include="Moq">
5258
<Version>4.10.1</Version>
5359
</PackageReference>
60+
<PackageReference Include="Sitecore.ContentSearch.ContentExtraction">
61+
<Version>9.3.0</Version>
62+
</PackageReference>
5463
<PackageReference Include="Sitecore.FakeDb">
55-
<Version>1.7.4</Version>
64+
<Version>3.0.0-alpha1</Version>
5665
</PackageReference>
5766
<PackageReference Include="Sitecore.Nexus">
58-
<Version>9.2.0</Version>
67+
<Version>9.3.0</Version>
5968
</PackageReference>
6069
<PackageReference Include="xunit" Version="2.4.1" />
6170
<PackageReference Include="xunit.runner.visualstudio">

‎examples/helix-basic-tds/src/Feature/Navigation/tests/app.config‎

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,11 @@
1010
<sitecore>
1111
<settings>
1212
<setting name="LicenseFile" value="..\..\..\..\..\..\..\..\install-assets\license.xml" />
13-
<setting name="MailServer" value="localhost" />
1413
</settings>
1514
<!-- DATABASE TYPE
1615
For Sitecore versions prior to 8.2 should be 'Sitecore.Data.Database, Sitecore.Kernel'.
1716
For Sitecore 8.2 and later should be 'Sitecore.Data.DefaultDatabase, Sitecore.Kernel'. -->
1817
<sc.variable name="databaseType" value="Sitecore.Data.DefaultDatabase, Sitecore.Kernel" />
19-
<factories>
20-
<factory id="nsubstitute" type="Sitecore.FakeDb.NSubstitute.NSubstituteFactory, Sitecore.FakeDb.NSubstitute" />
21-
</factories>
2218
</sitecore>
2319
<log4net />
2420
<system.web>
@@ -45,4 +41,51 @@
4541
</properties>
4642
</profile>
4743
</system.web>
44+
<runtime>
45+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
46+
<dependentAssembly>
47+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
48+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
49+
</dependentAssembly>
50+
<dependentAssembly>
51+
<assemblyIdentity name="NSubstitute" publicKeyToken="92dd2e9066daa5ca" culture="neutral" />
52+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
53+
</dependentAssembly>
54+
<dependentAssembly>
55+
<assemblyIdentity name="xunit.core" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
56+
<bindingRedirect oldVersion="0.0.0.0-2.4.1.0" newVersion="2.4.1.0" />
57+
</dependentAssembly>
58+
<dependentAssembly>
59+
<assemblyIdentity name="AutoFixture" publicKeyToken="b24654c590009d4f" culture="neutral" />
60+
<bindingRedirect oldVersion="0.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
61+
</dependentAssembly>
62+
<dependentAssembly>
63+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
64+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
65+
</dependentAssembly>
66+
<dependentAssembly>
67+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
68+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
69+
</dependentAssembly>
70+
<dependentAssembly>
71+
<assemblyIdentity name="System.Security.Cryptography.Xml" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
72+
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
73+
</dependentAssembly>
74+
<dependentAssembly>
75+
<assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
76+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
77+
</dependentAssembly>
78+
<dependentAssembly>
79+
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
80+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
81+
</dependentAssembly>
82+
<dependentAssembly>
83+
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
84+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
85+
</dependentAssembly>
86+
</assemblyBinding>
87+
</runtime>
88+
<startup>
89+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
90+
</startup>
4891
</configuration>

‎examples/helix-basic-tds/src/Feature/Navigation/website/BasicCompany.Feature.Navigation.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<WarningLevel>4</WarningLevel>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<PackageReference Include="Sitecore.Kernel" Version="9.2.0" />
47-
<PackageReference Include="Sitecore.Mvc" Version="9.2.0" />
46+
<PackageReference Include="Sitecore.Kernel" Version="9.3.0" />
47+
<PackageReference Include="Sitecore.Mvc" Version="9.3.0" />
4848
</ItemGroup>
4949
<ItemGroup>
5050
<Reference Include="Microsoft.CSharp" />

‎examples/helix-basic-tds/src/Feature/Products/tests/BasicCompany.Feature.Products.Tests.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,20 @@
4747
<Compile Include="Properties\AssemblyInfo.cs" />
4848
</ItemGroup>
4949
<ItemGroup>
50+
<PackageReference Include="Microsoft.Extensions.DependencyInjection">
51+
<Version>2.2.0</Version>
52+
</PackageReference>
53+
<PackageReference Include="Microsoft.Extensions.Logging">
54+
<Version>2.2.0</Version>
55+
</PackageReference>
5056
<PackageReference Include="Moq">
5157
<Version>4.10.1</Version>
5258
</PackageReference>
5359
<PackageReference Include="Sitecore.FakeDb">
54-
<Version>1.7.4</Version>
60+
<Version>3.0.0-alpha1</Version>
5561
</PackageReference>
5662
<PackageReference Include="Sitecore.Nexus">
57-
<Version>9.2.0</Version>
63+
<Version>9.3.0</Version>
5864
</PackageReference>
5965
<PackageReference Include="xunit" Version="2.4.1" />
6066
<PackageReference Include="xunit.runner.visualstudio">

‎examples/helix-basic-tds/src/Feature/Products/tests/app.config‎

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,11 @@
1010
<sitecore>
1111
<settings>
1212
<setting name="LicenseFile" value="..\..\..\..\..\..\..\..\install-assets\license.xml" />
13-
<setting name="MailServer" value="localhost" />
1413
</settings>
1514
<!-- DATABASE TYPE
1615
For Sitecore versions prior to 8.2 should be 'Sitecore.Data.Database, Sitecore.Kernel'.
1716
For Sitecore 8.2 and later should be 'Sitecore.Data.DefaultDatabase, Sitecore.Kernel'. -->
1817
<sc.variable name="databaseType" value="Sitecore.Data.DefaultDatabase, Sitecore.Kernel" />
19-
<factories>
20-
<factory id="nsubstitute" type="Sitecore.FakeDb.NSubstitute.NSubstituteFactory, Sitecore.FakeDb.NSubstitute" />
21-
</factories>
2218
</sitecore>
2319
<log4net />
2420
<system.web>
@@ -45,4 +41,51 @@
4541
</properties>
4642
</profile>
4743
</system.web>
44+
<runtime>
45+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
46+
<dependentAssembly>
47+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
48+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
49+
</dependentAssembly>
50+
<dependentAssembly>
51+
<assemblyIdentity name="NSubstitute" publicKeyToken="92dd2e9066daa5ca" culture="neutral" />
52+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
53+
</dependentAssembly>
54+
<dependentAssembly>
55+
<assemblyIdentity name="xunit.core" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
56+
<bindingRedirect oldVersion="0.0.0.0-2.4.1.0" newVersion="2.4.1.0" />
57+
</dependentAssembly>
58+
<dependentAssembly>
59+
<assemblyIdentity name="AutoFixture" publicKeyToken="b24654c590009d4f" culture="neutral" />
60+
<bindingRedirect oldVersion="0.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
61+
</dependentAssembly>
62+
<dependentAssembly>
63+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
64+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
65+
</dependentAssembly>
66+
<dependentAssembly>
67+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
68+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
69+
</dependentAssembly>
70+
<dependentAssembly>
71+
<assemblyIdentity name="System.Security.Cryptography.Xml" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
72+
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
73+
</dependentAssembly>
74+
<dependentAssembly>
75+
<assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
76+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
77+
</dependentAssembly>
78+
<dependentAssembly>
79+
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
80+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
81+
</dependentAssembly>
82+
<dependentAssembly>
83+
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
84+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
85+
</dependentAssembly>
86+
</assemblyBinding>
87+
</runtime>
88+
<startup>
89+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
90+
</startup>
4891
</configuration>

0 commit comments

Comments
 (0)