Skip to content

Upgraded all sitecore librray related to Sitecore 10.4 #465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Upgraded all sitecore librray related to Sitecore 10.4 #465

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
00835af
Upgraded all sitecore librray related to Sitecore 10.4
girishsharma008 May 30, 2024
04e94b0
updated project references
girishsharma008 May 30, 2024
2ae0789
Revert "updated project references"
girishsharma008 May 30, 2024
87fbacf
fixed compilation issue
girishsharma008 May 30, 2024
8615224
removed unwanted folders
girishsharma008 May 30, 2024
fe0a9ce
added workflow
girishsharma008 Jun 29, 2024
a076753
updated missed version
girishsharma008 Jun 29, 2024
ddfa89f
updated workflow yml files
girishsharma008 Jun 29, 2024
1063de2
added specific check for 104
girishsharma008 Jul 1, 2024
b91dd00
Updated check for ScVersionTest
girishsharma008 Jul 1, 2024
b5640ea
reverted changes
girishsharma008 Jul 1, 2024
a80466d
updated rule
girishsharma008 Jul 1, 2024
b0345dd
added null check
girishsharma008 Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/Dev-CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@master

- name: Dotnet build Sitecore v10.4.0
run: dotnet build Glass.Mapper.sln --packages .\NuGetv104 --configfile .nuget\NuGet.Config -p:ScVersion=10.4.0

- name: Dotnet build Sitecore v10.3.0
run: dotnet build Glass.Mapper.sln --packages .\NuGetv103 --configfile .nuget\NuGet.Config -p:ScVersion=10.3.0
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/Release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:

env:
NUGET_PACKAGE_PATH: '.\NuGetPackages' # set this to your nuget package path

SC_V104_VERSION: '10.4.0' # set this to your Sitecore dll version for v10.4.0
NUGET_SC_V104_VERSION: '104' #set this to the Number for the Sitecore version on the NuGet package

SC_V103_VERSION: '10.3.0' # set this to your Sitecore dll version for v10.3.0
NUGET_SC_V103_VERSION: '103' #set this to the Number for the Sitecore version on the NuGet package
Expand Down Expand Up @@ -51,6 +54,13 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@master

- name: Dotnet pack Sitecore v10.4.0
run: |
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 }}'
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 }}'
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 }}'
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 }}'

- name: Dotnet pack Sitecore v10.3.0
run: |
Expand Down
22 changes: 21 additions & 1 deletion CommonSettings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,27 @@
<Project>
<Choose>
<When Condition="'$(Configuration)|$(Platform)' == 'sc103|AnyCPU' Or '$(ScVersion)' == '10.3.0' Or '$(ScVersion)' == '' or
<When Condition="'$(Configuration)|$(Platform)' == 'sc104|AnyCPU' Or '$(ScVersion)' == '10.4.0' Or '$(ScVersion)' == '' or
'$(ScVersion)' == '*undefined*'">
<PropertyGroup>
<IncludeContentExtractionDll>true</IncludeContentExtractionDll>
<ScFakeDBVersion>3.0.0-alpha1</ScFakeDBVersion>
<NSubstituteVersion>4.2.1</NSubstituteVersion>
<CastleVersion>4.4.0</CastleVersion>
<TargetFramework Condition="'$(TargetFramework)' == '' ">net48</TargetFramework>
<AspNetMvcVersion>5.2.4</AspNetMvcVersion>
<AspNetRazorWebVersion>3.2.4</AspNetRazorWebVersion>
<DebugSymbols>true</DebugSymbols>
<DefineConstants>SC104</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<OutputPath>bin\104\</OutputPath>
<ScVersion>10.4.0</ScVersion>
</PropertyGroup>
</When>

