Skip to content

Commit adf54a4

Browse files
muso31muso31
authored
Merge pull request #436 from mikeedwards83/feature/10.1
Feature/10.1
2 parents 6482823 + 43b92b7 commit adf54a4

29 files changed

+115
-53
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.1.0
22+
run: dotnet build Glass.Mapper.sln --packages .\NuGetv101 --configfile .nuget\NuGet.Config -p:ScVersion=10.1.0
23+
2124
- name: Dotnet build Sitecore v10.0
2225
run: dotnet build Glass.Mapper.sln --packages .\NuGetv100 --configfile .nuget\NuGet.Config -p:ScVersion=10.0.0
2326

‎.github/workflows/Release.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
env:
99
NUGET_PACKAGE_PATH: '.\NuGetPackages' # set this to your nuget package path
1010

11+
SC_V101_VERSION: '10.1.0' # set this to your Sitecore dll version for v10.1.0
12+
NUGET_SC_V101_VERSION: '101' #set this to the Number for the Sitecore version on the NuGet package
13+
1114
SC_V10_VERSION: '10.0.0' # set this to your Sitecore dll version for v10
1215
NUGET_SC_V10_VERSION: '100' #set this to the Number for the Sitecore version on the NuGet package
1316

@@ -41,7 +44,14 @@ jobs:
4144
# Steps represent a sequence of tasks that will be executed as part of the job
4245
steps:
4346
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
44-
- uses: actions/checkout@master
47+
- uses: actions/checkout@master
48+
49+
- name: Dotnet pack Sitecore v10.1.0
50+
run: |
51+
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 }}'
52+
dotnet pack "./Source/Glass.Mapper.Sc.WebForms/Glass.Mapper.Sc.WebForms.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 }}'
53+
dotnet pack "./Source/Glass.Mapper.Sc.Mvc/Glass.Mapper.Sc.Mvc.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 }}'
54+
dotnet pack "./Source/Glass.Mapper/Glass.Mapper.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 }}'
4555
4656
- name: Dotnet pack Sitecore v10.0
4757
run: |

‎CommonSettings.targets

+21-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,27 @@
11
<Project>
22
<Choose>
3-
<When Condition="'$(Configuration)|$(Platform)' == 'sc100|AnyCPU' Or '$(ScVersion)' == '10.0.0' Or '$(ScVersion)' == '' or
3+
<When Condition="'$(Configuration)|$(Platform)' == 'sc101|AnyCPU' Or '$(ScVersion)' == '10.1' Or '$(ScVersion)' == '' or
44
'$(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>SC101</DefineConstants>
15+
<DebugType>full</DebugType>
16+
<PlatformTarget>AnyCPU</PlatformTarget>
17+
<ErrorReport>prompt</ErrorReport>
18+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
19+
<OutputPath>bin\101\</OutputPath>
20+
<ScVersion>10.1</ScVersion>
21+
</PropertyGroup>
22+
</When>
23+
24+
<When Condition="'$(Configuration)|$(Platform)' == 'sc100|AnyCPU' Or '$(ScVersion)' == '10.0.0'">
525
<PropertyGroup>
626
<IncludeContentExtractionDll>true</IncludeContentExtractionDll>
727
<ScFakeDBVersion>3.0.0-alpha1</ScFakeDBVersion>

‎Glass.Mapper.sln

