Skip to content

Commit 2a7a929

Browse files
bjurisbjuris
authored
Merge pull request #46 from episerver/feature/new-ui-release-prep
Final bits before pushing it out
2 parents 660519b + 950d321 commit 2a7a929

15 files changed

+70
-61
lines changed

‎.nuget/build-packages.ps1

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1 @@
1-
2-
Add-Type -assembly "system.io.compression.filesystem"
3-
4-
$moduleName = "EPiServer.DeveloperTools"
5-
$source = $PSScriptRoot + "\..\DeveloperTools\modules\_protected\" + $moduleName
6-
$destination = $PSScriptRoot + "\..\DeveloperTools\" + $moduleName + ".zip"
7-
8-
If(Test-path $destination) {Remove-item $destination}
9-
[io.compression.zipfile]::CreateFromDirectory($Source, $destination)
10-
111
.\nuget.exe pack ..\DeveloperTools\DeveloperTools.csproj -Properties Configuration=Release
12-

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# CHANELOG
2+
## [3.5.0]
3+
- Starting from v3.5 EPiServer DeveloperTools package is distributed as expanded (no zip file) add-on.
4+
Add-on is not zipped due to issue with Razor ViewEngine and web.config file (more details here - https://world.episerver.com/forum/developer-forum/Developer-to-developer/Thread-Container/2019/4/issue-with-razor-views-while-developing-custom-add-on/#204171).
5+
NB! If you have installed EPiServer.DeveloperTools previously and upgrading to v3.5 or above - delete EPiServer.DeveloperTools.zip file!

‎DeveloperTools/DeveloperTools.csproj

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<AppDesignerFolder>Properties</AppDesignerFolder>
1313
<RootNamespace>DeveloperTools</RootNamespace>
1414
<AssemblyName>EPiServer.DeveloperTools</AssemblyName>
15-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
15+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1616
<MvcBuildViews>false</MvcBuildViews>
1717
<UseIISExpress>false</UseIISExpress>
1818
<SccProjectName>SAK</SccProjectName>
@@ -202,6 +202,7 @@
202202
<Reference Include="System.Xml.Linq" />
203203
</ItemGroup>
204204
<ItemGroup>
205+
<None Include="copy-to-sandbox.ps1" />
205206
<Compile Include="Controllers\ContentTypeAnalyzerController.cs" />
206207
<Compile Include="Controllers\LocalObjectCacheController.cs" />
207208
<Compile Include="Controllers\RoutesController.cs" />
@@ -234,24 +235,23 @@
234235
<Compile Include="Models\ViewEngineLocationsModel.cs" />
235236
<Compile Include="Properties\AssemblyInfo.cs" />
236237
<Compile Include="Core\RollingMemoryAppender.cs" />
238+
<Content Include="readme.txt" />
237239
</ItemGroup>
238240
<ItemGroup>
239-
<None Include="app.config" />
240241
<Compile Include="Controllers\ModuleDependenciesController.cs" />
241-
<None Include="EPiServer.DeveloperTools.zip" />
242-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\ContentTypeAnalyzer\Index.cshtml" />
243-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\LoadedAssemblies\Index.cshtml" />
244-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\LocalObjectCache\Index.cshtml" />
245-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\LogViewer\Show.cshtml" />
246-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\MemoryDump\Index.cshtml" />
247-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\ModuleDependencies\Index.cshtml" />
248-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\RemoteEvent\Index.cshtml" />
249-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\RevertToDefault\Index.cshtml" />
250-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\Routes\Index.cshtml" />
251-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\Shared\DevToolsMaster.cshtml" />
252-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\Templates\Index.cshtml" />
253-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\TimeMeters\Index.cshtml" />
254-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\IOC\Index.cshtml" />
242+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\ContentTypeAnalyzer\Index.cshtml" />
243+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\LoadedAssemblies\Index.cshtml" />
244+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\LocalObjectCache\Index.cshtml" />
245+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\LogViewer\Show.cshtml" />
246+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\MemoryDump\Index.cshtml" />
247+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\ModuleDependencies\Index.cshtml" />
248+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\RemoteEvent\Index.cshtml" />
249+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\RevertToDefault\Index.cshtml" />
250+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\Routes\Index.cshtml" />
251+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\Shared\DevToolsMaster.cshtml" />
252+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\Templates\Index.cshtml" />
253+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\TimeMeters\Index.cshtml" />
254+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\IOC\Index.cshtml" />
255255
<Content Include="modules\_protected\EPiServer.DeveloperTools\Web.config" />
256256
</ItemGroup>
257257
<ItemGroup />
@@ -262,7 +262,7 @@
262262
<Content Include="packages.config">
263263
<SubType>Designer</SubType>
264264
</Content>
265-
<None Include="modules\_protected\EPiServer.DeveloperTools\Views\ViewEngineLocations\Index.cshtml" />
265+
<Content Include="modules\_protected\EPiServer.DeveloperTools\Views\ViewEngineLocations\Index.cshtml" />
266266
<None Include="Web.config" />
267267
<Content Include="modules\_protected\EPiServer.DeveloperTools\module.config" />
268268
<Content Include="web.config.transform" />
@@ -282,8 +282,7 @@
282282
</Target>
283283
<ProjectExtensions />
284284
<PropertyGroup>
285-
<PostBuildEvent>
286-
</PostBuildEvent>
285+
<PostBuildEvent>powershell.exe -noexit -file "$(ProjectDir)copy-to-sandbox.ps1"</PostBuildEvent>
287286
</PropertyGroup>
288287
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
289288
</Project>

‎DeveloperTools/DeveloperTools.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<tags>Episerver Developer Tools DeveloperTools IoC Routes ViewLocations MemoryDump LogViewer ContentTypeAnalyzer ModuleDependencies EPiServerModulePackage</tags>
1414
</metadata>
1515
<files>
16-
<file src="EPiServer.DeveloperTools.zip" target="content\modules\_protected\EPiServer.DeveloperTools" />
16+
<file src="readme.txt" target="readme.txt" />
1717
</files>
1818
</package>

‎DeveloperTools/EPiServer.DeveloperTools.zip

-16.8 KB
Binary file not shown.

‎DeveloperTools/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
[assembly: AssemblyConfiguration("")]
77
[assembly: AssemblyCompany("EPiServer")]
88
[assembly: AssemblyProduct("DeveloperTools")]
9-
[assembly: AssemblyCopyright("Copyright © 2012 - 2019")]
9+
[assembly: AssemblyCopyright("Copyright © 2012 - 2020")]
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212
[assembly: ComVisible(false)]
1313
[assembly: Guid("15a30f61-0a54-4a91-b98f-5b30eb22b6f5")]
14-
[assembly: AssemblyVersion("3.4.1.0")]
15-
[assembly: AssemblyFileVersion("3.4.1.0")]
16-
[assembly: AssemblyInformationalVersion("3.4.1")]
14+
[assembly: AssemblyVersion("3.5.0.0")]
15+
[assembly: AssemblyFileVersion("3.5.0.0")]
16+
[assembly: AssemblyInformationalVersion("3.5.0")]

‎DeveloperTools/app.config

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

‎DeveloperTools/copy-to-sandbox.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# go up to project root
2+
3+
cd ..\..
4+
5+
Copy-Item modules\_protected\EPiServer.DeveloperTools\* ..\tests\DeveloperTools.SandboxSite\modules\_protected\EPiServer.DeveloperTools -Recurse

‎DeveloperTools/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<packages>
33
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
44
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
5-
<package id="EPiServer.CMS.AspNet" version="11.12.0" targetFramework="net461" />
6-
<package id="EPiServer.CMS.Core" version="11.12.0" targetFramework="net461" />
7-
<package id="EPiServer.CMS.UI.Core" version="11.21.1" targetFramework="net461" />
8-
<package id="EPiServer.Framework" version="11.12.0" targetFramework="net461" />
9-
<package id="EPiServer.Framework.AspNet" version="11.12.0" targetFramework="net461" />
5+
<package id="EPiServer.CMS.AspNet" version="11.12.0" allowedVersions="[11.12.0, 12.0)" targetFramework="net461" />
6+
<package id="EPiServer.CMS.Core" version="11.12.0" allowedVersions="[11.12.0, 12.0)" targetFramework="net461" />
7+
<package id="EPiServer.CMS.UI.Core" version="11.21.1" allowedVersions="[11.12.1, 12.0)" targetFramework="net461" />
8+
<package id="EPiServer.Framework" version="11.12.0" allowedVersions="[11.12.0, 12.0)" targetFramework="net461" />
9+
<package id="EPiServer.Framework.AspNet" version="11.12.0" allowedVersions="[11.12.0, 12.0)" targetFramework="net461" />
1010
<package id="EPiServer.ServiceLocation.StructureMap" version="2.0.0" targetFramework="net461" />
1111
<package id="log4net" version="2.0.3" targetFramework="net45" />
1212
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net461" />

‎DeveloperTools/readme.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## Episerver Developer Tools - Developer Friendly Toolbelt
2+
3+
Starting from v3.5 EPiServer DeveloperTools package is distributed as expanded (no zip file) add-on.
4+
Add-on is not zipped due to issue with Razor ViewEngine and web.config file (more details here - https://world.episerver.com/forum/developer-forum/Developer-to-developer/Thread-Container/2019/4/issue-with-razor-views-while-developing-custom-add-on/#204171).
5+
6+
NB! If you have installed EPiServer.DeveloperTools previously and upgrading to v3.5 or above - delete EPiServer.DeveloperTools.zip file!

‎README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,10 @@ Current features:
2222
You can read more in depth analysis of toolset and it's side-effects [here](https://blog.tech-fellow.net/2019/02/14/how-risky-are-episerver-developertools-on-production-environment/).
2323

2424
## Contributing?
25+
26+
### Sandbox Site
2527
Sandbox site credentials: admin/P@ssword1!
28+
29+
### Building
30+
Post build event is copying Razor views from source project (DeveloperTools/) to test sandbox site (tests/DeveloperTools.SandboxSite).
31+
If it fails to execute - please create an GitHub issue.

‎tests/DeveloperTools.SandboxSite/DeveloperTools.SandboxSite.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,12 @@
342342
<Compile Include="Properties\AssemblyInfo.cs" />
343343
<Compile Include="Startup.cs" />
344344
</ItemGroup>
345-
<ItemGroup />
345+
<ItemGroup>
346+
<ProjectReference Include="..\..\DeveloperTools\DeveloperTools.csproj">
347+
<Project>{cc833335-20f0-4559-8160-ee6bc0ef9112}</Project>
348+
<Name>DeveloperTools</Name>
349+
</ProjectReference>
350+
</ItemGroup>
346351
<ItemGroup>
347352
<Content Include="App_Data\EPiServerDB_0d3ce289.mdf" />
348353
<Content Include="App_Data\EPiServerDB_0d3ce289_log.ldf">

‎tests/DeveloperTools.Tests/DeveloperTools.Tests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>DeveloperTools.Tests</RootNamespace>
1111
<AssemblyName>DeveloperTools.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -19,6 +19,7 @@
1919
<TestProjectType>UnitTest</TestProjectType>
2020
<NuGetPackageImportStamp>
2121
</NuGetPackageImportStamp>
22+
<TargetFrameworkProfile />
2223
</PropertyGroup>
2324
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2425
<DebugSymbols>true</DebugSymbols>

‎tests/DeveloperTools.Tests/app.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
23
<configuration>
34
<runtime>
45
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -8,4 +9,7 @@
89
</dependentAssembly>
910
</assemblyBinding>
1011
</runtime>
12+
<startup>
13+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
14+
</startup>
1115
</configuration>

‎tests/DeveloperTools.Tests/packages.config

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="xunit" version="2.3.1" targetFramework="net471" />
4-
<package id="xunit.abstractions" version="2.0.1" targetFramework="net471" />
5-
<package id="xunit.analyzers" version="0.8.0" targetFramework="net471" />
6-
<package id="xunit.assert" version="2.3.1" targetFramework="net471" />
7-
<package id="xunit.core" version="2.3.1" targetFramework="net471" />
8-
<package id="xunit.extensibility.core" version="2.3.1" targetFramework="net471" />
9-
<package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net471" />
3+
<package id="xunit" version="2.3.1" targetFramework="net472" />
4+
<package id="xunit.abstractions" version="2.0.1" targetFramework="net472" />
5+
<package id="xunit.analyzers" version="0.8.0" targetFramework="net472" />
6+
<package id="xunit.assert" version="2.3.1" targetFramework="net472" />
7+
<package id="xunit.core" version="2.3.1" targetFramework="net472" />
8+
<package id="xunit.extensibility.core" version="2.3.1" targetFramework="net472" />
9+
<package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net472" />
1010
</packages>

0 commit comments

Comments
 (0)