Skip to content

Commit bc88b83

Browse files
muso31muso31
authored
Merge pull request #466 from robmaas/feature/sitecore-104
Sitecore 104
2 parents 7d96216 + 80b06f4 commit bc88b83

29 files changed

+148
-68
lines changed

‎.github/workflows/Dev-CI.yml

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ jobs:
1717
steps:
1818
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
1919
- uses: actions/checkout@master
20+
21+
- name: Dotnet build Sitecore v10.4.0
22+
run: dotnet build Glass.Mapper.sln --packages .\NuGetv104 --configfile .nuget\NuGet.Config -p:ScVersion=10.4.0
2023

2124
- name: Dotnet build Sitecore v10.3.0
2225
run: dotnet build Glass.Mapper.sln --packages .\NuGetv103 --configfile .nuget\NuGet.Config -p:ScVersion=10.3.0

‎.github/workflows/Release.yml

+10
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77

88
env:
99
NUGET_PACKAGE_PATH: '.\NuGetPackages' # set this to your nuget package path
10+
11+
SC_V104_VERSION: '10.4.0' # set this to your Sitecore dll version for v10.4.0
12+
NUGET_SC_V104_VERSION: '104' #set this to the Number for the Sitecore version on the NuGet package
1013

1114
SC_V103_VERSION: '10.3.0' # set this to your Sitecore dll version for v10.3.0
1215
NUGET_SC_V103_VERSION: '103' #set this to the Number for the Sitecore version on the NuGet package
@@ -51,6 +54,13 @@ jobs:
5154
steps:
5255
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
5356
- uses: actions/checkout@master
57+
58+
- name: Dotnet pack Sitecore v10.4.0
59+
run: |
60+
dotnet pack "./Source/Glass.Mapper.Sc/Glass.Mapper.Sc.csproj" --packages .\NuGetv104 --configfile .nuget\NuGet.Config -p:Version=${{ github.event.release.tag_name }} -p:ScVersion=${{ env.SC_V104_VERSION }} -p:PackageScVersion=${{ env.NUGET_SC_V104_VERSION }} -p:TargetFramework=net48 -o:'${{ env.NUGET_PACKAGE_PATH }}'
61+
dotnet pack "./Source/Glass.Mapper.Sc.WebForms/Glass.Mapper.Sc.WebForms.csproj" --packages .\NuGetv104 --configfile .nuget\NuGet.Config -p:Version=${{ github.event.release.tag_name }} -p:ScVersion=${{ env.SC_V104_VERSION }} -p:PackageScVersion=${{ env.NUGET_SC_V104_VERSION }} -p:TargetFramework=net48 -o:'${{ env.NUGET_PACKAGE_PATH }}'
62+
dotnet pack "./Source/Glass.Mapper.Sc.Mvc/Glass.Mapper.Sc.Mvc.csproj" --packages .\NuGetv104 --configfile .nuget\NuGet.Config -p:Version=${{ github.event.release.tag_name }} -p:ScVersion=${{ env.SC_V104_VERSION }} -p:PackageScVersion=${{ env.NUGET_SC_V104_VERSION }} -p:TargetFramework=net48 -o:'${{ env.NUGET_PACKAGE_PATH }}'
63+
dotnet pack "./Source/Glass.Mapper/Glass.Mapper.csproj" --packages .\NuGetv104 --configfile .nuget\NuGet.Config -p:Version=${{ github.event.release.tag_name }} -p:ScVersion=${{ env.SC_V104_VERSION }} -p:PackageScVersion=${{ env.NUGET_SC_V104_VERSION }} -p:TargetFramework=net48 -o:'${{ env.NUGET_PACKAGE_PATH }}'
5464
5565
- name: Dotnet pack Sitecore v10.3.0
5666
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)' == 'sc103|AnyCPU' Or '$(ScVersion)' == '10.3.0' Or '$(ScVersion)' == '' or
3+
<When Condition="'$(Configuration)|$(Platform)' == 'sc104|AnyCPU' Or '$(ScVersion)' == '10.4.0' 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>SC104</DefineConstants>
15+
<DebugType>full</DebugType>
16+
<PlatformTarget>AnyCPU</PlatformTarget>
17+
<ErrorReport>prompt</ErrorReport>
18+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
19+
<OutputPath>bin\104\</OutputPath>
20+
<ScVersion>10.4.0</ScVersion>
21+
</PropertyGroup>
22+
</When>
23+
24+
<When Condition="'$(Configuration)|$(Platform)' == 'sc103|AnyCPU' Or '$(ScVersion)' == '10.3.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
@@ -88,6 +88,7 @@ Global
8888
Sc101|Any CPU = Sc101|Any CPU
8989
Sc102|Any CPU = Sc102|Any CPU
9090
Sc103|Any CPU = Sc103|Any CPU
91+
Sc104|Any CPU = Sc104|Any CPU
9192
Sc70|Any CPU = Sc70|Any CPU
9293
Sc71|Any CPU = Sc71|Any CPU
9394
Sc72|Any CPU = Sc72|Any CPU
@@ -115,6 +116,8 @@ Global
115116
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc102|Any CPU.Build.0 = Debug|Any CPU
116117
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
117118
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
119+
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
120+
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
118121
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
119122
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc70|Any CPU.Build.0 = Release|Any CPU
120123
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc71|Any CPU.ActiveCfg = Release|Any CPU
@@ -151,6 +154,8 @@ Global
151154
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc102|Any CPU.Build.0 = Debug|Any CPU
152155
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
153156
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
157+
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
158+
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
154159
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
155160
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc70|Any CPU.Build.0 = Release|Any CPU
156161
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc71|Any CPU.ActiveCfg = Release|Any CPU
@@ -187,6 +192,8 @@ Global
187192
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc102|Any CPU.Build.0 = Debug|Any CPU
188193
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
189194
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
195+
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
196+
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
190197
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
191198
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc70|Any CPU.Build.0 = Release|Any CPU
192199
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc71|Any CPU.ActiveCfg = Release|Any CPU
@@ -223,6 +230,8 @@ Global
223230
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc102|Any CPU.Build.0 = Debug|Any CPU
224231
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
225232
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
233+
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
234+
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
226235
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
227236
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc70|Any CPU.Build.0 = Debug|Any CPU
228237
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -259,6 +268,8 @@ Global
259268
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc102|Any CPU.Build.0 = Debug|Any CPU
260269
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
261270
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
271+
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
272+
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
262273
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
263274
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc70|Any CPU.Build.0 = Debug|Any CPU
264275
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -295,6 +306,8 @@ Global
295306
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc102|Any CPU.Build.0 = Debug|Any CPU
296307
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
297308
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
309+
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
310+
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
298311
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
299312
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc70|Any CPU.Build.0 = Debug|Any CPU
300313
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -331,6 +344,8 @@ Global
331344
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc102|Any CPU.Build.0 = Debug|Any CPU
332345
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
333346
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
347+
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
348+
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
334349
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
335350
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc70|Any CPU.Build.0 = Debug|Any CPU
336351
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -367,6 +382,8 @@ Global
367382
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc102|Any CPU.Build.0 = Debug|Any CPU
368383
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
369384
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
385+
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
386+
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
370387
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
371388
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc70|Any CPU.Build.0 = Debug|Any CPU
372389
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -403,6 +420,8 @@ Global
403420
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc102|Any CPU.Build.0 = Debug|Any CPU
404421
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
405422
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
423+
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
424+
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
406425
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
407426
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc70|Any CPU.Build.0 = Debug|Any CPU
408427
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -439,6 +458,8 @@ Global
439458
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc102|Any CPU.Build.0 = Debug|Any CPU
440459
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
441460
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
461+
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
462+
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
442463
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
443464
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc70|Any CPU.Build.0 = Debug|Any CPU
444465
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
@@ -475,6 +496,8 @@ Global
475496
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc102|Any CPU.Build.0 = Debug|Any CPU
476497
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
477498
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
499+
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
500+
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
478501
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
479502
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc70|Any CPU.Build.0 = Release|Any CPU
480503
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc71|Any CPU.ActiveCfg = Release|Any CPU

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
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;sc102;Sc103</Configurations>
13+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102;Sc103;Sc104</Configurations>
14+
<TargetFramework>net48</TargetFramework>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>
@@ -21,7 +22,7 @@
2122
<ErrorReport>prompt</ErrorReport>
2223
<WarningLevel>4</WarningLevel>
2324
</PropertyGroup>
24-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc103|AnyCPU'">
25+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc104|AnyCPU'">
2526
<DebugSymbols>true</DebugSymbols>
2627
<DebugType>full</DebugType>
2728
<Optimize>false</Optimize>

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