+23
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ Global
8585
Debug|Any CPU = Debug|Any CPU
8686
Release|Any CPU = Release|Any CPU
8787
Sc100|Any CPU = Sc100|Any CPU
88+
Sc1001|Any CPU = Sc1001|Any CPU
8889
Sc70|Any CPU = Sc70|Any CPU
8990
Sc71|Any CPU = Sc71|Any CPU
9091
Sc72|Any CPU = Sc72|Any CPU
@@ -106,6 +107,8 @@ Global
106107
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Release|Any CPU.Build.0 = Release|Any CPU
107108
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc100|Any CPU.ActiveCfg = Release|Any CPU
108109
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc100|Any CPU.Build.0 = Release|Any CPU
110+
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc1001|Any CPU.ActiveCfg = Sc1001|Any CPU
111+
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc1001|Any CPU.Build.0 = Sc1001|Any CPU
109112
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
110113
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc70|Any CPU.Build.0 = Release|Any CPU
111114
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc71|Any CPU.ActiveCfg = Release|Any CPU
@@ -136,6 +139,8 @@ Global
136139
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Release|Any CPU.Build.0 = Release|Any CPU
137140
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc100|Any CPU.ActiveCfg = Release|Any CPU
138141
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc100|Any CPU.Build.0 = Release|Any CPU
142+
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc1001|Any CPU.ActiveCfg = Sc1001|Any CPU
143+
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc1001|Any CPU.Build.0 = Sc1001|Any CPU
139144
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
140145
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc70|Any CPU.Build.0 = Release|Any CPU
141146
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc71|Any CPU.ActiveCfg = Release|Any CPU
@@ -166,6 +171,8 @@ Global
166171
{728CF1A7-0F06-4464-B434-33A982D97C82}.Release|Any CPU.Build.0 = Release|Any CPU
167172
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc100|Any CPU.ActiveCfg = Release|Any CPU
168173
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc100|Any CPU.Build.0 = Release|Any CPU
174+
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc1001|Any CPU.ActiveCfg = Sc1001|Any CPU
175+
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc1001|Any CPU.Build.0 = Sc1001|Any CPU
169176
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
170177
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc70|Any CPU.Build.0 = Release|Any CPU
171178
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc71|Any CPU.ActiveCfg = Release|Any CPU
@@ -196,6 +203,8 @@ Global
196203
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Release|Any CPU.Build.0 = Release|Any CPU
197204
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc100|Any CPU.ActiveCfg = Debug|Any CPU
198205
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc100|Any CPU.Build.0 = Debug|Any CPU
206+
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc1001|Any CPU.ActiveCfg = Sc1001|Any CPU
207+
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc1001|Any CPU.Build.0 = Sc1001|Any CPU
199208
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
200209
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc70|Any CPU.Build.0 = Debug|Any CPU
201210
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -226,6 +235,8 @@ Global
226235
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Release|Any CPU.Build.0 = Release|Any CPU
227236
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc100|Any CPU.ActiveCfg = Debug|Any CPU
228237
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc100|Any CPU.Build.0 = Debug|Any CPU
238+
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc1001|Any CPU.ActiveCfg = Sc1001|Any CPU
239+
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc1001|Any CPU.Build.0 = Sc1001|Any CPU
229240
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
230241
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc70|Any CPU.Build.0 = Debug|Any CPU
231242
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -256,6 +267,8 @@ Global
256267
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Release|Any CPU.Build.0 = Release|Any CPU
257268
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc100|Any CPU.ActiveCfg = Debug|Any CPU
258269
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc100|Any CPU.Build.0 = Debug|Any CPU
270+
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc1001|Any CPU.ActiveCfg = Sc1001|Any CPU
271+
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc1001|Any CPU.Build.0 = Sc1001|Any CPU
259272
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
260273
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc70|Any CPU.Build.0 = Debug|Any CPU
261274
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -286,6 +299,8 @@ Global
286299
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Release|Any CPU.Build.0 = Release|Any CPU
287300
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc100|Any CPU.ActiveCfg = Debug|Any CPU
288301
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc100|Any CPU.Build.0 = Debug|Any CPU
302+
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc1001|Any CPU.ActiveCfg = Sc1001|Any CPU
303+
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc1001|Any CPU.Build.0 = Sc1001|Any CPU
289304
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
290305
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc70|Any CPU.Build.0 = Debug|Any CPU
291306
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -316,6 +331,8 @@ Global
316331
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Release|Any CPU.Build.0 = Release|Any CPU
317332
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc100|Any CPU.ActiveCfg = Debug|Any CPU
318333
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc100|Any CPU.Build.0 = Debug|Any CPU
334+
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc1001|Any CPU.ActiveCfg = Sc1001|Any CPU
335+
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc1001|Any CPU.Build.0 = Sc1001|Any CPU
319336
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
320337
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc70|Any CPU.Build.0 = Debug|Any CPU
321338
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -346,6 +363,8 @@ Global
346363
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Release|Any CPU.Build.0 = Release|Any CPU
347364
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc100|Any CPU.ActiveCfg = Debug|Any CPU
348365
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc100|Any CPU.Build.0 = Debug|Any CPU
366+
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc1001|Any CPU.ActiveCfg = Sc1001|Any CPU
367+
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc1001|Any CPU.Build.0 = Sc1001|Any CPU
349368
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
350369
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc70|Any CPU.Build.0 = Debug|Any CPU
351370
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -376,6 +395,8 @@ Global
376395
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Release|Any CPU.Build.0 = Release|Any CPU
377396
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc100|Any CPU.ActiveCfg = Debug|Any CPU
378397
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc100|Any CPU.Build.0 = Debug|Any CPU
398+
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc1001|Any CPU.ActiveCfg = Sc1001|Any CPU
399+
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc1001|Any CPU.Build.0 = Sc1001|Any CPU
379400
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
380401
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc70|Any CPU.Build.0 = Debug|Any CPU
381402
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -406,6 +427,8 @@ Global
406427
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Release|Any CPU.Build.0 = Release|Any CPU
407428
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc100|Any CPU.ActiveCfg = Release|Any CPU
408429
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc100|Any CPU.Build.0 = Release|Any CPU
430+
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc1001|Any CPU.ActiveCfg = Sc1001|Any CPU
431+
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc1001|Any CPU.Build.0 = Sc1001|Any CPU
409432
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
410433
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc70|Any CPU.Build.0 = Release|Any CPU
411434
{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</Configurations>
13+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101</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</Configurations>
14+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101</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</Configurations>
13+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101</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
70+
#if SC81 || SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101
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 //removed in SC93 & SC100
220+
#if !SC93 && !SC100 && !SC101 //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)
240+
#if (SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101)
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</Configurations>
17+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101</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
506+
#if SC90 || SC91|| SC92 || SC93 || SC100 || SC101
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
4+
#if SC93 || SC100 || SC101
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
41+
#if SC93 || SC100 || SC101
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
7+
#if SC90 || SC91 || SC92 || SC93 || SC100 || SC101
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
21+
#if SC90 || SC91 || SC92 || SC93 || SC100 || SC101
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
26+
#if SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101
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
40+
#if SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101
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</Configurations>
17+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101</Configurations>
1818
</PropertyGroup>
1919
<PropertyGroup>
2020
<IsPackable>true</IsPackable>

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

+1-1
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</Configurations>
12+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101</Configurations>
1313
</PropertyGroup>
1414
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1515
<PlatformTarget>AnyCPU</PlatformTarget>

‎Tests/Unit Tests/Glass.Mapper.Sc.FakeDb/DataMappers/SitecoreFieldFileMapperFixture.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Sitecore.FakeDb;
88
using Sitecore.Resources.Media;
99

10-
#if SC90 || SC91 || SC92 || SC93 || SC100
10+
#if SC90 || SC91 || SC92 || SC93 || SC100 || SC101
1111
using Sitecore.Abstractions;
1212
using Sitecore.DependencyInjection;
1313
#endif
@@ -42,7 +42,7 @@ public void GetViewValue_FieldPointsAtFile_ReturnFileObject()
4242
{
4343

4444

45-
#if SC90 || SC91 || SC92 || SC93 || SC100
45+
#if SC90 || SC91 || SC92 || SC93 || SC100 || SC101
4646

4747
var mediaUrlProvider = Substitute.For<BaseMediaManager>();
4848

@@ -178,7 +178,7 @@ public void SetField_FileObjectPass_FieldPopulated()
178178

179179

180180

181-
#if SC90 || SC91 || SC92 || SC93 || SC100
181+
#if SC90 || SC91 || SC92 || SC93 || SC100 || SC101
182182

183183
var mediaUrlProvider = Substitute.For<BaseMediaManager>();
184184

0 commit comments

Comments
 (0)