Skip to content

Commit cbe0264

Browse files
author
Stephan
committed
Rebrand Our.ModelsBuilder
1 parent 3132fba commit cbe0264

File tree

169 files changed

+8655
-6233
lines changed

Some content is hidden

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

169 files changed

+8655
-6233
lines changed

build/Nuspecs/ModelsBuilder/web.config.install.xdt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
xdt:Transform="Remove" xdt:Locator="Match(assembly)" />
2121
<add assembly="Umbraco.ModelsBuilder.Embedded"
2222
xdt:Transform="Remove" xdt:Locator="Match(assembly)" />
23-
<add assembly="ZpqrtBnk.ModelsBuilder"
23+
<add assembly="Our.ModelsBuilder"
2424
xdt:Transform="InsertIfMissing" xdt:Locator="Match(assembly)" />
2525
</assemblies>
2626
</compilation>

build/Nuspecs/ModelsBuilder/web.config.uninstall.xdt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<system.web>
1515
<compilation>
1616
<assemblies>
17-
<add assembly="ZpqrtBnk.ModelsBuilder"
17+
<add assembly="Our.ModelsBuilder"
1818
xdt:Transform="Remove" xdt:Locator="Match(assembly)" />
1919
<add assembly="Umbraco.ModelsBuilder"
2020
xdt:Transform="InsertIfMissing" xdt:Locator="Match(assembly)" />
+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
3+
<metadata minClientVersion="2.8.1">
4+
<id>Our.ModelsBuilder.Web</id>
5+
<version>$version$</version>
6+
<title>Our ModelsBuilder Web</title>
7+
<authors>The Umbraco Community</authors>
8+
<owners>The Umbraco Community</owners>
9+
<license type="expression">MIT</license>
10+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11+
<iconUrl>https://raw.githubusercontent.com/ZpqrtBnk/Our.ModelsBuilder/v4/dev/etc/logo.png</iconUrl>
12+
<!--<icon>img\logo.png</icon>-->
13+
<description>Our ModelsBuilder Web Integration for Umbraco.</description>
14+
<projectUrl>https://github.com/ZpqrtBnk/Our.ModelsBuilder</projectUrl>
15+
<copyright>$copyright$</copyright>
16+
<language>en-US</language>
17+
<tags>umbraco</tags>
18+
<dependencies>
19+
<group targetFramework="net472">
20+
<dependency id="Our.ModelsBuilder" version="$version$" />
21+
</group>
22+
</dependencies>
23+
</metadata>
24+
<files>
25+
<!-- our dlls -->
26+
<file src="$solution$\build.tmp\bin\Our.ModelsBuilder.Web.dll" target="lib\net472\Our.ModelsBuilder.Web.dll" />
27+
<file src="$solution$\build.tmp\bin\Our.ModelsBuilder.Web.pdb" target="lib\net472\Our.ModelsBuilder.Web.pdb" />
28+
29+
<!-- content for the dashboard -->
30+
<file src="$solution$\src\Our.ModelsBuilder.Web\Plugin\modelsbuilder.html" target="content\App_Plugins\Our.ModelsBuilder\modelsbuilder.html" />
31+
<file src="$solution$\src\Our.ModelsBuilder.Web\Plugin\modelsbuilder.controller.js" target="content\App_Plugins\Our.ModelsBuilder\modelsbuilder.controller.js" />
32+
<file src="$solution$\src\Our.ModelsBuilder.Web\Plugin\modelsbuilder.resource.js" target="content\App_Plugins\Our.ModelsBuilder\modelsbuilder.resource.js" />
33+
<file src="$solution$\src\Our.ModelsBuilder.Web\Plugin\lang\en-US.xml" target="content\App_Plugins\Our.ModelsBuilder\lang\en-US.xml" />
34+
<file src="$solution$\build\Nuspecs\logo.png" target="content\App_Plugins\Our.ModelsBuilder\logo.png" />
35+
36+
<!-- transforms -->
37+
<file src="$solution$\build\Nuspecs\ModelsBuilder\web.config.install.xdt" target="content" />
38+
<file src="$solution$\build\Nuspecs\ModelsBuilder\web.config.uninstall.xdt" target="content" />
39+
40+
<!-- the icon -->
41+
<!--<file src="$solution$\build\Nuspecs\logo.png" target="img\" />-->
42+
43+
</files>
44+
</package>

