diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 7775aaabbe..2cedc69e85 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -15,31 +15,31 @@ en-US umbraco - - + + - - - + + + - + - + - - + + - - - + + + - + @@ -66,4 +66,4 @@ - \ No newline at end of file + diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec index a8fb9cf0c3..8f5cf495c7 100644 --- a/build/NuSpecs/UmbracoCms.nuspec +++ b/build/NuSpecs/UmbracoCms.nuspec @@ -16,9 +16,9 @@ umbraco - - - + + + @@ -49,4 +49,4 @@ - \ No newline at end of file + diff --git a/src/Umbraco.Compat7/Umbraco.Compat7.csproj b/src/Umbraco.Compat7/Umbraco.Compat7.csproj index a014cc8abb..8cc5df4b42 100644 --- a/src/Umbraco.Compat7/Umbraco.Compat7.csproj +++ b/src/Umbraco.Compat7/Umbraco.Compat7.csproj @@ -1,13 +1,14 @@  - v4.6.1 + v4.7 false {185E098F-5706-4B97-B404-EB974F05F633} Library Umbraco.Compat7 Umbraco.Compat7 ..\ + true @@ -41,7 +42,7 @@ - + diff --git a/src/Umbraco.Core/Composing/LightInjectExtensions.cs b/src/Umbraco.Core/Composing/LightInjectExtensions.cs index 74a2c331e9..c7b51404fe 100644 --- a/src/Umbraco.Core/Composing/LightInjectExtensions.cs +++ b/src/Umbraco.Core/Composing/LightInjectExtensions.cs @@ -59,7 +59,7 @@ namespace Umbraco.Core.Composing // _scanner = scanner; //} - public void Scan(Assembly assembly, IServiceRegistry serviceRegistry, Func lifetime, Func shouldRegister) + public void Scan(Assembly assembly, IServiceRegistry serviceRegistry, Func lifetime, Func shouldRegister, Func serviceNameProvider) { // nothing - we *could* scan non-Umbraco assemblies, though } diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 373d49c5aa..ff09db7409 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -1,13 +1,14 @@  - v4.6.1 + v4.7 false {31785BC3-256C-4613-B2F5-A1B0BDDED8C1} Library Umbraco.Core Umbraco.Core ..\ + true @@ -38,16 +39,14 @@ - + - - ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll - + @@ -60,33 +59,28 @@ - - - 1.9.6 - - - - - + + + + + - - - + + + - - + + - - 4.4.0 - + AnyCPU @@ -41,136 +42,87 @@ Always - - ..\packages\BenchmarkDotNet.0.10.12\lib\net46\BenchmarkDotNet.dll - - - ..\packages\BenchmarkDotNet.Core.0.10.12\lib\net46\BenchmarkDotNet.Core.dll - - - ..\packages\BenchmarkDotNet.Diagnostics.Windows.0.9.9\lib\net45\BenchmarkDotNet.Diagnostics.Windows.dll - - - ..\packages\BenchmarkDotNet.Toolchains.Roslyn.0.10.12\lib\net46\BenchmarkDotNet.Toolchains.Roslyn.dll - - - ..\packages\Castle.Core.4.1.1\lib\net45\Castle.Core.dll - - - ..\packages\Microsoft.CodeAnalysis.Common.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll - - - ..\packages\Microsoft.CodeAnalysis.CSharp.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll - - - ..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll - - - ..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll - - - ..\packages\Microsoft.DotNet.PlatformAbstractions.1.1.1\lib\net451\Microsoft.DotNet.PlatformAbstractions.dll - - - ..\packages\Microsoft.Win32.Registry.4.3.0\lib\net46\Microsoft.Win32.Registry.dll - - - ..\packages\Moq.4.7.99\lib\net45\Moq.dll - - - ..\packages\NPoco.3.9.3\lib\net45\NPoco.dll - - - ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - True - - - ..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll - - - ..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll - - - ..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll - - - ..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll - - - ..\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll - - - ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - - - ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - - - ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - True - - - ..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll - - - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll - - - ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - - - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - - - ..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll - - - ..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll - - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net46\System.Security.Cryptography.X509Certificates.dll - True - ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll - - - ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - - - ..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll - - - ..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll - - - ..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll - + + + + + + + + + All + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -224,13 +176,6 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /I /C /D xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" /Y /F /E /I /C /D - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -125,6 +17,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Tests.Benchmarks/packages.config b/src/Umbraco.Tests.Benchmarks/packages.config deleted file mode 100644 index 37c28f9569..0000000000 --- a/src/Umbraco.Tests.Benchmarks/packages.config +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config index 0cd869810f..58c7c9c409 100644 --- a/src/Umbraco.Tests/App.config +++ b/src/Umbraco.Tests/App.config @@ -1,9 +1,9 @@ - + -
+
@@ -12,227 +12,443 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - + + + + + + + + + - + - - - - + + + + - + - + - - + + - - - + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/Umbraco.Tests/CoreThings/CallContextTests.cs b/src/Umbraco.Tests/CoreThings/CallContextTests.cs index 6e9aeb2ba9..e01534c8d9 100644 --- a/src/Umbraco.Tests/CoreThings/CallContextTests.cs +++ b/src/Umbraco.Tests/CoreThings/CallContextTests.cs @@ -19,7 +19,7 @@ namespace Umbraco.Tests.CoreThings }, o => {}); } - [TestFixtureSetUp] + [OneTimeSetUp] public void SetUpFixture() { _first = true; diff --git a/src/Umbraco.Tests/IO/AbstractFileSystemTests.cs b/src/Umbraco.Tests/IO/AbstractFileSystemTests.cs index a60986ea0d..9f83529d11 100644 --- a/src/Umbraco.Tests/IO/AbstractFileSystemTests.cs +++ b/src/Umbraco.Tests/IO/AbstractFileSystemTests.cs @@ -3,12 +3,14 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; +using System.Threading; using NUnit.Framework; using Umbraco.Core.IO; namespace Umbraco.Tests.IO { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] public abstract class AbstractFileSystemTests { protected IFileSystem _fileSystem; diff --git a/src/Umbraco.Tests/IO/PhysicalFileSystemTests.cs b/src/Umbraco.Tests/IO/PhysicalFileSystemTests.cs index ba9ab823b4..a69f2e1920 100644 --- a/src/Umbraco.Tests/IO/PhysicalFileSystemTests.cs +++ b/src/Umbraco.Tests/IO/PhysicalFileSystemTests.cs @@ -3,13 +3,15 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; +using System.Threading; using NUnit.Framework; using Umbraco.Core.IO; namespace Umbraco.Tests.IO { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] public class PhysicalFileSystemTests : AbstractFileSystemTests { public PhysicalFileSystemTests() diff --git a/src/Umbraco.Tests/Integration/GetCultureTests.cs b/src/Umbraco.Tests/Integration/GetCultureTests.cs index dd86b44af8..5441024570 100644 --- a/src/Umbraco.Tests/Integration/GetCultureTests.cs +++ b/src/Umbraco.Tests/Integration/GetCultureTests.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Threading; using NUnit.Framework; using Umbraco.Core.Models; using Umbraco.Tests.Services; @@ -10,7 +11,8 @@ using Umbraco.Web.Routing; namespace Umbraco.Tests.Integration { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class GetCultureTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs b/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs index 3f9ac11d55..6f1543285c 100644 --- a/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs +++ b/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs @@ -1,4 +1,5 @@ using System.Collections.Specialized; +using System.Threading; using System.Web.Security; using Moq; using NUnit.Framework; @@ -12,7 +13,8 @@ using Umbraco.Web.Security.Providers; namespace Umbraco.Tests.Membership { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.None, WithApplication = true)] public class UmbracoServiceMembershipProviderTests : UmbracoTestBase { diff --git a/src/Umbraco.Tests/Migrations/SqlScripts/SqlResources.Designer.cs b/src/Umbraco.Tests/Migrations/SqlScripts/SqlResources.Designer.cs index d60ccffa50..e01c9b3feb 100644 --- a/src/Umbraco.Tests/Migrations/SqlScripts/SqlResources.Designer.cs +++ b/src/Umbraco.Tests/Migrations/SqlScripts/SqlResources.Designer.cs @@ -10,8 +10,8 @@ namespace Umbraco.Tests.Migrations.SqlScripts { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,19 +19,19 @@ namespace Umbraco.Tests.Migrations.SqlScripts { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class SqlResources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal SqlResources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ namespace Umbraco.Tests.Migrations.SqlScripts { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,7 +59,7 @@ namespace Umbraco.Tests.Migrations.SqlScripts { resourceCulture = value; } } - + /// /// Looks up a localized string similar to /******************************************************************************************* /// @@ -70,11 +70,11 @@ namespace Umbraco.Tests.Migrations.SqlScripts { /// /// /// Umbraco database installation script for MySQL - /// + /// ///IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT - /// + /// /// Database version: 4.8.0.4 - /// + /// /// Please increment this version number if ANY change is made to this script, /// so compatibility with scripts for other database systems can be verified easily. /// The first 3 digits depict the Umbraco version, t [rest of string was truncated]";. @@ -84,7 +84,7 @@ namespace Umbraco.Tests.Migrations.SqlScripts { return ResourceManager.GetString("MySqlTotal_480", resourceCulture); } } - + /// /// Looks up a localized string similar to CREATE TABLE [umbracoUserType] ( /// [id] int NOT NULL IDENTITY (5,1) @@ -113,33 +113,33 @@ namespace Umbraco.Tests.Migrations.SqlScripts { return ResourceManager.GetString("SqlCe_SchemaAndData_4110", resourceCulture); } } - + /// - /// Looks up a localized string similar to CREATE TABLE [umbracoRelation] - ///( - ///[id] [int] NOT NULL IDENTITY(1, 1), - ///[parentId] [int] NOT NULL, - ///[childId] [int] NOT NULL, - ///[relType] [int] NOT NULL, - ///[datetime] [datetime] NOT NULL CONSTRAINT [DF_umbracoRelation_datetime] DEFAULT (getdate()), - ///[comment] [nvarchar] (1000) NOT NULL - ///) - /// - ///; - ///ALTER TABLE [umbracoRelation] ADD CONSTRAINT [PK_umbracoRelation] PRIMARY KEY ([id]) - ///; - ///CREATE TABLE [cmsDocument] - ///( - ///[nodeId] [int] NOT NULL, - ///[published] [bit] NOT NULL, - ///[writerUserId] [int] NOT [rest of string was truncated]";. + /// Looks up a localized string similar to CREATE TABLE [umbracoRelation] + ///( + ///[id] [int] NOT NULL IDENTITY(1, 1), + ///[parentId] [int] NOT NULL, + ///[childId] [int] NOT NULL, + ///[relType] [int] NOT NULL, + ///[datetime] [datetime] NOT NULL CONSTRAINT [DF_umbracoRelation_datetime] DEFAULT (getdate()), + ///[comment] [nvarchar] (1000) NOT NULL + ///) + /// + ///; + ///ALTER TABLE [umbracoRelation] ADD CONSTRAINT [PK_umbracoRelation] PRIMARY KEY ([id]) + ///; + ///CREATE TABLE [cmsDocument] + ///( + ///[nodeId] [int] NOT NULL, + ///[published] [bit] NOT NULL, + ///[documentUser] [int] NOT [rest of string was truncated]";. /// internal static string SqlCeTotal_480 { get { return ResourceManager.GetString("SqlCeTotal_480", resourceCulture); } } - + /// /// Looks up a localized string similar to /******************************************************************************************* /// @@ -150,11 +150,11 @@ namespace Umbraco.Tests.Migrations.SqlScripts { /// /// /// Umbraco database installation script for SQL Server - /// + /// ///IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT - /// + /// /// Database version: 4.8.0.0 - /// + /// /// Please increment this version number if ANY change is made to this script, /// so compatibility with scripts for other database systems can be verified easily. /// The first 3 digits depict the Umbraco versi [rest of string was truncated]";. diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs index 8244cb75ef..93e3e91f6a 100644 --- a/src/Umbraco.Tests/Models/ContentTests.cs +++ b/src/Umbraco.Tests/Models/ContentTests.cs @@ -143,8 +143,8 @@ namespace Umbraco.Tests.Models // Assert Assert.That(content.Properties.Any(), Is.True); - Assert.That(content.Properties["title"], Is.Not.Null); - Assert.That(content.Properties["title"].GetValue(), Is.StringContaining("sample.txt")); + Assert.That(content.Properties["title"], Is.Not.Null); + Assert.IsTrue(content.Properties["title"].GetValue().ToString().Contains("sample.txt")); } diff --git a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs index cd147c8b5d..0d5c9548fd 100644 --- a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs +++ b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs @@ -34,28 +34,8 @@ namespace Umbraco.Tests.Models.Mapping { base.SetUp(); - //var nullCacheHelper = CacheHelper.CreateDisabledCacheHelper(); - //var logger = Mock.Of(); - - //var databaseFactory = TestObjects.GetDatabaseFactoryMock(); - - ////Create an app context using mocks - //var appContext = new ApplicationContext( - // new DatabaseContext(databaseFactory, logger, Mock.Of(), Mock.Of()), - - // //Create service context using mocks - // new ServiceContext( - - // contentService: _contentService.Object, - // contentTypeService:_contentTypeService.Object, - // dataTypeService:_dataTypeService.Object, - // entityService:_entityService.Object, - // fileService: _fileService.Object), - - // nullCacheHelper, - // new ProfilingLogger(logger, Mock.Of())); - // fixme - are we initializing mappers that... have already been? + Mapper.Reset(); Mapper.Initialize(configuration => { //initialize our content type mapper diff --git a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs index 9015cd1109..a8c03929fd 100644 --- a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs +++ b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs @@ -2,6 +2,7 @@ using System.Configuration; using System.Data.SqlServerCe; using System.IO; +using System.Threading; using Moq; using NPoco; using NUnit.Framework; @@ -16,7 +17,8 @@ using Umbraco.Tests.TestHelpers; namespace Umbraco.Tests.Persistence { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] public class DatabaseContextTests { private IUmbracoDatabaseFactory _databaseFactory; diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs index 1e3303fa3e..08cbb74145 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs @@ -11,6 +11,7 @@ using Umbraco.Tests.UmbracoExamine; using Umbraco.Web; using Umbraco.Web.PublishedCache.XmlPublishedCache; using System.Linq; +using System.Threading; using System.Xml; using Examine; using Umbraco.Core.Cache; @@ -27,7 +28,8 @@ namespace Umbraco.Tests.PublishedContent /// /// Tests the typed extension methods on IPublishedContent using the DefaultPublishedMediaStore /// - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true)] public class PublishedMediaTests : PublishedContentTestBase { @@ -114,7 +116,7 @@ namespace Umbraco.Tests.PublishedContent { indexer.RebuildIndex(); - + var searcher = indexer.GetSearcher(); var ctx = GetUmbracoContext("/test"); var cache = new PublishedMediaCache(ServiceContext.MediaService, ServiceContext.UserService, searcher, indexer, new StaticCacheProvider(), ContentTypesCache); @@ -140,7 +142,7 @@ namespace Umbraco.Tests.PublishedContent using (indexer.ProcessNonAsync()) { indexer.RebuildIndex(); - + var searcher = indexer.GetSearcher(); var ctx = GetUmbracoContext("/test"); @@ -159,7 +161,7 @@ namespace Umbraco.Tests.PublishedContent jpg "); indexer.IndexItems(new[]{ newXml.ConvertToValueSet("media") }); - + //ensure it still exists in the index (raw examine search) var criteria = searcher.CreateCriteria(); @@ -184,7 +186,7 @@ namespace Umbraco.Tests.PublishedContent using (indexer.ProcessNonAsync()) { indexer.RebuildIndex(); - + var searcher = indexer.GetSearcher(); var ctx = GetUmbracoContext("/test"); @@ -209,7 +211,7 @@ namespace Umbraco.Tests.PublishedContent using (indexer.ProcessNonAsync()) { indexer.RebuildIndex(); - + var searcher = indexer.GetSearcher(); var ctx = GetUmbracoContext("/test"); @@ -234,7 +236,7 @@ namespace Umbraco.Tests.PublishedContent using (indexer.ProcessNonAsync()) { indexer.RebuildIndex(); - + var searcher = indexer.GetSearcher(); var ctx = GetUmbracoContext("/test"); @@ -259,7 +261,7 @@ namespace Umbraco.Tests.PublishedContent using (indexer.ProcessNonAsync()) { indexer.RebuildIndex(); - + var ctx = GetUmbracoContext("/test"); var searcher = indexer.GetSearcher(); @@ -281,7 +283,7 @@ namespace Umbraco.Tests.PublishedContent using (indexer.ProcessNonAsync()) { indexer.RebuildIndex(); - + var ctx = GetUmbracoContext("/test"); var searcher = indexer.GetSearcher(); diff --git a/src/Umbraco.Tests/Routing/SiteDomainHelperTests.cs b/src/Umbraco.Tests/Routing/SiteDomainHelperTests.cs index 8ddf51f31d..3b149280bd 100644 --- a/src/Umbraco.Tests/Routing/SiteDomainHelperTests.cs +++ b/src/Umbraco.Tests/Routing/SiteDomainHelperTests.cs @@ -15,6 +15,12 @@ namespace Umbraco.Tests.Routing SiteDomainHelper.Clear(); // assuming this works! } + [TearDown] + public void TearDown() + { + SiteDomainHelper.Clear(); // assuming this works! + } + [Test] public void AddSites() { diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs index 9e21aa3d25..44c4b5c561 100644 --- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs +++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Threading; using Moq; using NUnit.Framework; using Umbraco.Core; @@ -12,7 +13,8 @@ using Umbraco.Core.Sync; namespace Umbraco.Tests.Routing { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] public class UmbracoModuleTests : BaseWebTest { private UmbracoModule _module; diff --git a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs index c6aaca8056..e1c856297d 100644 --- a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs +++ b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs @@ -17,7 +17,7 @@ namespace Umbraco.Tests.Scheduling { private ILogger _logger; - [TestFixtureSetUp] + [OneTimeSetUp] public void InitializeFixture() { _logger = new DebugDiagnosticsLogger(); diff --git a/src/Umbraco.Tests/Services/CachedDataTypeServiceTests.cs b/src/Umbraco.Tests/Services/CachedDataTypeServiceTests.cs index 2bce0ecf6c..27db2475ca 100644 --- a/src/Umbraco.Tests/Services/CachedDataTypeServiceTests.cs +++ b/src/Umbraco.Tests/Services/CachedDataTypeServiceTests.cs @@ -1,4 +1,5 @@ -using NUnit.Framework; +using System.Threading; +using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Tests.Testing; @@ -9,7 +10,8 @@ namespace Umbraco.Tests.Services /// /// Tests covering the DataTypeService with cache enabled /// - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class CachedDataTypeServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs index a5aec7ccfc..1944516164 100644 --- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using NPoco; using Umbraco.Core; using Umbraco.Core.Events; @@ -17,7 +18,8 @@ using Umbraco.Tests.Testing; namespace Umbraco.Tests.Services { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)] public class ContentTypeServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/DataTypeServiceTests.cs b/src/Umbraco.Tests/Services/DataTypeServiceTests.cs index e36ab4cac8..ceafa411d3 100644 --- a/src/Umbraco.Tests/Services/DataTypeServiceTests.cs +++ b/src/Umbraco.Tests/Services/DataTypeServiceTests.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; @@ -14,7 +15,8 @@ namespace Umbraco.Tests.Services /// /// Tests covering the DataTypeService /// - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class DataTypeServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/EntityServiceTests.cs b/src/Umbraco.Tests/Services/EntityServiceTests.cs index 3d5c2f6ef0..b8d24d940c 100644 --- a/src/Umbraco.Tests/Services/EntityServiceTests.cs +++ b/src/Umbraco.Tests/Services/EntityServiceTests.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; @@ -14,7 +15,8 @@ namespace Umbraco.Tests.Services /// /// Tests covering the EntityService /// - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)] public class EntityServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/FileServiceTests.cs b/src/Umbraco.Tests/Services/FileServiceTests.cs index ac1ef5b9e1..b419ae186f 100644 --- a/src/Umbraco.Tests/Services/FileServiceTests.cs +++ b/src/Umbraco.Tests/Services/FileServiceTests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; using System.Text; +using System.Threading; using System.Threading.Tasks; using NUnit.Framework; using Umbraco.Tests.TestHelpers; @@ -10,7 +11,8 @@ using Umbraco.Tests.Testing; namespace Umbraco.Tests.Services { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class FileServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs b/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs index 263aaab5bc..c02997198b 100644 --- a/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs +++ b/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs @@ -10,8 +10,8 @@ namespace Umbraco.Tests.Services.Importing { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,19 +19,19 @@ namespace Umbraco.Tests.Services.Importing { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class ImportResources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal ImportResources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ namespace Umbraco.Tests.Services.Importing { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,7 +59,7 @@ namespace Umbraco.Tests.Services.Importing { resourceCulture = value; } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8" standalone="no"?> ///<umbPackage> @@ -87,7 +87,7 @@ namespace Umbraco.Tests.Services.Importing { return ResourceManager.GetString("CheckboxList_Content_Package", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8" standalone="no"?> ///<umbPackage> @@ -113,7 +113,7 @@ namespace Umbraco.Tests.Services.Importing { return ResourceManager.GetString("CompositionsTestPackage", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8" standalone="no"?> ///<umbPackage> @@ -141,7 +141,7 @@ namespace Umbraco.Tests.Services.Importing { return ResourceManager.GetString("CompositionsTestPackage_Random", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?> ///<umbPackage> @@ -167,7 +167,7 @@ namespace Umbraco.Tests.Services.Importing { return ResourceManager.GetString("Dictionary_Package", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8" standalone="no"?> ///<umbPackage> @@ -195,7 +195,7 @@ namespace Umbraco.Tests.Services.Importing { return ResourceManager.GetString("Fanoe_Package", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8" standalone="no"?> ///<umbPackage> @@ -220,7 +220,7 @@ namespace Umbraco.Tests.Services.Importing { return ResourceManager.GetString("InheritedDocTypes_Package", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?> ///<DocumentType> @@ -248,7 +248,7 @@ namespace Umbraco.Tests.Services.Importing { return ResourceManager.GetString("SingleDocType", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8" standalone="no"?> ///<umbPackage> @@ -275,7 +275,7 @@ namespace Umbraco.Tests.Services.Importing { return ResourceManager.GetString("StandardMvc_Package", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8" standalone="no"?> ///<umbPackage> @@ -301,7 +301,7 @@ namespace Umbraco.Tests.Services.Importing { return ResourceManager.GetString("TemplateOnly_Package", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8" standalone="no"?> ///<umbPackage> @@ -327,7 +327,7 @@ namespace Umbraco.Tests.Services.Importing { return ResourceManager.GetString("TemplateOnly_Updated_Package", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8" standalone="no"?> ///<umbPackage> @@ -352,7 +352,7 @@ namespace Umbraco.Tests.Services.Importing { return ResourceManager.GetString("uBlogsy_Package", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8" standalone="no"?> ///<umbPackage> diff --git a/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs b/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs index b404a0a83c..1333ca9f57 100644 --- a/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs +++ b/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Xml.Linq; using NUnit.Framework; using Umbraco.Core.Models; @@ -14,7 +15,8 @@ using LightInject; namespace Umbraco.Tests.Services.Importing { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class PackageImportTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/LocalizationServiceTests.cs b/src/Umbraco.Tests/Services/LocalizationServiceTests.cs index e39ebfee8e..b2394200a1 100644 --- a/src/Umbraco.Tests/Services/LocalizationServiceTests.cs +++ b/src/Umbraco.Tests/Services/LocalizationServiceTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using System.Threading; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; @@ -16,7 +17,8 @@ namespace Umbraco.Tests.Services /// This is more of an integration test as it involves multiple layers /// as well as configuration. /// - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class LocalizationServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/MacroServiceTests.cs b/src/Umbraco.Tests/Services/MacroServiceTests.cs index c0c9c42e7d..c7e2978b19 100644 --- a/src/Umbraco.Tests/Services/MacroServiceTests.cs +++ b/src/Umbraco.Tests/Services/MacroServiceTests.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Threading; using Moq; using NUnit.Framework; using Umbraco.Core.Cache; @@ -13,7 +14,8 @@ using Umbraco.Tests.Testing; namespace Umbraco.Tests.Services { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class MacroServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/MediaServiceTests.cs b/src/Umbraco.Tests/Services/MediaServiceTests.cs index 86e48d8adc..814a4af4ab 100644 --- a/src/Umbraco.Tests/Services/MediaServiceTests.cs +++ b/src/Umbraco.Tests/Services/MediaServiceTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using System.Threading; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; @@ -15,7 +16,8 @@ using Umbraco.Tests.Testing; namespace Umbraco.Tests.Services { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)] public class MediaServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs index 3721f0450b..968b27a4f9 100644 --- a/src/Umbraco.Tests/Services/MemberServiceTests.cs +++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Web.Security; using Moq; using NUnit.Framework; @@ -22,7 +23,8 @@ using Umbraco.Web.Security.Providers; namespace Umbraco.Tests.Services { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true, WithApplication = true)] public class MemberServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs b/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs index 3d2678a05b..d5c0eac8c9 100644 --- a/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs +++ b/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using NUnit.Framework; using umbraco.cms.presentation.create.controls; using Umbraco.Core; @@ -12,7 +13,8 @@ using Umbraco.Tests.Testing; namespace Umbraco.Tests.Services { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true, WithApplication = true)] public class MemberTypeServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/PerformanceTests.cs b/src/Umbraco.Tests/Services/PerformanceTests.cs index 0ad07ac9b9..b157eb669d 100644 --- a/src/Umbraco.Tests/Services/PerformanceTests.cs +++ b/src/Umbraco.Tests/Services/PerformanceTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; +using System.Threading; using NPoco; using NUnit.Framework; using Umbraco.Core; @@ -24,7 +25,8 @@ namespace Umbraco.Tests.Services /// This is more of an integration test as it involves multiple layers /// as well as configuration. /// - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] [NUnit.Framework.Ignore("These should not be run by the server, only directly as they are only benchmark tests")] public class PerformanceTests : TestWithDatabaseBase diff --git a/src/Umbraco.Tests/Services/PublicAccessServiceTests.cs b/src/Umbraco.Tests/Services/PublicAccessServiceTests.cs index 0f70376544..8434aad332 100644 --- a/src/Umbraco.Tests/Services/PublicAccessServiceTests.cs +++ b/src/Umbraco.Tests/Services/PublicAccessServiceTests.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Threading; using NUnit.Framework; using Umbraco.Core.Models; using Umbraco.Core.Services; @@ -9,7 +10,8 @@ using Umbraco.Tests.Testing; namespace Umbraco.Tests.Services { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class PublicAccessServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/RelationServiceTests.cs b/src/Umbraco.Tests/Services/RelationServiceTests.cs index 806d97fe5b..cfef50a330 100644 --- a/src/Umbraco.Tests/Services/RelationServiceTests.cs +++ b/src/Umbraco.Tests/Services/RelationServiceTests.cs @@ -1,4 +1,5 @@ using System; +using System.Threading; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; @@ -7,7 +8,8 @@ using Umbraco.Tests.Testing; namespace Umbraco.Tests.Services { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)] public class RelationServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/SectionServiceTests.cs b/src/Umbraco.Tests/Services/SectionServiceTests.cs index d95bda81a8..ca5d755220 100644 --- a/src/Umbraco.Tests/Services/SectionServiceTests.cs +++ b/src/Umbraco.Tests/Services/SectionServiceTests.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using System.Linq; +using System.Threading; using Umbraco.Core.Models.Membership; using Umbraco.Tests.Testing; @@ -8,7 +9,8 @@ namespace Umbraco.Tests.Services /// /// Tests covering the SectionService /// - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true)] public class SectionServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/TagServiceTests.cs b/src/Umbraco.Tests/Services/TagServiceTests.cs index e1cf57a1e9..0db27e9f4c 100644 --- a/src/Umbraco.Tests/Services/TagServiceTests.cs +++ b/src/Umbraco.Tests/Services/TagServiceTests.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Threading; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; @@ -14,7 +15,8 @@ namespace Umbraco.Tests.Services /// This is more of an integration test as it involves multiple layers /// as well as configuration. /// - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class TagServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/Services/TestWithSomeContentBase.cs b/src/Umbraco.Tests/Services/TestWithSomeContentBase.cs index 1f9dd42dae..b821e5a516 100644 --- a/src/Umbraco.Tests/Services/TestWithSomeContentBase.cs +++ b/src/Umbraco.Tests/Services/TestWithSomeContentBase.cs @@ -1,4 +1,5 @@ using System; +using System.Threading; using NUnit.Framework; using Umbraco.Core.Models; using Umbraco.Tests.TestHelpers; @@ -6,7 +7,8 @@ using Umbraco.Tests.TestHelpers.Entities; namespace Umbraco.Tests.Services { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] public abstract class TestWithSomeContentBase : TestWithDatabaseBase { public override void SetUp() diff --git a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs index 0a4c3d774f..ae6a54e8e0 100644 --- a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs +++ b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs @@ -27,7 +27,8 @@ namespace Umbraco.Tests.Services // as I could not figure out _why_ and it does not look like we are // causing it, getting into __sysObjects locks, no idea why - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class ThreadSafetyServiceTest : TestWithDatabaseBase { diff --git a/src/Umbraco.Tests/Services/UserServiceTests.cs b/src/Umbraco.Tests/Services/UserServiceTests.cs index 78f30a41ed..a997eaffd8 100644 --- a/src/Umbraco.Tests/Services/UserServiceTests.cs +++ b/src/Umbraco.Tests/Services/UserServiceTests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Security.Cryptography; using System.Text; +using System.Threading; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Exceptions; @@ -20,7 +21,8 @@ namespace Umbraco.Tests.Services /// /// Tests covering the UserService /// - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true)] public class UserServiceTests : TestWithSomeContentBase { diff --git a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs index 2231953af6..38899170cd 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs @@ -30,6 +30,8 @@ namespace Umbraco.Tests.TestHelpers [SetUp] public virtual void Initialize() { + Current.Reset(); + var sqlSyntax = new SqlCeSyntaxProvider(); var container = new ServiceContainer(); diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs index 0ad95f8ed1..20630a7249 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using LightInject; using Moq; using NUnit.Framework; @@ -16,7 +17,8 @@ using Umbraco.Web.Routing; namespace Umbraco.Tests.TestHelpers { - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] public abstract class BaseWebTest : TestWithDatabaseBase { protected override void Initialize() diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs index b4b1162545..83042c4897 100644 --- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs +++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Configuration; using System.Data.SqlServerCe; using System.Linq; +using System.Threading; using System.Web.Routing; using System.Xml; using Moq; @@ -43,7 +44,7 @@ namespace Umbraco.Tests.TestHelpers /// Provides an Umbraco context and Xml content. /// fixme what else? /// - [RequiresSTA] // why? + [Apartment(ApartmentState.STA)] // why? [UmbracoTest(WithApplication = true)] public abstract class TestWithDatabaseBase : UmbracoTestBase { @@ -95,7 +96,7 @@ namespace Umbraco.Tests.TestHelpers }); } - [TestFixtureTearDown] + [OneTimeTearDown] public void FixtureTearDown() { RemoveDatabaseFile(); diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index 7a627a0558..b5c10fa4a3 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -377,6 +377,8 @@ namespace Umbraco.Tests.Testing // reset all other static things that should not be static ;( UriUtility.ResetAppDomainAppVirtualPath(); SettingsForTests.Reset(); // fixme - should it be optional? + + Mapper.Reset(); } #endregion diff --git a/src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs b/src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs index cba3ec9383..6a43dfbae2 100644 --- a/src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs +++ b/src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs @@ -4,6 +4,7 @@ using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers; using System; using System.Linq; +using System.Threading; using Umbraco.Tests.Testing; using Umbraco.Web.Services; using Current = Umbraco.Web.Composing.Current; @@ -16,7 +17,8 @@ namespace Umbraco.Tests.TreesAndSections ///This is a test class for ApplicationTreeTest and is intended ///to contain all ApplicationTreeTest Unit Tests /// - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class ApplicationTreeTest : TestWithDatabaseBase { diff --git a/src/Umbraco.Tests/TreesAndSections/ResourceFiles.Designer.cs b/src/Umbraco.Tests/TreesAndSections/ResourceFiles.Designer.cs index 3969e1a904..02bc84649e 100644 --- a/src/Umbraco.Tests/TreesAndSections/ResourceFiles.Designer.cs +++ b/src/Umbraco.Tests/TreesAndSections/ResourceFiles.Designer.cs @@ -10,8 +10,8 @@ namespace Umbraco.Tests.TreesAndSections { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,19 +19,19 @@ namespace Umbraco.Tests.TreesAndSections { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class ResourceFiles { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal ResourceFiles() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ namespace Umbraco.Tests.TreesAndSections { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,7 +59,7 @@ namespace Umbraco.Tests.TreesAndSections { resourceCulture = value; } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8"?> ///<applications> @@ -74,7 +74,7 @@ namespace Umbraco.Tests.TreesAndSections { return ResourceManager.GetString("applications", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8"?> ///<trees> diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index b73555af5e..ad2c207b44 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -10,7 +10,7 @@ Properties Umbraco.Tests Umbraco.Tests - v4.6.1 + v4.7 512 ..\ publish\ @@ -30,6 +30,8 @@ true $(SolutionDir)\packages + + true @@ -53,167 +55,65 @@ latest - - ..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll - - - ..\packages\Castle.Core.4.1.1\lib\net45\Castle.Core.dll - - - ..\packages\Examine.1.0.0-beta024\lib\net45\Examine.dll - - - ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - - ..\packages\LightInject.5.0.3\lib\net46\LightInject.dll - - - ..\packages\LightInject.Annotation.1.1.0\lib\net46\LightInject.Annotation.dll - - - ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - - ..\packages\Log4Net.Async.2.0.4\lib\net40\Log4Net.Async.dll - - - ..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Analyzers.dll - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Core.dll - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.FastVectorHighlighter.dll - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Highlighter.dll - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Memory.dll - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Queries.dll - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Regex.dll - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SimpleFacetedSearch.dll - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Snowball.dll - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SpellChecker.dll - - - ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll - - - ..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll - - - ..\packages\Microsoft.Owin.Hosting.3.1.0\lib\net45\Microsoft.Owin.Hosting.dll - - - ..\packages\Microsoft.Owin.Security.3.1.0\lib\net45\Microsoft.Owin.Security.dll - - - ..\packages\Microsoft.Owin.Testing.3.1.0\lib\net45\Microsoft.Owin.Testing.dll - - - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\packages\MiniProfiler.3.2.0.157\lib\net40\MiniProfiler.dll - - - ..\packages\Moq.4.7.99\lib\net45\Moq.dll - - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NPoco.3.9.3\lib\net45\NPoco.dll - - - ..\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll - - - ..\packages\Owin.1.0\lib\net40\Owin.dll - - - ..\packages\Semver.2.0.4\lib\net452\Semver.dll - - - ..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll - - - ..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - - - ..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - - - ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll - - - ..\packages\Microsoft.AspNet.WebApi.SelfHost.5.2.3\lib\net45\System.Web.Http.SelfHost.dll - - - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll - - - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - - - ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - - - ..\packages\Selenium.WebDriver.3.4.0\lib\net40\WebDriver.dll - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -625,7 +525,6 @@ - Designer diff --git a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs index e52b972429..5f55ed2bd0 100644 --- a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs +++ b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs @@ -16,7 +16,7 @@ namespace Umbraco.Tests.UmbracoExamine [TestFixture] public abstract class ExamineBaseTest : TestWithDatabaseBase { - [TestFixtureSetUp] + [OneTimeSetUp] public void InitializeFixture() { var logger = new Logger(new FileInfo(TestHelper.MapPathForTest("~/unit-test-log4net.config"))); diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs index 3d82aa6839..9d17be3476 100644 --- a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs +++ b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Threading; using Examine; using Examine.LuceneEngine.Providers; using Lucene.Net.Index; @@ -13,7 +14,8 @@ namespace Umbraco.Tests.UmbracoExamine /// /// Tests the standard indexing capabilities /// - [TestFixture, RequiresSTA] + [TestFixture] + [Apartment(ApartmentState.STA)] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class IndexTest : ExamineBaseTest { diff --git a/src/Umbraco.Tests/UmbracoExamine/TestFiles.Designer.cs b/src/Umbraco.Tests/UmbracoExamine/TestFiles.Designer.cs index a8ce73e7a8..b60dc487de 100644 --- a/src/Umbraco.Tests/UmbracoExamine/TestFiles.Designer.cs +++ b/src/Umbraco.Tests/UmbracoExamine/TestFiles.Designer.cs @@ -10,8 +10,8 @@ namespace Umbraco.Tests.UmbracoExamine { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,19 +19,19 @@ namespace Umbraco.Tests.UmbracoExamine { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class TestFiles { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal TestFiles() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ namespace Umbraco.Tests.UmbracoExamine { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,23 +59,23 @@ namespace Umbraco.Tests.UmbracoExamine { resourceCulture = value; } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8"?> ///<media> - /// <node id="1111" version="902e13f7-5793-482a-9e06-cd94eebd1de0" parentID="-1" level="1" writerID="0" nodeType="1031" template="0" sortOrder="2" createDate="2010-05-19T15:26:08" updateDate="2010-05-19T15:26:09" nodeName="Product Images" urlName="productimages" writerName="Administrator" nodeTypeAlias="Folder" path="-1,1111"> - /// <data alias="contents"></data> - /// <node id="2222" version="902e13f7-5793-482a-9e06-cd94eebd1de0" parentID="1111" level="2" writerID="0 [rest of string was truncated]";. + /// <node id="1111" version="902e13f7-5793-482a-9e06-cd94eebd1de0" parentID="-1" level="1" writerID="0" nodeType="1031" template="0" sortOrder="2" createDate="2010-05-19T15:26:08" updateDate="2010-05-19T15:26:09" nodeName="Product Images" urlName="productimages" writerName="Administrator" nodeTypeAlias="Folder" path="-1,1111"> + /// <data alias="contents"></data> + /// <node id="2222" version="902e13f7-5793-482a-9e06-cd94eebd1de0" parentID="1111" level="2" writerID="0 [rest of string was truncated]";. /// internal static string media { get { return ResourceManager.GetString("media", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8"?> - ///<!DOCTYPE root[ + ///<!DOCTYPE root[ ///<!ELEMENT CWS_Contact ANY> ///<!ATTLIST CWS_Contact id ID #REQUIRED> ///<!ELEMENT CWS_EmailAFriend ANY> @@ -88,18 +88,17 @@ namespace Umbraco.Tests.UmbracoExamine { ///<!ATTLIST CWS_Gallery id ID #REQUIRED> ///<!ELEMENT CWS_Home ANY> ///<!ATTLIST CWS_Home id ID #REQUIRED> - ///<!ELEMENT CWS_NewsEventsList ANY> - /// [rest of string was truncated]";. + ///<!ELEMENT CWS_NewsEventsList ANY> /// [rest of string was truncated]";. /// internal static string umbraco { get { return ResourceManager.GetString("umbraco", resourceCulture); } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8"?> - ///<!DOCTYPE root[ + ///<!DOCTYPE root[ ///<!ELEMENT CWS_Contact ANY> ///<!ATTLIST CWS_Contact id ID #REQUIRED> ///<!ELEMENT CWS_EmailAFriend ANY> @@ -112,8 +111,7 @@ namespace Umbraco.Tests.UmbracoExamine { ///<!ATTLIST CWS_Gallery id ID #REQUIRED> ///<!ELEMENT CWS_Home ANY> ///<!ATTLIST CWS_Home id ID #REQUIRED> - ///<!ELEMENT CWS_NewsEventsList ANY> - /// [rest of string was truncated]";. + ///<!ELEMENT CWS_NewsEventsList ANY> /// [rest of string was truncated]";. /// internal static string umbraco_sort { get { diff --git a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs index 95c95b4e71..6604e25aa2 100644 --- a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs +++ b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs @@ -67,10 +67,6 @@ namespace Umbraco.Tests.Web.Controllers userServiceMock.Setup(service => service.GetUserById(It.IsAny())) .Returns((int id) => id == 1234 ? new User(1234, "Test", "test@test.com", "test@test.com", "", new List(), new int[0], new int[0]) : null); - //we need to manually apply automapper mappings with the mocked applicationcontext - //InitializeMappers(helper.UmbracoContext.Application); - InitializeAutoMapper(true); - var usersController = new UsersController(); Container.InjectProperties(usersController); return usersController; @@ -128,10 +124,6 @@ namespace Umbraco.Tests.Web.Controllers { ApiController Factory(HttpRequestMessage message, UmbracoHelper helper) { - //we need to manually apply automapper mappings with the mocked applicationcontext - //InitializeMappers(helper.UmbracoContext.Application); - InitializeAutoMapper(true); - var usersController = new UsersController(); Container.InjectProperties(usersController); return usersController; @@ -160,10 +152,6 @@ namespace Umbraco.Tests.Web.Controllers It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>())) .Returns(() => users); - //we need to manually apply automapper mappings with the mocked applicationcontext - //InitializeMappers(helper.UmbracoContext.Application); - InitializeAutoMapper(true); - var usersController = new UsersController(); Container.InjectProperties(usersController); return usersController; diff --git a/src/Umbraco.Tests/packages.config b/src/Umbraco.Tests/packages.config deleted file mode 100644 index 1a1c0f0b2d..0000000000 --- a/src/Umbraco.Tests/packages.config +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Properties/Settings.Designer.cs b/src/Umbraco.Web.UI/Properties/Settings.Designer.cs index d318fd8cba..c7632f5c92 100644 --- a/src/Umbraco.Web.UI/Properties/Settings.Designer.cs +++ b/src/Umbraco.Web.UI/Properties/Settings.Designer.cs @@ -9,20 +9,20 @@ //------------------------------------------------------------------------------ namespace Umbraco.Web.UI.Properties { - - + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - + public static Settings Default { get { return defaultInstance; } } - + [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("http://our.umbraco.org/umbraco/webservices/api/repository.asmx")] diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 6a2b07dad9..f16ad10645 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -1,10 +1,8 @@  - - - v4.6.1 + v4.7 false {4C4C194C-B5E4-4991-8F87-4373E24CC19F} Library @@ -22,6 +20,7 @@ + true @@ -51,69 +50,19 @@ latest - - ..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll - - - ..\packages\ClientDependency.1.9.6\lib\net45\ClientDependency.Core.dll - - - ..\packages\Examine.1.0.0-beta024\lib\net45\Examine.dll - - - ..\packages\ImageProcessor.Web.4.8.4\lib\net45\ImageProcessor.Web.dll - - - ..\packages\Log4Net.Async.2.0.4\lib\net40\Log4Net.Async.dll - - - ..\packages\Microsoft.CodeAnalysis.Common.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll - - - ..\packages\Microsoft.CodeAnalysis.CSharp.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll - - - ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - - ..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.2\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll - - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - - - ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll - + + - - ..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll - - - ..\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll - + - - ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - - - ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - - - ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - + - - ..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - + @@ -121,28 +70,8 @@ - - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll - - - ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - - - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - - - ..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll - - - ..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll - - - ..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll - + @@ -153,284 +82,99 @@ - - ..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll - True - - - ..\packages\Umbraco.ModelsBuilder.8.0.0-alpha.15\lib\Umbraco.ModelsBuilder.dll - - + + + + + + + All + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - All - - --> - - - - - - ../packages/log4net.2.0.8/lib/net45-full/log4net.dll - True - - - ../packages/Microsoft.AspNet.Mvc.5.2.3/lib/net45/System.Web.Mvc.dll - True - - - ../packages/Microsoft.AspNet.WebApi.Core.5.2.3/lib/net45/System.Web.Http.dll - True - - - ../packages/ClientDependency-Mvc5.1.8.0.0/lib/net45/ClientDependency.Core.Mvc.dll - True - - - ../packages/SharpZipLib.0.86.0/lib/20/ICSharpCode.SharpZipLib.dll - True - - - ../packages/ImageProcessor.2.5.4/lib/net45/ImageProcessor.dll - True - - - ..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Analyzers.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Core.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.FastVectorHighlighter.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Highlighter.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Memory.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Queries.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Regex.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SimpleFacetedSearch.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Snowball.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SpellChecker.dll - True - - - ../packages/Microsoft.AspNet.Identity.Core.2.2.1/lib/net45/Microsoft.AspNet.Identity.Core.dll - True - - - ../packages/Microsoft.AspNet.Identity.Owin.2.2.1/lib/net45/Microsoft.AspNet.Identity.Owin.dll - True - - - ../packages/Microsoft.Owin.3.1.0/lib/net45/Microsoft.Owin.dll - True - - - ../packages/Microsoft.Owin.Host.SystemWeb.3.1.0/lib/net45/Microsoft.Owin.Host.SystemWeb.dll - True - - - ../packages/Microsoft.Owin.Security.3.1.0/lib/net45/Microsoft.Owin.Security.dll - True - - - ../packages/Microsoft.Owin.Security.Cookies.3.1.0/lib/net45/Microsoft.Owin.Security.Cookies.dll - True - - - ../packages/Microsoft.Owin.Security.OAuth.3.1.0/lib/net45/Microsoft.Owin.Security.OAuth.dll - True - - - ../packages/MiniProfiler.3.2.0.157/lib/net40/MiniProfiler.dll - True - - - ../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll - True - - - ../packages/Owin.1.0/lib/net40/Owin.dll - True - - - ../packages/System.Collections.Immutable.1.3.1/lib/netstandard1.0/System.Collections.Immutable.dll - True - - - ../packages/SqlServerCE.4.0.0.1/lib/System.Data.SqlServerCe.dll - True - - - ../packages/SqlServerCE.4.0.0.1/lib/System.Data.SqlServerCe.Entity.dll - True - - - ../packages/Microsoft.AspNet.WebApi.Client.5.2.3/lib/net45/System.Net.Http.Formatting.dll - True - - - ../packages/System.Reflection.Metadata.1.4.1/lib/portable-net45+win8/System.Reflection.Metadata.dll - True - - - ../packages/Microsoft.AspNet.WebPages.3.2.3/lib/net45/System.Web.Helpers.dll - True - - - ../packages/Microsoft.AspNet.WebApi.WebHost.5.2.3/lib/net45/System.Web.Http.WebHost.dll - True - - - ../packages/Microsoft.AspNet.Razor.3.2.3/lib/net45/System.Web.Razor.dll - True - - - ../packages/Microsoft.AspNet.WebPages.3.2.3/lib/net45/System.Web.WebPages.dll - True - - - ../packages/Microsoft.Web.Infrastructure.1.0.0.0/lib/net40/Microsoft.Web.Infrastructure.dll - True - - - ../packages/Microsoft.AspNet.WebPages.3.2.3/lib/net45/System.Web.WebPages.Deployment.dll - True - - - ../packages/Microsoft.AspNet.WebPages.3.2.3/lib/net45/System.Web.WebPages.Razor.dll - True - - - ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - - - ..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll - True - - - ..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll - True - - - ../packages/System.Xml.XPath.XDocument.4.3.0/lib/net46/System.Xml.XPath.XDocument.dll - True - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -446,7 +190,6 @@ Umbraco.Web - Properties\SolutionInfo.cs @@ -584,6 +327,17 @@ + + + + + + + + + + + @@ -672,9 +426,6 @@ SettingsSingleFileGenerator Settings.Designer.cs - - Designer - UI.xml @@ -981,8 +732,6 @@ - - @@ -1074,8 +823,6 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" - - @@ -1101,11 +848,4 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/config/imageprocessor/processing.config b/src/Umbraco.Web.UI/config/imageprocessor/processing.config index a52661a196..34c9fd96c4 100644 --- a/src/Umbraco.Web.UI/config/imageprocessor/processing.config +++ b/src/Umbraco.Web.UI/config/imageprocessor/processing.config @@ -2,61 +2,65 @@ - - - - - - - - - - - - - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - + - - - + - - - - - + - - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config deleted file mode 100644 index 66ae8a6406..0000000000 --- a/src/Umbraco.Web.UI/packages.config +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web/Mvc/Strings.Designer.cs b/src/Umbraco.Web/Mvc/Strings.Designer.cs index afcf1c26ff..1c2e2bebbb 100644 --- a/src/Umbraco.Web/Mvc/Strings.Designer.cs +++ b/src/Umbraco.Web/Mvc/Strings.Designer.cs @@ -10,8 +10,8 @@ namespace Umbraco.Web.Mvc { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,19 +19,19 @@ namespace Umbraco.Web.Mvc { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Strings { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Strings() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ namespace Umbraco.Web.Mvc { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,7 +59,7 @@ namespace Umbraco.Web.Mvc { resourceCulture = value; } } - + /// /// Looks up a localized string similar to <?xml version="1.0"?> ///<configuration> diff --git a/src/Umbraco.Web/Properties/Settings1.Designer.cs b/src/Umbraco.Web/Properties/Settings1.Designer.cs index c1460bbdcb..368d6bdae3 100644 --- a/src/Umbraco.Web/Properties/Settings1.Designer.cs +++ b/src/Umbraco.Web/Properties/Settings1.Designer.cs @@ -9,20 +9,20 @@ //------------------------------------------------------------------------------ namespace Umbraco.Web.Properties { - - + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - + public static Settings Default { get { return defaultInstance; } } - + [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("http://regexlib.com/WebServices.asmx")] @@ -31,7 +31,7 @@ namespace Umbraco.Web.Properties { return ((string)(this["umbraco_com_regexlib_Webservices"])); } } - + [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] @@ -41,7 +41,7 @@ namespace Umbraco.Web.Properties { return ((string)(this["umbraco_org_umbraco_update_CheckForUpgrade"])); } } - + [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("Somthing")] @@ -50,7 +50,7 @@ namespace Umbraco.Web.Properties { return ((string)(this["test"])); } } - + [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] diff --git a/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs b/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs index 26de94898d..5a4f733991 100644 --- a/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs +++ b/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs @@ -10,8 +10,8 @@ namespace Umbraco.Web.UI.JavaScript { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,19 +19,19 @@ namespace Umbraco.Web.UI.JavaScript { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ namespace Umbraco.Web.UI.JavaScript { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,13 +59,15 @@ namespace Umbraco.Web.UI.JavaScript { resourceCulture = value; } } - + /// /// Looks up a localized string similar to [ /// 'lib/jquery/jquery.min.js', /// 'lib/angular/1.1.5/angular.min.js', /// 'lib/underscore/underscore-min.js', /// + /// 'lib/moment/moment.min.js', + /// /// 'lib/jquery-ui/jquery-ui.min.js', /// 'lib/jquery-ui-touch-punch/jquery.ui.touch-punch.js', /// @@ -76,14 +78,14 @@ namespace Umbraco.Web.UI.JavaScript { /// 'lib/angular/angular-ui-sortable.js', /// /// 'lib/angular-dynamic-locale/tmhDynamicLocale.min.js', - /// 'lib/ng-file-upload/ng-file-upload.min. [rest of string was truncated]";. + /// 'lib [rest of string was truncated]";. /// internal static string JsInitialize { get { return ResourceManager.GetString("JsInitialize", resourceCulture); } } - + /// /// Looks up a localized string similar to LazyLoad.js("##JsInitialize##", function () { /// //we need to set the legacy UmbClientMgr path @@ -101,7 +103,7 @@ namespace Umbraco.Web.UI.JavaScript { return ResourceManager.GetString("Main", resourceCulture); } } - + /// /// Looks up a localized string similar to //TODO: This would be nicer as an angular module so it can be injected into stuff... that'd be heaps nicer, but ///// how to do that when this is not a regular JS file, it is a server side JS file and RequireJS seems to only want diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index ecdb2e0552..fec49a09d3 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -1,7 +1,7 @@  - v4.6.1 + v4.7 false false {651E1350-91B6-44B7-BD60-7207006D7003} @@ -11,6 +11,7 @@ ..\ true Off + true @@ -49,12 +50,8 @@ - - ..\packages\System.Threading.Tasks.Dataflow.4.7.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll - - - ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll - + + @@ -68,13 +65,13 @@ - + - - + + @@ -85,28 +82,29 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + + diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs b/src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs index 2075ab641d..70a4e51592 100644 --- a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs +++ b/src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs @@ -8,9 +8,9 @@ // //------------------------------------------------------------------------------ -// +// // This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000. -// +// #pragma warning disable 1591 namespace Umbraco.Web.org.umbraco.our { @@ -20,42 +20,42 @@ namespace Umbraco.Web.org.umbraco.our { using System.Web.Services.Protocols; using System.Xml.Serialization; using System.ComponentModel; - - + + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Web.Services.WebServiceBindingAttribute(Name="RepositorySoap", Namespace="http://packages.umbraco.org/webservices/")] public partial class Repository : System.Web.Services.Protocols.SoapHttpClientProtocol { - + private System.Threading.SendOrPostCallback CategoriesOperationCompleted; - + private System.Threading.SendOrPostCallback ModulesOperationCompleted; - + private System.Threading.SendOrPostCallback ModulesCategorizedOperationCompleted; - + private System.Threading.SendOrPostCallback NitrosOperationCompleted; - + private System.Threading.SendOrPostCallback NitrosCategorizedOperationCompleted; - + private System.Threading.SendOrPostCallback authenticateOperationCompleted; - + private System.Threading.SendOrPostCallback fetchPackageOperationCompleted; - + private System.Threading.SendOrPostCallback fetchPackageByVersionOperationCompleted; - + private System.Threading.SendOrPostCallback fetchProtectedPackageOperationCompleted; - + private System.Threading.SendOrPostCallback SubmitPackageOperationCompleted; - + private System.Threading.SendOrPostCallback PackageByGuidOperationCompleted; - + private bool useDefaultCredentialsSetExplicitly; - + /// public Repository() { - this.Url = global::Umbraco.Web.Properties.Settings.Default.umbraco_org_umbraco_our_Repository; + this.Url = "http://our.umbraco.org/umbraco/webservices/api/repository.asmx"; if ((this.IsLocalFileSystemWebService(this.Url) == true)) { this.UseDefaultCredentials = true; this.useDefaultCredentialsSetExplicitly = false; @@ -64,21 +64,21 @@ namespace Umbraco.Web.org.umbraco.our { this.useDefaultCredentialsSetExplicitly = true; } } - + public new string Url { get { return base.Url; } set { - if ((((this.IsLocalFileSystemWebService(base.Url) == true) - && (this.useDefaultCredentialsSetExplicitly == false)) + if ((((this.IsLocalFileSystemWebService(base.Url) == true) + && (this.useDefaultCredentialsSetExplicitly == false)) && (this.IsLocalFileSystemWebService(value) == false))) { base.UseDefaultCredentials = false; } base.Url = value; } } - + public new bool UseDefaultCredentials { get { return base.UseDefaultCredentials; @@ -88,40 +88,40 @@ namespace Umbraco.Web.org.umbraco.our { this.useDefaultCredentialsSetExplicitly = true; } } - + /// public event CategoriesCompletedEventHandler CategoriesCompleted; - + /// public event ModulesCompletedEventHandler ModulesCompleted; - + /// public event ModulesCategorizedCompletedEventHandler ModulesCategorizedCompleted; - + /// public event NitrosCompletedEventHandler NitrosCompleted; - + /// public event NitrosCategorizedCompletedEventHandler NitrosCategorizedCompleted; - + /// public event authenticateCompletedEventHandler authenticateCompleted; - + /// public event fetchPackageCompletedEventHandler fetchPackageCompleted; - + /// public event fetchPackageByVersionCompletedEventHandler fetchPackageByVersionCompleted; - + /// public event fetchProtectedPackageCompletedEventHandler fetchProtectedPackageCompleted; - + /// public event SubmitPackageCompletedEventHandler SubmitPackageCompleted; - + /// public event PackageByGuidCompletedEventHandler PackageByGuidCompleted; - + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/Categories", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public Category[] Categories(string repositoryGuid) { @@ -129,12 +129,12 @@ namespace Umbraco.Web.org.umbraco.our { repositoryGuid}); return ((Category[])(results[0])); } - + /// public void CategoriesAsync(string repositoryGuid) { this.CategoriesAsync(repositoryGuid, null); } - + /// public void CategoriesAsync(string repositoryGuid, object userState) { if ((this.CategoriesOperationCompleted == null)) { @@ -143,26 +143,26 @@ namespace Umbraco.Web.org.umbraco.our { this.InvokeAsync("Categories", new object[] { repositoryGuid}, this.CategoriesOperationCompleted, userState); } - + private void OnCategoriesOperationCompleted(object arg) { if ((this.CategoriesCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.CategoriesCompleted(this, new CategoriesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/Modules", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public Package[] Modules() { object[] results = this.Invoke("Modules", new object[0]); return ((Package[])(results[0])); } - + /// public void ModulesAsync() { this.ModulesAsync(null); } - + /// public void ModulesAsync(object userState) { if ((this.ModulesOperationCompleted == null)) { @@ -170,26 +170,26 @@ namespace Umbraco.Web.org.umbraco.our { } this.InvokeAsync("Modules", new object[0], this.ModulesOperationCompleted, userState); } - + private void OnModulesOperationCompleted(object arg) { if ((this.ModulesCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.ModulesCompleted(this, new ModulesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/ModulesCategorized", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public Category[] ModulesCategorized() { object[] results = this.Invoke("ModulesCategorized", new object[0]); return ((Category[])(results[0])); } - + /// public void ModulesCategorizedAsync() { this.ModulesCategorizedAsync(null); } - + /// public void ModulesCategorizedAsync(object userState) { if ((this.ModulesCategorizedOperationCompleted == null)) { @@ -197,26 +197,26 @@ namespace Umbraco.Web.org.umbraco.our { } this.InvokeAsync("ModulesCategorized", new object[0], this.ModulesCategorizedOperationCompleted, userState); } - + private void OnModulesCategorizedOperationCompleted(object arg) { if ((this.ModulesCategorizedCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.ModulesCategorizedCompleted(this, new ModulesCategorizedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/Nitros", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public Package[] Nitros() { object[] results = this.Invoke("Nitros", new object[0]); return ((Package[])(results[0])); } - + /// public void NitrosAsync() { this.NitrosAsync(null); } - + /// public void NitrosAsync(object userState) { if ((this.NitrosOperationCompleted == null)) { @@ -224,26 +224,26 @@ namespace Umbraco.Web.org.umbraco.our { } this.InvokeAsync("Nitros", new object[0], this.NitrosOperationCompleted, userState); } - + private void OnNitrosOperationCompleted(object arg) { if ((this.NitrosCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.NitrosCompleted(this, new NitrosCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/NitrosCategorized", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public Category[] NitrosCategorized() { object[] results = this.Invoke("NitrosCategorized", new object[0]); return ((Category[])(results[0])); } - + /// public void NitrosCategorizedAsync() { this.NitrosCategorizedAsync(null); } - + /// public void NitrosCategorizedAsync(object userState) { if ((this.NitrosCategorizedOperationCompleted == null)) { @@ -251,14 +251,14 @@ namespace Umbraco.Web.org.umbraco.our { } this.InvokeAsync("NitrosCategorized", new object[0], this.NitrosCategorizedOperationCompleted, userState); } - + private void OnNitrosCategorizedOperationCompleted(object arg) { if ((this.NitrosCategorizedCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.NitrosCategorizedCompleted(this, new NitrosCategorizedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/authenticate", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public string authenticate(string email, string md5Password) { @@ -267,12 +267,12 @@ namespace Umbraco.Web.org.umbraco.our { md5Password}); return ((string)(results[0])); } - + /// public void authenticateAsync(string email, string md5Password) { this.authenticateAsync(email, md5Password, null); } - + /// public void authenticateAsync(string email, string md5Password, object userState) { if ((this.authenticateOperationCompleted == null)) { @@ -282,14 +282,14 @@ namespace Umbraco.Web.org.umbraco.our { email, md5Password}, this.authenticateOperationCompleted, userState); } - + private void OnauthenticateOperationCompleted(object arg) { if ((this.authenticateCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.authenticateCompleted(this, new authenticateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/fetchPackage", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] @@ -298,12 +298,12 @@ namespace Umbraco.Web.org.umbraco.our { packageGuid}); return ((byte[])(results[0])); } - + /// public void fetchPackageAsync(string packageGuid) { this.fetchPackageAsync(packageGuid, null); } - + /// public void fetchPackageAsync(string packageGuid, object userState) { if ((this.fetchPackageOperationCompleted == null)) { @@ -312,14 +312,14 @@ namespace Umbraco.Web.org.umbraco.our { this.InvokeAsync("fetchPackage", new object[] { packageGuid}, this.fetchPackageOperationCompleted, userState); } - + private void OnfetchPackageOperationCompleted(object arg) { if ((this.fetchPackageCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.fetchPackageCompleted(this, new fetchPackageCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/fetchPackageByVersion", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] @@ -329,12 +329,12 @@ namespace Umbraco.Web.org.umbraco.our { repoVersion}); return ((byte[])(results[0])); } - + /// public void fetchPackageByVersionAsync(string packageGuid, string repoVersion) { this.fetchPackageByVersionAsync(packageGuid, repoVersion, null); } - + /// public void fetchPackageByVersionAsync(string packageGuid, string repoVersion, object userState) { if ((this.fetchPackageByVersionOperationCompleted == null)) { @@ -344,14 +344,14 @@ namespace Umbraco.Web.org.umbraco.our { packageGuid, repoVersion}, this.fetchPackageByVersionOperationCompleted, userState); } - + private void OnfetchPackageByVersionOperationCompleted(object arg) { if ((this.fetchPackageByVersionCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.fetchPackageByVersionCompleted(this, new fetchPackageByVersionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/fetchProtectedPackage", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] @@ -361,12 +361,12 @@ namespace Umbraco.Web.org.umbraco.our { memberKey}); return ((byte[])(results[0])); } - + /// public void fetchProtectedPackageAsync(string packageGuid, string memberKey) { this.fetchProtectedPackageAsync(packageGuid, memberKey, null); } - + /// public void fetchProtectedPackageAsync(string packageGuid, string memberKey, object userState) { if ((this.fetchProtectedPackageOperationCompleted == null)) { @@ -376,14 +376,14 @@ namespace Umbraco.Web.org.umbraco.our { packageGuid, memberKey}, this.fetchProtectedPackageOperationCompleted, userState); } - + private void OnfetchProtectedPackageOperationCompleted(object arg) { if ((this.fetchProtectedPackageCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.fetchProtectedPackageCompleted(this, new fetchProtectedPackageCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/SubmitPackage", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public SubmitStatus SubmitPackage(string repositoryGuid, string authorGuid, string packageGuid, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] packageFile, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] packageDoc, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] packageThumbnail, string name, string author, string authorUrl, string description) { @@ -400,12 +400,12 @@ namespace Umbraco.Web.org.umbraco.our { description}); return ((SubmitStatus)(results[0])); } - + /// public void SubmitPackageAsync(string repositoryGuid, string authorGuid, string packageGuid, byte[] packageFile, byte[] packageDoc, byte[] packageThumbnail, string name, string author, string authorUrl, string description) { this.SubmitPackageAsync(repositoryGuid, authorGuid, packageGuid, packageFile, packageDoc, packageThumbnail, name, author, authorUrl, description, null); } - + /// public void SubmitPackageAsync(string repositoryGuid, string authorGuid, string packageGuid, byte[] packageFile, byte[] packageDoc, byte[] packageThumbnail, string name, string author, string authorUrl, string description, object userState) { if ((this.SubmitPackageOperationCompleted == null)) { @@ -423,14 +423,14 @@ namespace Umbraco.Web.org.umbraco.our { authorUrl, description}, this.SubmitPackageOperationCompleted, userState); } - + private void OnSubmitPackageOperationCompleted(object arg) { if ((this.SubmitPackageCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.SubmitPackageCompleted(this, new SubmitPackageCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/PackageByGuid", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public Package PackageByGuid(string packageGuid) { @@ -438,12 +438,12 @@ namespace Umbraco.Web.org.umbraco.our { packageGuid}); return ((Package)(results[0])); } - + /// public void PackageByGuidAsync(string packageGuid) { this.PackageByGuidAsync(packageGuid, null); } - + /// public void PackageByGuidAsync(string packageGuid, object userState) { if ((this.PackageByGuidOperationCompleted == null)) { @@ -452,51 +452,51 @@ namespace Umbraco.Web.org.umbraco.our { this.InvokeAsync("PackageByGuid", new object[] { packageGuid}, this.PackageByGuidOperationCompleted, userState); } - + private void OnPackageByGuidOperationCompleted(object arg) { if ((this.PackageByGuidCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.PackageByGuidCompleted(this, new PackageByGuidCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// public new void CancelAsync(object userState) { base.CancelAsync(userState); } - + private bool IsLocalFileSystemWebService(string url) { - if (((url == null) + if (((url == null) || (url == string.Empty))) { return false; } System.Uri wsUri = new System.Uri(url); - if (((wsUri.Port >= 1024) + if (((wsUri.Port >= 1024) && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) { return true; } return false; } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://packages.umbraco.org/webservices/")] public partial class Category { - + private string textField; - + private string descriptionField; - + private string urlField; - + private int idField; - + private Package[] packagesField; - + /// public string Text { get { @@ -506,7 +506,7 @@ namespace Umbraco.Web.org.umbraco.our { this.textField = value; } } - + /// public string Description { get { @@ -516,7 +516,7 @@ namespace Umbraco.Web.org.umbraco.our { this.descriptionField = value; } } - + /// public string Url { get { @@ -526,7 +526,7 @@ namespace Umbraco.Web.org.umbraco.our { this.urlField = value; } } - + /// public int Id { get { @@ -536,7 +536,7 @@ namespace Umbraco.Web.org.umbraco.our { this.idField = value; } } - + /// public Package[] Packages { get { @@ -547,45 +547,45 @@ namespace Umbraco.Web.org.umbraco.our { } } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://packages.umbraco.org/webservices/")] public partial class Package { - + private System.Guid repoGuidField; - + private string textField; - + private string descriptionField; - + private string iconField; - + private string thumbnailField; - + private string documentationField; - + private string demoField; - + private bool acceptedField; - + private bool isModuleField; - + private bool editorsPickField; - + private bool protectedField; - + private bool hasUpgradeField; - + private string upgradeVersionField; - + private string upgradeReadMeField; - + private string urlField; - + /// public System.Guid RepoGuid { get { @@ -595,7 +595,7 @@ namespace Umbraco.Web.org.umbraco.our { this.repoGuidField = value; } } - + /// public string Text { get { @@ -605,7 +605,7 @@ namespace Umbraco.Web.org.umbraco.our { this.textField = value; } } - + /// public string Description { get { @@ -615,7 +615,7 @@ namespace Umbraco.Web.org.umbraco.our { this.descriptionField = value; } } - + /// public string Icon { get { @@ -625,7 +625,7 @@ namespace Umbraco.Web.org.umbraco.our { this.iconField = value; } } - + /// public string Thumbnail { get { @@ -635,7 +635,7 @@ namespace Umbraco.Web.org.umbraco.our { this.thumbnailField = value; } } - + /// public string Documentation { get { @@ -645,7 +645,7 @@ namespace Umbraco.Web.org.umbraco.our { this.documentationField = value; } } - + /// public string Demo { get { @@ -655,7 +655,7 @@ namespace Umbraco.Web.org.umbraco.our { this.demoField = value; } } - + /// public bool Accepted { get { @@ -665,7 +665,7 @@ namespace Umbraco.Web.org.umbraco.our { this.acceptedField = value; } } - + /// public bool IsModule { get { @@ -675,7 +675,7 @@ namespace Umbraco.Web.org.umbraco.our { this.isModuleField = value; } } - + /// public bool EditorsPick { get { @@ -685,7 +685,7 @@ namespace Umbraco.Web.org.umbraco.our { this.editorsPickField = value; } } - + /// public bool Protected { get { @@ -695,7 +695,7 @@ namespace Umbraco.Web.org.umbraco.our { this.protectedField = value; } } - + /// public bool HasUpgrade { get { @@ -705,7 +705,7 @@ namespace Umbraco.Web.org.umbraco.our { this.hasUpgradeField = value; } } - + /// public string UpgradeVersion { get { @@ -715,7 +715,7 @@ namespace Umbraco.Web.org.umbraco.our { this.upgradeVersionField = value; } } - + /// public string UpgradeReadMe { get { @@ -725,7 +725,7 @@ namespace Umbraco.Web.org.umbraco.our { this.upgradeReadMeField = value; } } - + /// public string Url { get { @@ -736,43 +736,43 @@ namespace Umbraco.Web.org.umbraco.our { } } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://packages.umbraco.org/webservices/")] public enum SubmitStatus { - + /// Complete, - + /// Exists, - + /// NoAccess, - + /// Error, } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] public delegate void CategoriesCompletedEventHandler(object sender, CategoriesCompletedEventArgs e); - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class CategoriesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - + private object[] results; - - internal CategoriesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + + internal CategoriesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : base(exception, cancelled, userState) { this.results = results; } - + /// public Category[] Result { get { @@ -781,24 +781,24 @@ namespace Umbraco.Web.org.umbraco.our { } } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] public delegate void ModulesCompletedEventHandler(object sender, ModulesCompletedEventArgs e); - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class ModulesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - + private object[] results; - - internal ModulesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + + internal ModulesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : base(exception, cancelled, userState) { this.results = results; } - + /// public Package[] Result { get { @@ -807,24 +807,24 @@ namespace Umbraco.Web.org.umbraco.our { } } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] public delegate void ModulesCategorizedCompletedEventHandler(object sender, ModulesCategorizedCompletedEventArgs e); - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class ModulesCategorizedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - + private object[] results; - - internal ModulesCategorizedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + + internal ModulesCategorizedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : base(exception, cancelled, userState) { this.results = results; } - + /// public Category[] Result { get { @@ -833,24 +833,24 @@ namespace Umbraco.Web.org.umbraco.our { } } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] public delegate void NitrosCompletedEventHandler(object sender, NitrosCompletedEventArgs e); - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class NitrosCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - + private object[] results; - - internal NitrosCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + + internal NitrosCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : base(exception, cancelled, userState) { this.results = results; } - + /// public Package[] Result { get { @@ -859,24 +859,24 @@ namespace Umbraco.Web.org.umbraco.our { } } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] public delegate void NitrosCategorizedCompletedEventHandler(object sender, NitrosCategorizedCompletedEventArgs e); - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class NitrosCategorizedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - + private object[] results; - - internal NitrosCategorizedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + + internal NitrosCategorizedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : base(exception, cancelled, userState) { this.results = results; } - + /// public Category[] Result { get { @@ -885,24 +885,24 @@ namespace Umbraco.Web.org.umbraco.our { } } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] public delegate void authenticateCompletedEventHandler(object sender, authenticateCompletedEventArgs e); - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class authenticateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - + private object[] results; - - internal authenticateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + + internal authenticateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : base(exception, cancelled, userState) { this.results = results; } - + /// public string Result { get { @@ -911,24 +911,24 @@ namespace Umbraco.Web.org.umbraco.our { } } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] public delegate void fetchPackageCompletedEventHandler(object sender, fetchPackageCompletedEventArgs e); - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class fetchPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - + private object[] results; - - internal fetchPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + + internal fetchPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : base(exception, cancelled, userState) { this.results = results; } - + /// public byte[] Result { get { @@ -937,24 +937,24 @@ namespace Umbraco.Web.org.umbraco.our { } } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] public delegate void fetchPackageByVersionCompletedEventHandler(object sender, fetchPackageByVersionCompletedEventArgs e); - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class fetchPackageByVersionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - + private object[] results; - - internal fetchPackageByVersionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + + internal fetchPackageByVersionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : base(exception, cancelled, userState) { this.results = results; } - + /// public byte[] Result { get { @@ -963,24 +963,24 @@ namespace Umbraco.Web.org.umbraco.our { } } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] public delegate void fetchProtectedPackageCompletedEventHandler(object sender, fetchProtectedPackageCompletedEventArgs e); - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class fetchProtectedPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - + private object[] results; - - internal fetchProtectedPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + + internal fetchProtectedPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : base(exception, cancelled, userState) { this.results = results; } - + /// public byte[] Result { get { @@ -989,24 +989,24 @@ namespace Umbraco.Web.org.umbraco.our { } } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] public delegate void SubmitPackageCompletedEventHandler(object sender, SubmitPackageCompletedEventArgs e); - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class SubmitPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - + private object[] results; - - internal SubmitPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + + internal SubmitPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : base(exception, cancelled, userState) { this.results = results; } - + /// public SubmitStatus Result { get { @@ -1015,24 +1015,24 @@ namespace Umbraco.Web.org.umbraco.our { } } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] public delegate void PackageByGuidCompletedEventHandler(object sender, PackageByGuidCompletedEventArgs e); - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class PackageByGuidCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - + private object[] results; - - internal PackageByGuidCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + + internal PackageByGuidCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : base(exception, cancelled, userState) { this.results = results; } - + /// public Package Result { get { @@ -1043,4 +1043,4 @@ namespace Umbraco.Web.org.umbraco.our { } } -#pragma warning restore 1591 +#pragma warning restore 1591 \ No newline at end of file diff --git a/src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs b/src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs index 2818eff1e2..ccd43e8edc 100644 --- a/src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs +++ b/src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs @@ -8,9 +8,9 @@ // //------------------------------------------------------------------------------ -// +// // This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000. -// +// #pragma warning disable 1591 namespace Umbraco.Web.org.umbraco.update { @@ -20,24 +20,24 @@ namespace Umbraco.Web.org.umbraco.update { using System.Web.Services.Protocols; using System.Xml.Serialization; using System.ComponentModel; - - + + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Web.Services.WebServiceBindingAttribute(Name="CheckForUpgradeSoap", Namespace="http://update.umbraco.org/")] public partial class CheckForUpgrade : System.Web.Services.Protocols.SoapHttpClientProtocol { - + private System.Threading.SendOrPostCallback InstallOperationCompleted; - + private System.Threading.SendOrPostCallback CheckUpgradeOperationCompleted; - + private bool useDefaultCredentialsSetExplicitly; - + /// public CheckForUpgrade() { - this.Url = global::Umbraco.Web.Properties.Settings.Default.umbraco_org_umbraco_update_CheckForUpgrade; + this.Url = "http://update.umbraco.org/checkforupgrade.asmx"; if ((this.IsLocalFileSystemWebService(this.Url) == true)) { this.UseDefaultCredentials = true; this.useDefaultCredentialsSetExplicitly = false; @@ -46,21 +46,21 @@ namespace Umbraco.Web.org.umbraco.update { this.useDefaultCredentialsSetExplicitly = true; } } - + public new string Url { get { return base.Url; } set { - if ((((this.IsLocalFileSystemWebService(base.Url) == true) - && (this.useDefaultCredentialsSetExplicitly == false)) + if ((((this.IsLocalFileSystemWebService(base.Url) == true) + && (this.useDefaultCredentialsSetExplicitly == false)) && (this.IsLocalFileSystemWebService(value) == false))) { base.UseDefaultCredentials = false; } base.Url = value; } } - + public new bool UseDefaultCredentials { get { return base.UseDefaultCredentials; @@ -70,13 +70,13 @@ namespace Umbraco.Web.org.umbraco.update { this.useDefaultCredentialsSetExplicitly = true; } } - + /// public event InstallCompletedEventHandler InstallCompleted; - + /// public event CheckUpgradeCompletedEventHandler CheckUpgradeCompleted; - + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://update.umbraco.org/Install", RequestNamespace="http://update.umbraco.org/", ResponseNamespace="http://update.umbraco.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public void Install(System.Guid installId, bool isUpgrade, bool installCompleted, System.DateTime timestamp, int versionMajor, int versionMinor, int versionPatch, string versionComment, string error, string userAgent, string dbProvider) { @@ -93,12 +93,12 @@ namespace Umbraco.Web.org.umbraco.update { userAgent, dbProvider}); } - + /// public void InstallAsync(System.Guid installId, bool isUpgrade, bool installCompleted, System.DateTime timestamp, int versionMajor, int versionMinor, int versionPatch, string versionComment, string error, string userAgent, string dbProvider) { this.InstallAsync(installId, isUpgrade, installCompleted, timestamp, versionMajor, versionMinor, versionPatch, versionComment, error, userAgent, dbProvider, null); } - + /// public void InstallAsync(System.Guid installId, bool isUpgrade, bool installCompleted, System.DateTime timestamp, int versionMajor, int versionMinor, int versionPatch, string versionComment, string error, string userAgent, string dbProvider, object userState) { if ((this.InstallOperationCompleted == null)) { @@ -117,14 +117,14 @@ namespace Umbraco.Web.org.umbraco.update { userAgent, dbProvider}, this.InstallOperationCompleted, userState); } - + private void OnInstallOperationCompleted(object arg) { if ((this.InstallCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.InstallCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://update.umbraco.org/CheckUpgrade", RequestNamespace="http://update.umbraco.org/", ResponseNamespace="http://update.umbraco.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public UpgradeResult CheckUpgrade(int versionMajor, int versionMinor, int versionPatch, string versionComment) { @@ -135,12 +135,12 @@ namespace Umbraco.Web.org.umbraco.update { versionComment}); return ((UpgradeResult)(results[0])); } - + /// public void CheckUpgradeAsync(int versionMajor, int versionMinor, int versionPatch, string versionComment) { this.CheckUpgradeAsync(versionMajor, versionMinor, versionPatch, versionComment, null); } - + /// public void CheckUpgradeAsync(int versionMajor, int versionMinor, int versionPatch, string versionComment, object userState) { if ((this.CheckUpgradeOperationCompleted == null)) { @@ -152,47 +152,47 @@ namespace Umbraco.Web.org.umbraco.update { versionPatch, versionComment}, this.CheckUpgradeOperationCompleted, userState); } - + private void OnCheckUpgradeOperationCompleted(object arg) { if ((this.CheckUpgradeCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.CheckUpgradeCompleted(this, new CheckUpgradeCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// public new void CancelAsync(object userState) { base.CancelAsync(userState); } - + private bool IsLocalFileSystemWebService(string url) { - if (((url == null) + if (((url == null) || (url == string.Empty))) { return false; } System.Uri wsUri = new System.Uri(url); - if (((wsUri.Port >= 1024) + if (((wsUri.Port >= 1024) && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) { return true; } return false; } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://update.umbraco.org/")] public partial class UpgradeResult { - + private string commentField; - + private UpgradeType upgradeTypeField; - + private string upgradeUrlField; - + /// public string Comment { get { @@ -202,7 +202,7 @@ namespace Umbraco.Web.org.umbraco.update { this.commentField = value; } } - + /// public UpgradeType UpgradeType { get { @@ -212,7 +212,7 @@ namespace Umbraco.Web.org.umbraco.update { this.upgradeTypeField = value; } } - + /// public string UpgradeUrl { get { @@ -223,56 +223,56 @@ namespace Umbraco.Web.org.umbraco.update { } } } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.2612.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://update.umbraco.org/")] public enum UpgradeType { - + /// None, - + /// Patch, - + /// Minor, - + /// Major, - + /// Critical, - + /// Error, - + /// OutOfSync, } - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] public delegate void InstallCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e); - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] public delegate void CheckUpgradeCompletedEventHandler(object sender, CheckUpgradeCompletedEventArgs e); - + /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1038.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2556.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class CheckUpgradeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - + private object[] results; - - internal CheckUpgradeCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + + internal CheckUpgradeCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : base(exception, cancelled, userState) { this.results = results; } - + /// public UpgradeResult Result { get { @@ -283,4 +283,4 @@ namespace Umbraco.Web.org.umbraco.update { } } -#pragma warning restore 1591 +#pragma warning restore 1591 \ No newline at end of file diff --git a/src/Umbraco.Web/WebApi/Filters/ValidationFilterAttribute.cs b/src/Umbraco.Web/WebApi/Filters/ValidationFilterAttribute.cs index 18a099b9b0..3dabf67e9e 100644 --- a/src/Umbraco.Web/WebApi/Filters/ValidationFilterAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/ValidationFilterAttribute.cs @@ -1,5 +1,8 @@ -using System.Net; +using System; +using System.Diagnostics; +using System.Net; using System.Net.Http; +using System.Threading; using System.Web.Http.Controllers; using System.Web.Http.Filters; @@ -13,13 +16,28 @@ namespace Umbraco.Web.WebApi.Filters { public override void OnActionExecuting(HttpActionContext actionContext) { + var m = actionContext.GetType().GetProperty("Request"); + if (m == null) throw new Exception("property"); // does not throw + var x = m.GetMethod; + if (x == null) throw new Exception("method"); // does not throw + var v1 = m.GetValue(actionContext); + if (v1 == null) throw new Exception("value1"); // does not throw + var v2 = x.Invoke(actionContext, Array.Empty()); + if (v2 == null) throw new Exception("value2"); // does not throw + Thread.Sleep(10*1000); + + // throws get_Request method not found ?! + var r = actionContext.Request; + + // this would show we are using our own, copied into asp.net temp + //throw new Exception(actionContext.GetType().Assembly.Location); + var modelState = actionContext.ModelState; if (!modelState.IsValid) { actionContext.Response = actionContext.Request.CreateErrorResponse(HttpStatusCode.BadRequest, modelState); } - } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Resources.Designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Resources.Designer.cs index e76b5ad4f7..ab69886621 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Resources.Designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Resources.Designer.cs @@ -10,8 +10,8 @@ namespace Umbraco.Web.umbraco.presentation.umbraco.templateControls { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,19 +19,19 @@ namespace Umbraco.Web.umbraco.presentation.umbraco.templateControls { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ namespace Umbraco.Web.umbraco.presentation.umbraco.templateControls { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,17 +59,17 @@ namespace Umbraco.Web.umbraco.presentation.umbraco.templateControls { resourceCulture = value; } } - + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?> ///<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp "&#x00A0;"> ]> - ///<xsl:stylesheet - /// version="1.0" - /// xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - /// xmlns:msxml="urn:schemas-microsoft-com:xslt" - /// xmlns:umbraco.library="urn:umbraco.library" + ///<xsl:stylesheet + /// version="1.0" + /// xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + /// xmlns:msxml="urn:schemas-microsoft-com:xslt" + /// xmlns:umbraco.library="urn:umbraco.library" /// {3} - /// exclude-result-prefixes="msxml umbraco.library {2}"> + /// exclude-result-prefixes="msxml umbraco.library {2}"> ///<xsl:output method="xml" omit-xml-declaration="yes"/> ///<xsl:param name="currentPage"/> ///<xsl:param name="itemData"/>