Merge pull request #109 from RWS/feature/upgrade-dotnet4.8

Feature/upgrade dotnet4.8
RWS · Feb 7, 2024 · c2cf4f5 · c2cf4f5
2 parents 7098867 + 0c27841
commit c2cf4f5
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 48 deletions.
diff --git a/_NuGet/DD4T.Providers.DxaModelService.nuspec b/_NuGet/DD4T.Providers.DxaModelService.nuspec
@@ -5,28 +5,29 @@
         <!-- Version is set by ciBuild.proj -->
         <version>0.0.0</version>
         <!-- NOTE: Visual Studio's NuGet UI only shows 'id' and 'description' -->
-        <title>DD4T Provider for SDL Digital eXperience Accelerator Model Service</title>
-        <authors>SDL Group</authors>
-        <projectUrl>https://github.com/sdl/dxa-web-application-dotnet</projectUrl>
+        <title>DD4T Provider for RWS Digital eXperience Accelerator Model Service</title>
+        <authors>RWS Group</authors>
+        <projectUrl>https://github.com/rws/dxa-web-application-dotnet</projectUrl>
         <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
-        <iconUrl>http://dr0muzwhcp26z.cloudfront.net/static/corporate/SDL-logo-2014.png</iconUrl>
+        <icon>images\rws-logo-128.png</icon>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>DD4T Provider for SDL Digital eXperience Accelerator Model Service</description>
-        <copyright>Copyright 2015-2019 SDL Group</copyright>
-        <tags>SDL DD4T DXA Model Service Provider</tags>
+        <description>DD4T Provider for RWS Digital eXperience Accelerator Model Service</description>
+        <copyright>Copyright 2015-2024 RWS Group</copyright>
+        <tags>RWS DD4T DXA Model Service Provider</tags>
         <references>
             <reference file="DD4T.Providers.DxaModelService.dll" />
             <reference file="Sdl.Web.ModelService.dll" />
         </references>
         <dependencies>
-            <dependency id="Sdl.Web.Delivery" version="11.0.11022" />
-            <dependency id="Newtonsoft.Json" version="11.0.2" />
+            <dependency id="Sdl.Web.Delivery" version="12.0.1197" />
+            <dependency id="Newtonsoft.Json" version="13.0.3" />
             <dependency id="DD4T.Core" version="2.2.2" />
             <dependency id="DD4T.Model" version="2.2.2" />
         </dependencies>
     </metadata>
     <files>
-        <file src="..\DD4T\build\bin\DD4T.Providers.DxaModelService.dll" target="lib\net462" />
-        <file src="..\Sdl.Web.ModelService\bin\Release\Sdl.Web.ModelService.dll" target="lib\net462" />
+        <file src="..\DD4T\build\bin\DD4T.Providers.DxaModelService.dll" target="lib\net48" />
+        <file src="..\Sdl.Web.ModelService\bin\Release\Sdl.Web.ModelService.dll" target="lib\net48" />
+		<file src="..\rws-logo-128.png" target="images\" />
     </files>
 </package>
diff --git a/_NuGet/Sdl.Dxa.Framework/Sdl.Dxa.Framework.Web8.nuspec b/_NuGet/Sdl.Dxa.Framework/Sdl.Dxa.Framework.Web8.nuspec
@@ -5,37 +5,38 @@
         <!-- Version is set by ciBuild.proj -->
         <version>0.0.0</version>
         <!-- NOTE: Visual Studio's NuGet UI only shows 'id' and 'description' -->
-        <title>SDL Digital eXperience Accelerator Framework for SDL Web 8 and Tridion DX</title>
-        <authors>SDL Group</authors>
-        <projectUrl>https://github.com/sdl/dxa-web-application-dotnet</projectUrl>
+        <title>RWS Digital eXperience Accelerator Framework for RWS Tridion Sites</title>
+        <authors>RWS Group</authors>
+        <projectUrl>https://github.com/rws/dxa-web-application-dotnet</projectUrl>
         <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
-        <iconUrl>http://dr0muzwhcp26z.cloudfront.net/static/corporate/SDL-logo-2014.png</iconUrl>
+        <icon>images\rws-logo-128.png</icon>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>SDL Digital eXperience Accelerator Framework for SDL Web 8 and Tridion DX</description>
-        <copyright>Copyright 2015-2019 SDL Group</copyright>
-        <tags>SDL DXA Web8 Sites9 Tridion DX</tags>
+        <description>RWS Digital eXperience Accelerator Framework for RWS Tridion Sites.</description>
+        <copyright>Copyright 2015-2024 RWS Group</copyright>
+        <tags>RWS DXA Web8 Sites9 Sites10</tags>
         <references>
             <!-- These assemblies form the DXA public API -->
             <reference file="Sdl.Web.Mvc.dll" />
             <reference file="Sdl.Web.Common.dll" />
         </references>
         <dependencies>
             <!-- NOTE: We don't use package dependencies for everything, because we don't want direct references to transitive dependencies and the explicit reference above don't control those.-->
