From b9d4cacff1de92e1f310e2d2d023a72ae2eaf972 Mon Sep 17 00:00:00 2001 From: Stoyan Dimitrov Date: Thu, 27 Oct 2022 15:55:59 +0300 Subject: [PATCH] Upgrade to 14.3 --- .nuget/NuGet.Config | 6 - .nuget/NuGet.targets | 143 - AssemblyInfoShare/SharedAssemblyInfo.cs | Bin 2384 -> 2384 bytes Feather.sln | 16 +- README.md | 2 +- .../Telerik.Sitefinity.Frontend.Data.csproj | 25 +- .../packages.config | 2 +- .../ControllerProvider.cs | 19 + Telerik.Sitefinity.Frontend/FrontendModule.cs | 7 + .../FrontendModuleInstaller.cs | 2 +- .../FrontendModuleUninstaller.cs | 33 - .../FrontendModuleUpgrader.cs | 10 +- .../GridSystem/GridWidgetRegistrator.cs | 4 +- .../Controllers/ContentBaseController.cs | 2 +- .../ControllerContainerInitializer.cs | 43 +- .../Controllers/ControllerExtensions.cs | 23 +- .../Mvc/Models/ContentModelBase.cs | 29 +- .../Mvc/Models/ServerContext.cs | 22 + .../Mvc/Views/Shared/ServerContext.cshtml | 4 + .../Resources/ServerContext.js | 16 +- .../FilesService/FilesWebServiceConstants.cs | 28 +- Telerik.Sitefinity.Frontend/Startup.cs | 7 + .../Telerik.Sitefinity.Frontend.csproj | 74 +- .../assets/dist/css/html-field.css | 1 - .../assets/dist/css/loading.css | 12 - .../assets/dist/css/sitefinity-backend.css | 10451 ++-------------- .../dist/css/sitefinity-backend.min.css | 4 +- .../sass/kendo/kendo_material_main_min.css | 33 +- .../src/sass/modules/_sf-media-selector.sass | 8 + .../fields/image-field/sf-image-field.js | 94 +- .../image-field/sf-image-field.sf-cshtml | 63 +- .../fields/media-field/sf-media-field.js | 88 +- .../selectors/common/sf-services.js | 3 +- .../selectors/media/sf-media-service.js | 31 + Telerik.Sitefinity.Frontend/packages.config | 22 +- 35 files changed, 1219 insertions(+), 10108 deletions(-) delete mode 100644 .nuget/NuGet.Config delete mode 100644 .nuget/NuGet.targets create mode 100644 Telerik.Sitefinity.Frontend/ControllerProvider.cs diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config deleted file mode 100644 index 67f8ea046..000000000 --- a/.nuget/NuGet.Config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets deleted file mode 100644 index 219e5cd96..000000000 --- a/.nuget/NuGet.targets +++ /dev/null @@ -1,143 +0,0 @@ - - - - $(MSBuildProjectDirectory)\..\ - - - false - - - false - - - true - - - true - - - - - - - - - - - - - $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) - - - - - $(SolutionDir).nuget - - - - $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config - $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config - - - - $(MSBuildProjectDirectory)\packages.config - $(PackagesProjectConfig) - - - - - $(NuGetToolsPath)\NuGet.exe - @(PackageSource) - - "$(NuGetExePath)" - mono --runtime=v4.0.30319 $(NuGetExePath) - - $(TargetDir.Trim('\\')) - - -RequireConsent - -NonInteractive - - "$(SolutionDir) " - "$(SolutionDir)" - - - $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) -NoCache - $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols - - - - RestorePackages; - $(BuildDependsOn); - - - - - $(BuildDependsOn); - BuildPackage; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AssemblyInfoShare/SharedAssemblyInfo.cs b/AssemblyInfoShare/SharedAssemblyInfo.cs index b405cf25a0521cf89fbe8009a17e1fe6265deee9..78fe202c57d4b2906c19e3231637864ac8d91d46 100644 GIT binary patch delta 46 tcmca0bU|ptH4b)T20aD~27}3WIU=Q?Yz6}$)B|EA22F-o23`g(1^@@w2vh(7 delta 46 tcmca0bU|ptH4b(o20aFI2FuBJIU=Q?Yz6}$)B|EA22F-o23`g(1^@{&2x0&L diff --git a/Feather.sln b/Feather.sln index 26ebe6413..7f6df6058 100644 --- a/Feather.sln +++ b/Feather.sln @@ -1,18 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Telerik.Sitefinity.Frontend", "Telerik.Sitefinity.Frontend\Telerik.Sitefinity.Frontend.csproj", "{17ED04C3-0AB9-4055-9908-6C70720DAF77}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F9885515-25E7-4C15-AE1B-032098DE1A90}" - ProjectSection(SolutionItems) = preProject - .nuget\NuGet.Config = .nuget\NuGet.Config - .nuget\NuGet.exe = .nuget\NuGet.exe - .nuget\NuGet.targets = .nuget\NuGet.targets - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Telerik.Sitefinity.Frontend.Data", "Telerik.Sitefinity.Frontend.Data\Telerik.Sitefinity.Frontend.Data.csproj", "{A9C3B088-8C44-4F0A-93E8-82FDB99A4205}" EndProject -Global +Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release Pro|Any CPU = Release Pro|Any CPU @@ -35,4 +30,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F2510ABD-5A02-4C97-BD7B-87CAFB8311D9} + EndGlobalSection EndGlobal diff --git a/README.md b/README.md index 2b6bda6be..3c8c4b347 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -The Feather Project +The Feather Project ======= This repository contains the core infrastructure related to [Project Feather](http://projectfeather.sitefinity.com). diff --git a/Telerik.Sitefinity.Frontend.Data/Telerik.Sitefinity.Frontend.Data.csproj b/Telerik.Sitefinity.Frontend.Data/Telerik.Sitefinity.Frontend.Data.csproj index 68278e4c3..96c562be0 100644 --- a/Telerik.Sitefinity.Frontend.Data/Telerik.Sitefinity.Frontend.Data.csproj +++ b/Telerik.Sitefinity.Frontend.Data/Telerik.Sitefinity.Frontend.Data.csproj @@ -44,6 +44,15 @@ true + + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + @@ -78,35 +87,25 @@ - - PublicKey.snk - - ..\packages\Telerik.Sitefinity.Core.14.2.7900\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.14.3.8000\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.14.2.7900\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.14.3.8000\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.14.2.7900\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.14.3.8000\lib\net48\Telerik.Sitefinity.Utilities.dll True - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - -