diff --git a/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/Configuration/AssemblyInfo.vb b/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/Configuration/AssemblyInfo.vb new file mode 100644 index 0000000000..24e51cc723 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/Configuration/AssemblyInfo.vb @@ -0,0 +1,31 @@ +Imports System.Reflection +Imports System.Runtime.CompilerServices +Imports System.Runtime.InteropServices + +' Information about this assembly is defined by the following +' attributes. +' +' change them to the information which is associated with the assembly +' you compile. + + + + + + + + + + +' This sets the default COM visibility of types in the assembly to invisible. +' If you need to expose a type to COM, use on that type. + + +' The assembly version has following format : +' +' Major.Minor.Build.Revision +' +' You can specify all values by your own or you can build default build and revision +' numbers with the '*' character (the default): + + diff --git a/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/Globals.vb b/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/Globals.vb new file mode 100644 index 0000000000..bbcdbcb09e --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/Globals.vb @@ -0,0 +1,45 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +''' +''' EnvDTE.Globals class defined in VB.NET so multiple parameterized properties can be defined +''' which are not supported in C#. This allows Powershell to use the properties as methods: +''' +''' $dte.Solution.Globals.VariablePersists("MyVariable") = $true +''' $dte.Solution.Globals.VariablePersists("MyVariable") +''' $dte.Solution.Globals.VariableValue("MyVariable") = "path/to/tool" +''' $dte.Solution.Globals.VariablePersists("MyVariable") = $true +''' +Public MustInherit Class Globals + Public Property VariableValue(ByVal name As String) As Object + Get + Return GetVariableValue(name) + End Get + Set + SetVariableValue(name, value) + End Set + End Property + + Protected MustOverride Function GetVariableValue(ByVal name As String) As Object + Protected MustOverride Sub SetVariableValue(ByVal name As String, ByVal value As Object) + + Public Property VariablePersists(ByVal name As String) As Boolean + Get + Return GetVariablePersists(name) + End Get + Set + SetVariablePersists(name, value) + End Set + End Property + + Protected MustOverride Function GetVariablePersists(ByVal name As String) As Boolean + Protected MustOverride Sub SetVariablePersists(ByVal name As String, ByVal value As Boolean) + + Public ReadOnly Property VariableExists(ByVal name As string) As Boolean + Get + Return GetVariableExists(name) + End Get + End Property + + Protected MustOverride Function GetVariableExists(ByVal name As String) As Boolean +End Class diff --git a/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/PackageManagement.EnvDTEHelpers.vbproj b/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/PackageManagement.EnvDTEHelpers.vbproj new file mode 100644 index 0000000000..a438d502c4 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/PackageManagement.EnvDTEHelpers.vbproj @@ -0,0 +1,50 @@ + + + + {F7886FB7-3764-4574-B981-25EB164B532E} + Debug + AnyCPU + Library + Windows + ICSharpCode.PackageManagement.EnvDTE + PackageManagement.EnvDTEHelpers + v4.0 + Properties + On + ..\..\..\..\..\..\AddIns\Misc\PackageManagement\ + + + AnyCPU + + + True + Full + False + DEBUG=1,TRACE=1 + + + False + None + True + TRACE=1 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/PackageManagement.sln b/src/AddIns/Misc/PackageManagement/PackageManagement.sln index c53601c29b..bd76daab5e 100644 --- a/src/AddIns/Misc/PackageManagement/PackageManagement.sln +++ b/src/AddIns/Misc/PackageManagement/PackageManagement.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.3.0.8820-alpha +# SharpDevelop 4.3 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement", "Project\PackageManagement.csproj", "{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Tests", "Test\PackageManagement.Tests.csproj", "{56E98A01-8398-4A08-9578-C7337711A52B}" @@ -36,6 +36,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "..\..\D EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.PowerShell", "PowerShell\Project\PackageManagement.PowerShell.csproj", "{A406803B-C584-43A3-BCEE-A0BB3132CB5F}" EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "PackageManagement.EnvDTEHelpers", "EnvDTEHelpers\Project\PackageManagement.EnvDTEHelpers.vbproj", "{F7886FB7-3764-4574-B981-25EB164B532E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 @@ -180,5 +182,13 @@ Global {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Debug|Any CPU.ActiveCfg = Debug|x86 {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Release|Any CPU.Build.0 = Release|x86 {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Release|Any CPU.ActiveCfg = Release|x86 + {F7886FB7-3764-4574-B981-25EB164B532E}.Debug|x86.Build.0 = Debug|Any CPU + {F7886FB7-3764-4574-B981-25EB164B532E}.Debug|x86.ActiveCfg = Debug|Any CPU + {F7886FB7-3764-4574-B981-25EB164B532E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F7886FB7-3764-4574-B981-25EB164B532E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F7886FB7-3764-4574-B981-25EB164B532E}.Release|x86.Build.0 = Release|Any CPU + {F7886FB7-3764-4574-B981-25EB164B532E}.Release|x86.ActiveCfg = Release|Any CPU + {F7886FB7-3764-4574-B981-25EB164B532E}.Release|Any CPU.Build.0 = Release|Any CPU + {F7886FB7-3764-4574-B981-25EB164B532E}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection EndGlobal diff --git a/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj b/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj index 0b6eb895f1..f67b13d684 100644 --- a/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj +++ b/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj @@ -119,7 +119,6 @@ - @@ -129,6 +128,7 @@ + @@ -507,6 +507,10 @@ AvalonEdit.AddIn False + + {F7886FB7-3764-4574-B981-25EB164B532E} + PackageManagement.EnvDTEHelpers + {A406803B-C584-43A3-BCEE-A0BB3132CB5F} PackageManagement.PowerShell diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Solution.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Solution.cs index c6538299fc..e77606b3fc 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Solution.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Solution.cs @@ -17,7 +17,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE this.projectService = projectService; this.solution = projectService.OpenSolution; this.Projects = new Projects(projectService); - this.Globals = new Globals(this); + this.Globals = new SolutionGlobals(this); } public string FullName { diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Globals.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionGlobals.cs similarity index 52% rename from src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Globals.cs rename to src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionGlobals.cs index 7be4996024..05c72489f2 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Globals.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionGlobals.cs @@ -2,33 +2,41 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; -using System.Collections.Generic; -using System.Linq; - -using SD = ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class Globals + public class SolutionGlobals : Globals { SolutionExtensibilityGlobals extensibilityGlobals; SolutionExtensibilityGlobalsPersistence extensibilityGlobalsPersistence; - public Globals(Solution solution) + public SolutionGlobals(Solution solution) { this.extensibilityGlobals = new SolutionExtensibilityGlobals(solution); this.extensibilityGlobalsPersistence = new SolutionExtensibilityGlobalsPersistence(extensibilityGlobals); } - public virtual SolutionExtensibilityGlobals VariableValue { - get { return extensibilityGlobals; } + protected override object GetVariableValue(string name) + { + return extensibilityGlobals[name]; + } + + protected override void SetVariableValue(string name, object value) + { + extensibilityGlobals[name] = value; } - public virtual SolutionExtensibilityGlobalsPersistence VariablePersists { - get { return extensibilityGlobalsPersistence; } + protected override bool GetVariablePersists(string name) + { + return extensibilityGlobalsPersistence[name]; + } + + protected override void SetVariablePersists(string name, bool value) + { + extensibilityGlobalsPersistence[name] = value; } - public virtual bool VariableExists(string name) + protected override bool GetVariableExists(string name) { return extensibilityGlobals.ItemExists(name); } diff --git a/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj b/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj index fe37bc2691..df836b2955 100644 --- a/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj +++ b/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj @@ -351,6 +351,10 @@ {0162E499-42D0-409B-AA25-EED21F75336B} AvalonEdit.AddIn + + {F7886FB7-3764-4574-B981-25EB164B532E} + PackageManagement.EnvDTEHelpers + {A406803B-C584-43A3-BCEE-A0BB3132CB5F} PackageManagement.PowerShell diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/SolutionGlobalsTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/SolutionGlobalsTests.cs index 3d01aa01c4..bf68330d9e 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/SolutionGlobalsTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/SolutionGlobalsTests.cs @@ -53,7 +53,7 @@ namespace PackageManagement.Tests.EnvDTE AddExtensibilityGlobalsSection(); AddVariableToExtensibilityGlobals("test"); - bool exists = globals.VariableExists("test"); + bool exists = globals.get_VariableExists("test"); Assert.IsTrue(exists); } @@ -63,7 +63,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateSolution(); - bool exists = globals.VariableExists("test"); + bool exists = globals.get_VariableExists("test"); Assert.IsFalse(exists); } @@ -74,7 +74,7 @@ namespace PackageManagement.Tests.EnvDTE CreateSolution(); AddExtensibilityGlobalsSection(); - bool exists = globals.VariableExists("test"); + bool exists = globals.get_VariableExists("test"); Assert.IsFalse(exists); } @@ -86,7 +86,7 @@ namespace PackageManagement.Tests.EnvDTE AddExtensibilityGlobalsSection(); AddVariableToExtensibilityGlobals("TEST"); - bool exists = globals.VariableExists("test"); + bool exists = globals.get_VariableExists("test"); Assert.IsTrue(exists); } @@ -98,7 +98,7 @@ namespace PackageManagement.Tests.EnvDTE AddExtensibilityGlobalsSection(); AddVariableToExtensibilityGlobals("test", "test-value"); - object value = globals.VariableValue["test"]; + object value = globals.get_VariableValue("test"); Assert.AreEqual("test-value", value); } @@ -110,7 +110,7 @@ namespace PackageManagement.Tests.EnvDTE AddExtensibilityGlobalsSection(); AddVariableToExtensibilityGlobals("TEST", "test-value"); - object value = globals.VariableValue["test"]; + object value = globals.get_VariableValue("test"); Assert.AreEqual("test-value", value); } @@ -120,7 +120,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateSolution(); - Assert.Throws(delegate { object value = globals.VariableValue["test"]; }); + Assert.Throws(delegate { object value = globals.get_VariableValue("test"); }); } [Test] @@ -129,7 +129,7 @@ namespace PackageManagement.Tests.EnvDTE CreateSolution(); AddExtensibilityGlobalsSection(); - Assert.Throws(delegate { object value = globals.VariableValue["test"]; }); + Assert.Throws(delegate { object value = globals.get_VariableValue("test"); }); } [Test] @@ -139,7 +139,7 @@ namespace PackageManagement.Tests.EnvDTE AddExtensibilityGlobalsSection(); AddVariableToExtensibilityGlobals("test", "value"); - globals.VariableValue["test"] = "new-value"; + globals.set_VariableValue("test", "new-value"); SD.SolutionItem item = GetExtensibilityGlobalsSolutionItem("test"); Assert.AreEqual("new-value", item.Location); @@ -151,8 +151,8 @@ namespace PackageManagement.Tests.EnvDTE CreateSolution(); AddExtensibilityGlobalsSection(); - globals.VariableValue["test"] = "new-value"; - object value = globals.VariableValue["test"]; + globals.set_VariableValue("test", "new-value"); + object value = globals.get_VariableValue("test"); Assert.AreEqual("new-value", value); } @@ -163,7 +163,7 @@ namespace PackageManagement.Tests.EnvDTE CreateSolution(); AddExtensibilityGlobalsSection(); - globals.VariableValue["test"] = "new-value"; + globals.set_VariableValue("test", "new-value"); SD.SolutionItem item = GetExtensibilityGlobalsSolutionItem("test"); Assert.IsNull(item); @@ -174,7 +174,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateSolution(); - globals.VariableValue["test"] = "new-value"; + globals.set_VariableValue("test", "new-value"); SD.ProjectSection section = GetExtensibilityGlobalsSection(); Assert.IsNull(section); @@ -185,8 +185,8 @@ namespace PackageManagement.Tests.EnvDTE { CreateSolution(); - globals.VariableValue["test"] = "new-value"; - object value = globals.VariableValue["TEST"]; + globals.set_VariableValue("test", "new-value"); + object value = globals.get_VariableValue("test"); Assert.AreEqual("new-value", value); } @@ -197,9 +197,9 @@ namespace PackageManagement.Tests.EnvDTE CreateSolution(); AddExtensibilityGlobalsSection(); - globals.VariableValue["test"] = "value"; + globals.set_VariableValue("test", "value"); - bool exists = globals.VariableExists("test"); + bool exists = globals.get_VariableExists("test"); Assert.IsTrue(exists); } @@ -208,9 +208,9 @@ namespace PackageManagement.Tests.EnvDTE public void VariablePersists_NewVariableAdded_ReturnsFalse() { CreateSolution(); - globals.VariableValue["test"] = "new-value"; + globals.set_VariableValue("test", "new-value"); - bool persists = globals.VariablePersists["test"]; + bool persists = globals.get_VariablePersists("test"); Assert.IsFalse(persists); } @@ -220,7 +220,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateSolution(); - Assert.Throws(delegate { bool persists = globals.VariablePersists["test"]; }); + Assert.Throws(delegate { bool persists = globals.get_VariablePersists("test"); }); } [Test] @@ -230,7 +230,7 @@ namespace PackageManagement.Tests.EnvDTE AddExtensibilityGlobalsSection(); AddVariableToExtensibilityGlobals("test", "value"); - bool persists = globals.VariablePersists["test"]; + bool persists = globals.get_VariablePersists("test"); Assert.IsTrue(persists); } @@ -239,9 +239,9 @@ namespace PackageManagement.Tests.EnvDTE public void VariablePersists_NoExistingExtensibilityGlobalsAndVariableSetToTrueAfterNewVariableAdded_VariableAddedToSolution() { CreateSolution(); - globals.VariableValue["test"] = "new-value"; + globals.set_VariableValue("test", "new-value"); - globals.VariablePersists["test"] = true; + globals.set_VariablePersists("test", true); SD.SolutionItem item = GetExtensibilityGlobalsSolutionItem("test"); Assert.AreEqual("new-value", item.Location); @@ -251,10 +251,10 @@ namespace PackageManagement.Tests.EnvDTE public void VariablePersists_SetToTrueAfterNewVariableAdded_ReturnsTrue() { CreateSolution(); - globals.VariableValue["test"] = "new-value"; + globals.set_VariableValue("test", "new-value"); - globals.VariablePersists["test"] = true; - bool persists = globals.VariablePersists["test"]; + globals.set_VariablePersists("test", true); + bool persists = globals.get_VariablePersists("test"); Assert.IsTrue(persists); } @@ -264,9 +264,9 @@ namespace PackageManagement.Tests.EnvDTE { CreateSolution(); AddExtensibilityGlobalsSection(); - globals.VariableValue["test"] = "new-value"; + globals.set_VariableValue("test", "new-value"); - globals.VariablePersists["test"] = true; + globals.set_VariablePersists("test", true); SD.SolutionItem item = GetExtensibilityGlobalsSolutionItem("test"); Assert.AreEqual("new-value", item.Location); @@ -276,9 +276,9 @@ namespace PackageManagement.Tests.EnvDTE public void VariablePersists_SetToTrueAfterNewVariableAdded_ExtensibilityGlobalsSectionAddedWithPostSolutionType() { CreateSolution(); - globals.VariableValue["test"] = "new-value"; + globals.set_VariableValue("test", "new-value"); - globals.VariablePersists["test"] = true; + globals.set_VariablePersists("test", true); SD.ProjectSection section = GetExtensibilityGlobalsSection(); Assert.AreEqual("postSolution", section.SectionType); @@ -291,8 +291,8 @@ namespace PackageManagement.Tests.EnvDTE AddExtensibilityGlobalsSection(); AddVariableToExtensibilityGlobals("test", "value"); - globals.VariablePersists["test"] = false; - bool persists = globals.VariablePersists["test"]; + globals.set_VariablePersists("test", false); + bool persists = globals.get_VariablePersists("test"); Assert.IsFalse(persists); } @@ -304,7 +304,7 @@ namespace PackageManagement.Tests.EnvDTE AddExtensibilityGlobalsSection(); AddVariableToExtensibilityGlobals("test", "value"); - globals.VariablePersists["test"] = false; + globals.set_VariablePersists("test", false); SD.SolutionItem item = GetExtensibilityGlobalsSolutionItem("test"); Assert.IsNull(item); @@ -317,7 +317,7 @@ namespace PackageManagement.Tests.EnvDTE AddExtensibilityGlobalsSection(); AddVariableToExtensibilityGlobals("test", "value"); - globals.VariablePersists["TEST"] = false; + globals.set_VariablePersists("TEST", false); SD.SolutionItem item = GetExtensibilityGlobalsSolutionItem("test"); Assert.IsNull(item); @@ -327,10 +327,10 @@ namespace PackageManagement.Tests.EnvDTE public void VariableValue_AddNewVariableAndPersistThenUpdateVariableValue_SolutionValueUpdated() { CreateSolution(); - globals.VariableValue["test"] = "one"; - globals.VariablePersists["test"] = true; + globals.set_VariableValue("test", "one"); + globals.set_VariablePersists("test", true); - globals.VariableValue["test"] = "two"; + globals.set_VariableValue("test", "two"); SD.SolutionItem item = GetExtensibilityGlobalsSolutionItem("test"); Assert.AreEqual("two", item.Location); @@ -340,11 +340,11 @@ namespace PackageManagement.Tests.EnvDTE public void VariableValue_PersistVariableAfterSettingVariableValueTwice_NoExceptionThrown() { CreateSolution(); - globals.VariableValue["test"] = "two"; - globals.VariableValue["test"] = "three"; - globals.VariablePersists["test"] = true; + globals.set_VariableValue("test", "two"); + globals.set_VariableValue("test", "three"); + globals.set_VariablePersists("test", true); - object value = globals.VariableValue["test"]; + object value = globals.get_VariableValue("test"); Assert.AreEqual("three", value); } @@ -353,13 +353,13 @@ namespace PackageManagement.Tests.EnvDTE public void VariableValue_PersistVariableMultipleTimes_NoExceptionThrown() { CreateSolution(); - globals.VariableValue["test"] = "two"; - globals.VariablePersists["test"] = true; - globals.VariablePersists["test"] = false; - globals.VariablePersists["test"] = true; - globals.VariableValue["test"] = "four"; + globals.set_VariableValue("test", "two"); + globals.set_VariablePersists("test", true); + globals.set_VariablePersists("test", false); + globals.set_VariablePersists("test", true); + globals.set_VariableValue("test", "four"); - object value = globals.VariableValue["test"]; + object value = globals.get_VariableValue("test"); Assert.AreEqual("four", value); } @@ -368,10 +368,10 @@ namespace PackageManagement.Tests.EnvDTE public void VariablePersists_SetPersistToTrueTwice_VariableAddedToSolutionOnce() { CreateSolution(); - globals.VariableValue["test"] = "one"; + globals.set_VariableValue("test", "one"); - globals.VariablePersists["test"] = true; - globals.VariablePersists["test"] = true; + globals.set_VariablePersists("test", true); + globals.set_VariablePersists("test", true); SD.ProjectSection section = GetExtensibilityGlobalsSection(); int count = section.Items.Count; @@ -382,11 +382,11 @@ namespace PackageManagement.Tests.EnvDTE public void VariablePersists_SetPersistToFalseWhenNoExtensibilityGlobalsSection_ExceptionNotThrown() { CreateSolution(); - globals.VariableValue["test"] = "one"; + globals.set_VariableValue("test", "one"); - globals.VariablePersists["test"] = false; + globals.set_VariablePersists("test", false); - object value = globals.VariableValue["test"]; + object value = globals.get_VariableValue("test"); Assert.AreEqual("one", value); } @@ -394,9 +394,9 @@ namespace PackageManagement.Tests.EnvDTE public void VariablePersists_SetToTrueAfterNewVariableAdded_SolutionIsSaved() { CreateSolution(); - globals.VariableValue["test"] = "new-value"; + globals.set_VariableValue("test", "new-value"); - globals.VariablePersists["test"] = true; + globals.set_VariablePersists("test", true); solutionHelper.AssertSolutionIsSaved(); } @@ -405,9 +405,9 @@ namespace PackageManagement.Tests.EnvDTE public void VariablePersists_SetToFalseAfterNewVariableAdded_SolutionIsNotSaved() { CreateSolution(); - globals.VariableValue["test"] = "new-value"; + globals.set_VariableValue("test", "new-value"); - globals.VariablePersists["test"] = false; + globals.set_VariablePersists("test", false); solutionHelper.AssertSolutionIsNotSaved(); } @@ -419,7 +419,7 @@ namespace PackageManagement.Tests.EnvDTE AddExtensibilityGlobalsSection(); AddVariableToExtensibilityGlobals("test", "value"); - globals.VariablePersists["test"] = false; + globals.set_VariablePersists("test", false); solutionHelper.AssertSolutionIsSaved(); } @@ -431,7 +431,7 @@ namespace PackageManagement.Tests.EnvDTE AddExtensibilityGlobalsSection(); AddVariableToExtensibilityGlobals("test", "value"); - globals.VariablePersists["test"] = true; + globals.set_VariablePersists("test", true); solutionHelper.AssertSolutionIsNotSaved(); } @@ -443,7 +443,7 @@ namespace PackageManagement.Tests.EnvDTE AddExtensibilityGlobalsSection(); AddVariableToExtensibilityGlobals("test", "value"); - globals.VariableValue["test"] = "new-value"; + globals.set_VariableValue("test", "new-value"); solutionHelper.AssertSolutionIsSaved(); } @@ -452,9 +452,9 @@ namespace PackageManagement.Tests.EnvDTE public void VariableValue_VariableNotSolutionChanged_SolutionIsNotSaved() { CreateSolution(); - globals.VariableValue["test"] = "value"; + globals.set_VariableValue("test", "value"); - globals.VariableValue["test"] = "new-value"; + globals.set_VariableValue("test", "new-value"); solutionHelper.AssertSolutionIsNotSaved(); } diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs index 464839a144..7d20f3e487 100644 --- a/src/Setup/Files.wxs +++ b/src/Setup/Files.wxs @@ -1814,6 +1814,9 @@ + + + diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs index 27d326bc19..333b386264 100644 --- a/src/Setup/Setup.wxs +++ b/src/Setup/Setup.wxs @@ -533,6 +533,7 @@ +