build/Nuspecs/ZpqrtBnk.ModelsBuilder.nuspec build/Nuspecs/Our.ModelsBuilder.nuspec

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata minClientVersion="2.8.1">
4-
<id>ZpqrtBnk.ModelsBuilder</id>
4+
<id>Our.ModelsBuilder</id>
55
<version>$version$</version>
6-
<title>ZpqrtBnk ModelsBuilder</title>
7-
<authors>ZpqrtBnk</authors>
8-
<owners>ZpqrtBnk</owners>
6+
<title>Our ModelsBuilder</title>
7+
<authors>The Umbraco Community</authors>
8+
<owners>The Umbraco Community</owners>
99
<license type="expression">MIT</license>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11-
<iconUrl>https://raw.githubusercontent.com/zpqrtbnk/Zbu.ModelsBuilder/v4/dev/etc/logo.png</iconUrl>
11+
<iconUrl>https://raw.githubusercontent.com/ZpqrtBnk/Our.ModelsBuilder/v4/dev/etc/logo.png</iconUrl>
1212
<!--<icon>img\logo.png</icon>-->
13-
<description>ZpqrtBnk ModelsBuilder for Umbraco.</description>
14-
<projectUrl>https://github.com/zpqrtbnk/Zbu.ModelsBuilder</projectUrl>
13+
<description>Our ModelsBuilder for Umbraco.</description>
14+
<projectUrl>https://github.com/ZpqrtBnk/Our.ModelsBuilder</projectUrl>
1515
<copyright>$copyright$</copyright>
1616
<language>en-US</language>
1717
<tags>umbraco</tags>
@@ -23,8 +23,8 @@
2323
</metadata>
2424
<files>
2525
<!-- our dlls -->
26-
<file src="$solution$\build.tmp\bin\ZpqrtBnk.ModelsBuilder.dll" target="lib\net472\ZpqrtBnk.ModelsBuilder.dll" />
27-
<file src="$solution$\build.tmp\bin\ZpqrtBnk.ModelsBuilder.pdb" target="lib\net472\ZpqrtBnk.ModelsBuilder.pdb" />
26+
<file src="$solution$\build.tmp\bin\Our.ModelsBuilder.dll" target="lib\net472\Our.ModelsBuilder.dll" />
27+
<file src="$solution$\build.tmp\bin\Our.ModelsBuilder.pdb" target="lib\net472\Our.ModelsBuilder.pdb" />
2828

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

build/Nuspecs/ZpqrtBnk.ModelsBuilder.Web.nuspec

-44
This file was deleted.

build/build.ps1

+19-19
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@{ Continue = $continue })
3636
if ($ubuild.OnError()) { return }
3737

38-
Write-Host "ZpqrtBnk.ModelsBuilder Build"
38+
Write-Host "Our.ModelsBuilder Build"
3939
Write-Host "Umbraco.Build v$($ubuild.BuildVersion)"
4040

4141
# ################################################################
@@ -57,7 +57,7 @@
5757