+3-2
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;sc102;Sc103</Configurations>
14+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102;Sc103;Sc104</Configurations>
1515
</PropertyGroup>
1616
<PropertyGroup>
1717
<IsPackable>true</IsPackable>
@@ -21,6 +21,7 @@
2121
<NuspecProperties>$(NuspecProperties);version=$(Version)</NuspecProperties>
2222
<NuspecProperties>$(NuspecProperties);scVersion=$(PackageScVersion)</NuspecProperties>
2323
<NuspecProperties>$(NuspecProperties);netVersion=$(TargetFramework)</NuspecProperties>
24+
<TargetFramework>net48</TargetFramework>
2425
</PropertyGroup>
2526
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2627
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,7 +34,7 @@
3334
<WarningLevel>4</WarningLevel>
3435
<Prefer32Bit>false</Prefer32Bit>
3536
</PropertyGroup>
36-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc103|AnyCPU'">
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc104|AnyCPU'">
3738
<PlatformTarget>AnyCPU</PlatformTarget>
3839
<DebugSymbols>true</DebugSymbols>
3940
<DebugType>full</DebugType>

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

+3-2
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;sc102;Sc103</Configurations>
13+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102;Sc103;Sc104</Configurations>
1414
</PropertyGroup>
1515
<PropertyGroup>
1616
<IsPackable>true</IsPackable>
@@ -20,6 +20,7 @@
2020
<NuspecProperties>$(NuspecProperties);version=$(Version)</NuspecProperties>
2121
<NuspecProperties>$(NuspecProperties);scVersion=$(PackageScVersion)</NuspecProperties>
2222
<NuspecProperties>$(NuspecProperties);netVersion=$(TargetFramework)</NuspecProperties>
23+
<TargetFramework>net48</TargetFramework>
2324
</PropertyGroup>
2425
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2526
<DebugSymbols>true</DebugSymbols>
@@ -30,7 +31,7 @@
3031
<ErrorReport>prompt</ErrorReport>
3132
<WarningLevel>4</WarningLevel>
3233
</PropertyGroup>
33-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc103|AnyCPU'">
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc104|AnyCPU'">
3435
<DebugSymbols>true</DebugSymbols>
3536
<DebugType>full</DebugType>
3637
<Optimize>false</Optimize>