<When Condition="'$(Configuration)|$(Platform)' == 'sc103|AnyCPU' Or '$(ScVersion)' == '10.3.0'">
<PropertyGroup>
<IncludeContentExtractionDll>true</IncludeContentExtractionDll>
<ScFakeDBVersion>3.0.0-alpha1</ScFakeDBVersion>
Expand Down
23 changes: 23 additions & 0 deletions Glass.Mapper.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ Global
Sc101|Any CPU = Sc101|Any CPU
Sc102|Any CPU = Sc102|Any CPU
Sc103|Any CPU = Sc103|Any CPU
Sc104|Any CPU = Sc104|Any CPU
Sc70|Any CPU = Sc70|Any CPU
Sc71|Any CPU = Sc71|Any CPU
Sc72|Any CPU = Sc72|Any CPU
Expand Down Expand Up @@ -115,6 +116,8 @@ Global
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc102|Any CPU.Build.0 = Debug|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc70|Any CPU.Build.0 = Release|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Sc71|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -151,6 +154,8 @@ Global
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc102|Any CPU.Build.0 = Debug|Any CPU
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc70|Any CPU.Build.0 = Release|Any CPU
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Sc71|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -187,6 +192,8 @@ Global
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc102|Any CPU.Build.0 = Debug|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc70|Any CPU.Build.0 = Release|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Sc71|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -223,6 +230,8 @@ Global
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc102|Any CPU.Build.0 = Debug|Any CPU
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc70|Any CPU.Build.0 = Debug|Any CPU
{CE1CC8D6-60CC-4DCA-9B6C-0256778D107A}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -259,6 +268,8 @@ Global
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc102|Any CPU.Build.0 = Debug|Any CPU
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc70|Any CPU.Build.0 = Debug|Any CPU
{F872CEFA-8F7B-4703-ADAB-49B8081B8EBE}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -295,6 +306,8 @@ Global
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc102|Any CPU.Build.0 = Debug|Any CPU
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc70|Any CPU.Build.0 = Debug|Any CPU
{93828C18-FFB1-4597-86C9-CA3B462AD4E0}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -331,6 +344,8 @@ Global
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc102|Any CPU.Build.0 = Debug|Any CPU
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc70|Any CPU.Build.0 = Debug|Any CPU
{3EEF523D-F61C-4DD3-BBE1-C22BE90AFF3F}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -367,6 +382,8 @@ Global
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc102|Any CPU.Build.0 = Debug|Any CPU
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc70|Any CPU.Build.0 = Debug|Any CPU
{D03EFAFB-E535-45D3-96C9-52D1F5B35B87}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -403,6 +420,8 @@ Global
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc102|Any CPU.Build.0 = Debug|Any CPU
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc70|Any CPU.Build.0 = Debug|Any CPU
{F1095B93-944C-44FD-AB13-B952CD7E8E68}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -439,6 +458,8 @@ Global
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc102|Any CPU.Build.0 = Debug|Any CPU
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc70|Any CPU.ActiveCfg = Debug|Any CPU
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc70|Any CPU.Build.0 = Debug|Any CPU
{1D32E144-84DF-45D4-8047-E227A736C0C4}.Sc71|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -475,6 +496,8 @@ Global
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc102|Any CPU.Build.0 = Debug|Any CPU
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc103|Any CPU.ActiveCfg = Sc103|Any CPU
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc103|Any CPU.Build.0 = Sc103|Any CPU
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc104|Any CPU.ActiveCfg = Sc104|Any CPU
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc104|Any CPU.Build.0 = Sc104|Any CPU
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc70|Any CPU.ActiveCfg = Release|Any CPU
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc70|Any CPU.Build.0 = Release|Any CPU
{E5EAEA70-541C-4F98-9D04-EDD9CF48F1B5}.Sc71|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
5 changes: 3 additions & 2 deletions Source/Glass.Mapper.Sc.ContentSearch/Glass.Mapper.Sc.ContentSearch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102;Sc103</Configurations>
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102;Sc103;Sc104</Configurations>
<TargetFramework>net48</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -21,7 +22,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc103|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc104|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand Down
5 changes: 3 additions & 2 deletions Source/Glass.Mapper.Sc.Mvc/Glass.Mapper.Sc.Mvc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<TargetFrameworkProfile />
<DocumentationFile>bin\Glass.Mapper.Sc.Mvc.XML</DocumentationFile>
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102;Sc103</Configurations>
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102;Sc103;Sc104</Configurations>
</PropertyGroup>
<PropertyGroup>
<IsPackable>true</IsPackable>
Expand All @@ -21,6 +21,7 @@
<NuspecProperties>$(NuspecProperties);version=$(Version)</NuspecProperties>
<NuspecProperties>$(NuspecProperties);scVersion=$(PackageScVersion)</NuspecProperties>
<NuspecProperties>$(NuspecProperties);netVersion=$(TargetFramework)</NuspecProperties>
<TargetFramework>net48</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -33,7 +34,7 @@
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc103|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc104|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
Expand Down
5 changes: 3 additions & 2 deletions Source/Glass.Mapper.Sc.WebForms/Glass.Mapper.Sc.WebForms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<DocumentationFile>bin\Glass.Mapper.Sc.WebForms.xml</DocumentationFile>
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102;Sc103</Configurations>
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102;Sc103;Sc104</Configurations>
</PropertyGroup>
<PropertyGroup>
<IsPackable>true</IsPackable>
Expand All @@ -20,6 +20,7 @@
<NuspecProperties>$(NuspecProperties);version=$(Version)</NuspecProperties>
<NuspecProperties>$(NuspecProperties);scVersion=$(PackageScVersion)</NuspecProperties>
<NuspecProperties>$(NuspecProperties);netVersion=$(TargetFramework)</NuspecProperties>
<TargetFramework>net48</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -30,7 +31,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc103|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc104|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand Down
2 changes: 1 addition & 1 deletion Source/Glass.Mapper.Sc/Configuration/SitecoreInfoType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public enum SitecoreInfoType
/// </summary>
BaseTemplateIds=14,

