Update dependencies
Rob Mensching committed
Apr 7, 2021 at 23:05 UTC
79cc786be11fb288374222287c549b910e4ce65d
4 files changed
+7
-7
global.json
+1
-1
@@ -1,5 +1,5 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0170"
3
+ "WixToolset.Sdk": "4.0.0-build-0206"
4
}
5
}
src/test/WixToolsetTest.PowerShell/TestData/TypesFile/Package.wxs
+3
-5
@@ -8,10 +8,8 @@
8
</Package>
9
10
<Fragment>
11
- <Directory Id="TARGETDIR" Name="SourceDir">
12
- <Directory Id="ProgramFilesFolder">
13
- <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
14
- </Directory>
15
- </Directory>
11
+ <StandardDirectory Id="ProgramFilesFolder">
12
+ <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
13
+ </StandardDirectory>
14
</Fragment>
15
</Wix>
src/wixext/PSCompiler.cs
+1
-1
@@ -175,7 +175,7 @@ namespace WixToolset.PowerShell
175
// for use in Formats and Types files. PowerShell v2 still uses 1.
176
var major = (2 == requiredPowerShellVersion.Major) ? 1 : requiredPowerShellVersion.Major;
177
178
- var variableId = new Identifier(AccessModifier.Public, String.Format(CultureInfo.InvariantCulture, "{0}_{1}", VarPrefix, id));
178
+ var variableId = new Identifier(AccessModifier.Global, String.Format(CultureInfo.InvariantCulture, "{0}_{1}", VarPrefix, id));
179
section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, variableId)
180
{
181
Value = major.ToString(CultureInfo.InvariantCulture),
src/wixext/WixToolset.PowerShell.wixext.csproj
+2
@@ -10,10 +10,12 @@
10
<IsTool>true</IsTool>
11
<ContentTargetFolders>build</ContentTargetFolders>
12
</PropertyGroup>
13
+
14
<ItemGroup>
15
<Content Include="$(MSBuildThisFileName).targets" />
16
<EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" />
17
</ItemGroup>
18
+
19
<ItemGroup>
20
<PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
21
</ItemGroup>