c6a67f79ac
# Conflicts: # src/SolutionInfo.cs # src/Umbraco.Core/Configuration/GlobalSettings.cs # src/Umbraco.Core/Configuration/UmbracoConfig.cs # src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs # src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs # src/Umbraco.Core/Models/IContentTypeBase.cs # src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs # src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs # src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs # src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs # src/Umbraco.Core/Services/ContentService.cs # src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs # src/Umbraco.Tests/packages.config # src/Umbraco.Web.UI.Client/bower.json # src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js # src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js # src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js # src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js # src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js # src/Umbraco.Web.UI.Client/src/less/belle.less # src/Umbraco.Web.UI.Client/src/less/buttons.less # src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less # src/Umbraco.Web.UI.Client/src/less/forms.less # src/Umbraco.Web.UI.Client/src/less/hacks.less # src/Umbraco.Web.UI.Client/src/less/modals.less # src/Umbraco.Web.UI.Client/src/less/panel.less # src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js # src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js # src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js # src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html # src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html # src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html # src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html # src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html # src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html # src/Umbraco.Web.UI.Client/src/views/users/user.html # src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html # src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml # src/Umbraco.Web.UI/Umbraco/config/lang/da.xml # src/Umbraco.Web.UI/Umbraco/dialogs/protectPage.aspx # src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx # src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config # src/Umbraco.Web.UI/config/EmbeddedMedia.config # src/Umbraco.Web.UI/umbraco/config/lang/en.xml # src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml # src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx # src/Umbraco.Web.UI/umbraco_client/Dialogs/PublishDialog.js # src/Umbraco.Web.UI/web.Template.config # src/Umbraco.Web/Editors/ContentController.cs # src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs # src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs # src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs # src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs # src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs # src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs # src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs # src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs # src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs # src/Umbraco.Web/Templates/TemplateUtilities.cs # src/Umbraco.Web/UmbracoHelper.cs # src/Umbraco.Web/WebServices/SaveFileController.cs # src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs # src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs # src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs # src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs # src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx # src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs # src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
23 lines
794 B
C#
23 lines
794 B
C#
using System.Reflection;
|
|
using System.Resources;
|
|
|
|
[assembly: AssemblyCompany("Umbraco")]
|
|
[assembly: AssemblyCopyright("Copyright © Umbraco 2018")]
|
|
[assembly: AssemblyTrademark("")]
|
|
[assembly: AssemblyCulture("")]
|
|
|
|
[assembly: NeutralResourcesLanguage("en-US")]
|
|
|
|
// versions
|
|
// read https://stackoverflow.com/questions/64602/what-are-differences-between-assemblyversion-assemblyfileversion-and-assemblyin
|
|
|
|
// note: do NOT change anything here manually, use the build scripts
|
|
|
|
// this is the ONLY ONE the CLR cares about for compatibility
|
|
// should change ONLY when "hard" breaking compatibility (manual change)
|
|
[assembly: AssemblyVersion("8.0.0")]
|
|
|
|
// these are FYI and changed automatically
|
|
[assembly: AssemblyFileVersion("8.0.0")]
|
|
[assembly: AssemblyInformationalVersion("8.0.0-alpha.52")]
|