Skip to content

Commit 8433082

Browse files
mattbrailsfordmattbrailsford
authored
Merge pull request #3 from bjarnef/bug/fix-conflicting-versions
Remove packages.lock.json files
2 parents 22a864d + c291c5d commit 8433082

15 files changed

+117
-5684
lines changed

‎src/Umbraco.UIBuilder.Demo.Web/packages.lock.json‎

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

‎src/Umbraco.UIBuilder.Demo/Models/Advanced.generated.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// <auto-generated>
33
// This code was generated by a tool.
44
//
5-
// Umbraco.ModelsBuilder.Embedded v10.0.0-rc4+9ff06ee
5+
// Umbraco.ModelsBuilder.Embedded v12.2.0+173d8dc
66
//
77
// Changes to this file will be lost if the code is regenerated.
88
// </auto-generated>
@@ -23,22 +23,22 @@ namespace Umbraco.UIBuilder.Demo.Models
2323
public partial interface IAdvanced : IPublishedElement
2424
{
2525
/// <summary>Raw Markup</summary>
26-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
26+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
2727
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
2828
string RawMarkup { get; }
2929

3030
/// <summary>Redirect to Node</summary>
31-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
31+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
3232
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
3333
global::Umbraco.Cms.Core.Models.PublishedContent.IPublishedContent UmbracoRedirect { get; }
3434

3535
/// <summary>URL Alias</summary>
36-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
36+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
3737
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
3838
string UmbracoUrlAlias { get; }
3939

4040
/// <summary>URL Name</summary>
41-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
41+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
4242
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
4343
string UmbracoUrlName { get; }
4444
}
@@ -49,15 +49,15 @@ public partial class Advanced : PublishedElementModel, IAdvanced
4949
{
5050
// helpers
5151
#pragma warning disable 0109 // new is redundant
52-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
52+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
5353
public new const string ModelTypeAlias = "advanced";
54-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
54+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
5555
public new const PublishedItemType ModelItemType = PublishedItemType.Content;
56-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
56+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
5757
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
5858
public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
5959
=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
60-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
60+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
6161
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
6262
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<Advanced, TValue>> selector)
6363
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -77,52 +77,52 @@ public Advanced(IPublishedElement content, IPublishedValueFallback publishedValu
7777
///<summary>
7878
/// Raw Markup: DANGEROUS! Drop in any raw markup to be appended before the closing body tag. Used mostly for analytics code snippets. It's best not to use this field unless you know what you are doing.
7979
///</summary>
80-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
80+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
8181
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
8282
[ImplementPropertyType("rawMarkup")]
8383
public virtual string RawMarkup => GetRawMarkup(this, _publishedValueFallback);
8484

8585
/// <summary>Static getter for Raw Markup</summary>
86-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
86+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
8787
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
8888
public static string GetRawMarkup(IAdvanced that, IPublishedValueFallback publishedValueFallback) => that.Value<string>(publishedValueFallback, "rawMarkup");
8989

9090
///<summary>
9191
/// Redirect to Node: If sets redirects any request for this page to the linked page instead.
9292
///</summary>
93-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
93+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
9494
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
9595
[ImplementPropertyType("umbracoRedirect")]
9696
public virtual global::Umbraco.Cms.Core.Models.PublishedContent.IPublishedContent UmbracoRedirect => GetUmbracoRedirect(this, _publishedValueFallback);
9797

9898
/// <summary>Static getter for Redirect to Node</summary>
99-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
99+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
100100
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
101101
public static global::Umbraco.Cms.Core.Models.PublishedContent.IPublishedContent GetUmbracoRedirect(IAdvanced that, IPublishedValueFallback publishedValueFallback) => that.Value<global::Umbraco.Cms.Core.Models.PublishedContent.IPublishedContent>(publishedValueFallback, "umbracoRedirect");
102102

103103
///<summary>
104104
/// URL Alias: Defines a comma-separated list of alternative URLs this page should be accessible from. Good for marketing purposes.
105105
///</summary>
106-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
106+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
107107
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
108108
[ImplementPropertyType("umbracoUrlAlias")]
109109
public virtual string UmbracoUrlAlias => GetUmbracoUrlAlias(this, _publishedValueFallback);
110110

111111
/// <summary>Static getter for URL Alias</summary>
112-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
112+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
113113
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
114114
public static string GetUmbracoUrlAlias(IAdvanced that, IPublishedValueFallback publishedValueFallback) => that.Value<string>(publishedValueFallback, "umbracoUrlAlias");
115115

116116
///<summary>
117117
/// URL Name: Overrides the default URL name.
118118
///</summary>
119-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
119+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
120120
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
121121
[ImplementPropertyType("umbracoUrlName")]
122122
public virtual string UmbracoUrlName => GetUmbracoUrlName(this, _publishedValueFallback);
123123

124124
/// <summary>Static getter for URL Name</summary>
125-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
125+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
126126
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
127127
public static string GetUmbracoUrlName(IAdvanced that, IPublishedValueFallback publishedValueFallback) => that.Value<string>(publishedValueFallback, "umbracoUrlName");
128128
}