#if SC81 || SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101 || SC102 || SC103
#if SC81 || SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101 || SC102 || SC103 || SC104
/// <summary>
/// Gets the original language.
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion Source/Glass.Mapper.Sc/DataMappers/SitecoreFieldScWrapperMappers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ protected override ValueLookupField Create(Field field)
}
}

#if !SC93 && !SC100 && !SC101 && !SC102 && !SC103 //removed in > SC93
#if !SC93 && !SC100 && !SC101 && !SC102 && !SC103 && !SC104 //removed in > SC93

public class SitecoreFieldScVersionLinkFieldMapper : SitecoreFieldScFieldBaseMapper<Sitecore.Data.Fields.VersionLinkField>
{
Expand Down
2 changes: 1 addition & 1 deletion Source/Glass.Mapper.Sc/DataMappers/SitecoreInfoMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ public override void Setup(DataMapperResolverArgs args)
case SitecoreInfoType.ItemUri:
_getValue = (item, getOptions) => new ItemUri(item.ID, item.Language, item.Version, item.Database);
break;
#if (SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101 || SC102 || SC103)
#if (SC82 || SC90 || SC91 || SC92 || SC93 || SC100 || SC101 || SC102 || SC103 || SC104)
case SitecoreInfoType.OriginalLanguage:
_getValue = (item, getOptions) => item.OriginalLanguage;
break;
Expand Down
5 changes: 3 additions & 2 deletions Source/Glass.Mapper.Sc/Glass.Mapper.Sc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
<DocumentationFile>bin\Glass.Mapper.Sc.XML</DocumentationFile>
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102;Sc103</Configurations>
<Configurations>Debug;Release;sc100;sc93;sc92;sc91;sc90;sc82;sc81;sc80;sc75;sc72;sc71;sc70;sc101;sc102;Sc103;Sc104</Configurations>
</PropertyGroup>
<PropertyGroup>
<IsPackable>true</IsPackable>
Expand All @@ -23,6 +23,7 @@
<NuspecFile>$(SolutionDir)/NugetDefinitions/Glass.Mapper.Sc.symbols.nuspec</NuspecFile>
<NuspecProperties>$(NuspecProperties);version=$(Version)</NuspecProperties>
<NuspecProperties>$(NuspecProperties);scVersion=$(PackageScVersion)</NuspecProperties>
<TargetFramework>net48</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -34,7 +35,7 @@
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc103|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Sc104|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand Down
2 changes: 1 addition & 1 deletion Source/Glass.Mapper.Sc/GlassHtml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ public static RenderingResult BeginRenderLink(Link link, SafeDictionary<string>
AttributeCheck(attributes, "title", title);
AttributeCheck(attributes, "style", link.Style);

#if SC90 || SC91|| SC92 || SC93 || SC100 || SC101 || SC102 || SC103
#if SC90 || SC91|| SC92 || SC93 || SC100 || SC101 || SC102 || SC103 || SC104

if (attributes["target"] == "_blank" && Settings.ProtectExternalLinksWithBlankTarget)
{
Expand Down
4 changes: 2 additions & 2 deletions Source/Glass.Mapper.Sc/Pipelines/GetChromeData/EditFrameBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Text.RegularExpressions;
using Sitecore;
#if SC93 || SC100 || SC101 || SC102 || SC103
#if SC93 || SC100 || SC101 || SC102 || SC103 || SC104
using Sitecore.Abstractions;
#endif
using Sitecore.Configuration;
Expand Down Expand Up @@ -38,7 +38,7 @@ public class EditFrameBuilder : GetChromeDataProcessor

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

#if SC93 || SC100 || SC101 || SC102 || SC103
#if SC93 || SC100 || SC101 || SC102 || SC103 || SC104
public EditFrameBuilder(BaseClient client) : base(client)
{

Expand Down
Loading