Skip to content

Commit

Permalink
Upgrade to Umbraco 8.4, replace embedded
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephan committed Nov 5, 2019
1 parent e31ff73 commit 5071241
Show file tree
Hide file tree
Showing 20 changed files with 3,967 additions and 163 deletions.
6 changes: 4 additions & 2 deletions build/Nuspecs/ModelsBuilder/web.config.install.xdt
View file
Expand Up @@ -18,6 +18,8 @@
<assemblies>
<add assembly="Umbraco.ModelsBuilder"
xdt:Transform="Remove" xdt:Locator="Match(assembly)" />
<add assembly="Umbraco.ModelsBuilder.Embedded"
xdt:Transform="Remove" xdt:Locator="Match(assembly)" />
<add assembly="ZpqrtBnk.ModelsBuilder"
xdt:Transform="InsertIfMissing" xdt:Locator="Match(assembly)" />
</assemblies>
Expand All @@ -31,15 +33,15 @@
</dependentAssembly>
<dependentAssembly xdt:Transform="Replace" xdt:Locator="Condition(asmv1:assemblyIdentity/@name='Microsoft.CodeAnalysis')">
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
</dependentAssembly>
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')">
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.0.0.0" newVersion="0.0.0.0" />
</dependentAssembly>
<dependentAssembly xdt:Transform="Replace" xdt:Locator="Condition(asmv1:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')">
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
7 changes: 6 additions & 1 deletion build/Nuspecs/ZpqrtBnk.ModelsBuilder.Web.nuspec
View file
Expand Up @@ -8,7 +8,8 @@
<owners>ZpqrtBnk</owners>
<license type="expression">MIT</license>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
<iconUrl>https://raw.githubusercontent.com/zpqrtbnk/Zbu.ModelsBuilder/v4/dev/etc/logo.png</iconUrl>
<!--<icon>img\logo.png</icon>-->
<description>ZpqrtBnk ModelsBuilder Web Integration for Umbraco.</description>
<projectUrl>https://github.com/zpqrtbnk/Zbu.ModelsBuilder</projectUrl>
<copyright>$copyright$</copyright>
Expand All @@ -30,10 +31,14 @@
<file src="$solution$\src\ZpqrtBnk.ModelsBuilder.Web\Plugin\modelsbuilder.controller.js" target="content\App_Plugins\ZpqrtBnk.ModelsBuilder\modelsbuilder.controller.js" />
<file src="$solution$\src\ZpqrtBnk.ModelsBuilder.Web\Plugin\modelsbuilder.resource.js" target="content\App_Plugins\ZpqrtBnk.ModelsBuilder\modelsbuilder.resource.js" />
<file src="$solution$\src\ZpqrtBnk.ModelsBuilder.Web\Plugin\lang\en-US.xml" target="content\App_Plugins\ZpqrtBnk.ModelsBuilder\lang\en-US.xml" />
<file src="$solution$\build\Nuspecs\logo.png" target="content\App_Plugins\ZpqrtBnk.ModelsBuilder\logo.png" />

<!-- transforms -->
<file src="$solution$\build\Nuspecs\ModelsBuilder\web.config.install.xdt" target="content" />
<file src="$solution$\build\Nuspecs\ModelsBuilder\web.config.uninstall.xdt" target="content" />

<!-- the icon -->
<!--<file src="$solution$\build\Nuspecs\logo.png" target="img\" />-->

</files>
</package>
41 changes: 23 additions & 18 deletions build/Nuspecs/ZpqrtBnk.ModelsBuilder.nuspec
View file
@@ -1,28 +1,33 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata minClientVersion="2.8.1">
<id>ZpqrtBnk.ModelsBuilder</id>
<version>$version$</version>
<title>ZpqrtBnk ModelsBuilder</title>
<authors>ZpqrtBnk</authors>
<owners>ZpqrtBnk</owners>
<license type="expression">MIT</license>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
<description>ZpqrtBnk ModelsBuilder for Umbraco.</description>
<projectUrl>https://github.com/zpqrtbnk/Zbu.ModelsBuilder</projectUrl>
<copyright>$copyright$</copyright>
<language>en-US</language>
<tags>umbraco</tags>
<dependencies>
<group targetFramework="net472">
<dependency id="Microsoft.CodeAnalysis.CSharp" version="[3.2.0,4.0.0)" />
</group>
</dependencies>
<id>ZpqrtBnk.ModelsBuilder</id>
<version>$version$</version>
<title>ZpqrtBnk ModelsBuilder</title>
<authors>ZpqrtBnk</authors>
<owners>ZpqrtBnk</owners>
<license type="expression">MIT</license>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<iconUrl>https://raw.githubusercontent.com/zpqrtbnk/Zbu.ModelsBuilder/v4/dev/etc/logo.png</iconUrl>
<!--<icon>img\logo.png</icon>-->
<description>ZpqrtBnk ModelsBuilder for Umbraco.</description>
<projectUrl>https://github.com/zpqrtbnk/Zbu.ModelsBuilder</projectUrl>
<copyright>$copyright$</copyright>
<language>en-US</language>
<tags>umbraco</tags>
<dependencies>
<group targetFramework="net472">
<dependency id="Microsoft.CodeAnalysis.CSharp" version="[3.3.1,4.0.0)" />
</group>
</dependencies>
</metadata>
<files>
<!-- our dlls -->
<file src="$solution$\build.tmp\bin\ZpqrtBnk.ModelsBuilder.dll" target="lib\net472\ZpqrtBnk.ModelsBuilder.dll" />
<file src="$solution$\build.tmp\bin\ZpqrtBnk.ModelsBuilder.pdb" target="lib\net472\ZpqrtBnk.ModelsBuilder.pdb" />

