Skip to content

Commit 02939f5

Browse files
muso31muso31
authored
Merge pull request #441 from avwolferen/feature/sitecore102
Sitecore 10.2.0 update
2 parents 4dfa6c1 + e9aee77 commit 02939f5

32 files changed

+124
-60
lines changed

‎.github/workflows/Dev-CI.yml

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ jobs:
1818
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
1919
- uses: actions/checkout@master
2020

21+
- name: Dotnet build Sitecore v10.2.0
22+
run: dotnet build Glass.Mapper.sln --packages .\NuGetv101 --configfile .nuget\NuGet.Config -p:ScVersion=10.2.0
23+
2124
- name: Dotnet build Sitecore v10.1.0
2225
run: dotnet build Glass.Mapper.sln --packages .\NuGetv101 --configfile .nuget\NuGet.Config -p:ScVersion=10.1.0
2326

‎.github/workflows/Release.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ on:
77

88
env:
99
NUGET_PACKAGE_PATH: '.\NuGetPackages' # set this to your nuget package path
10-
10+
11+
SC_V102_VERSION: '10.2.0' # set this to your Sitecore dll version for v10.2.0
12+
NUGET_SC_V102_VERSION: '102' #set this to the Number for the Sitecore version on the NuGet package
13+
1114
SC_V101_VERSION: '10.1.0' # set this to your Sitecore dll version for v10.1.0
1215
NUGET_SC_V101_VERSION: '101' #set this to the Number for the Sitecore version on the NuGet package
1316

@@ -46,6 +49,13 @@ jobs:
4649
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
4750
- uses: actions/checkout@master
4851

52+
- name: Dotnet pack Sitecore v10.2.0
53+
run: |
54+
dotnet pack "./Source/Glass.Mapper.Sc/Glass.Mapper.Sc.csproj" --packages .\NuGetv102 --configfile .nuget\NuGet.Config -p:Version=${{ github.event.release.tag_name }} -p:ScVersion=${{ env.SC_V102_VERSION }} -p:PackageScVersion=${{ env.NUGET_SC_V102_VERSION }} -p:TargetFramework=net48 -o:'${{ env.NUGET_PACKAGE_PATH }}'
55+
dotnet pack "./Source/Glass.Mapper.Sc.WebForms/Glass.Mapper.Sc.WebForms.csproj" --packages .\NuGetv102 --configfile .nuget\NuGet.Config -p:Version=${{ github.event.release.tag_name }} -p:ScVersion=${{ env.SC_V102_VERSION }} -p:PackageScVersion=${{ env.NUGET_SC_V102_VERSION }} -p:TargetFramework=net48 -o:'${{ env.NUGET_PACKAGE_PATH }}'
56+
dotnet pack "./Source/Glass.Mapper.Sc.Mvc/Glass.Mapper.Sc.Mvc.csproj" --packages .\NuGetv102 --configfile .nuget\NuGet.Config -p:Version=${{ github.event.release.tag_name }} -p:ScVersion=${{ env.SC_V102_VERSION }} -p:PackageScVersion=${{ env.NUGET_SC_V102_VERSION }} -p:TargetFramework=net48 -o:'${{ env.NUGET_PACKAGE_PATH }}'
57+
dotnet pack "./Source/Glass.Mapper/Glass.Mapper.csproj" --packages .\NuGetv102 --configfile .nuget\NuGet.Config -p:Version=${{ github.event.release.tag_name }} -p:ScVersion=${{ env.SC_V102_VERSION }} -p:PackageScVersion=${{ env.NUGET_SC_V102_VERSION }} -p:TargetFramework=net48 -o:'${{ env.NUGET_PACKAGE_PATH }}'
58+
4959
- name: Dotnet pack Sitecore v10.1.0
5060
run: |
5161
dotnet pack "./Source/Glass.Mapper.Sc/Glass.Mapper.Sc.csproj" --packages .\NuGetv101 --configfile .nuget\NuGet.Config -p:Version=${{ github.event.release.tag_name }} -p:ScVersion=${{ env.SC_V101_VERSION }} -p:PackageScVersion=${{ env.NUGET_SC_V101_VERSION }} -p:TargetFramework=net48 -o:'${{ env.NUGET_PACKAGE_PATH }}'

‎CommonSettings.targets

