diff --git a/.gitignore b/.gitignore
index 6c180fa693..be42ec2747 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
+#
+# Umbraco Cms Git Ignore
+#
+
+# common files
*.obj
*.pdb
*.user
@@ -9,21 +14,29 @@
*.vs10x
*.ndproj
+# common directories
.DS_Store
._.DS_Store
+.vs/
+/local/
-[Bb]in
+# build directories
+[Bb]in/
[Db]ebug*/
-obj/
[Rr]elease*/
+obj/
+# tools
_ReSharper*/
-
_NCrunch_*/
*.ncrunchsolution
*.ncrunchsolution.user
*.ncrunchproject
*.crunchsolution.cache
+tools/NDepend/
+
+
+
[Tt]est[Rr]esult*
[Bb]uild[Ll]og.*
@@ -97,7 +110,6 @@ src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
-tools/NDepend/
src/Umbraco.Web.UI/App_Plugins/*
src/*.psess
@@ -146,7 +158,6 @@ apidocs/api/*
build/docs.zip
build/ui-docs.zip
build/csharp-docs.zip
-.vs/
src/packages/
src/PrecompiledWeb/*
@@ -155,3 +166,7 @@ build.out/
build.tmp/
build/hooks/
build/temp/
+
+
+
+# eof
\ No newline at end of file
diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 5e836f602b..60fe8a49fa 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -15,74 +15,66 @@
en-US
umbraco
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
-
-
-
+
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 241a46d2c2..fc3cde4936 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -16,7 +16,7 @@
umbraco
-
+
@@ -27,8 +27,6 @@
-
-
diff --git a/build/build.ps1 b/build/build.ps1
index 3bdf2ba6e1..e2a85f0c1a 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -298,10 +298,10 @@
# copy libs
Write-Host "Copy SqlCE libraries"
$nugetPackages = [System.Environment]::ExpandEnvironmentVariables("%userprofile%\.nuget\packages")
- $this.CopyFiles("$nugetPackages\SqlServerCE\4.0.0.1", "*.*", "$tmp\bin", `
- { -not $_.Extension.StartsWith(".nu") -and -not $_.RelativeName.StartsWith("lib\") })
- $this.CopyFiles("$nugetPackages\SqlServerCE\4.0.0.1", "*.*", "$tmp\WebApp\bin", `
- { -not $_.Extension.StartsWith(".nu") -and -not $_.RelativeName.StartsWith("lib\") })
+ $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\bin\x86")
+ $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\bin\amd64")
+ $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\WebApp\bin\x86")
+ $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\WebApp\bin\amd64")
# copy Belle
Write-Host "Copy Belle"
@@ -388,11 +388,6 @@
Write-Host "Create NuGet packages"
- # see https://docs.microsoft.com/en-us/nuget/schema/nuspec
- # note - warnings about SqlCE native libs being outside of 'lib' folder,
- # nothing much we can do about it as it's intentional yet there does not
- # seem to be a way to disable the warning
-
&$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Core.nuspec" `
-Properties BuildTmp="$($this.BuildTemp)" `
-Version "$($this.Version.Semver.ToString())" `
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 37150025fa..9a1987c6b9 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -19,4 +19,4 @@ using System.Resources;
// these are FYI and changed automatically
[assembly: AssemblyFileVersion("8.0.0")]
-[assembly: AssemblyInformationalVersion("8.0.0-alpha.34")]
+[assembly: AssemblyInformationalVersion("8.0.0-alpha.37")]
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 063125e462..e3f0e2c61c 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Configuration
///
/// Gets the version comment of the executing code (eg "beta").
///
- public static string CurrentComment => "alpha.34";
+ public static string CurrentComment => "alpha.37";
///
/// Gets the assembly version of Umbraco.Code.dll.
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 1fa5bd676a..021746017a 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -67,9 +67,7 @@
-
- 5.2.6
-
+
@@ -78,7 +76,7 @@
-
+
diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
index 95c91a9c21..7d2b236c9d 100644
--- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -71,7 +71,7 @@
-
+
@@ -158,12 +158,5 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index e5a8fcd1a6..6339a1ced4 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -63,6 +63,7 @@
+
@@ -105,79 +106,68 @@
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Tests/Strings/StringValidationTests.cs b/src/Umbraco.Tests/Strings/StringValidationTests.cs
index 24ba6fbb2a..b76783080b 100644
--- a/src/Umbraco.Tests/Strings/StringValidationTests.cs
+++ b/src/Umbraco.Tests/Strings/StringValidationTests.cs
@@ -24,6 +24,17 @@ namespace Umbraco.Tests.Strings
Assert.IsFalse(foo.IsValid("fdsa"));
Assert.IsFalse(foo.IsValid("fdsa@"));
+
+ // IsValid can be either a powerful regex OR a dummy test,
+ // and by default it depends on System.ComponentModel.DataAnnotations.AppSettings.DisableRegEx
+ // which ends up using BinaryCompatibility.Current.TargetsAtLeastFramework472 so for some reason
+ // in 472 we are not using the regex anymore
+ //
+ // it can be forced, though with an app settings
+ // dataAnnotations:dataTypeAttribute:disableRegEx = false
+ //
+ // since Umbraco is now 4.7.2+, the setting is required for the following tests to pass
+
Assert.IsFalse(foo.IsValid("fdsa@fdsa"));
Assert.IsFalse(foo.IsValid("fdsa@fdsa."));
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index c82a21e334..6a5de1b3e3 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -105,7 +105,7 @@
-
+
@@ -601,13 +601,5 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 145b035e7f..e2c0e46b2b 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -108,9 +108,15 @@
-
+
+
+
+
+
+
+
-
+
@@ -604,14 +610,6 @@
-
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 7eedec3ec0..aaa1f4d850 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -56,6 +56,7 @@
+
@@ -241,38 +242,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -294,40 +267,24 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/Umbraco.Web/Routing/UrlProvider.cs b/src/Umbraco.Web/Routing/UrlProvider.cs
index 6fa818f392..ea84bbf4e1 100644
--- a/src/Umbraco.Web/Routing/UrlProvider.cs
+++ b/src/Umbraco.Web/Routing/UrlProvider.cs
@@ -188,11 +188,10 @@ namespace Umbraco.Web.Routing
if (content == null)
return "#";
- // this the ONLY place where we deal with default culture - IUrlProvider always receive a culture
+ // this the ONLY place where we deal with default culture - IUrlProvider always receive a culture
+ // be nice with tests, assume things can be null, ultimately fall back to invariant
if (culture == null)
- {
- culture = _variationContextAccessor.VariationContext.Culture;
- }
+ culture = _variationContextAccessor?.VariationContext?.Culture ?? "";
if (current == null)
current = _umbracoContext.CleanedUmbracoUrl;
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 4d2c6fb850..5c6346822e 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -74,9 +74,7 @@
-
- 5.2.6
-
+
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 02a5367e04..f21b257639 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -91,6 +91,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "About", "About", "{420D2458
..\LICENSE.md = ..\LICENSE.md
..\PULL_REQUEST_TEMPLATE.md = ..\PULL_REQUEST_TEMPLATE.md
..\README.md = ..\README.md
+ ..\V8_GETTING_STARTED.md = ..\V8_GETTING_STARTED.md
EndProjectSection
EndProject
Global