‎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 || SC102 || SC103
70+
#if SC81 || SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101 || SC102 || SC103 || SC104
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 && !SC102 && !SC103 //removed in > SC93
220+
#if !SC93 && !SC100 && !SC101 && !SC102 && !SC103 && !SC104 //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 || SC102 || SC103)
240+
#if (SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101 || SC102 || SC103 || SC104)
241241
case SitecoreInfoType.OriginalLanguage:
242242
_getValue = (item, getOptions) => item.OriginalLanguage;
243243
break;

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

+3-2
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;sc102;Sc103</Configurations>
17+
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102;Sc103;Sc104</Configurations>
1818
</PropertyGroup>
1919
<PropertyGroup>
2020
<IsPackable>true</IsPackable>
@@ -23,6 +23,7 @@
2323
<NuspecFile>$(SolutionDir)/NugetDefinitions/Glass.Mapper.Sc.symbols.nuspec</NuspecFile>
2424
<NuspecProperties>$(NuspecProperties);version=$(Version)</NuspecProperties>
2525
<NuspecProperties>$(NuspecProperties);scVersion=$(PackageScVersion)</NuspecProperties>
26+
<TargetFramework>net48</TargetFramework>
2627
</PropertyGroup>
2728
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2829
<DebugSymbols>true</DebugSymbols>
@@ -34,7 +35,7 @@
3435
<WarningLevel>4</WarningLevel>
3536
<Prefer32Bit>false</Prefer32Bit>
3637
</PropertyGroup>
37-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc103|AnyCPU'">
38+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc104|AnyCPU'">
3839
<DebugSymbols>true</DebugSymbols>
3940
<DebugType>full</DebugType>
4041
<Optimize>false</Optimize>

‎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 || SC102 || SC103
506+
#if SC90 || SC91|| SC92 || SC93 || SC100 || SC101 || SC102 || SC103 || SC104
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 || SC102 || SC103
4+
#if SC93 || SC100 || SC101 || SC102 || SC103 || SC104
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 || SC102 || SC103
41+
#if SC93 || SC100 || SC101 || SC102 || SC103 || SC104
4242
public EditFrameBuilder(BaseClient client) : base(client)
4343
{
4444

0 commit comments

Comments
 (0)