+21
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
<Project>
22
<Choose>
3+
<When Condition="'$(Configuration)|$(Platform)' == 'sc102|AnyCPU' Or '$(ScVersion)' == '10.2.0' Or '$(ScVersion)' == '' or
4+
'$(ScVersion)' == '*undefined*'">
5+
<PropertyGroup>
6+
<IncludeContentExtractionDll>true</IncludeContentExtractionDll>
7+
<ScFakeDBVersion>3.0.0-alpha1</ScFakeDBVersion>
8+
<NSubstituteVersion>4.2.1</NSubstituteVersion>
9+
<CastleVersion>4.4.0</CastleVersion>
10+
<TargetFramework Condition="'$(TargetFramework)' == '' ">net48</TargetFramework>
11+
<AspNetMvcVersion>5.2.4</AspNetMvcVersion>
12+
<AspNetRazorWebVersion>3.2.4</AspNetRazorWebVersion>
13+
<DebugSymbols>true</DebugSymbols>
14+
<DefineConstants>SC102</DefineConstants>
15+
<DebugType>full</DebugType>
16+
<PlatformTarget>AnyCPU</PlatformTarget>
17+
<ErrorReport>prompt</ErrorReport>
18+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
19+
<OutputPath>bin\102\</OutputPath>
20+
<ScVersion>10.2.0</ScVersion>
21+
</PropertyGroup>
22+
</When>
23+
324
<When Condition="'$(Configuration)|$(Platform)' == 'sc101|AnyCPU' Or '$(ScVersion)' == '10.1.0' Or '$(ScVersion)' == '' or
425
'$(ScVersion)' == '*undefined*'">
526
<PropertyGroup>

‎Glass.Mapper.sln