<!-- the icon -->
<!--<file src="$solution$\build\Nuspecs\logo.png" target="img\" />-->

</files>
</package>
Binary file added build/Nuspecs/logo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
170 changes: 85 additions & 85 deletions build/build.ps1
View file
Expand Up @@ -176,91 +176,91 @@
{
Write-Host "Package ZpqrtBnk.ModelsBuilder.Extension"

$vsix = "$($this.SolutionRoot)\build.tmp\bin\ZpqrtBnk.ModelsBuilder.Extension.vsix"
$temp = "$($this.SolutionRoot)\build.tmp\bin\ZpqrtBnk.ModelsBuilder.Extension.temp"
$target = "$($this.BuildOutput)\ZpqrtBnk.ModelsBuilder.Extension-$($this.Version.Semver.ToString()).vsix"

[Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem") | Out-Null
[System.IO.Compression.ZipFile]::ExtractToDirectory($vsix, $temp) | Out-Null

Remove-Item -Force -Recurse "$temp/x86"
Remove-Item -Force -Recurse "$temp/amd64"
Remove-Item -Force -Recurse "$temp/cs"
Remove-Item -Force -Recurse "$temp/de"
Remove-Item -Force -Recurse "$temp/es"
Remove-Item -Force -Recurse "$temp/fr"
Remove-Item -Force -Recurse "$temp/it"
Remove-Item -Force -Recurse "$temp/ja"
Remove-Item -Force -Recurse "$temp/ko"
Remove-Item -Force -Recurse "$temp/pl"
Remove-Item -Force -Recurse "$temp/pt-BR"
Remove-Item -Force -Recurse "$temp/ru"
Remove-Item -Force -Recurse "$temp/tr"
Remove-Item -Force -Recurse "$temp/zh-Hans"
Remove-Item -Force -Recurse "$temp/zh-Hant"

Remove-Item -Force "$temp/ClientDependency.*"
Remove-Item -Force "$temp/CSharpTest.*"
Remove-Item -Force "$temp/HtmlAgilityPack.*"
Remove-Item -Force "$temp/ImageProcessor.*"
Remove-Item -Force "$temp/LightInject.*"
Remove-Item -Force "$temp/Lucene.*"
Remove-Item -Force "$temp/Markdown.*"
Remove-Item -Force "$temp/MiniProfiler.*"
Remove-Item -Force "$temp/NPoco.*"
Remove-Item -Force "$temp/Serilog.*"
Remove-Item -Force "$temp/Superpower.*"
Remove-Item -Force "$temp/Umbraco.Examine.*"

Remove-Item -Force "$temp/*.pdb"

$manifest = Get-Content "$temp/manifest.json" | ConvertFrom-Json

$files = $manifest.files # is an array of objects (fixed size)
$nfiles = @()

foreach ($file in $files)
{
$fileName = $file.fileName

if ($fileName.StartsWith("/x86")) { continue }
if ($fileName.StartsWith("/amd64")) { continue }
if ($fileName.StartsWith("/cs")) { continue }
if ($fileName.StartsWith("/de")) { continue }
if ($fileName.StartsWith("/es")) { continue }
if ($fileName.StartsWith("/fr")) { continue }
if ($fileName.StartsWith("/it")) { continue }
if ($fileName.StartsWith("/ja")) { continue }
if ($fileName.StartsWith("/ko")) { continue }
if ($fileName.StartsWith("/pl")) { continue }
if ($fileName.StartsWith("/pt-BR")) { continue }
if ($fileName.StartsWith("/tr")) { continue }
if ($fileName.StartsWith("/zh-Hans")) { continue }
if ($fileName.StartsWith("/zh-Hant")) { continue }

if ($fileName.StartsWith("/ClientDependency.")) { continue }
if ($fileName.StartsWith("/CSharpTest.")) { continue }
if ($fileName.StartsWith("/HtmlAgilityPack.")) { continue }
if ($fileName.StartsWith("/ImageProcessor.")) { continue }
if ($fileName.StartsWith("/LightInject.")) { continue }
if ($fileName.StartsWith("/Lucene.")) { continue }
if ($fileName.StartsWith("/Markdown.")) { continue }
if ($fileName.StartsWith("/MiniProfiler.")) { continue }
if ($fileName.StartsWith("/NPoco.")) { continue }
if ($fileName.StartsWith("/Serilog.")) { continue }
if ($fileName.StartsWith("/Superpower.")) { continue }
if ($fileName.StartsWith("/Umbraco.Examine.")) { continue }

if ($fileName.EndsWith(".pdb")) { continue }

$nfiles += $file
}

$manifest.files = $nfiles

$manifest | ConvertTo-Json | Set-Content "$temp/manifest.json"

[System.IO.Compression.ZipFile]::CreateFromDirectory($temp, $target)
$vsix = "$($this.SolutionRoot)\build.tmp\bin\ZpqrtBnk.ModelsBuilder.Extension.vsix"
$temp = "$($this.SolutionRoot)\build.tmp\bin\ZpqrtBnk.ModelsBuilder.Extension.temp"
$target = "$($this.BuildOutput)\ZpqrtBnk.ModelsBuilder.Extension-$($this.Version.Semver.ToString()).vsix"

[Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem") | Out-Null
[System.IO.Compression.ZipFile]::ExtractToDirectory($vsix, $temp) | Out-Null

Remove-Item -Force -Recurse "$temp/x86"
Remove-Item -Force -Recurse "$temp/amd64"
Remove-Item -Force -Recurse "$temp/cs"
Remove-Item -Force -Recurse "$temp/de"
Remove-Item -Force -Recurse "$temp/es"
Remove-Item -Force -Recurse "$temp/fr"
Remove-Item -Force -Recurse "$temp/it"
Remove-Item -Force -Recurse "$temp/ja"
Remove-Item -Force -Recurse "$temp/ko"
Remove-Item -Force -Recurse "$temp/pl"
Remove-Item -Force -Recurse "$temp/pt-BR"
Remove-Item -Force -Recurse "$temp/ru"
Remove-Item -Force -Recurse "$temp/tr"
Remove-Item -Force -Recurse "$temp/zh-Hans"
Remove-Item -Force -Recurse "$temp/zh-Hant"

Remove-Item -Force "$temp/ClientDependency.*"
Remove-Item -Force "$temp/CSharpTest.*"
Remove-Item -Force "$temp/HtmlAgilityPack.*"
Remove-Item -Force "$temp/ImageProcessor.*"
Remove-Item -Force "$temp/LightInject.*"
Remove-Item -Force "$temp/Lucene.*"
Remove-Item -Force "$temp/Markdown.*"
Remove-Item -Force "$temp/MiniProfiler.*"
Remove-Item -Force "$temp/NPoco.*"
Remove-Item -Force "$temp/Serilog.*"
Remove-Item -Force "$temp/Superpower.*"
Remove-Item -Force "$temp/Umbraco.Examine.*"

Remove-Item -Force "$temp/*.pdb"

$manifest = Get-Content "$temp/manifest.json" | ConvertFrom-Json

$files = $manifest.files # is an array of objects (fixed size)
$nfiles = @()

foreach ($file in $files)
{
$fileName = $file.fileName

if ($fileName.StartsWith("/x86")) { continue }
if ($fileName.StartsWith("/amd64")) { continue }
if ($fileName.StartsWith("/cs")) { continue }
if ($fileName.StartsWith("/de")) { continue }
if ($fileName.StartsWith("/es")) { continue }
if ($fileName.StartsWith("/fr")) { continue }
if ($fileName.StartsWith("/it")) { continue }
if ($fileName.StartsWith("/ja")) { continue }
if ($fileName.StartsWith("/ko")) { continue }
if ($fileName.StartsWith("/pl")) { continue }
if ($fileName.StartsWith("/pt-BR")) { continue }
if ($fileName.StartsWith("/tr")) { continue }
if ($fileName.StartsWith("/zh-Hans")) { continue }
if ($fileName.StartsWith("/zh-Hant")) { continue }

if ($fileName.StartsWith("/ClientDependency.")) { continue }
if ($fileName.StartsWith("/CSharpTest.")) { continue }
if ($fileName.StartsWith("/HtmlAgilityPack.")) { continue }
if ($fileName.StartsWith("/ImageProcessor.")) { continue }
if ($fileName.StartsWith("/LightInject.")) { continue }
if ($fileName.StartsWith("/Lucene.")) { continue }
if ($fileName.StartsWith("/Markdown.")) { continue }
if ($fileName.StartsWith("/MiniProfiler.")) { continue }
if ($fileName.StartsWith("/NPoco.")) { continue }
if ($fileName.StartsWith("/Serilog.")) { continue }
if ($fileName.StartsWith("/Superpower.")) { continue }
if ($fileName.StartsWith("/Umbraco.Examine.")) { continue }

if ($fileName.EndsWith(".pdb")) { continue }

$nfiles += $file
}

$manifest.files = $nfiles

$manifest | ConvertTo-Json | Set-Content "$temp/manifest.json"

[System.IO.Compression.ZipFile]::CreateFromDirectory($temp, $target)
})

$ubuild.DefineMethod("VerifyNuGet",
Expand Down

0 comments on commit 5071241

Please sign in to comment.