diff --git a/docs/01-Getting-Started.md b/docs/01-Getting-Started.md index 66a9731d56..218bf20366 100644 --- a/docs/01-Getting-Started.md +++ b/docs/01-Getting-Started.md @@ -2,13 +2,14 @@ ## Software Versions -This version of Habitat uses the following versions of this software: +This version of Habitat uses the following software versions: | Software | Version | | --- | --- | -| Sitecore | 9.1.0 | -| Solr | 7.2.1 | -| Sitecore Installation Framework | 2.0.0 | +| Sitecore | 9.2.0 | +| Solr | 7.5.0 | +| Sitecore Installation Framework | 2.1.0 | +| Visual Studio / MSBuild | 2019 / 16.x | ## Locations and settings @@ -22,9 +23,9 @@ This project assumes the following settings: | SQL Server | . | `settings.ps1` | | SQL Server Admin | sa | `settings.ps1` | | SQL Server Password | 12345 | `settings.ps1` | -| SOLR Location | c:\solr\ | `settings.ps1` | -| SOLR URL | [https://localhost:8983/solr](https://localhost:8983/solr) (*Note https*) | `settings.ps1` | -| SOLR Windows Service Name | Solr | `settings.ps1` | +| SOLR Location | C:\solr\solr-7.5.0 | `settings.ps1` | +| SOLR URL | [https://solr750:8750/solr](https://solr750:8750/solr) (*Note https*) | `settings.ps1` | +| SOLR Windows Service Name | Solr-7.5.0 | `settings.ps1` | 1 Files referred are: @@ -65,7 +66,7 @@ If your Solr environment is not currently running with HTTPS, you can create an ### 1. Installing Sitecore -1. **Clone** the [Habitat repository](https://github.com/Sitecore/Habitat/) to your local file system. +1. **Clone or Download** the [Habitat repository](https://github.com/Sitecore/Habitat/) to your local file system. 1. Download the correct version of Sitecore from [dev.sitecore.net](https://dev.sitecore.net/Downloads.aspx) and place it in the `.\build\assets` folder. * Habitat will install by default on an *Sitecore XP Single*, i.e. a standalone version of Sitecore CMS including xConnect. * The currently supported version is defined in the `.\settings.ps1` file @@ -98,9 +99,9 @@ If your Solr environment is not currently running with HTTPS, you can create an 1. Build and publish the solution using either: * Open an command prompt with elevated privileges and run **`gulp`** in the root of repository. * Use Visual Studio: - * Open **Visual Studio 2017** in administrator mode by right-clicking on its icon and selecting **Run as administrator**. + * Open **Visual Studio 2019** in administrator mode by right-clicking on its icon and selecting **Run as administrator**. * Open the Habitat solution. - * Open the **Visual Studio 2017** Task Runner Explorer pane (**View** | **Other Windows** | **Task Runner Explorer**). + * Open the **Visual Studio 2019** Task Runner Explorer pane (**View** | **Other Windows** | **Task Runner Explorer**). * Switch to "Solution 'Habitat'" * Run the "default" task @@ -127,7 +128,6 @@ In the initial installation running the **default** task will execute all the co * The **Auto-Publish-Css** automatically publishes .css files when changed (Configure Sass compilation in Visual Studio) * The **Auto-Publish-Assemblies** task publishes assemblies as they are built using the standard Visual Studio build process * The **Auto-Publish-Views** task publishes .cshtml files when they are changed. -* The **Publish-[...]** tasks helps you by manually publishing different types of files or project types to your website. ### SMTP Settings @@ -150,6 +150,7 @@ For this to work, you need to set the SMTP settings in Sitecore.config. Habitat demonstrates utilizing the Federated Authentication features of Sitecore to allow login via Facebook account. To enable this functionality: +1. Use IIS to add an SSL certificate and binding to your Habitat site (required by Facebook). 1. [Register a Facebook App](https://developers.facebook.com/docs/apps/register/) using a Facebook Developer Account. -2. Add the domain under which you are running Habitat to the *App Domains* setting of your Facebook App. By default this is `habitat.dev.local`. -3. Use the *App ID* and *App Secret* from your app settings to populate the `Sitecore.Feature.Accounts.Facebook.AppId` and `Sitecore.Feature.Accounts.Facebook.AppSecret` settings, by default found in `Feature\Accounts\code\App_Config\Include\Feature\Feature.Accounts.config`. \ No newline at end of file +1. Add the domain under which you are running Habitat to the *App Domains* setting of your Facebook App. By default this is `habitat.dev.local`. +1. Use the *App ID* and *App Secret* from your app settings to populate the `Sitecore.Feature.Accounts.Facebook.AppId` and `Sitecore.Feature.Accounts.Facebook.AppSecret` settings, by default found in `Feature\Accounts\code\App_Config\Include\Feature\Feature.Accounts.config`. \ No newline at end of file diff --git a/docs/02-Resources.md b/docs/02-Resources.md index e105997360..df52b88513 100644 --- a/docs/02-Resources.md +++ b/docs/02-Resources.md @@ -6,9 +6,9 @@ You must install these before installing Habitat: * [PowerShell version 5 or later](https://www.microsoft.com/en-us/download/details.aspx?id=50395) * [.NET Framework 4.7.1 Developer Pack](https://www.microsoft.com/en-us/download/details.aspx?id=56119) -* [Visual Studio 2017](https://www.visualstudio.com/downloads/) - * **Be sure you are using VS17 v15.5 or higher in order to get necessary updates to MSBuild. Update your IDE if needed.** - * Within VS2017, install these extensions: +* [Visual Studio 2019](https://www.visualstudio.com/downloads/) + * **Be sure you are using VS19 v16.1.6 or higher. Update your IDE if needed.** + * Within VS2019, install these extensions: * [Web Compiler](https://marketplace.visualstudio.com/items?itemName=MadsKristensen.WebCompiler) * ASP.NET MVC for the user interface patterns * On Windows 10, this is enabled by going to: @@ -22,8 +22,7 @@ These are additional tools used in Habitat's creation. You do not need to instal * Front end framework: [Bootstrap 3](http://getbootstrap.com/) * Package management: NuGet, [Node (npm)](https://nodejs.org/) and [Bower](https://www.bower.io/) * Build scripts: [Gulp](http://gulpjs.com/) -* Item serialisation: [Unicorn 4](https://github.com/kamsar/Unicorn) - * Windows PowerShell 4.0+ required to sync Unicorn via Gulp task +* Item serialization: [Unicorn](https://github.com/kamsar/Unicorn) * Bug-tracking: [GitHub](https://github.com/Sitecore/Habitat/issues) * CI server: TeamCity * Unit tests: xUnit diff --git a/gulp-config.js b/gulp-config.js index 74b4d80966..5ba8e3be28 100644 --- a/gulp-config.js +++ b/gulp-config.js @@ -8,7 +8,7 @@ module.exports = function () { packagePath: instanceRoot + "\\App_Data\\packages", solutionName: "Habitat", buildConfiguration: "Debug", - buildToolsVersion: 15.0, + buildToolsVersion: '16.0', buildMaxCpuCount: 0, buildVerbosity: "minimal", buildPlatform: "Any CPU", diff --git a/gulpfile.js b/gulpfile.js index bd7995a21a..5a48947b7e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,6 +1,6 @@ /// var gulp = require("gulp"); -var msbuild = require("gulp-msbuild"); +var _msbuild = require("msbuild"); var debug = require("gulp-debug"); var foreach = require("gulp-foreach"); var rename = require("gulp-rename"); @@ -16,6 +16,7 @@ var path = require("path"); var rimrafDir = require("rimraf"); var rimraf = require("gulp-rimraf"); var xmlpoke = require("xmlpoke"); +var glob = require("glob"); var config; if (fs.existsSync("./gulp-config.js.user")) { @@ -79,43 +80,74 @@ gulp.task("References-Nuget", gulp.task("Publish-All-Projects", function(callback) { - return runSequence( - "Build-Solution", - "Publish-Foundation-Projects", - "Publish-Feature-Projects", - "Publish-Project-Projects", - callback); + var msbuild = new _msbuild(callback); + msbuild.solutionName = config.solutionName + '.sln'; + var overrideParams = []; + overrideParams.push('/p:Configuration=' + config.buildConfiguration); + overrideParams.push('/p:DeployOnBuild=true'); + overrideParams.push('/p:DeployDefaultTarget=WebPublish'); + overrideParams.push('/p:WebPublishMethod=FileSystem'); + overrideParams.push('/p:DeleteExistingFiles=false'); + overrideParams.push('/p:publishUrl=' + config.websiteRoot); + overrideParams.push('/m'); + overrideParams.push('/restore'); + msbuild.config('overrideParams', overrideParams); + msbuild.config('version', config.buildToolsVersion); + msbuild.build(); }); gulp.task("Apply-Xml-Transform", function() { + // Need to apply these synchronously or risk trying to write the same destination file in parallel var layerPathFilters = [ - "./src/Foundation/**/*.xdt", "./src/Feature/**/*.xdt", "./src/Project/**/*.xdt", - "!./src/**/obj/**/*.xdt", "!./src/**/bin/**/*.xdt" + "./src/Foundation/**/*.xdt", "./src/Feature/**/*.xdt", "./src/Project/**/*.xdt" ]; - return gulp.src(layerPathFilters) - .pipe(foreach(function(stream, file) { - var fileToTransform = file.path.replace(/.+code\\(.+)\.xdt/, "$1"); - util.log("Applying configuration transform: " + file.path); - return gulp.src("./scripts/applytransform.targets") - .pipe(msbuild({ - targets: ["ApplyTransform"], - configuration: config.buildConfiguration, - logCommand: false, - verbosity: config.buildVerbosity, - stdout: true, - errorOnFail: true, - maxcpucount: config.buildMaxCpuCount, - nodeReuse: false, - toolsVersion: config.buildToolsVersion, - properties: { - Platform: config.buildPlatform, - WebConfigToTransform: config.websiteRoot, - TransformFile: file.path, - FileToTransform: fileToTransform - } - })); - })); + // Collect all the transforms into an array + var transforms = layerPathFilters.reduce(function (files, path) { + glob.sync(path, {absolute: true}).forEach(function(file) { + files.push(file); + }); + return files; + }, []); + // Remove any transforms that ended up in compiled output + transforms = transforms.filter(function(path) { + return !path.includes('bin') && !path.includes('obj'); + }); + util.log("Discovered transforms: " + JSON.stringify(transforms)); + + // return a promise since we're not using gulp streams + return new Promise(function(resolve, reject) { + + // use transform list as a queue and process each sequentially + var processTransforms = function() { + var next = transforms.shift(); + if (next) { + applyTransform(next); + } else { + // no more transforms, let gulp know we're done + resolve('done'); + } + } + + var applyTransform = function(transformFile) { + var fileToTransform = transformFile.replace(/.+code\/(.+)\.xdt/, "$1"); + + // _msbuild will call back to the function above to apply the next transform when finished + var msbuild = new _msbuild(processTransforms); + msbuild.sourcePath = './scripts/applytransform.targets'; + msbuild.targets = ['ApplyTransform']; + msbuild.configuration = config.buildConfiguration; + var overrideParams = []; + overrideParams.push('/p:WebConfigToTransform=' + config.websiteRoot); + overrideParams.push('/p:TransformFile=' + transformFile.replace(/\//g, "\\")); + overrideParams.push('/p:FileToTransform=' + fileToTransform.replace(/\//g, "\\")); + msbuild.config('overrideParams', overrideParams); + msbuild.config('version', config.buildToolsVersion); + msbuild.build(); + }; + + processTransforms(); + }); }); gulp.task("Publish-Transforms", @@ -133,170 +165,8 @@ gulp.task("Sync-Unicorn", unicorn(function() { return callback() }, options); }); -/***************************** - Copy assemblies to all local projects -*****************************/ -gulp.task("Copy-Local-Assemblies", - function() { - console.log("Copying site assemblies to all local projects"); - var files = config.sitecoreLibraries + "/**/*"; - - var root = "./src"; - var projects = root + "/**/code/bin"; - return gulp.src(projects, { base: root }) - .pipe(foreach(function(stream, file) { - console.log("copying to " + file.path); - gulp.src(files) - .pipe(gulp.dest(file.path)); - return stream; - })); - }); - -/***************************** - Publish -*****************************/ -var publishStream = function(stream, dest) { - var targets = ["Build"]; - - return stream - .pipe(debug({ title: "Building project:" })) - .pipe(msbuild({ - targets: targets, - configuration: config.buildConfiguration, - logCommand: false, - verbosity: config.buildVerbosity, - stdout: true, - errorOnFail: true, - maxcpucount: config.buildMaxCpuCount, - nodeReuse: false, - toolsVersion: config.buildToolsVersion, - properties: { - Platform: config.publishPlatform, - DeployOnBuild: "true", - DeployDefaultTarget: "WebPublish", - WebPublishMethod: "FileSystem", - BuildProjectReferences: "false", - DeleteExistingFiles: "false", - publishUrl: dest - } - })); -}; -var publishProject = function(location, dest) { - dest = dest || config.websiteRoot; - - console.log("publish to " + dest + " folder"); - return gulp.src(["./src/" + location + "/code/*.csproj"]) - .pipe(foreach(function(stream, file) { - return publishStream(stream, dest); - })); -}; -var publishProjects = function(location, dest) { - dest = dest || config.websiteRoot; - - console.log("publish to " + dest + " folder"); - return gulp.src([location + "/**/code/*.csproj"]) - .pipe(foreach(function(stream, file) { - return publishStream(stream, dest); - })); -}; - -gulp.task("Build-Solution", - function() { - var targets = ["Build"]; - if (config.runCleanBuilds) { - targets = ["Clean", "Build"]; - } - - var solution = "./" + config.solutionName + ".sln"; - return gulp.src(solution) - .pipe(msbuild({ - targets: targets, - configuration: config.buildConfiguration, - logCommand: false, - verbosity: config.buildVerbosity, - stdout: true, - errorOnFail: true, - maxcpucount: config.buildMaxCpuCount, - nodeReuse: false, - toolsVersion: config.buildToolsVersion, - properties: { - Platform: config.buildPlatform - }, - customArgs: [ "/restore" ] - })); - }); -gulp.task("Publish-Foundation-Projects", - function() { - return publishProjects("./src/Foundation"); - }); -gulp.task("Publish-Feature-Projects", - function() { - return publishProjects("./src/Feature"); - }); - -gulp.task("Publish-Project-Projects", - function() { - return publishProjects("./src/Project"); - }); - -gulp.task("Publish-Project", - function() { - if (yargs && yargs.m && typeof(yargs.m) == "string") { - return publishProject(yargs.m); - } else { - throw "\n\n------\n USAGE: -m Layer/Module \n------\n\n"; - } - }); - -gulp.task("Publish-Assemblies", - function() { - var root = "./src"; - var binFiles = root + "/**/code/**/bin/Sitecore.{Feature,Foundation,Habitat}.*.{dll,pdb}"; - var destination = config.websiteRoot + "/bin/"; - return gulp.src(binFiles, { base: root }) - .pipe(rename({ dirname: "" })) - .pipe(newer(destination)) - .pipe(debug({ title: "Copying " })) - .pipe(gulp.dest(destination)); - }); - -gulp.task("Publish-All-Views", - function() { - var root = "./src"; - var roots = [root + "/**/Views", "!" + root + "/**/obj/**/Views"]; - var files = "/**/*.cshtml"; - var destination = config.websiteRoot + "\\Views"; - return gulp.src(roots, { base: root }).pipe( - foreach(function(stream, file) { - console.log("Publishing from " + file.path); - gulp.src(file.path + files, { base: file.path }) - .pipe(newer(destination)) - .pipe(debug({ title: "Copying " })) - .pipe(gulp.dest(destination)); - return stream; - }) - ); - }); - -gulp.task("Publish-All-Configs", - function() { - var root = "./src"; - var roots = [root + "/**/App_Config", "!" + root + "/**/tests/App_Config", "!" + root + "/**/obj/**/App_Config"]; - var files = "/**/*.config"; - var destination = config.websiteRoot + "\\App_Config"; - return gulp.src(roots, { base: root }).pipe( - foreach(function(stream, file) { - console.log("Publishing from " + file.path); - gulp.src(file.path + files, { base: file.path }) - .pipe(newer(destination)) - .pipe(debug({ title: "Copying " })) - .pipe(gulp.dest(destination)); - return stream; - }) - ); - }); /***************************** Watchers diff --git a/nuget.config b/nuget.config index 301bf3a598..710abfa12b 100644 --- a/nuget.config +++ b/nuget.config @@ -5,12 +5,9 @@ --> - - - - + + - diff --git a/package.json b/package.json index 553189681f..307087ccf7 100644 --- a/package.json +++ b/package.json @@ -12,13 +12,13 @@ "gulp-exec": "^2.1.2", "gulp-foreach": "^0.1.0", "gulp-load-plugins": "^1.0.0", - "gulp-msbuild": "^0.4.4", "gulp-newer": "^1.0.0", "gulp-rename": "^1.2.2", "gulp-rimraf": "^0.2.0", "gulp-sass": "^3.1.0", "gulp-util": "^3.0.7", "gulp-watch": "^4.3.5", + "msbuild": "^1.1.2", "rimraf": "^2.4.3", "run-sequence": "^1.1.4", "vinyl": "^1.1.0", @@ -26,8 +26,7 @@ "xmlpoke": "^0.1.12", "yargs": "^6.4.0" }, - "devDependencies": { - }, + "devDependencies": {}, "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/scripts/NuGet/ConvertToNewNuget.ps1 b/scripts/NuGet/ConvertToNewNuget.ps1 deleted file mode 100644 index e2ea123e73..0000000000 --- a/scripts/NuGet/ConvertToNewNuget.ps1 +++ /dev/null @@ -1,49 +0,0 @@ -## Nuget v2 URL for the target platform, and the target marketing version -$SitecoreNuget = "https://sitecore.myget.org/F/sc-platform-9-1/api/v2" -$TargetVersion = "9.1.0" - -## Nuget URL to retrieve package metadata, including dependencies -$MetaPackage = "$SitecoreNuget/Packages(Id='Sitecore.Experience.Platform',Version='$TargetVersion')" - -## Retrieve the package metadata from nuget (no nice way of doing this via CLI) -$PackageMetadata = [xml](Invoke-WebRequest $MetaPackage).Content - -## Parse the package dependencies so we know the appropriate package versions for this release -$versions = $PackageMetadata.entry.properties.Dependencies.Split('|') | % { - $dependencySplit = $_.Split(':') - New-Object PSObject -Property @{ - Name = $dependencySplit[0] - Version = $dependencySplit[1] - } -} - -## Find all Visual Studio projects and parse their XML -Get-ChildItem *.csproj -recurse | % { - New-Object psobject -Property @{ - File = $_ - ProjectXml = [xml](gc $_ -Raw) - } -} | % { - $fileName = $_.File.Name - - ## Find all package references - $_.ProjectXml.GetElementsByTagName("PackageReference") | ? { - ## Exclude non-Sitecore packages, and FakeDb - $_.Include.StartsWith("Sitecore") -and -not $_.Include.Contains("FakeDb") - } | % { - ## Remove NoReferences extension on the package if present - if ($_.Include.EndsWith(".NoReferences")) { - $_.SetAttribute("Include", $_.Include.Replace(".NoReferences", "")) - } - ## Look up the appropriate version and replace - $packageName = $_.Include - $newPackage = $versions | ? { $_.Name -eq $packageName } | select -first 1 - if (-not $newPackage) { - Write-Host "WARNING: Could not find new version for package $packageName in $fileName" -ForegroundColor yellow - } - $_.SetAttribute("Version", $newPackage.Version) - } - - ## Save the project file - $_.ProjectXml.Save($_.File) -} \ No newline at end of file diff --git a/scripts/NuGet/UpdgradeReferences.ps1 b/scripts/NuGet/UpdgradeReferences.ps1 new file mode 100644 index 0000000000..012b86919e --- /dev/null +++ b/scripts/NuGet/UpdgradeReferences.ps1 @@ -0,0 +1,26 @@ +$TargetVersion = "9.2.0" + +## Find all Visual Studio projects and parse their XML +Get-ChildItem *.csproj -recurse | % { + New-Object psobject -Property @{ + File = $_ + ProjectXml = [xml](gc $_ -Raw) + } +} | % { + $fileName = $_.File.Name + + ## Find all package references + $_.ProjectXml.GetElementsByTagName("PackageReference") | ? { + ## Exclude non-Sitecore packages, and FakeDb + $_.Include.StartsWith("Sitecore") -and -not $_.Include.Contains("FakeDb") + } | % { + ## Remove NoReferences extension on the package if present + if ($_.Include.EndsWith(".NoReferences")) { + $_.SetAttribute("Include", $_.Include.Replace(".NoReferences", "")) + } + $_.SetAttribute("Version", $TargetVersion) + } + + ## Save the project file + $_.ProjectXml.Save($_.File) +} \ No newline at end of file diff --git a/scripts/applytransform.targets b/scripts/applytransform.targets index 93a12ccab0..2b02b74284 100644 --- a/scripts/applytransform.targets +++ b/scripts/applytransform.targets @@ -1,5 +1,5 @@ - + diff --git a/settings.ps1 b/settings.ps1 index 47e65136a8..805d8c97fd 100644 --- a/settings.ps1 +++ b/settings.ps1 @@ -3,9 +3,9 @@ $SolutionPrefix = "habitat" $SitePostFix = "dev.local" $webroot = "C:\inetpub\wwwroot" -$SitecoreVersion = "9.1.0 rev. 001564" -$IdentityServerVersion = "2.0.0 rev. 00157" -$InstallerVersion = "2.0.0" +$SitecoreVersion = "9.2.0 rev. 002893" +$IdentityServerVersion = "3.0.0 rev. 00211" +$InstallerVersion = "2.1.0" # Assets and prerequisites $AssetsRoot = "$PSScriptRoot\build\assets" @@ -21,6 +21,7 @@ $CertPath = Join-Path "$AssetsRoot" "Certificates" $SqlServer = "." $SqlAdminUser = "sa" $SqlAdminPassword = "12345" + # Prerequisities Check $PrerequisitiesConfiguration = "$AssetsRoot\Prerequisites.json" @@ -49,6 +50,6 @@ $IdentityAllowedCorsOrigins = $SitecoreSiteUrl $IdentityServerSiteRoot = Join-Path $webroot -ChildPath $IdentityServerSiteName # Solr Parameters -$SolrUrl = "https://localhost:8983/solr" -$SolrRoot = "c:\\solr" -$SolrService = "Solr" +$SolrUrl = "https://solr750:8750/solr" +$SolrRoot = "C:\\solr\\solr-7.5.0" +$SolrService = "Solr-7.5.0" diff --git a/src/Feature/Accounts/Tests/Sitecore.Feature.Accounts.Tests.csproj b/src/Feature/Accounts/Tests/Sitecore.Feature.Accounts.Tests.csproj index d12b861180..e9576fc930 100644 --- a/src/Feature/Accounts/Tests/Sitecore.Feature.Accounts.Tests.csproj +++ b/src/Feature/Accounts/Tests/Sitecore.Feature.Accounts.Tests.csproj @@ -107,10 +107,6 @@ $(SitecorePath)\bin\Sitecore.Analytics.dll True - - $(SitecorePath)\bin\Sitecore.Framework.Conditions.dll - True - $(SitecorePath)\bin\Sitecore.Kernel.dll True @@ -147,19 +143,18 @@ - - - - - - - - - - - - - + + + + + + + + + + + + @@ -241,11 +236,11 @@ - \ No newline at end of file diff --git a/src/Feature/Accounts/code/Infrastructure/Pipelines/IdentityProviders/Facebook.cs b/src/Feature/Accounts/code/Infrastructure/Pipelines/IdentityProviders/Facebook.cs index 2ecf24be80..9dde0bee22 100644 --- a/src/Feature/Accounts/code/Infrastructure/Pipelines/IdentityProviders/Facebook.cs +++ b/src/Feature/Accounts/code/Infrastructure/Pipelines/IdentityProviders/Facebook.cs @@ -26,7 +26,7 @@ public Facebook(FederatedAuthenticationConfiguration federatedAuthenticationConf protected override string IdentityProviderName => "Facebook"; - protected override void ProcessCore([NotNull] IdentityProvidersArgs args) + protected override void ProcessCore(IdentityProvidersArgs args) { Assert.ArgumentNotNull(args, nameof(args)); diff --git a/src/Feature/Accounts/code/Sitecore.Feature.Accounts.csproj b/src/Feature/Accounts/code/Sitecore.Feature.Accounts.csproj index f40dc87d6b..c120f1b042 100644 --- a/src/Feature/Accounts/code/Sitecore.Feature.Accounts.csproj +++ b/src/Feature/Accounts/code/Sitecore.Feature.Accounts.csproj @@ -121,16 +121,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Feature/Accounts/code/Web.config b/src/Feature/Accounts/code/Web.config index dd895143c5..6998e24360 100644 --- a/src/Feature/Accounts/code/Web.config +++ b/src/Feature/Accounts/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/Demo/code/Repositories/PersonalInfoRepository.cs b/src/Feature/Demo/code/Repositories/PersonalInfoRepository.cs index c62f1104ba..b83435eb75 100644 --- a/src/Feature/Demo/code/Repositories/PersonalInfoRepository.cs +++ b/src/Feature/Demo/code/Repositories/PersonalInfoRepository.cs @@ -207,7 +207,7 @@ private IEnumerable> GetPersonalInfoProperties() } } - [NotNull] + private IEnumerable> GetTagsProperties() { return this.contactFacetsProvider?.Contact?.Tags?.GetAll().Select(this.GetTagValue) ?? Enumerable.Empty>(); diff --git a/src/Feature/Demo/code/Sitecore.Feature.Demo.csproj b/src/Feature/Demo/code/Sitecore.Feature.Demo.csproj index 5ea2c2f281..69dbce4425 100644 --- a/src/Feature/Demo/code/Sitecore.Feature.Demo.csproj +++ b/src/Feature/Demo/code/Sitecore.Feature.Demo.csproj @@ -212,39 +212,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -396,11 +395,11 @@ - \ No newline at end of file diff --git a/src/Feature/Demo/code/Web.config b/src/Feature/Demo/code/Web.config index cab0095ee5..e6a172fc4f 100644 --- a/src/Feature/Demo/code/Web.config +++ b/src/Feature/Demo/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/Demo/tests/Sitecore.Feature.Demo.Tests.csproj b/src/Feature/Demo/tests/Sitecore.Feature.Demo.Tests.csproj index d12a07dade..3267b105d3 100644 --- a/src/Feature/Demo/tests/Sitecore.Feature.Demo.Tests.csproj +++ b/src/Feature/Demo/tests/Sitecore.Feature.Demo.Tests.csproj @@ -145,20 +145,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/Feature/Identity/code/Repositories/IdentityRepository.cs b/src/Feature/Identity/code/Repositories/IdentityRepository.cs index 21c3782117..90fa4706c6 100644 --- a/src/Feature/Identity/code/Repositories/IdentityRepository.cs +++ b/src/Feature/Identity/code/Repositories/IdentityRepository.cs @@ -6,7 +6,7 @@ public static class IdentityRepository { - public static Item Get([NotNull] Item contextItem) + public static Item Get(Item contextItem) { if (contextItem == null) throw new ArgumentNullException(nameof(contextItem)); diff --git a/src/Feature/Identity/code/Sitecore.Feature.Identity.csproj b/src/Feature/Identity/code/Sitecore.Feature.Identity.csproj index a43250c5c7..3bf26c1385 100644 --- a/src/Feature/Identity/code/Sitecore.Feature.Identity.csproj +++ b/src/Feature/Identity/code/Sitecore.Feature.Identity.csproj @@ -73,7 +73,7 @@ - + diff --git a/src/Feature/Identity/code/Web.config b/src/Feature/Identity/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/Identity/code/Web.config +++ b/src/Feature/Identity/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/Language/Tests/Sitecore.Feature.Language.Tests.csproj b/src/Feature/Language/Tests/Sitecore.Feature.Language.Tests.csproj index 3e13de7181..1aaa83ffd3 100644 --- a/src/Feature/Language/Tests/Sitecore.Feature.Language.Tests.csproj +++ b/src/Feature/Language/Tests/Sitecore.Feature.Language.Tests.csproj @@ -104,10 +104,10 @@ - - - - + + + + diff --git a/src/Feature/Language/code/Sitecore.Feature.Language.csproj b/src/Feature/Language/code/Sitecore.Feature.Language.csproj index 31eabe32ff..ef9f24e13f 100644 --- a/src/Feature/Language/code/Sitecore.Feature.Language.csproj +++ b/src/Feature/Language/code/Sitecore.Feature.Language.csproj @@ -73,7 +73,7 @@ - + diff --git a/src/Feature/Language/code/Web.config b/src/Feature/Language/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/Language/code/Web.config +++ b/src/Feature/Language/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/Maps/code/Sitecore.Feature.Maps.csproj b/src/Feature/Maps/code/Sitecore.Feature.Maps.csproj index 93d1d13ded..58213770c6 100644 --- a/src/Feature/Maps/code/Sitecore.Feature.Maps.csproj +++ b/src/Feature/Maps/code/Sitecore.Feature.Maps.csproj @@ -81,9 +81,9 @@ - - - + + + diff --git a/src/Feature/Maps/code/Web.config b/src/Feature/Maps/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/Maps/code/Web.config +++ b/src/Feature/Maps/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/Maps/tests/Sitecore.Feature.Maps.Tests.csproj b/src/Feature/Maps/tests/Sitecore.Feature.Maps.Tests.csproj index ba4fa7b4b6..bdd6aa7729 100644 --- a/src/Feature/Maps/tests/Sitecore.Feature.Maps.Tests.csproj +++ b/src/Feature/Maps/tests/Sitecore.Feature.Maps.Tests.csproj @@ -108,11 +108,11 @@ - - - - - + + + + + diff --git a/src/Feature/Media/Tests/Sitecore.Feature.Media.Tests.csproj b/src/Feature/Media/Tests/Sitecore.Feature.Media.Tests.csproj index af3c133d39..24a00c1063 100644 --- a/src/Feature/Media/Tests/Sitecore.Feature.Media.Tests.csproj +++ b/src/Feature/Media/Tests/Sitecore.Feature.Media.Tests.csproj @@ -108,11 +108,11 @@ - - - - - + + + + + diff --git a/src/Feature/Media/code/Repositories/MediaSelectorElementsRepository.cs b/src/Feature/Media/code/Repositories/MediaSelectorElementsRepository.cs index a48ab8dcf7..9d493cfd30 100644 --- a/src/Feature/Media/code/Repositories/MediaSelectorElementsRepository.cs +++ b/src/Feature/Media/code/Repositories/MediaSelectorElementsRepository.cs @@ -10,7 +10,7 @@ public static class MediaSelectorElementsRepository { - public static IEnumerable Get([NotNull] Item item) + public static IEnumerable Get(Item item) { if (item == null) throw new ArgumentNullException(nameof(item)); diff --git a/src/Feature/Media/code/Sitecore.Feature.Media.csproj b/src/Feature/Media/code/Sitecore.Feature.Media.csproj index a481200885..7643bbe292 100644 --- a/src/Feature/Media/code/Sitecore.Feature.Media.csproj +++ b/src/Feature/Media/code/Sitecore.Feature.Media.csproj @@ -77,8 +77,8 @@ - - + + diff --git a/src/Feature/Media/code/Web.config b/src/Feature/Media/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/Media/code/Web.config +++ b/src/Feature/Media/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/Metadata/code/Sitecore.Feature.Metadata.csproj b/src/Feature/Metadata/code/Sitecore.Feature.Metadata.csproj index f13e5247e2..e66599ae0f 100644 --- a/src/Feature/Metadata/code/Sitecore.Feature.Metadata.csproj +++ b/src/Feature/Metadata/code/Sitecore.Feature.Metadata.csproj @@ -77,8 +77,8 @@ - - + + diff --git a/src/Feature/Metadata/code/Web.config b/src/Feature/Metadata/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/Metadata/code/Web.config +++ b/src/Feature/Metadata/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/Multisite/code/Sitecore.Feature.Multisite.csproj b/src/Feature/Multisite/code/Sitecore.Feature.Multisite.csproj index 08fe1b1a25..d052bedc57 100644 --- a/src/Feature/Multisite/code/Sitecore.Feature.Multisite.csproj +++ b/src/Feature/Multisite/code/Sitecore.Feature.Multisite.csproj @@ -72,7 +72,7 @@ - + diff --git a/src/Feature/Multisite/code/Web.config b/src/Feature/Multisite/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/Multisite/code/Web.config +++ b/src/Feature/Multisite/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/Multisite/tests/Sitecore.Feature.Multisite.Tests.csproj b/src/Feature/Multisite/tests/Sitecore.Feature.Multisite.Tests.csproj index 956efe2f8e..61b60eff75 100644 --- a/src/Feature/Multisite/tests/Sitecore.Feature.Multisite.Tests.csproj +++ b/src/Feature/Multisite/tests/Sitecore.Feature.Multisite.Tests.csproj @@ -104,10 +104,10 @@ - - - - + + + + diff --git a/src/Feature/Navigation/code/Sitecore.Feature.Navigation.csproj b/src/Feature/Navigation/code/Sitecore.Feature.Navigation.csproj index ed18eb2b93..a34040ce57 100644 --- a/src/Feature/Navigation/code/Sitecore.Feature.Navigation.csproj +++ b/src/Feature/Navigation/code/Sitecore.Feature.Navigation.csproj @@ -77,8 +77,8 @@ - - + + diff --git a/src/Feature/Navigation/code/Web.config b/src/Feature/Navigation/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/Navigation/code/Web.config +++ b/src/Feature/Navigation/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/News/Tests/Sitecore.Feature.News.Tests.csproj b/src/Feature/News/Tests/Sitecore.Feature.News.Tests.csproj index d019592ea5..2930ee68c6 100644 --- a/src/Feature/News/Tests/Sitecore.Feature.News.Tests.csproj +++ b/src/Feature/News/Tests/Sitecore.Feature.News.Tests.csproj @@ -116,13 +116,13 @@ - - - - - - - + + + + + + + diff --git a/src/Feature/News/code/Sitecore.Feature.News.csproj b/src/Feature/News/code/Sitecore.Feature.News.csproj index a032e86dd0..44a2e2bc4c 100644 --- a/src/Feature/News/code/Sitecore.Feature.News.csproj +++ b/src/Feature/News/code/Sitecore.Feature.News.csproj @@ -81,9 +81,9 @@ - - - + + + diff --git a/src/Feature/News/code/Web.config b/src/Feature/News/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/News/code/Web.config +++ b/src/Feature/News/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/PageContent/code/Sitecore.Feature.PageContent.csproj b/src/Feature/PageContent/code/Sitecore.Feature.PageContent.csproj index 0336d4cacc..8e44b4c74e 100644 --- a/src/Feature/PageContent/code/Sitecore.Feature.PageContent.csproj +++ b/src/Feature/PageContent/code/Sitecore.Feature.PageContent.csproj @@ -78,8 +78,8 @@ - - + + diff --git a/src/Feature/PageContent/code/Web.config b/src/Feature/PageContent/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/PageContent/code/Web.config +++ b/src/Feature/PageContent/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/Person/code/Sitecore.Feature.Person.csproj b/src/Feature/Person/code/Sitecore.Feature.Person.csproj index cecb240f51..ea8ae8e7f2 100644 --- a/src/Feature/Person/code/Sitecore.Feature.Person.csproj +++ b/src/Feature/Person/code/Sitecore.Feature.Person.csproj @@ -80,9 +80,9 @@ - - - + + + diff --git a/src/Feature/Person/code/Web.config b/src/Feature/Person/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/Person/code/Web.config +++ b/src/Feature/Person/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/Person/tests/Sitecore.Feature.Person.Tests.csproj b/src/Feature/Person/tests/Sitecore.Feature.Person.Tests.csproj index 416b489994..64813bc365 100644 --- a/src/Feature/Person/tests/Sitecore.Feature.Person.Tests.csproj +++ b/src/Feature/Person/tests/Sitecore.Feature.Person.Tests.csproj @@ -107,11 +107,11 @@ - - - - - + + + + + diff --git a/src/Feature/Search/code/Sitecore.Feature.Search.csproj b/src/Feature/Search/code/Sitecore.Feature.Search.csproj index 6ef9a7c00f..091a0627fb 100644 --- a/src/Feature/Search/code/Sitecore.Feature.Search.csproj +++ b/src/Feature/Search/code/Sitecore.Feature.Search.csproj @@ -92,10 +92,10 @@ - - - - + + + + diff --git a/src/Feature/Search/code/Web.config b/src/Feature/Search/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/Search/code/Web.config +++ b/src/Feature/Search/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/Social/code/Sitecore.Feature.Social.csproj b/src/Feature/Social/code/Sitecore.Feature.Social.csproj index 7755299d8b..26e731429d 100644 --- a/src/Feature/Social/code/Sitecore.Feature.Social.csproj +++ b/src/Feature/Social/code/Sitecore.Feature.Social.csproj @@ -73,7 +73,7 @@ - + diff --git a/src/Feature/Social/code/Web.config b/src/Feature/Social/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/Social/code/Web.config +++ b/src/Feature/Social/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/Teasers/code/Models/DynamicTeaserItem.cs b/src/Feature/Teasers/code/Models/DynamicTeaserItem.cs index 7f2a95b12a..3760548845 100644 --- a/src/Feature/Teasers/code/Models/DynamicTeaserItem.cs +++ b/src/Feature/Teasers/code/Models/DynamicTeaserItem.cs @@ -25,13 +25,13 @@ public DynamicTeaserItem() this.PanelId = $"panel{Guid.NewGuid().ToString("N")}"; } - [CanBeNull] + public Item Item { get; set; } - [CanBeNull] + public string Title { get; private set; } - [CanBeNull] + public string Icon { get; set; } public bool IsActive { get; set; } diff --git a/src/Feature/Teasers/code/Models/DynamicTeaserModel.cs b/src/Feature/Teasers/code/Models/DynamicTeaserModel.cs index 58c6537f8e..4d30912252 100644 --- a/src/Feature/Teasers/code/Models/DynamicTeaserModel.cs +++ b/src/Feature/Teasers/code/Models/DynamicTeaserModel.cs @@ -10,7 +10,7 @@ public class DynamicTeaserModel { private DynamicTeaserItem[] _items; - public DynamicTeaserModel([NotNull] Item dynamicTeaser) + public DynamicTeaserModel(Item dynamicTeaser) { if (dynamicTeaser == null) { diff --git a/src/Feature/Teasers/code/Sitecore.Feature.Teasers.csproj b/src/Feature/Teasers/code/Sitecore.Feature.Teasers.csproj index 82b3cc954d..3c8c1cbda2 100644 --- a/src/Feature/Teasers/code/Sitecore.Feature.Teasers.csproj +++ b/src/Feature/Teasers/code/Sitecore.Feature.Teasers.csproj @@ -77,8 +77,8 @@ - - + + diff --git a/src/Feature/Teasers/code/Web.config b/src/Feature/Teasers/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/Teasers/code/Web.config +++ b/src/Feature/Teasers/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Feature/Teasers/tests/Sitecore.Feature.Teasers.Tests.csproj b/src/Feature/Teasers/tests/Sitecore.Feature.Teasers.Tests.csproj index bbe0f6da91..a03ec4a1e6 100644 --- a/src/Feature/Teasers/tests/Sitecore.Feature.Teasers.Tests.csproj +++ b/src/Feature/Teasers/tests/Sitecore.Feature.Teasers.Tests.csproj @@ -95,10 +95,10 @@ - - - - + + + + @@ -137,11 +137,11 @@ - \ No newline at end of file diff --git a/src/Feature/faq/code/Repositories/FaqRepository.cs b/src/Feature/faq/code/Repositories/FaqRepository.cs index a6386d1398..668e039014 100644 --- a/src/Feature/faq/code/Repositories/FaqRepository.cs +++ b/src/Feature/faq/code/Repositories/FaqRepository.cs @@ -8,7 +8,7 @@ public static class FaqRepository { - public static IEnumerable Get([NotNull] Item item) + public static IEnumerable Get(Item item) { if (item == null) throw new ArgumentNullException(nameof(item)); diff --git a/src/Feature/faq/code/Sitecore.Feature.FAQ.csproj b/src/Feature/faq/code/Sitecore.Feature.FAQ.csproj index 5427165826..f8b2fe56ac 100644 --- a/src/Feature/faq/code/Sitecore.Feature.FAQ.csproj +++ b/src/Feature/faq/code/Sitecore.Feature.FAQ.csproj @@ -73,7 +73,7 @@ - + diff --git a/src/Feature/faq/code/Web.config b/src/Feature/faq/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Feature/faq/code/Web.config +++ b/src/Feature/faq/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/Accounts/code/Sitecore.Foundation.Accounts.csproj b/src/Foundation/Accounts/code/Sitecore.Foundation.Accounts.csproj index dfede3212a..c7e64b1d9b 100644 --- a/src/Foundation/Accounts/code/Sitecore.Foundation.Accounts.csproj +++ b/src/Foundation/Accounts/code/Sitecore.Foundation.Accounts.csproj @@ -174,30 +174,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -276,11 +275,11 @@ - \ No newline at end of file diff --git a/src/Foundation/Accounts/code/Web.config b/src/Foundation/Accounts/code/Web.config index cab0095ee5..e6a172fc4f 100644 --- a/src/Foundation/Accounts/code/Web.config +++ b/src/Foundation/Accounts/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/Accounts/tests/Sitecore.Foundation.Accounts.Tests.csproj b/src/Foundation/Accounts/tests/Sitecore.Foundation.Accounts.Tests.csproj index 164035d3e5..5441c0f771 100644 --- a/src/Foundation/Accounts/tests/Sitecore.Foundation.Accounts.Tests.csproj +++ b/src/Foundation/Accounts/tests/Sitecore.Foundation.Accounts.Tests.csproj @@ -122,10 +122,6 @@ $(SitecorePath)\bin\Sitecore.ContentSearch.dll True - - $(SitecorePath)\bin\Sitecore.Framework.Conditions.dll - True - $(SitecorePath)\bin\Sitecore.Kernel.dll True @@ -158,22 +154,21 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -216,11 +211,11 @@ - \ No newline at end of file diff --git a/src/Foundation/Alerts/code/Sitecore.Foundation.Alerts.csproj b/src/Foundation/Alerts/code/Sitecore.Foundation.Alerts.csproj index 3dc6d3909b..7a00091420 100644 --- a/src/Foundation/Alerts/code/Sitecore.Foundation.Alerts.csproj +++ b/src/Foundation/Alerts/code/Sitecore.Foundation.Alerts.csproj @@ -76,8 +76,8 @@ - - + + diff --git a/src/Foundation/Alerts/code/Web.config b/src/Foundation/Alerts/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Foundation/Alerts/code/Web.config +++ b/src/Foundation/Alerts/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/Alerts/tests/Sitecore.Foundation.Alerts.Tests.csproj b/src/Foundation/Alerts/tests/Sitecore.Foundation.Alerts.Tests.csproj index 587bfc1094..13c858b10d 100644 --- a/src/Foundation/Alerts/tests/Sitecore.Foundation.Alerts.Tests.csproj +++ b/src/Foundation/Alerts/tests/Sitecore.Foundation.Alerts.Tests.csproj @@ -104,10 +104,10 @@ - - - - + + + + diff --git a/src/Foundation/Assets/code/Sitecore.Foundation.Assets.csproj b/src/Foundation/Assets/code/Sitecore.Foundation.Assets.csproj index bd2f6bebcf..93487e18d7 100644 --- a/src/Foundation/Assets/code/Sitecore.Foundation.Assets.csproj +++ b/src/Foundation/Assets/code/Sitecore.Foundation.Assets.csproj @@ -81,8 +81,8 @@ - - + + diff --git a/src/Foundation/Assets/code/web.config b/src/Foundation/Assets/code/web.config index 792daa9427..a8dc13162b 100644 --- a/src/Foundation/Assets/code/web.config +++ b/src/Foundation/Assets/code/web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/DependencyInjection/code/Sitecore.Foundation.DependencyInjection.csproj b/src/Foundation/DependencyInjection/code/Sitecore.Foundation.DependencyInjection.csproj index 2c04e85eed..31acaec96b 100644 --- a/src/Foundation/DependencyInjection/code/Sitecore.Foundation.DependencyInjection.csproj +++ b/src/Foundation/DependencyInjection/code/Sitecore.Foundation.DependencyInjection.csproj @@ -78,7 +78,7 @@ - + diff --git a/src/Foundation/DependencyInjection/code/Web.config b/src/Foundation/DependencyInjection/code/Web.config index ee5624a664..dd68167065 100644 --- a/src/Foundation/DependencyInjection/code/Web.config +++ b/src/Foundation/DependencyInjection/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/Dictionary/code/Repositories/DictionaryPhraseRepository.cs b/src/Foundation/Dictionary/code/Repositories/DictionaryPhraseRepository.cs index 78129a9d48..cd099a26c2 100644 --- a/src/Foundation/Dictionary/code/Repositories/DictionaryPhraseRepository.cs +++ b/src/Foundation/Dictionary/code/Repositories/DictionaryPhraseRepository.cs @@ -40,7 +40,7 @@ private static IDictionaryPhraseRepository GetCurrentFromCacheOrCreate() return returnValue; } - public string Get([NotNull] string relativePath, string defaultValue) + public string Get(string relativePath, string defaultValue) { if (relativePath == null) { @@ -60,7 +60,7 @@ public string Get([NotNull] string relativePath, string defaultValue) return dictionaryItem.Fields[Templates.DictionaryEntry.Fields.Phrase].Value ?? defaultValue; } - public Item GetItem([NotNull] string relativePath, string defaultValue = "") + public Item GetItem(string relativePath, string defaultValue = "") { if (relativePath == null) { @@ -75,7 +75,7 @@ public Item GetItem([NotNull] string relativePath, string defaultValue = "") return item; } - private Item GetOrAutoCreateItem([NotNull]string relativePath, [CanBeNull]string defaultValue) + private Item GetOrAutoCreateItem(string relativePath, string defaultValue) { relativePath = AssertRelativePath(relativePath); diff --git a/src/Foundation/Dictionary/code/Sitecore.Foundation.Dictionary.csproj b/src/Foundation/Dictionary/code/Sitecore.Foundation.Dictionary.csproj index 94be3e069b..0d7e09a503 100644 --- a/src/Foundation/Dictionary/code/Sitecore.Foundation.Dictionary.csproj +++ b/src/Foundation/Dictionary/code/Sitecore.Foundation.Dictionary.csproj @@ -77,8 +77,8 @@ - - + + @@ -143,11 +143,11 @@ - \ No newline at end of file diff --git a/src/Foundation/Dictionary/code/Web.config b/src/Foundation/Dictionary/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Foundation/Dictionary/code/Web.config +++ b/src/Foundation/Dictionary/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/Dictionary/tests/Sitecore.Foundation.Dictionary.Tests.csproj b/src/Foundation/Dictionary/tests/Sitecore.Foundation.Dictionary.Tests.csproj index ced0f6441c..97b9e7b5e5 100644 --- a/src/Foundation/Dictionary/tests/Sitecore.Foundation.Dictionary.Tests.csproj +++ b/src/Foundation/Dictionary/tests/Sitecore.Foundation.Dictionary.Tests.csproj @@ -103,11 +103,11 @@ - - - - - + + + + + diff --git a/src/Foundation/FieldEditor/code/Sitecore.Foundation.FieldEditor.csproj b/src/Foundation/FieldEditor/code/Sitecore.Foundation.FieldEditor.csproj index e7813a67a3..a5818732fe 100644 --- a/src/Foundation/FieldEditor/code/Sitecore.Foundation.FieldEditor.csproj +++ b/src/Foundation/FieldEditor/code/Sitecore.Foundation.FieldEditor.csproj @@ -77,8 +77,8 @@ - - + + diff --git a/src/Foundation/FieldEditor/code/Web.config b/src/Foundation/FieldEditor/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Foundation/FieldEditor/code/Web.config +++ b/src/Foundation/FieldEditor/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/FieldEditor/tests/Sitecore.Foundation.FieldEditor.Tests.csproj b/src/Foundation/FieldEditor/tests/Sitecore.Foundation.FieldEditor.Tests.csproj index 2d6c492e09..10a4dce05a 100644 --- a/src/Foundation/FieldEditor/tests/Sitecore.Foundation.FieldEditor.Tests.csproj +++ b/src/Foundation/FieldEditor/tests/Sitecore.Foundation.FieldEditor.Tests.csproj @@ -106,11 +106,11 @@ - - - - - + + + + + diff --git a/src/Foundation/Indexing/Tests/Sitecore.Foundation.Indexing.Tests.csproj b/src/Foundation/Indexing/Tests/Sitecore.Foundation.Indexing.Tests.csproj index 49696a2e44..cd0a3e351b 100644 --- a/src/Foundation/Indexing/Tests/Sitecore.Foundation.Indexing.Tests.csproj +++ b/src/Foundation/Indexing/Tests/Sitecore.Foundation.Indexing.Tests.csproj @@ -115,13 +115,13 @@ - - - - - - - + + + + + + + diff --git a/src/Foundation/Indexing/code/Sitecore.Foundation.Indexing.csproj b/src/Foundation/Indexing/code/Sitecore.Foundation.Indexing.csproj index f1b01da340..88faa1ddf2 100644 --- a/src/Foundation/Indexing/code/Sitecore.Foundation.Indexing.csproj +++ b/src/Foundation/Indexing/code/Sitecore.Foundation.Indexing.csproj @@ -95,10 +95,10 @@ - - - - + + + + diff --git a/src/Foundation/Indexing/code/web.config b/src/Foundation/Indexing/code/web.config index 792daa9427..a8dc13162b 100644 --- a/src/Foundation/Indexing/code/web.config +++ b/src/Foundation/Indexing/code/web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/Installer/code/Sitecore.Foundation.Installer.csproj b/src/Foundation/Installer/code/Sitecore.Foundation.Installer.csproj index 8cc9b0cf7b..cdb326e9b0 100644 --- a/src/Foundation/Installer/code/Sitecore.Foundation.Installer.csproj +++ b/src/Foundation/Installer/code/Sitecore.Foundation.Installer.csproj @@ -73,7 +73,7 @@ - + diff --git a/src/Foundation/Installer/code/web.config b/src/Foundation/Installer/code/web.config index 04976a3614..9b920aeeec 100644 --- a/src/Foundation/Installer/code/web.config +++ b/src/Foundation/Installer/code/web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/Installer/tests/Sitecore.Foundation.Installer.Tests.csproj b/src/Foundation/Installer/tests/Sitecore.Foundation.Installer.Tests.csproj index 7b7ac43c69..1ef130878c 100644 --- a/src/Foundation/Installer/tests/Sitecore.Foundation.Installer.Tests.csproj +++ b/src/Foundation/Installer/tests/Sitecore.Foundation.Installer.Tests.csproj @@ -99,9 +99,9 @@ - - - + + + diff --git a/src/Foundation/LocalDatasource/code/Extensions/ItemExtensions.cs b/src/Foundation/LocalDatasource/code/Extensions/ItemExtensions.cs index 36cc33e577..d03f4fd33b 100644 --- a/src/Foundation/LocalDatasource/code/Extensions/ItemExtensions.cs +++ b/src/Foundation/LocalDatasource/code/Extensions/ItemExtensions.cs @@ -9,7 +9,7 @@ public static class ItemExtensions { - public static bool HasLocalDatasourceFolder([NotNull] this Item item) + public static bool HasLocalDatasourceFolder(this Item item) { if (item == null) { @@ -19,7 +19,7 @@ public static bool HasLocalDatasourceFolder([NotNull] this Item item) return item.Children[Settings.LocalDatasourceFolderName] != null; } - public static Item GetLocalDatasourceFolder([NotNull] this Item item) + public static Item GetLocalDatasourceFolder(this Item item) { if (item == null) { @@ -41,7 +41,7 @@ public static Item[] GetLocalDatasourceDependencies(this Item item) return itemLinks.Select(l => l.GetTargetItem()).Where(i => i != null && i.IsLocalDatasourceItem(item)).Distinct().ToArray(); } - public static bool IsLocalDatasourceItem([NotNull] this Item dataSourceItem, Item ofItem) + public static bool IsLocalDatasourceItem(this Item dataSourceItem, Item ofItem) { if (dataSourceItem == null) { @@ -51,7 +51,7 @@ public static bool IsLocalDatasourceItem([NotNull] this Item dataSourceItem, Ite return datasourceFolder != null && dataSourceItem.Axes.IsDescendantOf(datasourceFolder); } - public static bool IsLocalDatasourceItem([NotNull] this Item dataSourceItem) + public static bool IsLocalDatasourceItem(this Item dataSourceItem) { if (dataSourceItem == null) { @@ -65,7 +65,7 @@ public static bool IsLocalDatasourceItem([NotNull] this Item dataSourceItem) return dataSourceItem.Parent?.TemplateName.Equals(Settings.LocalDatasourceFolderTemplate, StringComparison.InvariantCultureIgnoreCase) ?? false; } - public static Item GetParentLocalDatasourceFolder([NotNull] this Item dataSourceItem) + public static Item GetParentLocalDatasourceFolder(this Item dataSourceItem) { if (dataSourceItem == null) { diff --git a/src/Foundation/LocalDatasource/code/Services/ChangeLocalDatasourceReferencesService.cs b/src/Foundation/LocalDatasource/code/Services/ChangeLocalDatasourceReferencesService.cs index 53dbf9b77b..4378dbbd1d 100644 --- a/src/Foundation/LocalDatasource/code/Services/ChangeLocalDatasourceReferencesService.cs +++ b/src/Foundation/LocalDatasource/code/Services/ChangeLocalDatasourceReferencesService.cs @@ -23,7 +23,7 @@ public void UpdateAsync() { var jobCategory = typeof(UpdateLocalDatasourceReferencesService).Name; var siteName = Context.Site == null ? "No Site Context" : Context.Site.Name; - var jobOptions = new JobOptions(this.GetJobName(), jobCategory, siteName, this, nameof(this.Update)); + var jobOptions = new DefaultJobOptions(this.GetJobName(), jobCategory, siteName, this, nameof(this.Update)); JobManager.Start(jobOptions); } diff --git a/src/Foundation/LocalDatasource/code/Sitecore.Foundation.LocalDatasource.csproj b/src/Foundation/LocalDatasource/code/Sitecore.Foundation.LocalDatasource.csproj index ac6bdd1932..5f0cd844c7 100644 --- a/src/Foundation/LocalDatasource/code/Sitecore.Foundation.LocalDatasource.csproj +++ b/src/Foundation/LocalDatasource/code/Sitecore.Foundation.LocalDatasource.csproj @@ -76,8 +76,8 @@ - - + + diff --git a/src/Foundation/LocalDatasource/code/web.config b/src/Foundation/LocalDatasource/code/web.config index 792daa9427..a8dc13162b 100644 --- a/src/Foundation/LocalDatasource/code/web.config +++ b/src/Foundation/LocalDatasource/code/web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/LocalDatasource/tests/Sitecore.Foundation.LocalDatasource.Tests.csproj b/src/Foundation/LocalDatasource/tests/Sitecore.Foundation.LocalDatasource.Tests.csproj index b5a67ff9c6..156a482f84 100644 --- a/src/Foundation/LocalDatasource/tests/Sitecore.Foundation.LocalDatasource.Tests.csproj +++ b/src/Foundation/LocalDatasource/tests/Sitecore.Foundation.LocalDatasource.Tests.csproj @@ -90,9 +90,9 @@ - - - + + + @@ -126,11 +126,11 @@ - \ No newline at end of file diff --git a/src/Foundation/Multisite/code/Providers/DatasourceProvider.cs b/src/Foundation/Multisite/code/Providers/DatasourceProvider.cs index d24f458be7..36acae0423 100644 --- a/src/Foundation/Multisite/code/Providers/DatasourceProvider.cs +++ b/src/Foundation/Multisite/code/Providers/DatasourceProvider.cs @@ -54,7 +54,7 @@ private Item[] GetRelativeRoots(Item contextItem, string relativePath) return root != null ? new[] {root} : new Item[] { }; } - private Item[] GetRootsFromQuery([NotNull] Item contextItem, string query) + private Item[] GetRootsFromQuery(Item contextItem, string query) { if (contextItem == null) { diff --git a/src/Foundation/Multisite/code/Providers/SiteDefinitionsProvider.cs b/src/Foundation/Multisite/code/Providers/SiteDefinitionsProvider.cs index 5359605b86..fa0ac4c0d1 100644 --- a/src/Foundation/Multisite/code/Providers/SiteDefinitionsProvider.cs +++ b/src/Foundation/Multisite/code/Providers/SiteDefinitionsProvider.cs @@ -30,7 +30,7 @@ public SiteDefinition GetContextSiteDefinition(Item item) return this.GetSiteByHierarchy(item) ?? this.SiteDefinitions.FirstOrDefault(s => s.IsCurrent); } - private bool IsValidSite([NotNull] SiteInfo site) + private bool IsValidSite(SiteInfo site) { return this.GetSiteRootItem(site) != null; } @@ -54,7 +54,7 @@ private Item GetSiteRootItem(SiteInfo site) return item; } - private SiteDefinition Create([NotNull] SiteInfo site) + private SiteDefinition Create(SiteInfo site) { if (site == null) { @@ -85,7 +85,7 @@ private static string GetHostName(SiteInfo site) throw new ConfigurationErrorsException($"Cannot determine hostname for site '{site}'"); } - private static bool IsSite([NotNull] Item item) + private static bool IsSite(Item item) { if (item == null) { diff --git a/src/Foundation/Multisite/code/SiteContext.cs b/src/Foundation/Multisite/code/SiteContext.cs index 88c153f26f..9d973b8f99 100644 --- a/src/Foundation/Multisite/code/SiteContext.cs +++ b/src/Foundation/Multisite/code/SiteContext.cs @@ -15,7 +15,7 @@ public SiteContext(ISiteDefinitionsProvider siteDefinitionsProvider) this.siteDefinitionsProvider = siteDefinitionsProvider; } - public virtual SiteDefinition GetSiteDefinition([NotNull] Item item) + public virtual SiteDefinition GetSiteDefinition(Item item) { Assert.ArgumentNotNull(item, nameof(item)); diff --git a/src/Foundation/Multisite/code/Sitecore.Foundation.Multisite.csproj b/src/Foundation/Multisite/code/Sitecore.Foundation.Multisite.csproj index d52379de4b..5b57aadd84 100644 --- a/src/Foundation/Multisite/code/Sitecore.Foundation.Multisite.csproj +++ b/src/Foundation/Multisite/code/Sitecore.Foundation.Multisite.csproj @@ -87,9 +87,9 @@ - - - + + + diff --git a/src/Foundation/Multisite/code/Web.config b/src/Foundation/Multisite/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Foundation/Multisite/code/Web.config +++ b/src/Foundation/Multisite/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/Multisite/tests/Sitecore.Foundation.Multisite.Tests.csproj b/src/Foundation/Multisite/tests/Sitecore.Foundation.Multisite.Tests.csproj index 27447560df..081a74cf65 100644 --- a/src/Foundation/Multisite/tests/Sitecore.Foundation.Multisite.Tests.csproj +++ b/src/Foundation/Multisite/tests/Sitecore.Foundation.Multisite.Tests.csproj @@ -103,10 +103,10 @@ - - - - + + + + diff --git a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.AutoPublish.config b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.AutoPublish.config index 646e09a552..796664fa9c 100644 --- a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.AutoPublish.config +++ b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.AutoPublish.config @@ -8,7 +8,7 @@ http://github.com/kamsar/Unicorn --> - + diff --git a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Configs.Default.Users.config.example b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Configs.Default.Users.config.example index 54ea72139c..34ec45bb5c 100644 --- a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Configs.Default.Users.config.example +++ b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Configs.Default.Users.config.example @@ -47,8 +47,8 @@ NOTE: if you do not alter the default values you can remove this entirely and use the defaults set in Unicorn.Users.config removeOrphans: - If you set RemoveOrphans to true, role syncing will delete matching roles that are not serialized, like item syncing does. - If set to false, roles are only ever added or updated (similar to New Items Only item syncing but updates are also synced) + If you set RemoveOrphans to true, user syncing will delete matching users that are not serialized, like item syncing does. + If set to false, users are only ever added or updated (similar to New Items Only item syncing but updates are also synced) defaultPassword: When NEW users are deserialized, their passwords will be set to this value. diff --git a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Configs.Default.example b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Configs.Default.example index a12ad51fa4..54f0003734 100644 --- a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Configs.Default.example +++ b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Configs.Default.example @@ -8,7 +8,7 @@ See Unicorn.config for commentary on how configurations operate, or https://github.com/kamsar/Unicorn/blob/master/README.md --> - + @@ -65,7 +65,38 @@ - + + + + /* Predicate transforms apply, but "Title" gets ignored on this include definition */ + + + + + + + + + - + - + - + diff --git a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Remote.config.disabled b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Remote.config.disabled index 3d7ff30c68..99816ee5eb 100644 --- a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Remote.config.disabled +++ b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Remote.config.disabled @@ -11,8 +11,8 @@ http://github.com/kamsar/Unicorn https://github.com/BerserkerDotNet/Unicorn.VisualStudio --> - - + + diff --git a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Roles.DataProvider.config b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Roles.DataProvider.config index 1b04807151..413fc4b904 100644 --- a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Roles.DataProvider.config +++ b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Roles.DataProvider.config @@ -9,7 +9,7 @@ http://github.com/kamsar/Unicorn --> - + diff --git a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Roles.config b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Roles.config index b4c5736469..ad90fb76a6 100644 --- a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Roles.config +++ b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Roles.config @@ -11,13 +11,13 @@ http://github.com/kamsar/Unicorn --> - + - + diff --git a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.UI.config b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.UI.config index a0ac979007..42cb88ea7b 100644 --- a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.UI.config +++ b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.UI.config @@ -8,7 +8,7 @@ http://github.com/kamsar/Unicorn --> - + /unicorn.aspx + unicorn - + - + diff --git a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Users.config b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Users.config index e2b978e5a8..8cd4be437f 100644 --- a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Users.config +++ b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.Users.config @@ -11,13 +11,13 @@ http://github.com/kamsar/Unicorn --> - + - + diff --git a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.config b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.config index dc2bf9f900..d5caa0dbe9 100644 --- a/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.config +++ b/src/Foundation/Serialization/code/App_Config/Include/Unicorn/Unicorn.config @@ -10,8 +10,8 @@ http://github.com/kamsar/Unicorn --> - - + + - + + + false + @@ -206,5 +212,14 @@ + + + + + diff --git a/src/Foundation/Serialization/code/Sitecore.Foundation.Serialization.csproj b/src/Foundation/Serialization/code/Sitecore.Foundation.Serialization.csproj index d55d9e92c9..8344a1ef66 100644 --- a/src/Foundation/Serialization/code/Sitecore.Foundation.Serialization.csproj +++ b/src/Foundation/Serialization/code/Sitecore.Foundation.Serialization.csproj @@ -57,10 +57,10 @@ - - - - + + + + @@ -68,12 +68,12 @@ - - - - - - + + + + + + @@ -86,7 +86,7 @@ - + @@ -176,11 +176,11 @@ - \ No newline at end of file diff --git a/src/Foundation/Serialization/code/Web.config b/src/Foundation/Serialization/code/Web.config index ee5624a664..dd68167065 100644 --- a/src/Foundation/Serialization/code/Web.config +++ b/src/Foundation/Serialization/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/SitecoreExtensions/Tests/Sitecore.Foundation.SitecoreExtensions.Tests.csproj b/src/Foundation/SitecoreExtensions/Tests/Sitecore.Foundation.SitecoreExtensions.Tests.csproj index 49ec3b5de4..01f9233f43 100644 --- a/src/Foundation/SitecoreExtensions/Tests/Sitecore.Foundation.SitecoreExtensions.Tests.csproj +++ b/src/Foundation/SitecoreExtensions/Tests/Sitecore.Foundation.SitecoreExtensions.Tests.csproj @@ -119,10 +119,6 @@ $(SitecorePath)\bin\Sitecore.ContentSearch.dll True - - $(SitecorePath)\bin\Sitecore.Framework.Conditions.dll - True - $(SitecorePath)\bin\Sitecore.Kernel.dll True @@ -167,25 +163,24 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/Foundation/SitecoreExtensions/code/Extensions/RenderingExtensions.cs b/src/Foundation/SitecoreExtensions/code/Extensions/RenderingExtensions.cs index 4eb3088950..83ec6412ff 100644 --- a/src/Foundation/SitecoreExtensions/code/Extensions/RenderingExtensions.cs +++ b/src/Foundation/SitecoreExtensions/code/Extensions/RenderingExtensions.cs @@ -24,7 +24,7 @@ public static int GetIntegerParameter(this Rendering rendering, string parameter return !int.TryParse(parameter, out returnValue) ? defaultValue : returnValue; } - public static bool GetUseStaticPlaceholderNames([NotNull] this Rendering rendering) + public static bool GetUseStaticPlaceholderNames(this Rendering rendering) { return MainUtil.GetBool(rendering.Parameters[Constants.DynamicPlaceholdersLayoutParameters.UseStaticPlaceholderNames], false); } diff --git a/src/Foundation/SitecoreExtensions/code/Sitecore.Foundation.SitecoreExtensions.csproj b/src/Foundation/SitecoreExtensions/code/Sitecore.Foundation.SitecoreExtensions.csproj index ec9b5fa517..eaedebf3de 100644 --- a/src/Foundation/SitecoreExtensions/code/Sitecore.Foundation.SitecoreExtensions.csproj +++ b/src/Foundation/SitecoreExtensions/code/Sitecore.Foundation.SitecoreExtensions.csproj @@ -104,10 +104,6 @@ $(SitecorePath)\bin\Sitecore.ExperienceEditor.dll False - - $(SitecorePath)\bin\Sitecore.Framework.Conditions.dll - False - $(SitecorePath)\bin\Sitecore.Kernel.dll False @@ -140,21 +136,20 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/Foundation/SitecoreExtensions/code/web.config b/src/Foundation/SitecoreExtensions/code/web.config index 792daa9427..a8dc13162b 100644 --- a/src/Foundation/SitecoreExtensions/code/web.config +++ b/src/Foundation/SitecoreExtensions/code/web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/Theming/code/Extensions/RenderingExtensions.cs b/src/Foundation/Theming/code/Extensions/RenderingExtensions.cs index a819cd5a38..9bf1bdd36f 100644 --- a/src/Foundation/Theming/code/Extensions/RenderingExtensions.cs +++ b/src/Foundation/Theming/code/Extensions/RenderingExtensions.cs @@ -8,7 +8,7 @@ public static class RenderingExtensions { - public static CarouselOptions GetCarouselOptions([NotNull] this Rendering rendering) + public static CarouselOptions GetCarouselOptions(this Rendering rendering) { return new CarouselOptions { @@ -18,7 +18,7 @@ public static CarouselOptions GetCarouselOptions([NotNull] this Rendering render }; } - public static string GetBackgroundClass([NotNull] this Rendering rendering) + public static string GetBackgroundClass(this Rendering rendering) { var id = MainUtil.GetID(rendering.Parameters[Constants.BackgroundLayoutParameters.Background] ?? "", null); if (ID.IsNullOrEmpty(id)) @@ -27,28 +27,28 @@ public static string GetBackgroundClass([NotNull] this Rendering rendering) return item?[Templates.Style.Fields.Class] ?? ""; } - public static bool IsFixedHeight([NotNull] this Rendering rendering) + public static bool IsFixedHeight(this Rendering rendering) { var isFixed = MainUtil.GetBool(rendering.Parameters[Constants.IsFixedHeightLayoutParameters.FixedHeight] ?? "", false); return isFixed; } - public static int GetHeight([NotNull] this Rendering rendering) + public static int GetHeight(this Rendering rendering) { return MainUtil.GetInt(rendering.Parameters[Constants.IsFixedHeightLayoutParameters.Height] ?? "", 0); } - public static string GetContainerClass([NotNull] this Rendering rendering) + public static string GetContainerClass(this Rendering rendering) { return rendering.IsContainerFluid() ? "container-fluid" : "container"; } - public static bool IsContainerFluid([NotNull] this Rendering rendering) + public static bool IsContainerFluid(this Rendering rendering) { return MainUtil.GetBool(rendering.Parameters[Constants.HasContainerLayoutParameters.IsFluid], false); } - public static BackgroundRendering RenderBackground([NotNull] this Rendering rendering, HtmlHelper helper) + public static BackgroundRendering RenderBackground(this Rendering rendering, HtmlHelper helper) { return new BackgroundRendering(helper.ViewContext.Writer, rendering.GetBackgroundClass()); } diff --git a/src/Foundation/Theming/code/Sitecore.Foundation.Theming.csproj b/src/Foundation/Theming/code/Sitecore.Foundation.Theming.csproj index 1e6ee5b35d..e9b240d9d1 100644 --- a/src/Foundation/Theming/code/Sitecore.Foundation.Theming.csproj +++ b/src/Foundation/Theming/code/Sitecore.Foundation.Theming.csproj @@ -79,8 +79,8 @@ - - + + diff --git a/src/Foundation/Theming/code/Web.config b/src/Foundation/Theming/code/Web.config index 41f31e9fae..6e4689d4ed 100644 --- a/src/Foundation/Theming/code/Web.config +++ b/src/Foundation/Theming/code/Web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Foundation/Theming/tests/Sitecore.Foundation.Theming.Tests.csproj b/src/Foundation/Theming/tests/Sitecore.Foundation.Theming.Tests.csproj index b10041d84b..9c4c131990 100644 --- a/src/Foundation/Theming/tests/Sitecore.Foundation.Theming.Tests.csproj +++ b/src/Foundation/Theming/tests/Sitecore.Foundation.Theming.Tests.csproj @@ -103,10 +103,10 @@ - - - - + + + + diff --git a/src/Project/Common/code/Sitecore.Common.Website.csproj b/src/Project/Common/code/Sitecore.Common.Website.csproj index e181011275..4e28171b2e 100644 --- a/src/Project/Common/code/Sitecore.Common.Website.csproj +++ b/src/Project/Common/code/Sitecore.Common.Website.csproj @@ -79,7 +79,7 @@ - + @@ -240,6 +240,7 @@ + web.config diff --git a/src/Project/Common/code/Web.config.xdt b/src/Project/Common/code/Web.config.xdt new file mode 100644 index 0000000000..4f31642a2f --- /dev/null +++ b/src/Project/Common/code/Web.config.xdt @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Project/Common/code/web.config b/src/Project/Common/code/web.config index 792daa9427..a8dc13162b 100644 --- a/src/Project/Common/code/web.config +++ b/src/Project/Common/code/web.config @@ -14,8 +14,8 @@ --> - - + + diff --git a/src/Project/Habitat/code/App_Config/Environment/Project/Habitat.Dev.config b/src/Project/Habitat/code/App_Config/Environment/Project/Habitat.Dev.config index 96d2ce2bc4..6b7cc800ce 100644 --- a/src/Project/Habitat/code/App_Config/Environment/Project/Habitat.Dev.config +++ b/src/Project/Habitat/code/App_Config/Environment/Project/Habitat.Dev.config @@ -9,4 +9,6 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config b/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config index 8b9f2f191a..f82abfc925 100644 --- a/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config +++ b/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config @@ -4,14 +4,14 @@ - + habitat - + true diff --git a/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj b/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj index 200d7d5f26..0b639a427e 100644 --- a/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj +++ b/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj @@ -93,10 +93,10 @@ - - - - + + + + diff --git a/src/Project/Habitat/code/web.config b/src/Project/Habitat/code/web.config index 792daa9427..a8dc13162b 100644 --- a/src/Project/Habitat/code/web.config +++ b/src/Project/Habitat/code/web.config @@ -14,8 +14,8 @@ --> - - + +