+23
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ Global
8686
Release|Any CPU = Release|Any CPU
8787
Sc100|Any CPU = Sc100|Any CPU
8888
Sc101|Any CPU = Sc101|Any CPU
89+
Sc102|Any CPU = Sc102|Any CPU
8990
Sc70|Any CPU = Sc70|Any CPU
9091
Sc71|Any CPU = Sc71|Any CPU
9192
Sc72|Any CPU = Sc72|Any CPU
@@ -109,6 +110,8 @@ Global
109110
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc100|Any CPU.Build.0 = Release|Any CPU
110111
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc101|Any CPU.ActiveCfg = Sc101|Any CPU
111112
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc101|Any CPU.Build.0 = Sc101|Any CPU
113+
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc102|Any CPU.ActiveCfg = Sc102|Any CPU
114+
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc102|Any CPU.Build.0 = Sc102|Any CPU
112115
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
113116
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc70|Any CPU.Build.0 = Release|Any CPU
114117
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc71|Any CPU.ActiveCfg = Release|Any CPU
@@ -141,6 +144,8 @@ Global
141144
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc100|Any CPU.Build.0 = Release|Any CPU
142145
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc101|Any CPU.ActiveCfg = Sc101|Any CPU
143146
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc101|Any CPU.Build.0 = Sc101|Any CPU
147+
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc102|Any CPU.ActiveCfg = Sc102|Any CPU
148+
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc102|Any CPU.Build.0 = Sc102|Any CPU
144149
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
145150
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc70|Any CPU.Build.0 = Release|Any CPU
146151
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc71|Any CPU.ActiveCfg = Release|Any CPU
@@ -173,6 +178,8 @@ Global
173178
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc100|Any CPU.Build.0 = Release|Any CPU
174179
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc101|Any CPU.ActiveCfg = Sc101|Any CPU
175180
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc101|Any CPU.Build.0 = Sc101|Any CPU
181+
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc102|Any CPU.ActiveCfg = Sc102|Any CPU
182+
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc102|Any CPU.Build.0 = Sc102|Any CPU
176183
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
177184
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc70|Any CPU.Build.0 = Release|Any CPU
178185
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc71|Any CPU.ActiveCfg = Release|Any CPU
@@ -205,6 +212,8 @@ Global
205212
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc100|Any CPU.Build.0 = Debug|Any CPU
206213
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc101|Any CPU.ActiveCfg = Sc101|Any CPU
207214
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc101|Any CPU.Build.0 = Sc101|Any CPU
215+
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc102|Any CPU.ActiveCfg = Sc102|Any CPU
216+
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc102|Any CPU.Build.0 = Sc102|Any CPU
208217
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
209218
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc70|Any CPU.Build.0 = Debug|Any CPU
210219
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -237,6 +246,8 @@ Global
237246
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc100|Any CPU.Build.0 = Debug|Any CPU
238247
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc101|Any CPU.ActiveCfg = Sc101|Any CPU
239248
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc101|Any CPU.Build.0 = Sc101|Any CPU
249+
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc102|Any CPU.ActiveCfg = Sc102|Any CPU
250+
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc102|Any CPU.Build.0 = Sc102|Any CPU
240251
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
241252
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc70|Any CPU.Build.0 = Debug|Any CPU
242253
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -269,6 +280,8 @@ Global
269280
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc100|Any CPU.Build.0 = Debug|Any CPU
270281
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc101|Any CPU.ActiveCfg = Sc101|Any CPU
271282
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc101|Any CPU.Build.0 = Sc101|Any CPU
283+
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc102|Any CPU.ActiveCfg = Sc102|Any CPU
284+
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc102|Any CPU.Build.0 = Sc102|Any CPU
272285
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
273286
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc70|Any CPU.Build.0 = Debug|Any CPU
274287
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -301,6 +314,8 @@ Global
301314
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc100|Any CPU.Build.0 = Debug|Any CPU
302315
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc101|Any CPU.ActiveCfg = Sc101|Any CPU
303316
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc101|Any CPU.Build.0 = Sc101|Any CPU
317+
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc102|Any CPU.ActiveCfg = Sc102|Any CPU
318+
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc102|Any CPU.Build.0 = Sc102|Any CPU
304319
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
305320
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc70|Any CPU.Build.0 = Debug|Any CPU
306321
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -333,6 +348,8 @@ Global
333348
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc100|Any CPU.Build.0 = Debug|Any CPU
334349
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc101|Any CPU.ActiveCfg = Sc101|Any CPU
335350
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc101|Any CPU.Build.0 = Sc101|Any CPU
351+
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc102|Any CPU.ActiveCfg = Sc102|Any CPU
352+
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc102|Any CPU.Build.0 = Sc102|Any CPU
336353
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
337354
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc70|Any CPU.Build.0 = Debug|Any CPU
338355
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -365,6 +382,8 @@ Global
365382
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc100|Any CPU.Build.0 = Debug|Any CPU
366383
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc101|Any CPU.ActiveCfg = Sc101|Any CPU
367384
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc101|Any CPU.Build.0 = Sc101|Any CPU
385+
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc102|Any CPU.ActiveCfg = Sc102|Any CPU
386+
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc102|Any CPU.Build.0 = Sc102|Any CPU
368387
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
369388
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc70|Any CPU.Build.0 = Debug|Any CPU
370389
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -397,6 +416,8 @@ Global
397416
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc100|Any CPU.Build.0 = Debug|Any CPU
398417
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc101|Any CPU.ActiveCfg = Sc101|Any CPU
399418
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc101|Any CPU.Build.0 = Sc101|Any CPU
419+
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc102|Any CPU.ActiveCfg = Sc102|Any CPU
420+
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc102|Any CPU.Build.0 = Sc102|Any CPU
400421
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
401422
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc70|Any CPU.Build.0 = Debug|Any CPU
402423
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -429,6 +450,8 @@ Global
429450
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc100|Any CPU.Build.0 = Release|Any CPU
430451
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc101|Any CPU.ActiveCfg = Sc101|Any CPU
431452
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc101|Any CPU.Build.0 = Sc101|Any CPU
453+
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc102|Any CPU.ActiveCfg = Sc102|Any CPU
454+
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc102|Any CPU.Build.0 = Sc102|Any CPU
432455
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
433456
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc70|Any CPU.Build.0 = Release|Any CPU
434457
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc71|Any CPU.ActiveCfg = Release|Any CPU

‎Source/Glass.Mapper.Sc.ContentSearch/Glass.Mapper.Sc.ContentSearch.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<FileAlignment>512</FileAlignment>
1111
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1212
<RestorePackages>true</RestorePackages>
13-
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101</Configurations>
13+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102</Configurations>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1616
<DebugSymbols>true</DebugSymbols>