5858
# Edit VSIX
5959
Write-Host "Update VSIX manifest."
60-
$vsixFile = "$($this.SolutionRoot)\src\ZpqrtBnk.ModelsBuilder.Extension\source.extension.vsixmanifest"
60+
$vsixFile = "$($this.SolutionRoot)\src\Our.ModelsBuilder.Extension\source.extension.vsixmanifest"
6161
[xml] $vsixXml = Get-Content $vsixFile
6262
$xmlNameTable = New-Object System.Xml.NameTable
6363
$xmlNameSpace = New-Object System.Xml.XmlNamespaceManager($xmlNameTable)
@@ -105,9 +105,9 @@
105105
{
106106
Write-Host "Restore NuGet"
107107
Write-Host "Logging to $($this.BuildTemp)\nuget.restore.log"
108-
&$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\src\ZpqrtBnk.ModelsBuilder.sln" > "$($this.BuildTemp)\nuget.restore.log"
108+
&$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\src\Our.ModelsBuilder.sln" > "$($this.BuildTemp)\nuget.restore.log"
109109
# temp - ignore errors, because of a circular dependency between U and MB
110-
# we'll eventually move ZpqrtBnk.ModelsBuilder (and only that one) into Core,
110+
# we'll eventually move Our.ModelsBuilder (and only that one) into Core,
111111
# once I have decided what to do with the work-in-progress stuff
112112
#if (-not $?) { throw "Failed to restore NuGet packages." }
113113
$error.Clear()
@@ -130,7 +130,7 @@
130130

131131
# beware of the weird double \\ at the end of paths
132132
# see http://edgylogic.com/blog/powershell-and-external-commands-done-right/
133-
&$this.BuildEnv.VisualStudio.MsBuild "$src\ZpqrtBnk.ModelsBuilder.sln" `
133+
&$this.BuildEnv.VisualStudio.MsBuild "$src\Our.ModelsBuilder.sln" `
134134
/p:WarningLevel=0 `
135135
/p:Configuration=$buildConfiguration `
136136
/p:Platform="Any CPU" `
@@ -150,35 +150,35 @@
150150

151151
$ubuild.DefineMethod("PackageCore",
152152
{
153-
Write-Host "Package ZpqrtBnk.ModelsBuilder"
153+
Write-Host "Package Our.ModelsBuilder"
154154
$nuspecs = "$($this.SolutionRoot)\build\NuSpecs"
155-
$copyright = "Copyright (C) ZpqrtBnk $((Get-Date).Year)"
156-
&$this.BuildEnv.NuGet pack "$nuspecs\ZpqrtBnk.ModelsBuilder.nuspec" `
155+
$copyright = "Copyright (C) Our $((Get-Date).Year)"
156+
&$this.BuildEnv.NuGet pack "$nuspecs\Our.ModelsBuilder.nuspec" `
157157
-Properties copyright="$Copyright"`;solution="$($this.SolutionRoot)" `
158158
-Version "$($this.Version.Semver.ToString())" `
159159
-Verbosity detailed -OutputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.core.log"
160-
if (-not $?) { throw "Failed to pack NuGet ZpqrtBnk.ModelsBuilder." }
160+
if (-not $?) { throw "Failed to pack NuGet Our.ModelsBuilder." }
161161
})
162162

