3 files changed, 6 insertions, 6 deletions

diff --git a/src/test/WixToolsetTest.PowerShell/TestData/TypesFile/Package.wxs b/src/test/WixToolsetTest.PowerShell/TestData/TypesFile/Package.wxs
index 082ac4cc..411893bc 100644
--- a/src/test/WixToolsetTest.PowerShell/TestData/TypesFile/Package.wxs
+++ b/src/test/WixToolsetTest.PowerShell/TestData/TypesFile/Package.wxs
@@ -8,10 +8,8 @@
   </Package>
 
   <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-      </Directory>
-    </Directory>
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+    </StandardDirectory>
   </Fragment>
 </Wix>
diff --git a/src/wixext/PSCompiler.cs b/src/wixext/PSCompiler.cs
index 3b09897a..37591282 100644
--- a/src/wixext/PSCompiler.cs
+++ b/src/wixext/PSCompiler.cs
@@ -175,7 +175,7 @@ namespace WixToolset.PowerShell
             // for use in Formats and Types files. PowerShell v2 still uses 1.
             var major = (2 == requiredPowerShellVersion.Major) ? 1 : requiredPowerShellVersion.Major;
 
-            var variableId = new Identifier(AccessModifier.Public, String.Format(CultureInfo.InvariantCulture, "{0}_{1}", VarPrefix, id));
+            var variableId = new Identifier(AccessModifier.Global, String.Format(CultureInfo.InvariantCulture, "{0}_{1}", VarPrefix, id));
             section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, variableId)
             {
                 Value = major.ToString(CultureInfo.InvariantCulture),
diff --git a/src/wixext/WixToolset.PowerShell.wixext.csproj b/src/wixext/WixToolset.PowerShell.wixext.csproj
index 32bd9bac..a89a574c 100644
--- a/src/wixext/WixToolset.PowerShell.wixext.csproj
+++ b/src/wixext/WixToolset.PowerShell.wixext.csproj
@@ -10,10 +10,12 @@
     <IsTool>true</IsTool>
     <ContentTargetFolders>build</ContentTargetFolders>
   </PropertyGroup>
+
   <ItemGroup>
     <Content Include="$(MSBuildThisFileName).targets" />
     <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" />
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
   </ItemGroup>