Merge remote-tracking branch 'origin/v10/dev' into v10/feature/nullable-reference-types-in-Umbraco.Web.Backoffice
# Conflicts: # src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs # src/Umbraco.Core/Extensions/PublishedContentExtensions.cs # src/Umbraco.Core/Telemetry/Models/TelemetryReportData.cs # src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs # src/Umbraco.PublishedCache.NuCache/ContentStore.cs # src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs # src/Umbraco.Web.Common/ModelsBuilder/InMemoryModelFactory.cs # src/Umbraco.Web.Common/Security/MemberManager.cs # src/Umbraco.Web.Website/Routing/ControllerActionSearcher.cs # src/Umbraco.Web.Website/Routing/IControllerActionSearcher.cs # src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs
This commit is contained in:
12
src/Umbraco.Core/Models/TelemetryLevel.cs
Normal file
12
src/Umbraco.Core/Models/TelemetryLevel.cs
Normal file
@@ -0,0 +1,12 @@
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace Umbraco.Cms.Core.Models
|
||||
{
|
||||
[DataContract]
|
||||
public enum TelemetryLevel
|
||||
{
|
||||
Minimal,
|
||||
Basic,
|
||||
Detailed,
|
||||
}
|
||||
}
|
||||
11
src/Umbraco.Core/Models/TelemetryResource.cs
Normal file
11
src/Umbraco.Core/Models/TelemetryResource.cs
Normal file
@@ -0,0 +1,11 @@
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace Umbraco.Cms.Core.Models
|
||||
{
|
||||
[DataContract]
|
||||
public class TelemetryResource
|
||||
{
|
||||
[DataMember]
|
||||
public TelemetryLevel TelemetryLevel { get; set; }
|
||||
}
|
||||
}
|
||||
20
src/Umbraco.Core/Models/UsageInformation.cs
Normal file
20
src/Umbraco.Core/Models/UsageInformation.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace Umbraco.Cms.Core.Models
|
||||
{
|
||||
[DataContract]
|
||||
public class UsageInformation
|
||||
{
|
||||
[DataMember(Name = "name")]
|
||||
public string Name { get; }
|
||||
|
||||
[DataMember(Name = "data")]
|
||||
public object Data { get; }
|
||||
|
||||
public UsageInformation(string name, object data)
|
||||
{
|
||||
Name = name;
|
||||
Data = data;
|
||||
}
|
||||
}
|
||||
}
|
||||
20
src/Umbraco.Core/Models/UserTwoFactorProviderModel.cs
Normal file
20
src/Umbraco.Core/Models/UserTwoFactorProviderModel.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace Umbraco.Cms.Core.Models
|
||||
{
|
||||
[DataContract]
|
||||
public class UserTwoFactorProviderModel
|
||||
{
|
||||
public UserTwoFactorProviderModel(string providerName, bool isEnabledOnUser)
|
||||
{
|
||||
ProviderName = providerName;
|
||||
IsEnabledOnUser = isEnabledOnUser;
|
||||
}
|
||||
|
||||
[DataMember(Name = "providerName")]
|
||||
public string ProviderName { get; }
|
||||
|
||||
[DataMember(Name = "isEnabledOnUser")]
|
||||
public bool IsEnabledOnUser { get; }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user