Skip to content

Commit 6414ca8

Browse files
adeneysadeneys
committed
Convert projects to SDK format. Remove SC 8.x configs.
1 parent 73396d5 commit 6414ca8

File tree

80 files changed

+582
-4097
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+582
-4097
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ build
1010

1111
# Local deployment files
1212
deploy.targets
13+
deploy.props
1314

1415
# mstest test results
1516
TestResults

‎Directory.Build.props

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<Project>
2+
<Import Project="deploy.props" Condition="Exists('deploy.props')" />
3+
<PropertyGroup>
4+
<TargetFramework>net471</TargetFramework>
5+
<OutputType>Library</OutputType>
6+
<Authors>WeBlog Community</Authors>
7+
<Company>WeTeam Community</Company>
8+
<Product>WeBlog</Product>
9+
<Copyright>Copyright © 2011 - 2020</Copyright>
10+
<Version>4.1.0</Version>
11+
<Configurations>Debug sc9.0;Debug sc9.1;Debug sc9.2;Debug sc9.3;Release sc9.0;Release sc9.1;Release sc9.2;Release sc9.3</Configurations>
12+
</PropertyGroup>
13+
<PropertyGroup Condition="$(Configuration.Contains('Debug'))">
14+
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
15+
</PropertyGroup>
16+
<PropertyGroup Condition="$(Configuration.Contains('Release'))">
17+
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
18+
</PropertyGroup>
19+
<PropertyGroup Condition="$(Configuration.Contains('sc9.0'))">
20+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
21+
<DefineConstants>$(DefineConstants)</DefineConstants>
22+
<OutputPath>bin\sc90\</OutputPath>
23+
</PropertyGroup>
24+
<PropertyGroup Condition="$(Configuration.Contains('sc9.1'))">
25+
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
26+
<DefineConstants>$(DefineConstants);SC91</DefineConstants>
27+
<OutputPath>bin\sc91\</OutputPath>
28+
</PropertyGroup>
29+
<PropertyGroup Condition="$(Configuration.Contains('sc9.2'))">
30+
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
31+
<DefineConstants>$(DefineConstants);FEATURE_JOB_ABSTRACTIONS</DefineConstants>
32+
<OutputPath>bin\sc92\</OutputPath>
33+
</PropertyGroup>
34+
<PropertyGroup Condition="$(Configuration.Contains('sc9.3'))">
35+
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
36+
<DefineConstants>$(DefineConstants);FEATURE_JOB_ABSTRACTIONS;SC93</DefineConstants>
37+
<OutputPath>bin\sc93\</OutputPath>
38+
</PropertyGroup>
39+
</Project>

‎NuGet.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="Sitecore" value="https://sitecore.myget.org/F/sc-packages/api/v3/index.json" />
5+
</packageSources>
6+
</configuration>

‎Sitecore.Modules.WeBlog.sln

Lines changed: 330 additions & 176 deletions
Large diffs are not rendered by default.