‎Source/Glass.Mapper.Sc.Mvc/Glass.Mapper.Sc.Mvc.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1212
<TargetFrameworkProfile />
1313
<DocumentationFile>bin\Glass.Mapper.Sc.Mvc.XML</DocumentationFile>
14-
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101</Configurations>
14+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102</Configurations>
1515
</PropertyGroup>
1616
<PropertyGroup>
1717
<IsPackable>true</IsPackable>

‎Source/Glass.Mapper.Sc.WebForms/Glass.Mapper.Sc.WebForms.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<FileAlignment>512</FileAlignment>
1111
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1212
<DocumentationFile>bin\Glass.Mapper.Sc.WebForms.xml</DocumentationFile>
13-
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101</Configurations>
13+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102</Configurations>
1414
</PropertyGroup>
1515
<PropertyGroup>
1616
<IsPackable>true</IsPackable>

‎Source/Glass.Mapper.Sc/Configuration/SitecoreInfoType.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public enum SitecoreInfoType
6767
/// </summary>
6868
BaseTemplateIds=14,
6969

70-
#if SC81 || SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101
70+
#if SC81 || SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101 || SC102
7171
/// <summary>
7272
/// Gets the original language.
7373
/// </summary>

‎Source/Glass.Mapper.Sc/DataMappers/SitecoreFieldScWrapperMappers.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ protected override ValueLookupField Create(Field field)
217217
}
218218
}
219219

220-
#if !SC93 && !SC100 && !SC101 //removed in > SC93
220+
#if !SC93 && !SC100 && !SC101 && !SC102 //removed in > SC93
221221