163163
$ubuild.DefineMethod("PackageWeb",
164164
{
165-
Write-Host "Package ZpqrtBnk.ModelsBuilder.Web"
165+
Write-Host "Package Our.ModelsBuilder.Web"
166166
$nuspecs = "$($this.SolutionRoot)\build\NuSpecs"
167-
$copyright = "Copyright (C) ZpqrtBnk $((Get-Date).Year)"
168-
&$this.BuildEnv.NuGet pack "$nuspecs\ZpqrtBnk.ModelsBuilder.Web.nuspec" `
167+
$copyright = "Copyright (C) Our $((Get-Date).Year)"
168+
&$this.BuildEnv.NuGet pack "$nuspecs\Our.ModelsBuilder.Web.nuspec" `
169169
-Properties copyright="$Copyright"`;solution="$($this.SolutionRoot)" `
170170
-Version "$($this.Version.Semver.ToString())" `
171171
-Verbosity detailed -OutputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.web.log"
172-
if (-not $?) { throw "Failed to pack NuGet ZpqrtBnk.ModelsBuilder.Web." }
172+
if (-not $?) { throw "Failed to pack NuGet Our.ModelsBuilder.Web." }
173173
})
174174

175175
$ubuild.DefineMethod("PackageVsix",
176176
{
177-
Write-Host "Package ZpqrtBnk.ModelsBuilder.Extension"
177+
Write-Host "Package Our.ModelsBuilder.Extension"
178178

179-
$vsix = "$($this.SolutionRoot)\build.tmp\bin\ZpqrtBnk.ModelsBuilder.Extension.vsix"
180-
$temp = "$($this.SolutionRoot)\build.tmp\bin\ZpqrtBnk.ModelsBuilder.Extension.temp"
181-
$target = "$($this.BuildOutput)\ZpqrtBnk.ModelsBuilder.Extension-$($this.Version.Semver.ToString()).vsix"
179+
$vsix = "$($this.SolutionRoot)\build.tmp\bin\Our.ModelsBuilder.Extension.vsix"
180+
$temp = "$($this.SolutionRoot)\build.tmp\bin\Our.ModelsBuilder.Extension.temp"
181+
$target = "$($this.BuildOutput)\Our.ModelsBuilder.Extension-$($this.Version.Semver.ToString()).vsix"
182182

183183
[Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem") | Out-Null
184184
[System.IO.Compression.ZipFile]::ExtractToDirectory($vsix, $temp) | Out-Null
@@ -266,8 +266,8 @@
266266
$ubuild.DefineMethod("VerifyNuGet",
267267
{
268268
$this.VerifyNuGetConsistency(
269-
("ZpqrtBnk.ModelsBuilder", "ZpqrtBnk.ModelsBuilder.Web"),
270-
("ZpqrtBnk.ModelsBuilder", "ZpqrtBnk.ModelsBuilder.Web", "ZpqrtBnk.ModelsBuilder.Extension", "ZpqrtBnk.ModelsBuilder.Console"))
269+
("Our.ModelsBuilder", "Our.ModelsBuilder.Web"),
270+
("Our.ModelsBuilder", "Our.ModelsBuilder.Web", "Our.ModelsBuilder.Extension", "Our.ModelsBuilder.Console"))
271271
})
272272

273273
$ubuild.DefineMethod("PostPackageHook",

license.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013-2016 Umbraco ZpqrtBnk
3+
Copyright (c) 2013-2020 The Umbraco Community
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

readme.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#### Umbraco Models Builder
22

3-
Copyright (C) Umbraco ZpqrtBnk 2013-2016
3+
Copyright (C) The Umbraco Community 2013-2020
44
Distributed under the MIT license
55

66
A tool that can generate a complete set of strongly-typed published content models for Umbraco.
@@ -11,7 +11,7 @@ Requires Umbraco 7.1.4 or later.
1111

1212
#### Documentation
1313

14-
More infos, including a (hopefully) **complete documentation**, can be found in the [wiki](https://github.com/zpqrtbnk/Zbu.ModelsBuilder/wiki/Zbu.ModelsBuilder).
14+
More infos, including a (hopefully) **complete documentation**, can be found in the [wiki](https://github.com/zpqrtbnk/Our.ModelsBuilder/wiki/Our.ModelsBuilder).
1515

1616
**WARNING** the documentation has not been updated for version 3 (Umbraco.ModelsBuilder) yet.
1717

src/SolutionInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
using System.Runtime.InteropServices;
33

44
[assembly: AssemblyConfiguration("")]
5-
[assembly: AssemblyProduct("ZpqrtBnk ModelsBuilder")]
6-
[assembly: AssemblyCompany("ZpqrtBnk")]
7-
[assembly: AssemblyCopyright("Copyright © ZpqrtBnk 2013-2019")]
5+
[assembly: AssemblyProduct("Our ModelsBuilder")]
6+
[assembly: AssemblyCompany("The Umbraco Community")]
7+
[assembly: AssemblyCopyright("Copyright © The Umbraco Community 2013-2020")]
88
[assembly: AssemblyTrademark("")]
99
[assembly: AssemblyCulture("")]
1010

src/ZpqrtBnk.ModelsBuilder.Console/ZpqrtBnk.ModelsBuilder.Console.csproj src/ZpqrtBnk.ModelsBuilder.Console/Our.ModelsBuilder.Console.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
66
<ProjectGuid>{F0B757DF-0CF7-4AAF-8DD0-F46EDF25C3A3}</ProjectGuid>
77
<OutputType>Exe</OutputType>
8-
<AssemblyName>ZpqrtBnk.ModelsBuilder.Console</AssemblyName>
9-
<RootNamespace>ZpqrtBnk.ModelsBuilder.Console</RootNamespace>
8+
<AssemblyName>Our.ModelsBuilder.Console</AssemblyName>
9+
<RootNamespace>Our.ModelsBuilder.Console</RootNamespace>
1010
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1111
<TargetFrameworkProfile />
1212
</PropertyGroup>
@@ -46,13 +46,13 @@
4646
</None>
4747
</ItemGroup>
4848
<ItemGroup>
49-
<ProjectReference Include="..\ZpqrtBnk.ModelsBuilder.Web\ZpqrtBnk.ModelsBuilder.Web.csproj">
49+
<ProjectReference Include="..\ZpqrtBnk.ModelsBuilder.Web\Our.ModelsBuilder.Web.csproj">
5050
<Project>{2317be7f-1723-4512-b863-5b6835e583a2}</Project>
51-
<Name>ZpqrtBnk.ModelsBuilder.Web</Name>
51+
<Name>Our.ModelsBuilder.Web</Name>
5252
</ProjectReference>
53-
<ProjectReference Include="..\ZpqrtBnk.ModelsBuilder\ZpqrtBnk.ModelsBuilder.csproj">
53+
<ProjectReference Include="..\ZpqrtBnk.ModelsBuilder\Our.ModelsBuilder.csproj">
5454
<Project>{998fb014-303a-4146-b3e4-b927bab0210f}</Project>
55-
<Name>ZpqrtBnk.ModelsBuilder</Name>
55+
<Name>Our.ModelsBuilder</Name>
5656
</ProjectReference>
5757
</ItemGroup>
5858
<ItemGroup>

src/ZpqrtBnk.ModelsBuilder.Console/Program.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
using System;
22
using System.IO;
33
using System.Linq;
4-
using ZpqrtBnk.ModelsBuilder.Api;
5-
using ZpqrtBnk.ModelsBuilder.Web.Api;
4+
using Our.ModelsBuilder.Api;
5+
using Our.ModelsBuilder.Web.Api;
66
using SysConsole = System.Console;
77

8-
namespace ZpqrtBnk.ModelsBuilder.Console
8+
namespace Our.ModelsBuilder.Console
99
{
1010
class Program
1111
{
1212
static void Usage()
1313
{
14-
SysConsole.WriteLine("Usage: ZpqrtBnk.ModelsBuilder.Console [-d <directory>] [-ns <namespace>] <api>");
14+
SysConsole.WriteLine("Usage: Our.ModelsBuilder.Console [-d <directory>] [-ns <namespace>] <api>");
1515
SysConsole.WriteLine("\t<directory>: models directory");
1616
SysConsole.WriteLine("\t<namespace>: models namespace");
1717
SysConsole.WriteLine("\t<api>: API uri, including user and password (%-encoded)");
18-
SysConsole.WriteLine("Example: ZpqrtBnk.ModelsBuilder.Console -d c:/models -ns My.Models http://john%40doe.com:[email protected]");
18+
SysConsole.WriteLine("Example: Our.ModelsBuilder.Console -d c:/models -ns My.Models http://john%40doe.com:[email protected]");
1919
}
2020

2121
static void Main(string[] args)
2222
{
23-
SysConsole.WriteLine("ZpqrtBnk.ModelsBuilder v{0}", ApiVersion.Current.Version);
23+
SysConsole.WriteLine("Our.ModelsBuilder v{0}", ApiVersion.Current.Version);
2424

2525
string apiUrl, apiUser, apiPassword;
2626
string modelsDirectory, modelsNamespace;
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
33

4-
[assembly: AssemblyTitle("ZpqrtBnk ModelsBuilder Console")]
5-
[assembly: AssemblyDescription("ZpqrtBnk ModelsBuilder Console.")]
4+
[assembly: AssemblyTitle("Our ModelsBuilder Console")]
5+
[assembly: AssemblyDescription("Our ModelsBuilder Console.")]
66
[assembly: Guid("94a87170-d7db-466b-bfda-a7b1fe9790b1")]

src/ZpqrtBnk.ModelsBuilder.Extension/BuildModelsCommand.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
using System.Windows.Interop;
55
using EnvDTE;
66
using Microsoft.VisualStudio.Shell;
7-
using ZpqrtBnk.ModelsBuilder.Extension.VisualStudio;
7+
using Our.ModelsBuilder.Extension.VisualStudio;
88
using Task = System.Threading.Tasks.Task;
99

10-
namespace ZpqrtBnk.ModelsBuilder.Extension
10+
namespace Our.ModelsBuilder.Extension
1111
{
1212
/// <summary>
1313
/// Command handler

src/ZpqrtBnk.ModelsBuilder.Extension/ExtensionPackage.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Microsoft.VisualStudio.Shell.Interop;
1111
using Task = System.Threading.Tasks.Task;
1212

13-
namespace ZpqrtBnk.ModelsBuilder.Extension
13+
namespace Our.ModelsBuilder.Extension
1414
{
1515
/// <summary>
1616
/// This is the class that implements the package exposed by this assembly.

src/ZpqrtBnk.ModelsBuilder.Extension/ExtensionPackage.vsct

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<CommandFlag>TextChanges</CommandFlag>
7575
-->
7676
<Strings>
77-
<ButtonText>Build Models (ZpqrtBnk)</ButtonText>
77+
<ButtonText>Build Models (Our)</ButtonText>
7878
</Strings>
7979
</Button>
8080
</Buttons>

0 commit comments

Comments
 (0)