‎Test/IntegrationTest/App_Config/Include/zWeBlog.Test.ContentSearch.Lucene.config

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎Test/IntegrationTest/App_Config/Include/zWeBlog.Test.ContentSearch.SC90.xslt

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎Test/IntegrationTest/Managers/CustomBlog/CommentManager.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ namespace Sitecore.Modules.WeBlog.IntegrationTest.Managers.CustomBlog
44
{
55
[TestFixture]
66
[Category("CustomBlog.CommentManager")]
7-
public class CommentManager : Sitecore.Modules.WeBlog.Test.CommentManager
7+
public class CommentManager : CommentManagerFixture
88
{
99
[TestFixtureSetUp]
1010
public void ChangeBlog()
1111
{
1212
Sitecore.Context.Database.SetupCustomBlogs(TestContentRoot);
13-
//re-init to retrieve member items
14-
Initialize();
1513
}
1614

1715
[TestFixtureTearDown]

‎Test/IntegrationTest/Managers/EntryManagerFixture.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
using Sitecore.Data;
99
using Sitecore.Modules.WeBlog.Managers;
1010
using Sitecore.Modules.WeBlog.Search;
11-
#if FEATURE_XCONNECT
1211
using Sitecore.Xdb.Reporting;
13-
#else
14-
using Sitecore.Analytics.Reporting;
15-
#endif
1612

1713
namespace Sitecore.Modules.WeBlog.IntegrationTest.Managers
1814
{

‎Test/IntegrationTest/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Test/UnitTest/Caching/EntrySearchCacheLegacyFixture.cs

Lines changed: 0 additions & 162 deletions
This file was deleted.

‎Test/UnitTest/Caching/ProfanityFilterCacheFixture.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
namespace Sitecore.Modules.WeBlog.UnitTest.Caching
88
{
9-
#if FEATURE_ABSTRACTIONS
109
[TestFixture]
1110
public class ProfanityFilterCacheFixture
1211
{
@@ -92,5 +91,4 @@ public void WordListSet_DatabaseIsNullAndWordsSet_SavesWordsToInnerCache()
9291
innerCache.Verify(x => x.Add("wordlist_master", "lorem|ipsum"));
9392
}
9493
}
95-
#endif
9694
}

‎Test/UnitTest/Data/Items/BlogHomeItemFixture.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
using Moq;
22
using NUnit.Framework;
3+
using Sitecore.Abstractions;
34
using Sitecore.Modules.WeBlog.Configuration;
45
using Sitecore.Modules.WeBlog.Data.Items;
56
using System;
67

7-
#if FEATURE_ABSTRACTIONS
8-
using Sitecore.Abstractions;
9-
#endif
10-
11-
128
namespace Sitecore.Modules.WeBlog.UnitTest.Data.Items
139
{
1410
[TestFixture]
1511
public class BlogHomeItemFixture
1612
{
17-
#if FEATURE_ABSTRACTIONS
1813
[Test]
1914
public void Ctor_NullItem_ThrowsException()
2015
{
@@ -40,6 +35,5 @@ public void Ctor_NullLinkManager_ThrowsException()
4035
var ex = Assert.Throws<ArgumentNullException>(new TestDelegate(sutAction));
4136
Assert.That(ex.ParamName, Is.EqualTo("linkManager"));
4237
}
43-
#endif
4438
}
4539
}

‎Test/UnitTest/Data/Items/EntryItemFixture.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
using Moq;
22
using NUnit.Framework;
3+
using Sitecore.Abstractions;
34
using Sitecore.Modules.WeBlog.Data.Items;
45
using System;
56

6-
#if FEATURE_ABSTRACTIONS
7-
using Sitecore.Abstractions;
8-
#endif
9-
107
namespace Sitecore.Modules.WeBlog.UnitTest.Data.Items
118
{
129
[TestFixture]
1310
public class EntryItemFixture
1411
{
15-
#if FEATURE_ABSTRACTIONS
1612
[Test]
1713
public void Ctor_NullItem_ThrowsException()
1814
{
@@ -36,6 +32,5 @@ public void Ctor_NullLinkManager_ThrowsException()
3632
var ex = Assert.Throws<ArgumentNullException>(new TestDelegate(sutAction));
3733
Assert.That(ex.ParamName, Is.EqualTo("linkManager"));
3834
}
39-
#endif
4035
}
4136
}

‎Test/UnitTest/Pipelines/CreateComment/AkismetSpamCheckFixture.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_ABSTRACTIONS
2-
using Joel.Net;
1+
using Joel.Net;
32
using Moq;
43
using NUnit.Framework;
54
using Sitecore.Abstractions;
@@ -199,4 +198,3 @@ private CommentItem CreateCommentItem()
199198
}
200199
}
201200
}
202-
#endif

‎Test/UnitTest/Pipelines/ProfanityFilter/GetProfanityListFromItemFixture.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
namespace Sitecore.Modules.WeBlog.UnitTest.Pipelines.ProfanityFilter
88
{
9-
#if FEATURE_ABSTRACTIONS
109
[TestFixture]
1110
public class GetProfanityListFromItemFixture
1211
{
@@ -72,5 +71,4 @@ public void Process_WordsAlreadyPopulated_DoesNothing()
7271
Assert.That(args.WordList, Is.EquivalentTo(new[] { "dolor" }));
7372
}
7473
}
75-
#endif
7674
}

0 commit comments

Comments
 (0)