diff --git a/PowerShellTools.Test/FormsDesigner/CodeDomAstVisitor.Test.cs b/PowerShellTools.Test/FormsDesigner/CodeDomAstVisitor.Test.cs
index 54682cb..d4322c9 100644
--- a/PowerShellTools.Test/FormsDesigner/CodeDomAstVisitor.Test.cs
+++ b/PowerShellTools.Test/FormsDesigner/CodeDomAstVisitor.Test.cs
@@ -8,25 +8,6 @@ namespace PowerShellToolsPro.Test.FormsDesigner
{
public class CodeDomAstVisitorTest
{
- [Fact]
- public void ShouldParseSapienExport()
- {
- var codeDomVisitor = new SapienCodeDomAstVisitor();
-
- string result;
- using (Stream stream = GetType().Assembly.GetManifestResourceStream("PowerShellTools.Test.Assets.form.Export.ps1"))
- using (StreamReader reader = new StreamReader(stream))
- {
- result = reader.ReadToEnd();
- }
-
- Token[] tokens;
- ParseError[] errors;
- var ast = Parser.ParseInput(result, out tokens, out errors);
-
- var codeDom = codeDomVisitor.Parse(ast) as CodeCompileUnit;
- }
-
[Fact]
public void ShouldCreateCorrectResourceNode()
{
@@ -75,11 +56,11 @@ function InitializeComponent
var initialize = codeDom.Namespaces[0].Types[0].Members[1] as CodeMemberMethod;
var codeVariableDeclaration = initialize.Statements[0] as CodeVariableDeclarationStatement;
-
+
Assert.Equal("resources", codeVariableDeclaration.Name);
var objectCreate = codeVariableDeclaration.InitExpression as CodeObjectCreateExpression;
-
+
Assert.Equal("System.ComponentModel.ComponentResourceManager", objectCreate.CreateType.BaseType);
Assert.Equal("MainForm", (objectCreate.Parameters[0] as CodeTypeOfExpression).Type.BaseType);
}
diff --git a/PowerShellTools.Test/PowerShellTools.Test.csproj b/PowerShellTools.Test/PowerShellTools.Test.csproj
index 331d50c..6ac77b1 100644
--- a/PowerShellTools.Test/PowerShellTools.Test.csproj
+++ b/PowerShellTools.Test/PowerShellTools.Test.csproj
@@ -115,7 +115,6 @@
-
@@ -192,7 +191,6 @@
Always
-
@@ -229,11 +227,6 @@
PreserveNewest
-
-
- Designer
-
-
diff --git a/PowerShellTools.Test/WpfSupport/Resources/PowerShell/BlankWpfCodeBehind.ps1 b/PowerShellTools.Test/WpfSupport/Resources/PowerShell/BlankWpfCodeBehind.ps1
deleted file mode 100644
index 60b9672..0000000
--- a/PowerShellTools.Test/WpfSupport/Resources/PowerShell/BlankWpfCodeBehind.ps1
+++ /dev/null
@@ -1,12 +0,0 @@
-[System.Reflection.Assembly]::LoadWithPartialName("PresentationFramework") | Out-Null
-
-function Import-Xaml {
- [xml]$xaml = Get-Content -Path $PSScriptRoot\BlankWpfCodeBehind.xaml
- $manager = New-Object System.Xml.XmlNamespaceManager -ArgumentList $xaml.NameTable
- $manager.AddNamespace("x", "http://schemas.microsoft.com/winfx/2006/xaml");
- $xamlReader = New-Object System.Xml.XmlNodeReader $xaml
- [Windows.Markup.XamlReader]::Load($xamlReader)
-}
-
-$window = Import-Xaml
-$window.ShowDialog()
\ No newline at end of file
diff --git a/PowerShellTools.Test/WpfSupport/Resources/Xaml/XamlWithNamedButton.xaml b/PowerShellTools.Test/WpfSupport/Resources/Xaml/XamlWithNamedButton.xaml
deleted file mode 100644
index cc00916..0000000
--- a/PowerShellTools.Test/WpfSupport/Resources/Xaml/XamlWithNamedButton.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
diff --git a/PowerShellTools.Test/WpfSupport/WpfEventBindingProviderTest.cs b/PowerShellTools.Test/WpfSupport/WpfEventBindingProviderTest.cs
deleted file mode 100644
index 8ad75f9..0000000
--- a/PowerShellTools.Test/WpfSupport/WpfEventBindingProviderTest.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System.Management.Automation.Language;
-using Microsoft.VisualStudio.Text.Editor;
-using PowerShellToolsPro.Test.Mocking;
-using PowerShellToolsPro.WpfSupport;
-using Xunit;
-using Microsoft.Windows.Design.Host;
-using System;
-using PowerShellProTools.Host;
-
-namespace PowerShellToolsPro.Test.WpfSupport
-{
- public class WpfEventBindingProviderTest
- {
- private const string XamlResourceRoot = "PowerShellToolsPro.Test.WpfSupport.Resources.Xaml.";
- private const string PowerShellResourceRoot = "PowerShellToolsPro.Test.WpfSupport.Resources.PowerShell.";
-
- [Fact(Skip ="Test")]
- public void ShouldBePowerShellLanguage()
- {
- var xamlTextView = new TextEditor(
- TestUtilities.GetEmbeddedResource(XamlResourceRoot + "XamlWithNamedButton.xaml"), 601);
- var powerShellTextView = new TextEditor(
- TestUtilities.GetEmbeddedResource(PowerShellResourceRoot + "BlankWpfCodeBehind.ps1"), 0);
-
- var provider = new WpfEventBindingProvider(() => xamlTextView.TextView, () => powerShellTextView.TextView);
- Assert.Equal("PowerShell", provider.CodeProviderLanguage);
- }
-
- [Fact(Skip = "Need to fix")]
- public void ShouldAddControlVariableFunction()
- {
- var xamlTextView = new TextEditor(
- TestUtilities.GetEmbeddedResource(XamlResourceRoot + "XamlWithNamedButton.xaml"), 601);
- var powerShellTextView = new TextEditor(
- TestUtilities.GetEmbeddedResource(PowerShellResourceRoot + "BlankWpfCodeBehind.ps1"), 0);
-
- var provider = new WpfEventBindingProvider(() => xamlTextView.TextView, () => powerShellTextView.TextView);
-
- var eventDescription = new EventDescription("Click", "void");
-
- provider.CreateMethod(eventDescription, "OnClick", "");
-
- var ast = GetAstFromEditor(powerShellTextView);
- Assert.NotNull(ast.FindFunctionDefinitionAst("Add-ControlVariables"));
- }
-
- [Fact(Skip = "Need to fix")]
- public void ShouldPlaceAddControlVariablesFunctionAtBeginningOfFile()
- {
- var xamlTextView = new TextEditor(
- TestUtilities.GetEmbeddedResource(XamlResourceRoot + "XamlWithNamedButton.xaml"), 601);
- var powerShellTextView = new TextEditor(
- TestUtilities.GetEmbeddedResource(PowerShellResourceRoot + "BlankWpfCodeBehind.ps1"), 0);
-
- var provider = new WpfEventBindingProvider(() => xamlTextView.TextView, () => powerShellTextView.TextView);
-
- var eventDescription = new EventDescription("Click", "void");
-
- provider.CreateMethod(eventDescription, "OnClick", "");
-
- var ast = GetAstFromEditor(powerShellTextView);
- var functionDefinitionAst = ast.FindFunctionDefinitionAst("Add-ControlVariables");
-
- Assert.Equal(0, functionDefinitionAst.Extent.StartOffset);
- }
-
- [Fact(Skip = "Need to fix")]
- public void ShouldAddEventRemovalToLoadXaml()
- {
- var xamlTextView = new TextEditor(
- TestUtilities.GetEmbeddedResource(XamlResourceRoot + "XamlWithNamedButton.xaml"), 601);
- var powerShellTextView = new TextEditor(
- TestUtilities.GetEmbeddedResource(PowerShellResourceRoot + "BlankWpfCodeBehind.ps1"), 0);
-
- var provider = new WpfEventBindingProvider(() => xamlTextView.TextView, () => powerShellTextView.TextView);
-
- var eventDescription = new EventDescription("Click", "void");
-
- provider.CreateMethod(eventDescription, "OnClick", "");
-
- var ast = GetAstFromEditor(powerShellTextView);
- var functionDefinitionAst = ast.FindFunctionDefinitionAst("Import-Xaml");
-
- Assert.Contains("$xaml.SelectNodes(\"//*[@x:Name='Test']\", $manager)[0].RemoveAttribute('Click')", functionDefinitionAst.ToString());
- }
-
- private static Ast GetAstFromEditor(TextEditor editor)
- {
- var text = editor.TextView.TextBuffer.CurrentSnapshot.GetText();
-
- Token[] tokens;
- ParseError[] errors;
- return Parser.ParseInput(text, out tokens, out errors);
- }
- }
-}
diff --git a/PowerShellTools/PowerShellTools.15.0.imagemanifest b/PowerShellTools/PowerShellTools.15.0.imagemanifest
index 4bdce2a..680e130 100644
--- a/PowerShellTools/PowerShellTools.15.0.imagemanifest
+++ b/PowerShellTools/PowerShellTools.15.0.imagemanifest
@@ -2,7 +2,7 @@
-
+
diff --git a/PowerShellToolsPro.Cmdlets/PowerShellProTools.psd1 b/PowerShellToolsPro.Cmdlets/PowerShellProTools.psd1
index 383fb57..30bb728 100644
--- a/PowerShellToolsPro.Cmdlets/PowerShellProTools.psd1
+++ b/PowerShellToolsPro.Cmdlets/PowerShellProTools.psd1
@@ -18,7 +18,7 @@ ModuleVersion = '2024.7.0'
# CompatiblePSEditions = @()
# ID used to uniquely identify this module
-GUID = '4b665630-ddda-40ab-9b3b-818af8b586c5'
+GUID = '4b0c2845-3560-4dc6-b3d7-d56787a77d07'
# Author of this module
Author = 'Ironman Software, LLC'
diff --git a/PowerShellToolsPro.Cmdlets/PowerShellProTools.psm1 b/PowerShellToolsPro.Cmdlets/PowerShellProTools.psm1
index cef1247..97e8d91 100644
--- a/PowerShellToolsPro.Cmdlets/PowerShellProTools.psm1
+++ b/PowerShellToolsPro.Cmdlets/PowerShellProTools.psm1
@@ -151,8 +151,8 @@ function Expand-Object {
# 8GehghbYMIIW1AYKKwYBBAGCNwMDATGCFsQwghbABgkqhkiG9w0BBwKgghaxMIIW
# rQIBAzENMAsGCWCGSAFlAwQCATCB8wYLKoZIhvcNAQkQAQSggeMEgeAwgd0CAQEG
# CysGAQQBoDICAwECMDEwDQYJYIZIAWUDBAIBBQAEICkx1mva4klxbeW4WP91UJmg
-# DWt4BcXyh6cRKmeE4SEcAhRakVydJrDMdsQTdTzXjdBmz+7boBgPMjAyNDA3MTAx
-# NDM1MjVaMAMCAQECCQCyp0TJR9dMy6BhpF8wXTELMAkGA1UEBhMCQkUxGTAXBgNV
+# DWt4BcXyh6cRKmeE4SEcAhRPcCPJtPPlFI0H0eMPfvjVH8YrbxgPMjAyNDA3MTAx
+# NTE0NTNaMAMCAQECCQDUzjwBUOBts6BhpF8wXTELMAkGA1UEBhMCQkUxGTAXBgNV
# BAoMEEdsb2JhbFNpZ24gbnYtc2ExMzAxBgNVBAMMKkdsb2JhbHNpZ24gVFNBIGZv
# ciBDb2RlU2lnbjEgLSBSNiAtIDIwMjMxMaCCElQwggWDMIIDa6ADAgECAg5F5rsD
# gzPDhWVI5v9FUTANBgkqhkiG9w0BAQwFADBMMSAwHgYDVQQLExdHbG9iYWxTaWdu
@@ -257,17 +257,17 @@ function Expand-Object {
# bWVzdGFtcGluZyBDQSAtIFNIQTM4NCAtIEc0AhABm+reyE1rj/dsOp8uASQWMAsG
# CWCGSAFlAwQCAaCCAS0wGgYJKoZIhvcNAQkDMQ0GCyqGSIb3DQEJEAEEMCsGCSqG
# SIb3DQEJNDEeMBwwCwYJYIZIAWUDBAIBoQ0GCSqGSIb3DQEBCwUAMC8GCSqGSIb3
-# DQEJBDEiBCBvPFsy/u0xev2ZFD/1/g8z5brUk3MD3eaODHub4uKTATCBsAYLKoZI
+# DQEJBDEiBCCzjEKw9IOfNKpBLh2nt5WOYzR/vYWRCroHtw+0jSR6ejCBsAYLKoZI
# hvcNAQkQAi8xgaAwgZ0wgZowgZcEIDqIepUbXrkqXuFPbLt2gjelRdAQW/BFEb3i
# X4KpFtHoMHMwX6RdMFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWdu
# IG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIFRpbWVzdGFtcGluZyBDQSAtIFNI
-# QTM4NCAtIEc0AhABm+reyE1rj/dsOp8uASQWMA0GCSqGSIb3DQEBCwUABIIBgKgj
-# IqJuByxpZDxVTKT/8+hXo52WrR5CbRQNtUEwdDqiB6pk+X89VD0dEGVABxhWzFLj
-# cAjXJp/w0Mj45QUHtXgjGC1bpQL8jP3DaJtEZU1UAORTFbHkq0WPzx4z6VbuT6nl
-# 0Ve9l+iFAqVoJTJZyEZomPTL+s15Ao2xJTlDMexU8VHbysCbH1htiQ9TBkMfOlJt
-# abcOAN9vkWZP25cbLcQm2q/YQjn3BDMT/iMjrO30PP+yuGv2ItaJDVi305JxUXHP
-# F3tfF3Vx+wGWVbbksQHnsUI45HhrJjr4ieI3N6KnUsrumaONWQoAAzHdwVnuQ+jd
-# KgQ8dTsdp38eI75fNQsB80o2A3gBoKE1jqgwwIdd42txXfMBr3Jh3idgr/aZ2BwV
-# pA/aCTDlVsX1EZ8UsLXXOFKQyOPRCiqDDBP+Igz4axZf4BQhjKDXHmH7rsT9m8Vj
-# Pa8gT9qpIoOHzEx/nIBjAOAa+Xlv9546lggJpwXYZdy0lz6IJ46BqbLGKav5uQ==
+# QTM4NCAtIEc0AhABm+reyE1rj/dsOp8uASQWMA0GCSqGSIb3DQEBCwUABIIBgH4r
+# 7ahYM38gpCfKq7SRPJiFfaevcMnqZAwSfA8RHw4HEZUlG8I/Dvqc7ShHJ26rmr8Z
+# WTEaHVkBB14/2GgjhNS+32H9kHlnhTATXPef/EAnvrJJOn9pe/8GfPwDr7WDLpBB
+# nwydTpgN3QIOjCDOIjMVg2GpnxbII25Wm7puWQFxEarLNyucpy+ON2jbGNskxvvI
+# 0W2o0RJ6GBjow53pdh6G+2FfJVstusoObP1vLWrfam/atYp9ZJP4LKDkRe7AU23B
+# SdoQNUxh9z590vmd7Qrb4wdyVyhgKgtE9Mj6ALUy6gveBrP0DDI9S6KqIJ1B3vOQ
+# mVl91REMHEt/Rcn+8I1qGkfmxzbJ0C7GiPB3GOEBklVII7sN08z43GIniiMjTnjY
+# 5G4eRcnqV86N5OJV9eXXY9DZhMjedZeT2gKKnDGIG54S9oC6qRzdWWCSsaeSjRRM
+# OnyEa0+g8/ho5BBIs4gX2AngfZUzFUoe8DTtf09bFX2JTxxVV02x+SSJ3SqIsA==
# SIG # End signature block
diff --git a/poshtools.version.txt b/poshtools.version.txt
index b650325..ce9bbeb 100644
--- a/poshtools.version.txt
+++ b/poshtools.version.txt
@@ -1 +1 @@
-2024.3.0
\ No newline at end of file
+2024.7.0
\ No newline at end of file