Skip to content

Commit

Permalink
Merge pull request #59 from RWS/feature/upgrade-dotnet4.8
Browse files Browse the repository at this point in the history
Merge feature/upgrade dotnet4.8 changes to develop branch
  • Loading branch information
avmgan authored Feb 1, 2024
2 parents bfb0ea4 + d209238 commit 03f002f
Show file tree
Hide file tree
Showing 156 changed files with 177,730 additions and 84 deletions.
6 changes: 3 additions & 3 deletions CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
[assembly: AssemblyConfiguration("Release")]
#endif

[assembly: AssemblyCompany("SDL Group")]
[assembly: AssemblyProduct("SDL Digital Experience Accelerator")]
[assembly: AssemblyCompany("RWS Group")]
[assembly: AssemblyProduct("RWS Digital Experience Accelerator")]

[assembly: ComVisible(false)]

// NOTE: Version Info and Copyright statement is automatically appended by the build process (ciBuild.proj)
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("0.0.0.0")]
[assembly: AssemblyCopyright("Copyright © 2014-2019 SDL Group")]
[assembly: AssemblyCopyright("Copyright © 2014-2024 SDL Group")]
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
RWSDigital Experience Accelerator CM-side framework
RWS Digital Experience Accelerator CM-side framework
===
Build status
------------
- Develop: ![Build Status](https://github.com/sdl/dxa-content-management/workflows/Build/badge.svg?branch=develop)
- 1.8: ![Build Status](https://github.com/sdl/dxa-content-management/workflows/Build/badge.svg?branch=release/1.8)
- Develop: ![Build Status](https://github.com/rws/dxa-content-management/workflows/Build/badge.svg?branch=develop)
- 1.8: ![Build Status](https://github.com/rws/dxa-content-management/workflows/Build/badge.svg?branch=release/1.8)

Prerequisites
-------------
For building .NET repositories you must have the following installed:
- Visual Studio 2019
- .NET Framework 4.6.2
- .NET Framework 4.8

About
-----
The SDL Digital Experience Accelerator (DXA) is a reference implementation of SDL Tridion Sites 9 and SDL Web 8 intended to help you create, design and publish an SDL Tridion/Web-based website quickly.
The RWS Digital Experience Accelerator (DXA) is a reference implementation of RWS Tridion Sites 9 and SDL Web 8 intended to help you create, design and publish an RWS Tridion/Web-based website quickly.

DXA is available for both .NET and Java web applications. Its modular architecture consists of a framework and example web application, which includes all core SDL Tridion/Web functionality as well as separate Modules for additional, optional functionality.
DXA is available for both .NET and Java web applications. Its modular architecture consists of a framework and example web application, which includes all core rws Tridion/Web functionality as well as separate Modules for additional, optional functionality.

This repository contains the source code of the DXA Core Template Building Blocks used on the Content Manager side.
The full DXA distribution (including CM-side items and installation support) is downloadable from the [SDL AppStore](https://appstore.sdl.com/list/?search=dxa)
or the GitHub Releases of the [dxa-web-application-dotnet](https://github.com/sdl/dxa-web-application-dotnet/releases) or [dxa-web-application-java](https://github.com/sdl/dxa-web-application-java/releases) repositories.
or the GitHub Releases of the [dxa-web-application-dotnet](https://github.com/rws/dxa-web-application-dotnet/releases) or [dxa-web-application-java](https://github.com/rws/dxa-web-application-java/releases) repositories.

To facilitate upgrades, it is highly recommended to use an official, compiled version of the DXA Core TBBs (part of the DXA distribution) instead of a custom build.
If you really have to modify the DXA Core TBBs, we kindly request you to submit your changes as a Contribution; see below.
Expand All @@ -36,7 +36,7 @@ At RWS we take your investment in Digital Experience very seriously, if you enco

Documentation
-------------
Documentation can be found online in the SDL documentation portal: https://docs.sdl.com/sdldxa
Documentation can be found online in the RWS documentation portal: https://docs.rws.com/sdldxa

Building
---------
Expand Down Expand Up @@ -81,7 +81,7 @@ To publish to NuGet.org you must have the correct API key registered.

Repositories
------------
You can find all the DXA related repositories [here](https://github.com/sdl/?q=dxa&type=source&language=)
You can find all the DXA related repositories [here](https://github.com/rws/?q=dxa&type=source&language=)

Branches and Contributions
--------------------------
Expand All @@ -104,7 +104,7 @@ Of course, it's also possible (and appreciated) to report an Issue without assoc

License
-------
Copyright (c) 2014-2021 SDL Group.
Copyright (c) 2014-2024 RWS Group.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
12 changes: 6 additions & 6 deletions Sdl.Web.DXAResolver/Sdl.Web.DXAResolver.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Sdl.Web.DXAResolver</RootNamespace>
<AssemblyName>Sdl.Web.DXAResolver</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down Expand Up @@ -48,23 +48,23 @@
<Reference Include="System.Xml" />
<Reference Include="Tridion.Common">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.Common.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.Common.dll</HintPath>
</Reference>
<Reference Include="Tridion.ContentManager">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ContentManager.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ContentManager.dll</HintPath>
</Reference>
<Reference Include="Tridion.ContentManager.Common">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ContentManager.Common.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ContentManager.Common.dll</HintPath>
</Reference>
<Reference Include="Tridion.ContentManager.Publishing">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ContentManager.Publishing.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ContentManager.Publishing.dll</HintPath>
</Reference>
<Reference Include="Tridion.ContentManager.Templating">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ContentManager.Templating.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ContentManager.Templating.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Sdl.Web.DataModel/Sdl.Web.DataModel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Sdl.Web.DataModel</RootNamespace>
<AssemblyName>Sdl.Web.DataModel</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand All @@ -36,7 +36,7 @@
<ItemGroup>
<Reference Include="Newtonsoft.Json">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion Sdl.Web.DataModel/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Sdl.Web.Tridion.Templates.Legacy</RootNamespace>
<AssemblyName>Sdl.Web.Tridion.Templates.Legacy</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down Expand Up @@ -47,7 +47,7 @@
<HintPath>..\packages\DD4T.Templates.Base.2.0.8\lib\net45\DD4T.Templates.Base.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand All @@ -62,31 +62,31 @@
<Reference Include="System.Xml" />
<Reference Include="Tridion.Common">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.Common.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.Common.dll</HintPath>
</Reference>
<Reference Include="Tridion.ContentManager">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ContentManager.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ContentManager.dll</HintPath>
</Reference>
<Reference Include="Tridion.ContentManager.Common">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ContentManager.Common.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ContentManager.Common.dll</HintPath>
</Reference>
<Reference Include="Tridion.ContentManager.Publishing">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ContentManager.Publishing.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ContentManager.Publishing.dll</HintPath>
</Reference>
<Reference Include="Tridion.ContentManager.Templating">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ContentManager.Templating.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ContentManager.Templating.dll</HintPath>
</Reference>
<Reference Include="Tridion.ExternalContentLibrary">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ExternalContentLibrary.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ExternalContentLibrary.dll</HintPath>
</Reference>
<Reference Include="Tridion.ExternalContentLibrary.V2">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ExternalContentLibrary.V2.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ExternalContentLibrary.V2.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions Sdl.Web.Tridion.Templates.Legacy/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,35 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Tridion.ContentManager.Templating" publicKeyToken="360aac4d3354074b" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Tridion.ContentManager" publicKeyToken="360aac4d3354074b" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Tridion.Common" publicKeyToken="349a39f202fa9b53" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Tridion.ContentManager.Common" publicKeyToken="ddfc895746e5ee6b" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Tridion.ContentManager.Publishing" publicKeyToken="360aac4d3354074b" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Tridion.ExternalContentLibrary" publicKeyToken="ddfc895746e5ee6b" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.OData.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.5.1.20914" newVersion="7.5.1.20914" />
<bindingRedirect oldVersion="0.0.0.0-7.5.1.20914" newVersion="7.6.3.10130" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
2 changes: 1 addition & 1 deletion Sdl.Web.Tridion.Templates.Legacy/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<package id="DD4T.Model" version="2.0.7" targetFramework="net452" />
<package id="DD4T.Templates.Base" version="2.0.8" targetFramework="net452" />
<package id="ILMerge" version="2.14.1208" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
</packages>
18 changes: 9 additions & 9 deletions Sdl.Web.Tridion.Templates.R2/Sdl.Web.Tridion.Templates.R2.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Sdl.Web.Tridion.Templates.R2</RootNamespace>
<AssemblyName>Sdl.Web.Tridion.Templates.R2</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down Expand Up @@ -44,35 +44,35 @@
<Reference Include="System.Xml" />
<Reference Include="Newtonsoft.Json">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Tridion.Common">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.Common.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.Common.dll</HintPath>
</Reference>
<Reference Include="Tridion.ContentManager">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ContentManager.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ContentManager.dll</HintPath>
</Reference>
<Reference Include="Tridion.ContentManager.Common">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ContentManager.Common.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ContentManager.Common.dll</HintPath>
</Reference>
<Reference Include="Tridion.ContentManager.Publishing">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ContentManager.Publishing.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ContentManager.Publishing.dll</HintPath>
</Reference>
<Reference Include="Tridion.ContentManager.Templating">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ContentManager.Templating.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ContentManager.Templating.dll</HintPath>
</Reference>
<Reference Include="Tridion.ExternalContentLibrary">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ExternalContentLibrary.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ExternalContentLibrary.dll</HintPath>
</Reference>
<Reference Include="Tridion.ExternalContentLibrary.V2">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\_references\cm-9.0\Tridion.ExternalContentLibrary.V2.dll</HintPath>
<HintPath>..\_references\cm-10.0\Tridion.ExternalContentLibrary.V2.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Sdl.Web.Tridion.Templates.R2/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.OData.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.5.1.20914" newVersion="7.5.1.20914" />
<bindingRedirect oldVersion="0.0.0.0-7.5.1.20914" newVersion="7.6.3.10130" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
2 changes: 1 addition & 1 deletion Sdl.Web.Tridion.Templates.R2/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ILMerge" version="2.14.1208" targetFramework="net452" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
</packages>
16 changes: 8 additions & 8 deletions Sdl.Web.Tridion.Templates.Tests/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,35 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Tridion.ContentManager" publicKeyToken="360aac4d3354074b" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Tridion.Common" publicKeyToken="349a39f202fa9b53" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Tridion.ContentManager.Common" publicKeyToken="ddfc895746e5ee6b" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Tridion.ContentManager.Templating" publicKeyToken="360aac4d3354074b" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.OData.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.5.1.20914" newVersion="7.5.1.20914" />
<bindingRedirect oldVersion="0.0.0.0-7.5.1.20914" newVersion="7.6.3.10130" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Tridion.ContentManager.Publishing" publicKeyToken="360aac4d3354074b" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Tridion.ExternalContentLibrary" publicKeyToken="ddfc895746e5ee6b" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
Loading

0 comments on commit 03f002f

Please sign in to comment.