Skip to content

Commit aabb6cb

Browse files
jevgenijspjevgenijsp
committed
Merge remote-tracking branch 'origin/master' into feature/suggestions-cleanup-job
# Conflicts: # src/Geta.NotFoundHandler/Infrastructure/Configuration/NotFoundHandlerOptions.cs
2 parents b346274 + 83b7f8e commit aabb6cb

File tree

800 files changed

+7796
-8090
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

800 files changed

+7796
-8090
lines changed

‎sandbox/Foundation/Nuget.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<add key="Optimizely feed" value="https://nuget.optimizely.com/feed/packages.svc/" />
5+
<add key="Optimizely" value="https://nuget.optimizely.com/feed/packages.svc" />
66
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
77
</packageSources>
88
</configuration>

‎sandbox/Foundation/README.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Foundation offers a starting point that is intuitive, well-structured and modula
1313

1414
You will need these to run locally on your machine.
1515

16-
[Net 5](https://dotnet.microsoft.com/download/dotnet/5.0) sdk is required to use with visual studio. Runtime maybe sufficent to just run the application.
16+
[Net 6](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) sdk is required to use with visual studio. Runtime maybe sufficent to just run the application.
1717

1818
[Node JS](https://nodejs.org/en/download/)
1919

@@ -41,7 +41,6 @@ Windows
4141
open command prompt as administrator
4242
git clone https://github.com/episerver/Foundation.git
4343
cd foundation
44-
git checkout main
4544
setup.cmd
4645
dotnet run --project .\src\Foundation\Foundation.csproj
4746
```
@@ -52,7 +51,6 @@ dotnet run --project .\src\Foundation\Foundation.csproj
5251
Open a Terminal window
5352
git clone https://github.com/episerver/Foundation.git
5453
cd Foundation
55-
git checkout main
5654
chmod u+x setup.sh
5755
./setup.sh
5856
dotnet run --project ./src/Foundation/Foundation.csproj
@@ -64,7 +62,6 @@ dotnet run --project ./src/Foundation/Foundation.csproj
6462
Open a bash terminal window
6563
git clone https://github.com/episerver/Foundation.git
6664
cd Foundation
67-
git checkout main
6865
chmod u+x setup.sh
6966
./setup.sh
7067
dotnet run --project ./src/Foundation/Foundation.csproj
@@ -76,4 +73,4 @@ After completing the setup steps and running the solution, access the site at <a
7673

7774
To change the default port, modify the file <a href="https://github.com/episerver/Foundation/blob/main/src/Foundation/Properties/launchSettings.json">/src/Foundation/Properties/launchSettings.json</a>.
7875

79-
---
76+
---

‎sandbox/Foundation/setup.cmd‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ echo # ( ) ( ) ) #
5959
echo # ) ( ) ( ( #
6060
echo # ( ) ( ) ) #
6161
echo # _____________ #
62-
echo # ^|_____________^| ___ #
63-
echo # ^| ^|/ _ \ #
64-
echo # ^| ^| ^| ^| #
65-
echo # ^| EPI ^|_^| ^| #
66-
echo # ___^| ^|\___/ #
62+
echo # ^|_____________^| ___ #
63+
echo # ^| ^|/ _ \ #
64+
echo # ^| ^| ^| ^| #
65+
echo # ^| Optimizely ^|_^| ^| #
66+
echo # ___^| ^|\___/ #
6767
echo # / \___________/ \ #
6868
echo # \_____________________/ #
6969
echo # #
@@ -149,4 +149,4 @@ echo echo ######################################################################
149149
echo pause >> resetup.cmd
150150
echo setup %APPNAME% %SQLSERVER% "%ADDITIONAL_SQLCMD%" >> resetup.cmd
151151

152-
pause
152+
pause

‎sandbox/Foundation/src/Foundation/Features/Api/AuthorizedApiController.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using Microsoft.AspNetCore.Authorization;
2-
using Microsoft.AspNetCore.Mvc;
3-
4-
namespace Foundation.Features.Api
1+
namespace Foundation.Features.Api
52
{
63
[Authorize]
74
public class AuthorizedApiController : Controller

‎sandbox/Foundation/src/Foundation/Features/Api/CatalogExportController.cs‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
1-
using EPiServer;
2-
using EPiServer.Framework.Blobs;
1+
using EPiServer.Framework.Blobs;
32
using EPiServer.Logging;
43
using Mediachase.Commerce.Catalog.ImportExport;
5-
using Microsoft.AspNetCore.Http;
6-
using Microsoft.AspNetCore.Mvc;
7-
using System;
8-
using System.Collections.Generic;
9-
using System.Linq;
10-
using System.Net.Http;
11-
using System.Threading.Tasks;
12-
using Mediachase.Commerce.Catalog;
13-
using EPiServer.Commerce.Catalog.ContentTypes;
144
using System.IO;
155
using System.IO.Compression;
16-
using System.Net.Http.Headers;
17-
using Microsoft.Net.Http.Headers;
18-
using EPiServer.Authorization;
19-
using Microsoft.AspNetCore.Authorization;
206

217
namespace Foundation.Features.Api
228
{

‎sandbox/Foundation/src/Foundation/Features/Api/ExternalLoginConfirmationViewModel.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using Foundation.Infrastructure.Cms.Attributes;
2-
31
namespace Foundation.Features.Api
42
{
53
public class ExternalLoginConfirmationViewModel

‎sandbox/Foundation/src/Foundation/Features/Api/PublicApiController.cs‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
1-
using EPiServer;
2-
using EPiServer.Core;
3-
using EPiServer.Framework.Localization;
4-
using EPiServer.Web.Routing;
5-
using Foundation.Features.Login;
1+
using Foundation.Features.Login;
62
using Foundation.Features.MyAccount.AddressBook;
73
using Foundation.Infrastructure.Cms;
8-
using Foundation.Infrastructure.Cms.Extensions;
94
using Foundation.Infrastructure.Cms.Users;
105
using Foundation.Infrastructure.Commerce.Customer.Services;
11-
using Foundation.Infrastructure.Helpers;
126
using Foundation.Infrastructure.Personalization;
13-
using Microsoft.AspNetCore.Http;
14-
using Microsoft.AspNetCore.Mvc;
15-
using System;
16-
using System.Collections.Generic;
17-
using System.Linq;
18-
using System.Threading.Tasks;
197
using System.Web;
208

219
namespace Foundation.Features.Api

‎sandbox/Foundation/src/Foundation/Features/Blocks/AssetsDownloadLinksBlock/AssetsDownloadLinksBlock.cs‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
using EPiServer.Commerce;
2-
using EPiServer.Commerce.Catalog.ContentTypes;
3-
using EPiServer.Core;
4-
using EPiServer.DataAbstraction;
5-
using EPiServer.DataAnnotations;
6-
using Foundation.Features.Shared;
7-
using Foundation.Infrastructure;
8-
using System.ComponentModel.DataAnnotations;
9-
10-
namespace Foundation.Features.Blocks.AssetsDownloadLinksBlock
1+
namespace Foundation.Features.Blocks.AssetsDownloadLinksBlock
112
{
123
[ContentType(DisplayName = "Assets Download Links Block",
134
GUID = "F8C78C8A-9EB8-4171-8A0B-8CA4B190DE3E",
@@ -23,7 +14,7 @@ public class AssetsDownloadLinksBlock : FoundationBlockData
2314
Order = 10)]
2415
[Required]
2516
[AllowedTypes(new[] { typeof(ContentFolder), typeof(CatalogContentBase) })]
26-
[UIHint(UIHint.AllContent)]
17+
[UIHint(EPiServer.Commerce.UIHint.AllContent)]
2718
public virtual ContentReference RootContent { get; set; }
2819

2920
[Display(

‎sandbox/Foundation/src/Foundation/Features/Blocks/AssetsDownloadLinksBlock/AssetsDownloadLinksBlockComponent.cs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
1-
using EPiServer;
2-
using EPiServer.Commerce.Catalog.ContentTypes;
3-
using EPiServer.Core;
4-
using EPiServer.Web.Mvc;
5-
using EPiServer.Web.Routing;
6-
using Foundation.Infrastructure.Commerce.Extensions;
7-
using Microsoft.AspNetCore.Mvc;
8-
using System.Collections.Generic;
9-
using System.Linq;
10-
using System.Threading.Tasks;
11-
12-
namespace Foundation.Features.Blocks.AssetsDownloadLinksBlock.Component
1+
namespace Foundation.Features.Blocks.AssetsDownloadLinksBlock.Component
132
{
143
public class AssetsDownloadLinksBlockComponent : AsyncBlockComponent<AssetsDownloadLinksBlock>
154
{

‎sandbox/Foundation/src/Foundation/Features/Blocks/AssetsDownloadLinksBlock/AssetsDownloadLinksBlockController.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using EPiServer;
2-
using EPiServer.Core;
3-
using EPiServer.Framework.Blobs;
4-
using Microsoft.AspNetCore.Mvc;
1+
using EPiServer.Framework.Blobs;
52
using System.IO;
63

74
namespace Foundation.Features.Blocks.AssetsDownloadLinksBlock

0 commit comments

Comments
 (0)