-            <dependency id="NLog" version="4.7.4" />
-            <dependency id="Newtonsoft.Json" version="11.0.2" />
-            <dependency id="Sdl.Web.Delivery" version="11.0.11022" />
-            <dependency id="Sdl.Web.Context.Image" version="11.0.0" />
-            <dependency id="Sdl.Web.Context.Client" version="11.0.0" />
-            <dependency id="Sdl.Tridion.Api.Client" version="2.2.2" />
+            <dependency id="NLog" version="5.2.7" />
+            <dependency id="Newtonsoft.Json" version="13.0.3" />
+            <dependency id="Sdl.Web.Delivery" version="12.0.1197" />
+            <dependency id="Sdl.Web.Context.Image" version="12.0.1197" />
+            <dependency id="Sdl.Web.Context.Client" version="12.0.1197" />
+            <dependency id="Sdl.Tridion.Api.Client" version="2.2.3" />
         </dependencies>
     </metadata>
     <files>
         <!-- NOTE: We're excluding assemblies which come from dependent packages -->
-        <file src="..\..\Sdl.Web.Tridion\bin\Release\*.dll" exclude="**\Sdl.Web.Delivery*.dll;**\Sdl.Web.Context*.dll;**\Tridion.ContentDelivery*.dll;**\Microsoft.*.dll;**\System.Spatial.dll;**\System.Web*.dll;**\NLog.dll;**\Sdl.Tridion.Api.Client.dll;**\Newtonsoft.Json.dll" target="lib\net462" />
+        <file src="..\..\Sdl.Web.Tridion\bin\Release\*.dll" exclude="**\Sdl.Web.Delivery*.dll;**\Sdl.Web.Context*.dll;**\Tridion.ContentDelivery*.dll;**\Microsoft.*.dll;**\System.Spatial.dll;**\System.Web*.dll;**\NLog.dll;**\Sdl.Tridion.Api.Client.dll;**\Newtonsoft.Json.dll" target="lib\net48" />
 
-        <file src="Sdl.Dxa.Framework.Web8.targets" target="build\net462" />
-        <file src="..\..\Sdl.Web.Tridion\bin\Release\Sdl.Web.Common.xml" target="lib\net462" />
-        <file src="..\..\Sdl.Web.Tridion\bin\Release\Sdl.Web.Mvc.xml" target="lib\net462" />
-        <file src="..\..\Sdl.Web.Tridion\bin\Release\Sdl.Web.Tridion.xml" target="lib\net462" />
+        <file src="Sdl.Dxa.Framework.Web8.targets" target="build\net48" />
+        <file src="..\..\Sdl.Web.Tridion\bin\Release\Sdl.Web.Common.xml" target="lib\net48" />
+        <file src="..\..\Sdl.Web.Tridion\bin\Release\Sdl.Web.Mvc.xml" target="lib\net48" />
+        <file src="..\..\Sdl.Web.Tridion\bin\Release\Sdl.Web.Tridion.xml" target="lib\net48" />
+        <file src="..\..\rws-logo-128.png" target="images\" />
     </files>
 </package>
diff --git a/_NuGet/Sdl.Dxa.Framework/Sdl.Dxa.Framework.Web8.symbols.nuspec b/_NuGet/Sdl.Dxa.Framework/Sdl.Dxa.Framework.Web8.symbols.nuspec
@@ -5,37 +5,38 @@
         <!-- Version is set by ciBuild.proj -->
         <version>0.0.0</version>
         <!-- NOTE: Visual Studio's NuGet UI only shows 'id' and 'description' -->
-        <title>SDL Digital eXperience Accelerator Framework for SDL Web 8</title>
-        <authors>SDL Group</authors>
-        <projectUrl>https://github.com/sdl/dxa-web-application-dotnet</projectUrl>
+        <title>RWS Digital eXperience Accelerator Framework for RWS Tridion Sites</title>
+        <authors>RWS Group</authors>
+        <projectUrl>https://github.com/rws/dxa-web-application-dotnet</projectUrl>
         <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
