From 899d04967c27f0cf52d826013cf534165c55c765 Mon Sep 17 00:00:00 2001 From: Mihaly Arvai Date: Fri, 26 Feb 2021 15:09:32 +0100 Subject: [PATCH] upgrade to v10.1 --- .config/dotnet-tools.json | 12 +++ .env | 10 ++- .sitecore/schemas/ModuleFile.schema.json | 42 ++++++++++ .../schemas/RootConfigurationFile.schema.json | 57 +++++++++++++ .../schemas/UserConfiguration.schema.json | 79 ++++++++++++++++++ .vscode/settings.json | 19 +++++ Sitecore.BlazorUI.Serialization.json | Bin 0 -> 1184 bytes docker-compose.override.yml | 17 ++-- docker-compose.yml | 16 +++- docker/build/cm/Dockerfile | 5 ++ docker/build/{solr => solr-init}/Dockerfile | 1 - init.ps1 | 30 ++++--- .../Sitecore.BlazorUI.ShortCut/.scindex | 10 +++ .../Sitecore.BlazorUI.ShortCut/BlazorUI.yml | 37 ++++++++ sitecore.json | 10 +++ up.ps1 | 45 ++++++++++ 16 files changed, 365 insertions(+), 25 deletions(-) create mode 100644 .config/dotnet-tools.json create mode 100644 .sitecore/schemas/ModuleFile.schema.json create mode 100644 .sitecore/schemas/RootConfigurationFile.schema.json create mode 100644 .sitecore/schemas/UserConfiguration.schema.json create mode 100644 .vscode/settings.json create mode 100644 Sitecore.BlazorUI.Serialization.json rename docker/build/{solr => solr-init}/Dockerfile (99%) create mode 100644 serialization/Sitecore.BlazorUI.ShortCut/.scindex create mode 100644 serialization/Sitecore.BlazorUI.ShortCut/BlazorUI.yml create mode 100644 sitecore.json create mode 100644 up.ps1 diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json new file mode 100644 index 0000000..510172e --- /dev/null +++ b/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "sitecore.cli": { + "version": "3.0.0", + "commands": [ + "sitecore" + ] + } + } +} \ No newline at end of file diff --git a/.env b/.env index 6b54914..72f4682 100644 --- a/.env +++ b/.env @@ -15,10 +15,11 @@ ID_HOST=id.blazorui.localhost SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/ SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/ SITECORE_MODULE_REGISTRY=scr.sitecore.com/sxp/modules/ -SITECORE_VERSION=10.0-2004 -TOOLS_VERSION=10.0.0-1809 -SPE_VERSION=6.1.1-1809 -SXA_VERSION=10.0.0-1809 +SITECORE_VERSION=10.1-ltsc2019 +TOOLS_VERSION=10.1-1809 +MANAGEMENT_SERVICES_IMAGE=scr.sitecore.com/sxp/modules/sitecore-management-services-xp1-assets:3.0.0-1809 +SPE_VERSION=6.2-1809 +SXA_VERSION=10.1-1809 SITECORE_ADMIN_PASSWORD=b SQL_SA_PASSWORD=Password12345 @@ -33,3 +34,4 @@ TRAEFIK_ISOLATION=hyperv ISOLATION=hyperv SOLR_CORE_PREFIX_NAME=sitecore CD_HOST=cd.blazorui.localhost +MEDIA_REQUEST_PROTECTION_SHARED_SECRET= diff --git a/.sitecore/schemas/ModuleFile.schema.json b/.sitecore/schemas/ModuleFile.schema.json new file mode 100644 index 0000000..0362079 --- /dev/null +++ b/.sitecore/schemas/ModuleFile.schema.json @@ -0,0 +1,42 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "ModuleFile", + "description": "Sitecore module definition file schema", + "allOf": [ + { + "title": "ModuleConfiguration", + "type": "object", + "description": "Defines a \"DevEx Module\" that is a Helix-like module that can contain serialized item configurations, etc.\nThis class is overridden with Serialization-specific derived versions that provide access to their module-specific settings.", + "additionalProperties": {}, + "required": [ + "namespace" + ], + "properties": { + "$schema": { + "type": "string" + }, + "namespace": { + "type": "string", + "description": "The namespace of the module. All resources in the module inherit this namespace.\nNamespaces can contain letters, numbers, dots (.), and hyphens (-).", + "minLength": 1, + "pattern": "^[A-Za-z0-9\\.\\-\\$\\{\\}\\(\\)]+$" + }, + "description": { + "type": "string", + "description": "Description of the module, for reference/docs purposes only" + }, + "references": { + "type": "array", + "description": "Names of other modules that are referenced by resources in this module. Wildcards are allowed, i.e. Foundation.*.", + "items": { + "type": "string" + } + }, + "source": { + "type": "string", + "description": "Generic identifier as to where the module came from. Used internally for error messaging. Do not set in a module file; it will be ignored." + } + } + } + ] +} \ No newline at end of file diff --git a/.sitecore/schemas/RootConfigurationFile.schema.json b/.sitecore/schemas/RootConfigurationFile.schema.json new file mode 100644 index 0000000..06ca0ea --- /dev/null +++ b/.sitecore/schemas/RootConfigurationFile.schema.json @@ -0,0 +1,57 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "RootConfigurationFile", + "type": "object", + "description": "Defines the root Sitecore Developer Configuration file", + "additionalProperties": false, + "required": [ + "modules" + ], + "properties": { + "$schema": { + "type": "string" + }, + "modules": { + "type": "array", + "description": "Sitecore module file resolution globs", + "minItems": 1, + "items": { + "type": "string" + } + }, + "plugins": { + "type": "array", + "description": "Contains a list of Sitecore Plugin NugetPackages. The format of the name is [NugetPackageName]@[NugetPackageVersion]. These entries are normally managed using\nthe 'Sitecore Plugin Add' and 'Sitecore Plugin Remove' commands", + "items": { + "type": "string" + } + }, + "serialization": { + "description": "Global item serialization default settings", + "oneOf": [ + { + "$ref": "#/definitions/SerializationRootConfiguration" + } + ] + } + }, + "definitions": { + "SerializationRootConfiguration": { + "type": "object", + "additionalProperties": false, + "properties": { + "defaultMaxRelativeItemPathLength": { + "type": "integer", + "description": "Max relative item path length to serialize before considering path too long (and requiring aliasing to shorten).\nOverridable on a per-module basis; this is the default when it is unspecified.", + "format": "int32", + "default": 120 + }, + "defaultModuleRelativeSerializationPath": { + "type": "string", + "description": "The default relative physical path from a module file where serialized items for that module will be stored.\nFor example given module /c/foo/bar.module.json, and default '/serialization/items' path,\nthe serialized items for bar would be stored at /c/foo/bar/serialization/items.\nPrefix the path with ~/ for a root configuration relative path instead of a module-relative path.\nUse '$(module)' to insert the module name when using a root relative path.\nOverridable on a per-module basis; this is the default when it is unspecified.", + "default": "serialization" + } + } + } + } +} \ No newline at end of file diff --git a/.sitecore/schemas/UserConfiguration.schema.json b/.sitecore/schemas/UserConfiguration.schema.json new file mode 100644 index 0000000..9a5692b --- /dev/null +++ b/.sitecore/schemas/UserConfiguration.schema.json @@ -0,0 +1,79 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "UserConfiguration", + "type": "object", + "description": "Sitecore user configuration file", + "additionalProperties": false, + "properties": { + "endpoints": { + "type": "object", + "description": "Sitecore instance base URL to fetch or push data to", + "additionalProperties": { + "$ref": "#/definitions/EnvironmentConfiguration" + } + }, + "$schema": { + "type": "string" + } + }, + "definitions": { + "EnvironmentConfiguration": { + "type": "object", + "description": "Configures named Sitecore API endpoint", + "additionalProperties": false, + "required": [ + "host", + "authority" + ], + "properties": { + "allowWrite": { + "type": "boolean", + "description": "Whether writing data to this endpoint is allowed (i.e. to prevent accidental writes to production)" + }, + "host": { + "type": "string", + "description": "Base URL to the Sitecore instance to connect to (i.e. http://my.site.core)", + "format": "uri", + "minLength": 1 + }, + "authority": { + "type": "string", + "description": "Base URL to authentication server (IdentityServer, AAD, etc - i.e. https://my.site.core.identityserver - to test, $url/.well-known/openid-configuration should work)", + "format": "uri", + "minLength": 1 + }, + "useClientCredentials": { + "type": [ + "boolean", + "null" + ], + "description": "If true, use client credentials (client id and secret) instead of device (username/password). This is good for CI." + }, + "accessToken": { + "type": "string", + "description": "OAuth access token for this endpoint (use login command to get this)" + }, + "refreshToken": { + "type": "string", + "description": "OAuth refresh token for this endpoint (use login command to get this)" + }, + "clientId": { + "type": "string", + "description": "OAuth client ID for this endpoint", + "default": "SitecoreCLI" + }, + "clientSecret": { + "type": "string", + "description": "OAuth client secret for this endpoint (when useClientCredentials is true; ignored for device auth mode)" + }, + "variables": { + "type": "object", + "description": "Defines variables that are specific to this environment. Variables defined here override any definitions in the root configuration for this environment.", + "additionalProperties": { + "type": "string" + } + } + } + } + } +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..9fc4ac4 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,19 @@ +{ + "files.associations": { + "*.sicpackage": "json" + }, + "json.schemas": [ + { + "fileMatch": ["/sitecore.json"], + "url": "./.sitecore/schemas/RootConfigurationFile.schema.json" + }, + { + "fileMatch": ["/.sitecore/user.json"], + "url": "./.sitecore/schemas/UserConfiguration.schema.json" + }, + { + "fileMatch": ["*.module.json"], + "url": "./.sitecore/schemas/ModuleFile.schema.json" + } + ] +} \ No newline at end of file diff --git a/Sitecore.BlazorUI.Serialization.json b/Sitecore.BlazorUI.Serialization.json new file mode 100644 index 0000000000000000000000000000000000000000..45606f67380d18b69ec337fcb5014cb08af05847 GIT binary patch literal 1184 zcmbVLO%K695PfHf{~&u7y}RKgagdagI8dKSwW8}n{B^vYT2)QEC9-xq^XARG+1bba ziY6Lpy?zQ27C2yy1V^3%o)o&`Rp=w6?SdF5OfjUV{S|#8e#2${49sH8LM~2 z=+FA9(epw*duUd2pc<