diff --git a/foreign dlls/Examine.dll b/foreign dlls/Examine.dll
index d81e1822dd..cdaa5f6ff3 100644
Binary files a/foreign dlls/Examine.dll and b/foreign dlls/Examine.dll differ
diff --git a/foreign dlls/Examine.xml b/foreign dlls/Examine.xml
index 4491b1b663..53d6e5bd7f 100644
--- a/foreign dlls/Examine.xml
+++ b/foreign dlls/Examine.xml
@@ -92,6 +92,12 @@
The fluent API search.
+
+
+ Creates an instance of SearchCriteria for the provider
+
+
+
Creates an instance of SearchCriteria for the provider
diff --git a/foreign dlls/UmbracoExamine.dll b/foreign dlls/UmbracoExamine.dll
index 72badd63d3..810e6d6eba 100644
Binary files a/foreign dlls/UmbracoExamine.dll and b/foreign dlls/UmbracoExamine.dll differ
diff --git a/umbraco.Test/MacroTest.cs b/umbraco.Test/MacroTest.cs
new file mode 100644
index 0000000000..5677fe2731
--- /dev/null
+++ b/umbraco.Test/MacroTest.cs
@@ -0,0 +1,388 @@
+using umbraco.cms.businesslogic.macro;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Xml;
+
+namespace umbraco.Test
+{
+
+
+ ///
+ ///This is a test class for MacroTest and is intended
+ ///to contain all MacroTest Unit Tests
+ ///
+ [TestClass()]
+ public class MacroTest
+ {
+
+ ///
+ ///A test for MakeNew
+ ///
+ [TestMethod()]
+ public void Macro_Make_New()
+ {
+ var m = Macro.MakeNew(Guid.NewGuid().ToString("N"));
+ Assert.IsTrue(m.Id > 0);
+ Assert.IsInstanceOfType(m, typeof(Macro));
+
+ m.Delete();
+ var isfound = false;
+ try
+ {
+ var asdf = new Macro(m.Id);
+ isfound = true;
+ }
+ catch (ArgumentException)
+ {
+ isfound = false;
+ }
+
+ Assert.IsFalse(isfound);
+ }
+
+
+ #region Tests to write
+ /////
+ /////A test for Macro Constructor
+ /////
+ //[TestMethod()]
+ //public void MacroConstructorTest()
+ //{
+ // string alias = string.Empty; // TODO: Initialize to an appropriate value
+ // Macro target = new Macro(alias);
+ // Assert.Inconclusive("TODO: Implement code to verify target");
+ //}
+
+ /////
+ /////A test for Macro Constructor
+ /////
+ //[TestMethod()]
+ //public void MacroConstructorTest1()
+ //{
+ // int Id = 0; // TODO: Initialize to an appropriate value
+ // Macro target = new Macro(Id);
+ // Assert.Inconclusive("TODO: Implement code to verify target");
+ //}
+
+ /////
+ /////A test for Macro Constructor
+ /////
+ //[TestMethod()]
+ //public void MacroConstructorTest2()
+ //{
+ // Macro target = new Macro();
+ // Assert.Inconclusive("TODO: Implement code to verify target");
+ //}
+
+ /////
+ /////A test for Delete
+ /////
+ //[TestMethod()]
+ //public void DeleteTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // target.Delete();
+ // Assert.Inconclusive("A method that does not return a value cannot be verified.");
+ //}
+
+ /////
+ /////A test for GetAll
+ /////
+ //[TestMethod()]
+ //public void GetAllTest()
+ //{
+ // Macro[] expected = null; // TODO: Initialize to an appropriate value
+ // Macro[] actual;
+ // actual = Macro.GetAll();
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for GetByAlias
+ /////
+ //[TestMethod()]
+ //public void GetByAliasTest()
+ //{
+ // string Alias = string.Empty; // TODO: Initialize to an appropriate value
+ // Macro expected = null; // TODO: Initialize to an appropriate value
+ // Macro actual;
+ // actual = Macro.GetByAlias(Alias);
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for Import
+ /////
+ //[TestMethod()]
+ //public void ImportTest()
+ //{
+ // XmlNode n = null; // TODO: Initialize to an appropriate value
+ // Macro expected = null; // TODO: Initialize to an appropriate value
+ // Macro actual;
+ // actual = Macro.Import(n);
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+
+
+ /////
+ /////A test for RefreshProperties
+ /////
+ //[TestMethod()]
+ //public void RefreshPropertiesTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // target.RefreshProperties();
+ // Assert.Inconclusive("A method that does not return a value cannot be verified.");
+ //}
+
+ /////
+ /////A test for Save
+ /////
+ //[TestMethod()]
+ //public void SaveTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // target.Save();
+ // Assert.Inconclusive("A method that does not return a value cannot be verified.");
+ //}
+
+ /////
+ /////A test for ToXml
+ /////
+ //[TestMethod()]
+ //public void ToXmlTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // XmlDocument xd = null; // TODO: Initialize to an appropriate value
+ // XmlNode expected = null; // TODO: Initialize to an appropriate value
+ // XmlNode actual;
+ // actual = target.ToXml(xd);
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for Alias
+ /////
+ //[TestMethod()]
+ //public void AliasTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // string expected = string.Empty; // TODO: Initialize to an appropriate value
+ // string actual;
+ // target.Alias = expected;
+ // actual = target.Alias;
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for Assembly
+ /////
+ //[TestMethod()]
+ //public void AssemblyTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // string expected = string.Empty; // TODO: Initialize to an appropriate value
+ // string actual;
+ // target.Assembly = expected;
+ // actual = target.Assembly;
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for CacheByPage
+ /////
+ //[TestMethod()]
+ //public void CacheByPageTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // bool expected = false; // TODO: Initialize to an appropriate value
+ // bool actual;
+ // target.CacheByPage = expected;
+ // actual = target.CacheByPage;
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for CachePersonalized
+ /////
+ //[TestMethod()]
+ //public void CachePersonalizedTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // bool expected = false; // TODO: Initialize to an appropriate value
+ // bool actual;
+ // target.CachePersonalized = expected;
+ // actual = target.CachePersonalized;
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for Id
+ /////
+ //[TestMethod()]
+ //public void IdTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // int actual;
+ // actual = target.Id;
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for Name
+ /////
+ //[TestMethod()]
+ //public void NameTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // string expected = string.Empty; // TODO: Initialize to an appropriate value
+ // string actual;
+ // target.Name = expected;
+ // actual = target.Name;
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for Properties
+ /////
+ //[TestMethod()]
+ //public void PropertiesTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // MacroProperty[] actual;
+ // actual = target.Properties;
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for RefreshRate
+ /////
+ //[TestMethod()]
+ //public void RefreshRateTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // int expected = 0; // TODO: Initialize to an appropriate value
+ // int actual;
+ // target.RefreshRate = expected;
+ // actual = target.RefreshRate;
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for RenderContent
+ /////
+ //[TestMethod()]
+ //public void RenderContentTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // bool expected = false; // TODO: Initialize to an appropriate value
+ // bool actual;
+ // target.RenderContent = expected;
+ // actual = target.RenderContent;
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for ScriptingFile
+ /////
+ //[TestMethod()]
+ //public void ScriptingFileTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // string expected = string.Empty; // TODO: Initialize to an appropriate value
+ // string actual;
+ // target.ScriptingFile = expected;
+ // actual = target.ScriptingFile;
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for Type
+ /////
+ //[TestMethod()]
+ //public void TypeTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // string expected = string.Empty; // TODO: Initialize to an appropriate value
+ // string actual;
+ // target.Type = expected;
+ // actual = target.Type;
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for UseInEditor
+ /////
+ //[TestMethod()]
+ //public void UseInEditorTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // bool expected = false; // TODO: Initialize to an appropriate value
+ // bool actual;
+ // target.UseInEditor = expected;
+ // actual = target.UseInEditor;
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for Xslt
+ /////
+ //[TestMethod()]
+ //public void XsltTest()
+ //{
+ // Macro target = new Macro(); // TODO: Initialize to an appropriate value
+ // string expected = string.Empty; // TODO: Initialize to an appropriate value
+ // string actual;
+ // target.Xslt = expected;
+ // actual = target.Xslt;
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+ #endregion
+
+ #region Additional test attributes
+ //
+ //You can use the following additional attributes as you write your tests:
+ //
+ //Use ClassInitialize to run code before running the first test in the class
+ //[ClassInitialize()]
+ //public static void MyClassInitialize(TestContext testContext)
+ //{
+ //}
+ //
+ //Use ClassCleanup to run code after all tests in a class have run
+ //[ClassCleanup()]
+ //public static void MyClassCleanup()
+ //{
+ //}
+ //
+ //Use TestInitialize to run code before running each test
+ //[TestInitialize()]
+ //public void MyTestInitialize()
+ //{
+ //}
+ //
+ //Use TestCleanup to run code after each test has run
+ //[TestCleanup()]
+ //public void MyTestCleanup()
+ //{
+ //}
+ //
+ #endregion
+ }
+}
diff --git a/umbraco.Test/StyleSheetTest.cs b/umbraco.Test/StyleSheetTest.cs
new file mode 100644
index 0000000000..51398c3238
--- /dev/null
+++ b/umbraco.Test/StyleSheetTest.cs
@@ -0,0 +1,303 @@
+using umbraco.cms.businesslogic.web;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using umbraco.BusinessLogic;
+using System.Xml;
+
+namespace umbraco.Test
+{
+
+
+ ///
+ ///This is a test class for StyleSheetTest and is intended
+ ///to contain all StyleSheetTest Unit Tests
+ ///
+ [TestClass()]
+ public class StyleSheetTest
+ {
+
+ ///
+ ///A test for MakeNew
+ ///
+ [TestMethod()]
+ public void StyleSheet_Make_New()
+ {
+
+ var s = StyleSheet.MakeNew(m_User, Guid.NewGuid().ToString("N"), Guid.NewGuid().ToString("N") + ".css", Guid.NewGuid().ToString("N"));
+ Assert.IsTrue(s.Id > 0);
+ Assert.IsInstanceOfType(s, typeof(StyleSheet));
+
+ //now remove it
+ s.delete();
+ Assert.IsFalse(StyleSheet.IsNode(s.Id));
+
+ }
+
+ [TestMethod()]
+ public void StyleSheet_Make_New_AddProperty()
+ {
+
+ var s = StyleSheet.MakeNew(m_User, Guid.NewGuid().ToString("N"), Guid.NewGuid().ToString("N") + ".css", Guid.NewGuid().ToString("N"));
+ Assert.IsTrue(s.Id > 0);
+ Assert.IsInstanceOfType(s, typeof(StyleSheet));
+
+ //add property
+ var p = s.AddProperty(Guid.NewGuid().ToString("N"), m_User);
+ Assert.IsTrue(p.Id > 0);
+ Assert.IsInstanceOfType(p, typeof(StylesheetProperty));
+
+ //now remove it
+ s.delete();
+ Assert.IsFalse(StyleSheet.IsNode(s.Id));
+
+ //make sure the property is gone too
+ Assert.IsFalse(StylesheetProperty.IsNode(p.Id));
+
+ }
+
+ private User m_User = new User(0);
+
+ #region Tests to write
+ /////
+ /////A test for StyleSheet Constructor
+ /////
+ //[TestMethod()]
+ //public void StyleSheetConstructorTest()
+ //{
+ // int id = 0; // TODO: Initialize to an appropriate value
+ // bool setupStyleProperties = false; // TODO: Initialize to an appropriate value
+ // bool loadContentFromFile = false; // TODO: Initialize to an appropriate value
+ // StyleSheet target = new StyleSheet(id, setupStyleProperties, loadContentFromFile);
+ // Assert.Inconclusive("TODO: Implement code to verify target");
+ //}
+
+ /////
+ /////A test for StyleSheet Constructor
+ /////
+ //[TestMethod()]
+ //public void StyleSheetConstructorTest1()
+ //{
+ // int id = 0; // TODO: Initialize to an appropriate value
+ // StyleSheet target = new StyleSheet(id);
+ // Assert.Inconclusive("TODO: Implement code to verify target");
+ //}
+
+ /////
+ /////A test for StyleSheet Constructor
+ /////
+ //[TestMethod()]
+ //public void StyleSheetConstructorTest2()
+ //{
+ // Guid id = new Guid(); // TODO: Initialize to an appropriate value
+ // StyleSheet target = new StyleSheet(id);
+ // Assert.Inconclusive("TODO: Implement code to verify target");
+ //}
+
+ /////
+ /////A test for AddProperty
+ /////
+ //[TestMethod()]
+ //public void AddPropertyTest()
+ //{
+ // Guid id = new Guid(); // TODO: Initialize to an appropriate value
+ // StyleSheet target = new StyleSheet(id); // TODO: Initialize to an appropriate value
+ // string Alias = string.Empty; // TODO: Initialize to an appropriate value
+ // User u = null; // TODO: Initialize to an appropriate value
+ // StylesheetProperty expected = null; // TODO: Initialize to an appropriate value
+ // StylesheetProperty actual;
+ // actual = target.AddProperty(Alias, u);
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for GetAll
+ /////
+ //[TestMethod()]
+ //public void GetAllTest()
+ //{
+ // StyleSheet[] expected = null; // TODO: Initialize to an appropriate value
+ // StyleSheet[] actual;
+ // actual = StyleSheet.GetAll();
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for GetByName
+ /////
+ //[TestMethod()]
+ //public void GetByNameTest()
+ //{
+ // string name = string.Empty; // TODO: Initialize to an appropriate value
+ // StyleSheet expected = null; // TODO: Initialize to an appropriate value
+ // StyleSheet actual;
+ // actual = StyleSheet.GetByName(name);
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for GetStyleSheet
+ /////
+ //[TestMethod()]
+ //public void GetStyleSheetTest()
+ //{
+ // int id = 0; // TODO: Initialize to an appropriate value
+ // bool setupStyleProperties = false; // TODO: Initialize to an appropriate value
+ // bool loadContentFromFile = false; // TODO: Initialize to an appropriate value
+ // StyleSheet expected = null; // TODO: Initialize to an appropriate value
+ // StyleSheet actual;
+ // actual = StyleSheet.GetStyleSheet(id, setupStyleProperties, loadContentFromFile);
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for Import
+ /////
+ //[TestMethod()]
+ //public void ImportTest()
+ //{
+ // XmlNode n = null; // TODO: Initialize to an appropriate value
+ // User u = null; // TODO: Initialize to an appropriate value
+ // StyleSheet expected = null; // TODO: Initialize to an appropriate value
+ // StyleSheet actual;
+ // actual = StyleSheet.Import(n, u);
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+
+
+ /////
+ /////A test for Save
+ /////
+ //[TestMethod()]
+ //public void SaveTest()
+ //{
+ // Guid id = new Guid(); // TODO: Initialize to an appropriate value
+ // StyleSheet target = new StyleSheet(id); // TODO: Initialize to an appropriate value
+ // target.Save();
+ // Assert.Inconclusive("A method that does not return a value cannot be verified.");
+ //}
+
+ /////
+ /////A test for ToXml
+ /////
+ //[TestMethod()]
+ //public void ToXmlTest()
+ //{
+ // Guid id = new Guid(); // TODO: Initialize to an appropriate value
+ // StyleSheet target = new StyleSheet(id); // TODO: Initialize to an appropriate value
+ // XmlDocument xd = null; // TODO: Initialize to an appropriate value
+ // XmlNode expected = null; // TODO: Initialize to an appropriate value
+ // XmlNode actual;
+ // actual = target.ToXml(xd);
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for delete
+ /////
+ //[TestMethod()]
+ //public void deleteTest()
+ //{
+ // Guid id = new Guid(); // TODO: Initialize to an appropriate value
+ // StyleSheet target = new StyleSheet(id); // TODO: Initialize to an appropriate value
+ // target.delete();
+ // Assert.Inconclusive("A method that does not return a value cannot be verified.");
+ //}
+
+ /////
+ /////A test for saveCssToFile
+ /////
+ //[TestMethod()]
+ //public void saveCssToFileTest()
+ //{
+ // Guid id = new Guid(); // TODO: Initialize to an appropriate value
+ // StyleSheet target = new StyleSheet(id); // TODO: Initialize to an appropriate value
+ // target.saveCssToFile();
+ // Assert.Inconclusive("A method that does not return a value cannot be verified.");
+ //}
+
+ /////
+ /////A test for Content
+ /////
+ //[TestMethod()]
+ //public void ContentTest()
+ //{
+ // Guid id = new Guid(); // TODO: Initialize to an appropriate value
+ // StyleSheet target = new StyleSheet(id); // TODO: Initialize to an appropriate value
+ // string expected = string.Empty; // TODO: Initialize to an appropriate value
+ // string actual;
+ // target.Content = expected;
+ // actual = target.Content;
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for Filename
+ /////
+ //[TestMethod()]
+ //public void FilenameTest()
+ //{
+ // Guid id = new Guid(); // TODO: Initialize to an appropriate value
+ // StyleSheet target = new StyleSheet(id); // TODO: Initialize to an appropriate value
+ // string expected = string.Empty; // TODO: Initialize to an appropriate value
+ // string actual;
+ // target.Filename = expected;
+ // actual = target.Filename;
+ // Assert.AreEqual(expected, actual);
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+
+ /////
+ /////A test for Properties
+ /////
+ //[TestMethod()]
+ //public void PropertiesTest()
+ //{
+ // Guid id = new Guid(); // TODO: Initialize to an appropriate value
+ // StyleSheet target = new StyleSheet(id); // TODO: Initialize to an appropriate value
+ // StylesheetProperty[] actual;
+ // actual = target.Properties;
+ // Assert.Inconclusive("Verify the correctness of this test method.");
+ //}
+ #endregion
+
+
+
+ #region Additional test attributes
+ //
+ //You can use the following additional attributes as you write your tests:
+ //
+ //Use ClassInitialize to run code before running the first test in the class
+ //[ClassInitialize()]
+ //public static void MyClassInitialize(TestContext testContext)
+ //{
+ //}
+ //
+ //Use ClassCleanup to run code after all tests in a class have run
+ //[ClassCleanup()]
+ //public static void MyClassCleanup()
+ //{
+ //}
+ //
+ //Use TestInitialize to run code before running each test
+ //[TestInitialize()]
+ //public void MyTestInitialize()
+ //{
+ //}
+ //
+ //Use TestCleanup to run code after each test has run
+ //[TestCleanup()]
+ //public void MyTestCleanup()
+ //{
+ //}
+ //
+ #endregion
+ }
+}
diff --git a/umbraco.Test/UserTest.cs b/umbraco.Test/UserTest.cs
index 59aca2f778..4b69a81f58 100644
--- a/umbraco.Test/UserTest.cs
+++ b/umbraco.Test/UserTest.cs
@@ -36,6 +36,7 @@ namespace umbraco.Test
var user = User.GetUser(id);
Assert.AreEqual(id, user.Id);
+ //System.Diagnostics.Debugger.Launch();
user.delete();
var stillUser = User.GetUser(id);
diff --git a/umbraco.Test/umbraco.Test.csproj b/umbraco.Test/umbraco.Test.csproj
index caf1201627..c093131a68 100644
--- a/umbraco.Test/umbraco.Test.csproj
+++ b/umbraco.Test/umbraco.Test.csproj
@@ -142,12 +142,14 @@
+
+
diff --git a/umbraco.vsmdi b/umbraco.vsmdi
index c18b1ea158..c83c14b546 100644
--- a/umbraco.vsmdi
+++ b/umbraco.vsmdi
@@ -1,6 +1,6 @@
-
+
-
\ No newline at end of file
+
diff --git a/umbraco/businesslogic/User.cs b/umbraco/businesslogic/User.cs
index b43e95283e..b4b10b15ae 100644
--- a/umbraco/businesslogic/User.cs
+++ b/umbraco/businesslogic/User.cs
@@ -97,6 +97,10 @@ namespace umbraco.BusinessLogic
_usertype = UserType.GetUserType(dr.GetShort("UserType"));
_defaultToLiveEditing = dr.GetBoolean("defaultToLiveEditing");
}
+ else
+ {
+ throw new ArgumentException("No User exists with ID " + ID.ToString());
+ }
}
_isInitialized = true;
}
diff --git a/umbraco/cms/businesslogic/macro/Macro.cs b/umbraco/cms/businesslogic/macro/Macro.cs
index 14a1f37e24..44031b1f96 100644
--- a/umbraco/cms/businesslogic/macro/Macro.cs
+++ b/umbraco/cms/businesslogic/macro/Macro.cs
@@ -378,10 +378,14 @@ namespace umbraco.cms.businesslogic.macro
{
using (IRecordsReader dr = SqlHelper.ExecuteReader("select id, macroUseInEditor, macroRefreshRate, macroAlias, macroName, macroScriptType, macroScriptAssembly, macroXSLT, macroPython, macroDontRender, macroCacheByPage, macroCachePersonalized from cmsMacro where id = @id", SqlHelper.CreateParameter("@id", _id)))
{
- if(dr.Read())
- {
+ if (dr.Read())
+ {
PopulateMacroInfo(dr);
- }
+ }
+ else
+ {
+ throw new ArgumentException("No macro found for the id specified");
+ }
}
}
diff --git a/umbraco/cms/businesslogic/web/StyleSheet.cs b/umbraco/cms/businesslogic/web/StyleSheet.cs
index 02ac1e6637..edcbfb8c4f 100644
--- a/umbraco/cms/businesslogic/web/StyleSheet.cs
+++ b/umbraco/cms/businesslogic/web/StyleSheet.cs
@@ -250,7 +250,7 @@ namespace umbraco.cms.businesslogic.web
return StylesheetProperty.MakeNew(Alias, this, u);
}
- new public void delete()
+ public override void delete()
{
DeleteEventArgs e = new DeleteEventArgs();
FireBeforeDelete(e);
diff --git a/umbraco/cms/businesslogic/web/StylesheetProperty.cs b/umbraco/cms/businesslogic/web/StylesheetProperty.cs
index 56b315652a..118b89b7c5 100644
--- a/umbraco/cms/businesslogic/web/StylesheetProperty.cs
+++ b/umbraco/cms/businesslogic/web/StylesheetProperty.cs
@@ -79,7 +79,7 @@ namespace umbraco.cms.businesslogic.web
return ssp;
}
- new public void delete()
+ public override void delete()
{
DeleteEventArgs e = new DeleteEventArgs();
FireBeforeDelete(e);
diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj
index 9caaeb2e68..7efba1617d 100644
--- a/umbraco/presentation/umbraco.presentation.csproj
+++ b/umbraco/presentation/umbraco.presentation.csproj
@@ -2018,7 +2018,10 @@
-
+
+ SettingsSingleFileGenerator
+ Settings1.Designer.cs
+