‎src/Umbraco.UIBuilder.Demo/Models/BlogPostPage.generated.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// <auto-generated>
33
// This code was generated by a tool.
44
//
5-
// Umbraco.ModelsBuilder.Embedded v10.0.0-rc4+9ff06ee
5+
// Umbraco.ModelsBuilder.Embedded v12.2.0+173d8dc
66
//
77
// Changes to this file will be lost if the code is regenerated.
88
// </auto-generated>
@@ -24,15 +24,15 @@ public partial class BlogPostPage : PublishedContentModel
2424
{
2525
// helpers
2626
#pragma warning disable 0109 // new is redundant
27-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
27+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
2828
public new const string ModelTypeAlias = "blogPostPage";
29-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
29+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
3030
public new const PublishedItemType ModelItemType = PublishedItemType.Content;
31-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
31+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
3232
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3333
public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
3434
=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
35-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
35+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
3636
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3737
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<BlogPostPage, TValue>> selector)
3838
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -52,7 +52,7 @@ public BlogPostPage(IPublishedContent content, IPublishedValueFallback published
5252
///<summary>
5353
/// Body: The main body of the article.
5454
///</summary>
55-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
55+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
5656
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
5757
[ImplementPropertyType("body")]
5858
public virtual global::Umbraco.Cms.Core.Strings.IHtmlEncodedString Body => this.Value<global::Umbraco.Cms.Core.Strings.IHtmlEncodedString>(_publishedValueFallback, "body");

‎src/Umbraco.UIBuilder.Demo/Models/File.generated.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// <auto-generated>
33
// This code was generated by a tool.
44
//
5-
// Umbraco.ModelsBuilder.Embedded v10.0.0-rc4+9ff06ee
5+
// Umbraco.ModelsBuilder.Embedded v12.2.0+173d8dc
66
//
77
// Changes to this file will be lost if the code is regenerated.
88
// </auto-generated>
@@ -24,15 +24,15 @@ public partial class File : PublishedContentModel
2424
{
2525
// helpers
2626
#pragma warning disable 0109 // new is redundant
27-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
27+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
2828
public new const string ModelTypeAlias = "File";
29-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
29+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
3030
public new const PublishedItemType ModelItemType = PublishedItemType.Media;
31-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
31+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
3232
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3333
public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
3434
=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
35-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
35+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
3636
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3737
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<File, TValue>> selector)
3838
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -52,22 +52,22 @@ public File(IPublishedContent content, IPublishedValueFallback publishedValueFal
5252
///<summary>
5353
/// Size: in bytes
5454
///</summary>
55-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
55+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
5656
[ImplementPropertyType("umbracoBytes")]
5757
public virtual long UmbracoBytes => this.Value<long>(_publishedValueFallback, "umbracoBytes");
5858

5959
///<summary>
6060
/// Type
6161
///</summary>
62-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
62+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
6363
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
6464
[ImplementPropertyType("umbracoExtension")]
6565
public virtual string UmbracoExtension => this.Value<string>(_publishedValueFallback, "umbracoExtension");
6666

6767
///<summary>
6868
/// File
6969
///</summary>
70-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
70+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
7171
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
7272
[ImplementPropertyType("umbracoFile")]
7373
public virtual string UmbracoFile => this.Value<string>(_publishedValueFallback, "umbracoFile");

‎src/Umbraco.UIBuilder.Demo/Models/Folder.generated.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// <auto-generated>
33
// This code was generated by a tool.
44
//
5-
// Umbraco.ModelsBuilder.Embedded v10.0.0-rc4+9ff06ee
5+
// Umbraco.ModelsBuilder.Embedded v12.2.0+173d8dc
66
//
77
// Changes to this file will be lost if the code is regenerated.
88
// </auto-generated>
@@ -24,15 +24,15 @@ public partial class Folder : PublishedContentModel
2424
{
2525
// helpers
2626
#pragma warning disable 0109 // new is redundant
27-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
27+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
2828
public new const string ModelTypeAlias = "Folder";
29-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
29+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
3030
public new const PublishedItemType ModelItemType = PublishedItemType.Media;
31-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
31+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
3232
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3333
public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
3434
=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
35-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "10.0.0-rc4+9ff06ee")]
35+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "12.2.0+173d8dc")]
3636
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3737
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<Folder, TValue>> selector)
3838
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);

0 commit comments

Comments
 (0)