222222
public class SitecoreFieldScVersionLinkFieldMapper : SitecoreFieldScFieldBaseMapper<Sitecore.Data.Fields.VersionLinkField>
223223
{

‎Source/Glass.Mapper.Sc/DataMappers/SitecoreInfoMapper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public override void Setup(DataMapperResolverArgs args)
237237
case SitecoreInfoType.ItemUri:
238238
_getValue = (item, getOptions) => new ItemUri(item.ID, item.Language, item.Version, item.Database);
239239
break;
240-
#if (SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101)
240+
#if (SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101 || SC102)
241241
case SitecoreInfoType.OriginalLanguage:
242242
_getValue = (item, getOptions) => item.OriginalLanguage;
243243
break;

‎Source/Glass.Mapper.Sc/Glass.Mapper.Sc.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<RestorePackages>true</RestorePackages>
1515
<TargetFrameworkProfile />
1616
<DocumentationFile>bin\Glass.Mapper.Sc.XML</DocumentationFile>
17-
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101</Configurations>
17+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102</Configurations>
1818
</PropertyGroup>
1919
<PropertyGroup>
2020
<IsPackable>true</IsPackable>

‎Source/Glass.Mapper.Sc/GlassHtml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ public static RenderingResult BeginRenderLink(Link link, SafeDictionary<string>
503503
AttributeCheck(attributes, "title", title);
504504
AttributeCheck(attributes, "style", link.Style);
505505

506-
#if SC90 || SC91|| SC92 || SC93 || SC100 || SC101
506+
#if SC90 || SC91|| SC92 || SC93 || SC100 || SC101 || SC102
507507

508508
if (attributes["target"] == "_blank" && Settings.ProtectExternalLinksWithBlankTarget)
509509
{

‎Source/Glass.Mapper.Sc/Pipelines/GetChromeData/EditFrameBuilder.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Text.RegularExpressions;
33
using Sitecore;
4-
#if SC93 || SC100 || SC101
4+
#if SC93 || SC100 || SC101 || SC102
55
using Sitecore.Abstractions;
66
#endif
77
using Sitecore.Configuration;
@@ -38,7 +38,7 @@ public class EditFrameBuilder : GetChromeDataProcessor
3838

3939
private readonly Regex _titleRegex = new Regex("<title>(?<title>([^<]*))<title>");
4040

41-
#if SC93 || SC100 || SC101
41+
#if SC93 || SC100 || SC101 || SC102
4242
public EditFrameBuilder(BaseClient client) : base(client)
4343
{
4444

‎Source/Glass.Mapper.Sc/SitecoreVersionAbstractions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Text;
55
using System.Threading.Tasks;
66

7-
#if SC90 || SC91 || SC92 || SC93 || SC100 || SC101
7+
#if SC90 || SC91 || SC92 || SC93 || SC100 || SC101 || SC102
88
using Sitecore.Abstractions;
99
using Sitecore.DependencyInjection;
1010
#endif
@@ -18,7 +18,7 @@ namespace Glass.Mapper.Sc
1818
{
1919
public class SitecoreVersionAbstractions
2020
{
21-
#if SC90 || SC91 || SC92 || SC93 || SC100 || SC101
21+
#if SC90 || SC91 || SC92 || SC93 || SC100 || SC101 || SC102
2222

2323
internal static LazyResetable<BaseMediaManager> MediaManager = ServiceLocator.GetRequiredResetableService<BaseMediaManager>();
2424
internal static LazyResetable<BaseLinkManager> LinkManager = ServiceLocator.GetRequiredResetableService<BaseLinkManager>();

‎Source/Glass.Mapper.Sc/Utilities.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static bool IsPageEditor
2323
{
2424
get
2525
{
26-
#if SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101
26+
#if SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101 || SC102
2727
return Sitecore.Context.PageMode.IsExperienceEditor;
2828
#else
2929
return Sitecore.Context.PageMode.IsPageEditor;
@@ -37,7 +37,7 @@ public static bool IsPageEditorEditing
3737

3838
internal static Func<bool> GetIsPageEditorEditing = () =>
3939
{
40-
#if SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101
40+
#if SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101 || SC102
4141
return Sitecore.Context.PageMode.IsExperienceEditorEditing;
4242
#else
4343
return Sitecore.Context.PageMode.IsPageEditorEditing;

‎Source/Glass.Mapper/Glass.Mapper.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<RestorePackages>true</RestorePackages>
1515
<TargetFrameworkProfile />
1616
<DocumentationFile>bin\Glass.Mapper.XML</DocumentationFile>
17-
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101</Configurations>
17+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102</Configurations>
1818
</PropertyGroup>
1919
<PropertyGroup>
2020
<IsPackable>true</IsPackable>

‎Tests/Integration Tests/Sitecore/Glass.Mapper.Sc.Integration.Sc7/Glass.Mapper.Sc.Integration.Sc7.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<Reference Include="Sitecore.Kernel">
5050
<HintPath>..\..\$(ScDir)Sitecore.Kernel.dll</HintPath>
5151
</Reference>
52-
<Reference Include="Sitecore.Nexus">
52+
<Reference Include="Sitecore.Nexus" Condition="'$(ScVersion)' != '10.2.0'">
5353
<HintPath>..\..\$(ScDir)Sitecore.Nexus.dll</HintPath>
5454
</Reference>
5555
<Reference Include="sitecore.contentsearch">

‎Tests/Integration Tests/Sitecore/Glass.Mapper.Sc.Integration/Glass.Mapper.Sc.Integration.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<Reference Include="Sitecore.Kernel">
5454
<HintPath>..\..\$(ScDir)Sitecore.Kernel.dll</HintPath>
5555
</Reference>
56-
<Reference Include="Sitecore.Nexus">
56+
<Reference Include="Sitecore.Nexus" Condition="'$(ScVersion)' != '10.2.0'">
5757
<HintPath>..\..\$(ScDir)Sitecore.Nexus.dll</HintPath>
5858
</Reference>
5959
</ItemGroup>

‎Tests/Unit Tests/Glass.Mapper.Sc.FakeDb.ThirdParty/Glass.Mapper.Sc.FakeDb.ThirdParty.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AssemblyName>Glass.Mapper.Sc.FakeDb.ThirdParty</AssemblyName>
1010
<FileAlignment>512</FileAlignment>
1111
<RestorePackages>true</RestorePackages>
12-
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101</Configurations>
12+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102</Configurations>
1313
</PropertyGroup>
1414
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1515
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -47,7 +47,7 @@
4747
</ItemGroup>
4848
<ItemGroup>
4949
<PackageReference Include="Sitecore.Kernel" Version="$(ScVersion)" />
50-
<PackageReference Include="Sitecore.Nexus" Version="$(ScVersion)" />
50+
<PackageReference Include="Sitecore.Nexus" Version="$(ScVersion)" Condition="'$(ScVersion)' != '10.2.0'" />
5151
<PackageReference Include="Sitecore.Analytics" Version="$(ScVersion)" />
5252
<PackageReference Include="Sitecore.Client" Version="$(ScVersion)" />
5353
</ItemGroup>

0 commit comments

Comments
 (0)