Skip to content
This repository was archived by the owner on Apr 7, 2024. It is now read-only.

Commit 607155f

Browse files
7h3Rabbit7h3Rabbit
committed
init work on issues #54 & #47 
1 parent 7f9cdc9 commit 607155f

8 files changed

+41
-182
lines changed

‎Channels/StaticWebChannel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using EPiServer.Web;
2-
using System.Web;
32

43
namespace StaticWebEpiserverPlugin.Channels
54
{

‎Initialization/StaticWebDisplayModesInitialization.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using System.Linq;
2-
using System.Web;
3-
using System.Web.WebPages;
42
using EPiServer.Framework;
53
using EPiServer.Framework.Initialization;
64
using EPiServer.ServiceLocation;

‎Initialization/StaticWebInitialization.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using StaticWebEpiserverPlugin.Services;
1111
using System.Collections.Generic;
1212
using System.Linq;
13-
using System.Web.Mvc;
1413

1514
namespace StaticWebEpiserverPlugin.Initialization
1615
{

‎Initialization/StaticWebServiceLocatorDependencyResolver.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System;
33
using System.Collections.Generic;
44
using System.Linq;
5-
using System.Web.Mvc;
65

76
namespace StaticWebEpiserverPlugin.Initialization
87
{

‎Routing/StaticWebRouting.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System.Web.Routing;
2-
using System.Web.Mvc;
3-
using System.Collections.Generic;
1+
using System.Collections.Generic;
42
using System.IO;
53
using System;
64
using System.Xml.Linq;

‎StaticWebEpiserverPlugin.csproj

Lines changed: 40 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{1D22F30F-156B-4B34-B6DC-61A2794DEF2C}</ProjectGuid>
3+
<TargetFramework>net6.0</TargetFramework>
84
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>StaticWebEpiserverPlugin</RootNamespace>
11-
<AssemblyName>StaticWebEpiserverPlugin</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
155
<PublishUrl>publish\</PublishUrl>
166
<Install>true</Install>
177
<InstallFrom>Disk</InstallFrom>
@@ -27,147 +17,20 @@
2717
<IsWebBootstrapper>false</IsWebBootstrapper>
2818
<UseApplicationTrust>false</UseApplicationTrust>
2919
<BootstrapperEnabled>true</BootstrapperEnabled>
30-
<NuGetPackageImportStamp>
31-
</NuGetPackageImportStamp>
32-
</PropertyGroup>
33-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
34-
<DebugSymbols>true</DebugSymbols>
35-
<DebugType>full</DebugType>
36-
<Optimize>false</Optimize>
37-
<OutputPath>bin\Debug\</OutputPath>
38-
<DefineConstants>DEBUG;TRACE</DefineConstants>
39-
<ErrorReport>prompt</ErrorReport>
40-
<WarningLevel>4</WarningLevel>
20+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
4121
</PropertyGroup>
4222
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43-
<DebugType>pdbonly</DebugType>
44-
<Optimize>true</Optimize>
45-
<OutputPath>bin\Release\</OutputPath>
46-
<DefineConstants>TRACE</DefineConstants>
47-
<ErrorReport>prompt</ErrorReport>
48-
<WarningLevel>4</WarningLevel>
4923
<CodeAnalysisRuleSet>
5024
</CodeAnalysisRuleSet>
5125
<RunCodeAnalysis>true</RunCodeAnalysis>
5226
</PropertyGroup>
5327
<ItemGroup>
54-
<Reference Include="EPiServer, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
55-
<HintPath>packages\EPiServer.CMS.Core.11.20.9\lib\net461\EPiServer.dll</HintPath>
56-
</Reference>
57-
<Reference Include="EPiServer.ApplicationModules, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
58-
<HintPath>packages\EPiServer.Framework.11.20.9\lib\net461\EPiServer.ApplicationModules.dll</HintPath>
59-
</Reference>
60-
<Reference Include="EPiServer.Cms.AspNet, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
61-
<HintPath>packages\EPiServer.CMS.AspNet.11.20.9\lib\net461\EPiServer.Cms.AspNet.dll</HintPath>
62-
</Reference>
63-
<Reference Include="EPiServer.Configuration, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
64-
<HintPath>packages\EPiServer.CMS.AspNet.11.20.9\lib\net461\EPiServer.Configuration.dll</HintPath>
65-
</Reference>
66-
<Reference Include="EPiServer.Data, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
67-
<HintPath>packages\EPiServer.Framework.11.20.9\lib\net461\EPiServer.Data.dll</HintPath>
68-
</Reference>
69-
<Reference Include="EPiServer.Data.Cache, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
70-
<HintPath>packages\EPiServer.Framework.11.20.9\lib\net461\EPiServer.Data.Cache.dll</HintPath>
71-
</Reference>
72-
<Reference Include="EPiServer.Enterprise, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
73-
<HintPath>packages\EPiServer.CMS.Core.11.20.9\lib\net461\EPiServer.Enterprise.dll</HintPath>
74-
</Reference>
75-
<Reference Include="EPiServer.Events, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
76-
<HintPath>packages\EPiServer.Framework.11.20.9\lib\net461\EPiServer.Events.dll</HintPath>
77-
</Reference>
78-
<Reference Include="EPiServer.Framework, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
79-
<HintPath>packages\EPiServer.Framework.11.20.9\lib\net461\EPiServer.Framework.dll</HintPath>
80-
</Reference>
81-
<Reference Include="EPiServer.Framework.AspNet, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
82-
<HintPath>packages\EPiServer.Framework.AspNet.11.20.9\lib\net461\EPiServer.Framework.AspNet.dll</HintPath>
83-
</Reference>
84-
<Reference Include="EPiServer.ImageLibrary, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
85-
<HintPath>packages\EPiServer.CMS.AspNet.11.20.9\lib\net461\EPiServer.ImageLibrary.dll</HintPath>
86-
</Reference>
87-
<Reference Include="EPiServer.Licensing, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
88-
<HintPath>packages\EPiServer.Framework.11.20.9\lib\net461\EPiServer.Licensing.dll</HintPath>
89-
</Reference>
90-
<Reference Include="EPiServer.LinkAnalyzer, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
91-
<HintPath>packages\EPiServer.CMS.Core.11.20.9\lib\net461\EPiServer.LinkAnalyzer.dll</HintPath>
92-
</Reference>
93-
<Reference Include="EPiServer.Web.WebControls, Version=11.20.9.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
94-
<HintPath>packages\EPiServer.CMS.AspNet.11.20.9\lib\net461\EPiServer.Web.WebControls.dll</HintPath>
95-
</Reference>
96-
<Reference Include="System" />
97-
<Reference Include="System.ComponentModel.Annotations" />
98-
<Reference Include="System.ComponentModel.DataAnnotations" />
99-
<Reference Include="System.Configuration" />
100-
<Reference Include="System.Core" />
10128
<Reference Include="System.Data.OracleClient" />
102-
<Reference Include="System.Drawing" />
10329
<Reference Include="System.Net" />
10430
<Reference Include="System.Runtime.Remoting" />
10531
<Reference Include="System.Security" />
106-
<Reference Include="System.Security.AccessControl" />
107-
<Reference Include="System.Security.Principal.Windows" />
10832
<Reference Include="System.ServiceProcess" />
109-
<Reference Include="System.Threading.AccessControl" />
11033
<Reference Include="System.Transactions" />
111-
<Reference Include="System.Web" />
112-
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113-
<HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
114-
</Reference>
115-
<Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
116-
<HintPath>packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
117-
</Reference>
118-
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
119-
<HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
120-
</Reference>
121-
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
122-
<HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
123-
</Reference>
124-
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125-
<HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
126-
</Reference>
127-
<Reference Include="System.Xml.Linq" />
128-
<Reference Include="System.Data.DataSetExtensions" />
129-
<Reference Include="Microsoft.CSharp" />
130-
<Reference Include="System.Data" />
131-
<Reference Include="System.Net.Http" />
132-
<Reference Include="System.Xml" />
133-
<Reference Include="WindowsBase" />
134-
</ItemGroup>
135-
<ItemGroup>
136-
<Compile Include="Channels\StaticWebChannel.cs" />
137-
<Compile Include="Interfaces\ITextResourceDependencyService.cs" />
138-
<Compile Include="Models\GenerateOrderForScheduledJob.cs" />
139-
<Compile Include="Models\ResourceDependencyLookup.cs" />
140-
<Compile Include="Configuration\StaticWebConfiguration.cs" />
141-
<Compile Include="Configuration\StaticWebConfigurationSection.cs" />
142-
<Compile Include="Configuration\AllowedResourceTypeConfigurationElement.cs" />
143-
<Compile Include="Configuration\SiteConfigurationElement.cs" />
144-
<Compile Include="Configuration\AllowedResourceTypeConfigurationElementCollection.cs" />
145-
<Compile Include="Configuration\SiteConfigurationElementCollection.cs" />
146-
<Compile Include="Events\StaticWebGeneratePageEventArgs.cs" />
147-
<Compile Include="Events\StaticWebIOEvent.cs" />
148-
<Compile Include="Initialization\StaticWebDisplayModesInitialization.cs" />
149-
<Compile Include="Interfaces\IStaticWebIgnoreGenerate.cs" />
150-
<Compile Include="Interfaces\IStaticWebIgnoreGenerateDynamically.cs" />
151-
<Compile Include="Models\StaticWebDownloadResult.cs" />
152-
<Compile Include="Properties\AssemblyInfo.cs" />
153-
<Compile Include="Initialization\StaticWebInitialization.cs" />
154-
<Compile Include="Routing\StaticWebRouting.cs" />
155-
<Compile Include="ScheduledJobs\StaticWebScheduledJob.cs" />
156-
<Compile Include="Services\CssDependencyService.cs" />
157-
<Compile Include="Services\SvgDependencyService.cs" />
158-
<Compile Include="Services\HtmlDependencyService.cs" />
159-
<Compile Include="Services\IStaticWebService.cs" />
160-
<Compile Include="Services\StaticWebService.cs" />
161-
<Compile Include="Initialization\StaticWebServiceLocatorDependencyResolver.cs" />
162-
<Compile Include="VisitorGroups\StaticWebCriterion.cs" />
163-
<Compile Include="VisitorGroups\StaticWebCriterionSettings.cs" />
164-
</ItemGroup>
165-
<ItemGroup>
166-
<None Include="App.config" />
167-
<None Include="modules\_protected\CMS\CMS.zip" />
168-
<None Include="modules\_protected\EPiServer.Cms.TinyMce\EPiServer.Cms.TinyMce.zip" />
169-
<None Include="modules\_protected\Shell\Shell.zip" />
170-
<None Include="packages.config" />
17134
</ItemGroup>
17235
<ItemGroup>
17336
<BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
@@ -181,6 +44,41 @@
18144
<Install>false</Install>
18245
</BootstrapperPackage>
18346
</ItemGroup>
184-
<ItemGroup />
185-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
47+
<ItemGroup>
48+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
49+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
50+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
51+
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
52+
<PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
53+
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
54+
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0" />
55+
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.11.1" />
56+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
57+
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
58+
<PrivateAssets>all</PrivateAssets>
59+
</PackageReference>
60+
</ItemGroup>
61+
<ItemGroup>
62+
<PackageReference Include="Castle.Core" Version="4.4.1" />
63+
<PackageReference Include="Castle.Windsor" Version="4.1.0" />
64+
<PackageReference Include="EntityFramework" Version="6.4.4" />
65+
<PackageReference Include="EPiServer.CMS" Version="11.20.9" />
66+
<PackageReference Include="EPiServer.CMS.AspNet" Version="11.20.9" />
67+
<PackageReference Include="EPiServer.CMS.Core" Version="11.20.9" />
68+
<PackageReference Include="EPiServer.CMS.TinyMce" Version="2.13.0" />
69+
<PackageReference Include="EPiServer.CMS.UI" Version="11.36.3" />
70+
<PackageReference Include="EPiServer.CMS.UI.Core" Version="11.36.3" />
71+
<PackageReference Include="EPiServer.Framework" Version="11.20.9" />
72+
<PackageReference Include="EPiServer.Framework.AspNet" Version="11.20.9" />
73+
<PackageReference Include="EPiServer.ServiceLocation.StructureMap" Version="2.0.3" />
74+
<PackageReference Include="Microsoft.AspNet.Providers.Core" Version="2.0.0" />
75+
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
76+
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
77+
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
78+
<PackageReference Include="System.Security.Cryptography.Xml" Version="4.7.0" />
79+
<PackageReference Include="System.Security.Permissions" Version="4.7.0" />
80+
</ItemGroup>
81+
<ItemGroup>
82+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
83+
</ItemGroup>
18684
</Project>

‎VisitorGroups/StaticWebCriterion.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using EPiServer.Personalization.VisitorGroups;
22
using StaticWebEpiserverPlugin.Channels;
33
using System.Security.Principal;
4-
using System.Web;
54

65
namespace StaticWebEpiserverPlugin.VisitorGroups
76
{

‎packages.config

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)