-        <iconUrl>http://dr0muzwhcp26z.cloudfront.net/static/corporate/SDL-logo-2014.png</iconUrl>
+        <icon>images\rws-logo-128.png</icon>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>SDL Digital eXperience Accelerator Framework for SDL Web 8.</description>
-        <copyright>Copyright 2015-2016 SDL Group</copyright>
-        <tags>SDL DXA Web8</tags>
+        <description>RWS Digital eXperience Accelerator Framework for RWS Tridion Sites.</description>
+        <copyright>Copyright 2015-2024 RWS Group</copyright>
+        <tags>RWS DXA Web8 Sites9 Sites10</tags>
         <references>
             <!-- These assemblies form the DXA public API -->
             <reference file="Sdl.Web.Mvc.dll" />
             <reference file="Sdl.Web.Common.dll" />
         </references>
         <dependencies>
             <!-- NOTE: We don't use package dependencies for everything, because we don't want direct references to transitive dependencies and the explicit reference above don't control those.-->
-            <dependency id="NLog" version="4.7.4" />
-            <dependency id="Newtonsoft.Json" version="11.0.2" />
-            <dependency id="Sdl.Web.Delivery" version="11.0.11022" />
-            <dependency id="Sdl.Web.Context.Image" version="11.0.0" />
-            <dependency id="Sdl.Web.Context.Client" version="11.0.0" />
-            <dependency id="Sdl.Tridion.Api.Client" version="2.2.2" />
+            <dependency id="NLog" version="5.2.7" />
+            <dependency id="Newtonsoft.Json" version="13.0.3" />
+            <dependency id="Sdl.Web.Delivery" version="12.0.1197" />
+            <dependency id="Sdl.Web.Context.Image" version="12.0.1197" />
+            <dependency id="Sdl.Web.Context.Client" version="12.0.1197" />
+            <dependency id="Sdl.Tridion.Api.Client" version="2.2.3" />
         </dependencies>
     </metadata>
     <files>
         <!-- NOTE: We're excluding assemblies which come from dependent packages -->
-        <file src="..\..\Sdl.Web.Tridion\bin\Release\*.dll;..\..\Sdl.Web.Tridion\bin\Release\*.pdb" exclude="**\Sdl.Web.Delivery*.dll;**\Sdl.Web.Context*.dll;**\Tridion.ContentDelivery*.dll;**\Microsoft.*.dll;**\System.Spatial.dll;**\System.Web*.dll;**\NLog.dll;**\Sdl.Tridion.Api.Client.dll;**\Newtonsoft.Json.dll" target="lib\net462" />
+        <file src="..\..\Sdl.Web.Tridion\bin\Release\*.dll;..\..\Sdl.Web.Tridion\bin\Release\*.pdb" exclude="**\Sdl.Web.Delivery*.dll;**\Sdl.Web.Context*.dll;**\Tridion.ContentDelivery*.dll;**\Microsoft.*.dll;**\System.Spatial.dll;**\System.Web*.dll;**\NLog.dll;**\Sdl.Tridion.Api.Client.dll;**\Newtonsoft.Json.dll" target="lib\net48" />
 
-        <file src="Sdl.Dxa.Framework.Web8.targets" target="build\net462" />
-        <file src="..\..\Sdl.Web.Tridion\bin\Release\Sdl.Web.Common.xml" target="lib\net462" />
-        <file src="..\..\Sdl.Web.Tridion\bin\Release\Sdl.Web.Mvc.xml" target="lib\net462" />
-        <file src="..\..\Sdl.Web.Tridion\bin\Release\Sdl.Web.Tridion.xml" target="lib\net462" />
+        <file src="Sdl.Dxa.Framework.Web8.targets" target="build\net48" />
+        <file src="..\..\Sdl.Web.Tridion\bin\Release\Sdl.Web.Common.xml" target="lib\net48" />
+        <file src="..\..\Sdl.Web.Tridion\bin\Release\Sdl.Web.Mvc.xml" target="lib\net48" />
+        <file src="..\..\Sdl.Web.Tridion\bin\Release\Sdl.Web.Tridion.xml" target="lib\net48" />
+        <file src="..\..\rws-logo-128.png" target="images\" />
     </files>
 </package>
diff --git a/_NuGet/Sdl.Dxa.Framework/Sdl.Dxa.Framework.Web8.targets b/_NuGet/Sdl.Dxa.Framework/Sdl.Dxa.Framework.Web8.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Target Name="CopyDxaFrameworkLibsToOutput">
     <ItemGroup>
-      <DxaFrameworkLibs Include="..\packages\Sdl.Dxa.Framework.Web8.0.0.0\lib\net462\*.*" />
+      <DxaFrameworkLibs Include="..\packages\Sdl.Dxa.Framework.Web8.0.0.0\lib\net48\*.*" />
     </ItemGroup>
     <Copy SourceFiles="@(DxaFrameworkLibs)" DestinationFolder="$(OutputPath)" />
   </Target>

diff --git a/_tools/NuGet.exe b/_tools/NuGet.exe
diff --git a/rws-logo-128.png b/rws-logo-128.png